diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-13 00:55:23 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-13 00:55:23 +0100 |
| commit | 7b6525c91e3d0c2aded14b6dbefb5fa8d06cf116 (patch) | |
| tree | 871e3d07a7d57b5818f7850697ec701223d354c4 /toolkit | |
| parent | 8a78e5b7a060cfd12ccbe5c9cf83b703c2b530cc (diff) | |
removing remaining tools types from toolkit
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/inc/toolkit/awt/vclxwindows.hxx | 2 | ||||
| -rw-r--r-- | toolkit/inc/toolkit/helper/servicenames.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx index 89de37a048fd..3949b543c685 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 b0ce59b05d02..d784f5950328 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[]; |