diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-07-21 13:15:51 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-07-21 13:15:51 +0100 |
| commit | 2f5a541fc2f747e467ed11bb9acbae324e9ff4f9 (patch) | |
| tree | c1ab5ba3f630ee0dd5450d0709683201a7151a28 | |
| parent | 4087d1192ac3d94f722c7844696eae1c95b39941 (diff) | |
cleanup mis-mergesfeature/layout
| -rw-r--r-- | vcl/inc/vcl/outdev.hxx | 8 | ||||
| -rw-r--r-- | vcl/source/control/tabctrl.cxx | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index 4bbd18c02c..b808f1b11e 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -1139,14 +1139,6 @@ public: */ sal_Bool HasAlpha(); - /** Added return value to see if EPS could be painted directly. - Theoreticaly, handing over a matrix would be needed to handle - painting rotated EPS files (e.g. contained mín Metafiles). This - would then need to be supported for Mac and PS printers, but - that's too much for now, wrote #i107046# for this */ - bool DrawEPS( const Point& rPt, const Size& rSz, - const GfxLink& rGfxLink, GDIMetaFile* pSubst = NULL ); - /// request XCanvas render interface for this OutputDevice ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > GetCanvas() const; diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 6996c4f173..cfd0afa7b1 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -2214,7 +2214,7 @@ void TabControl::SetMinimumSizePixel( const Size& i_rSize ) // ----------------------------------------------------------------------- -Size TabControl::GetTabPageReqSize( USHORT nPageId ) +Size TabControl::GetTabPageReqSize( sal_uInt16 nPageId ) { long nWidth = mnMaxPageWidth > 0 ? mnMaxPageWidth : LONG_MAX; return ImplGetItemSize( ImplGetItem (nPageId), nWidth ); |