From cef41c30dd562e129b864b87c85f59bf038423a2 Mon Sep 17 00:00:00 2001 From: Xiaofei Zhang Date: Fri, 5 Nov 2010 10:31:15 +0800 Subject: removetooltypes01: #i112600# remove tooltypes from toolkit, svtools and framework --- toolkit/inc/layout/layout.hxx | 2 +- toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx | 4 ++-- toolkit/inc/toolkit/awt/vclxdevice.hxx | 2 +- toolkit/inc/toolkit/awt/vclxfont.hxx | 2 +- toolkit/inc/toolkit/awt/vclxmenu.hxx | 4 ++-- toolkit/inc/toolkit/awt/vclxwindow.hxx | 2 +- toolkit/inc/toolkit/awt/vclxwindows.hxx | 2 +- toolkit/inc/toolkit/controls/unocontrols.hxx | 4 ++-- toolkit/inc/toolkit/helper/unowrapper.hxx | 6 +++--- 9 files changed, 14 insertions(+), 14 deletions(-) (limited to 'toolkit/inc') diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx index 78c7ea29272a..2489064c152c 100644 --- a/toolkit/inc/layout/layout.hxx +++ b/toolkit/inc/layout/layout.hxx @@ -798,7 +798,7 @@ public: operator String(); String getString (); rtl::OUString getOUString (); - String GetToken (USHORT i, sal_Char c); + String GetToken (sal_uInt16 i, sal_Char c); }; class InPlugImpl; diff --git a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx index 12e7b10d8330..1d85dfe8d77b 100644 --- a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx @@ -74,8 +74,8 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> mxWindow; VCLXWindow* mpVCLXindow; - ULONG nDummy1; - ULONG nDummy2; + sal_uIntPtr nDummy1; + sal_uIntPtr nDummy2; void* pDummy1; VCLExternalSolarLock* m_pSolarLock; diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/toolkit/inc/toolkit/awt/vclxdevice.hxx index 62753a36136d..a0197ee617e5 100644 --- a/toolkit/inc/toolkit/awt/vclxdevice.hxx +++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx @@ -45,7 +45,7 @@ class VirtualDevice; // class VCLXDevice // ---------------------------------------------------- -// For using nDummy, no incompatible update, add a BOOL bCreatedWithToolkitMember later... +// For using nDummy, no incompatible update, add a sal_Bool bCreatedWithToolkitMember later... #define FLAGS_CREATEDWITHTOOLKIT 0x00000001 class TOOLKIT_DLLPUBLIC VCLXDevice : public ::com::sun::star::awt::XDevice, diff --git a/toolkit/inc/toolkit/awt/vclxfont.hxx b/toolkit/inc/toolkit/awt/vclxfont.hxx index e912f2d13114..352dae82c853 100644 --- a/toolkit/inc/toolkit/awt/vclxfont.hxx +++ b/toolkit/inc/toolkit/awt/vclxfont.hxx @@ -53,7 +53,7 @@ private: FontMetric* mpFontMetric; protected: - BOOL ImplAssertValidFontMetric(); + sal_Bool ImplAssertValidFontMetric(); ::osl::Mutex& GetMutex() { return maMutex; } public: diff --git a/toolkit/inc/toolkit/awt/vclxmenu.hxx b/toolkit/inc/toolkit/awt/vclxmenu.hxx index c675ad1d4bd9..7eee1bfea7c4 100644 --- a/toolkit/inc/toolkit/awt/vclxmenu.hxx +++ b/toolkit/inc/toolkit/awt/vclxmenu.hxx @@ -70,7 +70,7 @@ protected: DECL_LINK( MenuEventListener, VclSimpleEvent* ); - void ImplCreateMenu( BOOL bPopup ); + void ImplCreateMenu( sal_Bool bPopup ); public: VCLXMenu(); @@ -79,7 +79,7 @@ public: Menu* GetMenu() const { return mpMenu; } - BOOL IsPopupMenu() const; + sal_Bool IsPopupMenu() const; // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/awt/vclxwindow.hxx b/toolkit/inc/toolkit/awt/vclxwindow.hxx index 6ad3c3ab6076..5875a1571bce 100644 --- a/toolkit/inc/toolkit/awt/vclxwindow.hxx +++ b/toolkit/inc/toolkit/awt/vclxwindow.hxx @@ -98,7 +98,7 @@ protected: CreateAccessibleContext(); void SetSynthesizingVCLEvent( sal_Bool b ); - BOOL IsSynthesizingVCLEvent() const; + sal_Bool IsSynthesizingVCLEvent() const; void SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ); diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx index ca3267bffb5e..f4edaad82831 100644 --- a/toolkit/inc/toolkit/awt/vclxwindows.hxx +++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx @@ -305,7 +305,7 @@ private: ::rtl::OUString maActionCommand; protected: - void ImplClickedOrToggled( BOOL bToggled ); + void ImplClickedOrToggled( sal_Bool bToggled ); void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx index 88449418c70a..18385bffc709 100644 --- a/toolkit/inc/toolkit/controls/unocontrols.hxx +++ b/toolkit/inc/toolkit/controls/unocontrols.hxx @@ -119,7 +119,7 @@ private: // They only support XTextComponent, so keep the text // here, maybe there is no Peer when calling setText()... ::rtl::OUString maText; - USHORT mnMaxTextLen; + sal_uInt16 mnMaxTextLen; sal_Bool mbSetTextInPeer; sal_Bool mbSetMaxTextLenInPeer; @@ -1004,7 +1004,7 @@ class UnoSpinFieldControl : public UnoEditControl, { private: SpinListenerMultiplexer maSpinListeners; - BOOL mbRepeat; + sal_Bool mbRepeat; public: UnoSpinFieldControl(); diff --git a/toolkit/inc/toolkit/helper/unowrapper.hxx b/toolkit/inc/toolkit/helper/unowrapper.hxx index 31cc259b7fd0..562d78f34c83 100644 --- a/toolkit/inc/toolkit/helper/unowrapper.hxx +++ b/toolkit/inc/toolkit/helper/unowrapper.hxx @@ -60,17 +60,17 @@ public: virtual void ReleaseAllGraphics( OutputDevice* pOutDev ); // Window - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, BOOL bCreate ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, sal_Bool bCreate ); virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ); void WindowDestroyed( Window* pWindow ); void WindowEvent_Move( Window* pWindow ); void WindowEvent_Resize( Window* pWindow ); - void WindowEvent_Show( Window* pWindow, BOOL bShow ); + void WindowEvent_Show( Window* pWindow, sal_Bool bShow ); void WindowEvent_Close( Window* pWindow ); void WindowEvent_Minimize( Window* pWindow ); void WindowEvent_Normalize( Window* pWindow ); - void WindowEvent_Activate( Window* pWindow, BOOL bActivated ); + void WindowEvent_Activate( Window* pWindow, sal_Bool bActivated ); void WindowEvent_MouseButtonUp( Window* pWindow, const MouseEvent& rEvt ); void WindowEvent_MouseButtonDown( Window* pWindow, const MouseEvent& rEvt ); void WindowEvent_MouseMove( Window* pWindow, const MouseEvent& rEvt ); -- cgit From f0199f252c2cc653afef67ad321cf5544d7bf145 Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Fri, 14 Jan 2011 17:19:25 +0100 Subject: removetooltypes01: #i112600# Remove tool types from binfilter, starmath, svx, toolkit and xmloff --- toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'toolkit/inc') diff --git a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx index 1d85dfe8d77b..2c3744a2eefe 100644 --- a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx @@ -74,8 +74,8 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> mxWindow; VCLXWindow* mpVCLXindow; - sal_uIntPtr nDummy1; - sal_uIntPtr nDummy2; + sal_uLong nDummy1; + sal_uLong nDummy2; void* pDummy1; VCLExternalSolarLock* m_pSolarLock; -- cgit From ce5f1dd187c3a7d8113c7653fa887b98fd50aaf6 Mon Sep 17 00:00:00 2001 From: "Jens-Heiner Rechtien [hr]" Date: Fri, 11 Feb 2011 18:06:45 +0100 Subject: DEV300 masterfix: #i116814,i116838#: fix XCloneable so that tests work again --- toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx | 1 + toolkit/inc/toolkit/controls/dialogcontrol.hxx | 1 + 2 files changed, 2 insertions(+) (limited to 'toolkit/inc') diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx index d50fecd8a344..2246ec0204b4 100644 --- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx +++ b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx @@ -95,6 +95,7 @@ protected: ::rtl::OUString m_sTooltip; sal_Int16 m_nTabPageId; + void Clone_Impl(ControlModelContainerBase& _rClone) const; protected: ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/toolkit/inc/toolkit/controls/dialogcontrol.hxx index a68760715035..1ab0120ec470 100644 --- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx +++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx @@ -52,6 +52,7 @@ public: UnoControlDialogModel( const UnoControlDialogModel& rModel ); ~UnoControlDialogModel(); + UnoControlModel* Clone() const; // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); -- cgit