[Libreoffice-commits] .: Branch 'integration/dev300_m101' - toolkit/inc

[Bjoern Michaelsen]

 toolkit/inc/toolkit/awt/vclxwindows.hxx     |    2 +-
 toolkit/inc/toolkit/helper/servicenames.hxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit df1d42a0a2a16b9d4179bd56656fb70ad61ad03f
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Mar 13 00:55:23 2011 +0100

    removing remaining tools types from toolkit

diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx
index 01bab11..2721864 100644
--- a/toolkit/inc/toolkit/awt/vclxwindows.hxx
+++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx
@@ -536,7 +536,7 @@ public:
     virtual void SAL_CALL removeTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
     // C++
     TabControl*  getTabControl() const throw ( ::com::sun::star::uno::RuntimeException);
-    USHORT insertTab( TabPage*, rtl::OUString& sTitle );
+    sal_uInt16 insertTab( TabPage*, rtl::OUString& sTitle );
     static void     ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
diff --git a/toolkit/inc/toolkit/helper/servicenames.hxx b/toolkit/inc/toolkit/helper/servicenames.hxx
index 9537ab7..f335928 100644
--- a/toolkit/inc/toolkit/helper/servicenames.hxx
+++ b/toolkit/inc/toolkit/helper/servicenames.hxx
@@ -104,7 +104,7 @@ extern const sal_Char szServiceName_GridControlModel[];
 extern const sal_Char szServiceName_DefaultGridDataModel[];
 extern const sal_Char szServiceName_DefaultGridColumnModel[];
 extern const sal_Char szServiceName_GridColumn[];
-extern const sal_Char __FAR_DATA szServiceName_SortableGridDataModel[];
+extern const sal_Char szServiceName_SortableGridDataModel[];
 
 extern const sal_Char szServiceName_UnoSimpleAnimationControl[], szServiceName2_UnoSimpleAnimationControl[];
 extern const sal_Char szServiceName_UnoSimpleAnimationControlModel[], szServiceName2_UnoSimpleAnimationControlModel[];