[Libreoffice-commits] .: Branch 'feature/layout' - vcl/inc vcl/source

[Michael Meeks]

 vcl/inc/vcl/outdev.hxx         |    8 --------
 vcl/source/control/tabctrl.cxx |    2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 2f5a541fc2f747e467ed11bb9acbae324e9ff4f9
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Jul 21 13:15:51 2011 +0100

    cleanup mis-merges

diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index 4bbd18c..b808f1b 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 6996c4f..cfd0afa 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 );