gridsort: pulled and merged DEV300_m100

11 files changed, 16 insertions, 14 deletions

diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
index b4b219b850e2..c434347b38e2 100644
--- a/toolkit/inc/layout/layout.hxx
+++ b/toolkit/inc/layout/layout.hxx
@@ -795,7 +795,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..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;
 
-    ULONG                           nDummy1;
-    ULONG                           nDummy2;
+    sal_uLong                           nDummy1;
+    sal_uLong                           nDummy2;
     void*                           pDummy1;
     VCLExternalSolarLock*           m_pSolarLock;
 
diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/toolkit/inc/toolkit/awt/vclxdevice.hxx
index bb1c35078055..ca0b20a3f4bc 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 565691b97f09..81419fcafa0f 100644
--- a/toolkit/inc/toolkit/awt/vclxwindow.hxx
+++ b/toolkit/inc/toolkit/awt/vclxwindow.hxx
@@ -100,7 +100,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 1d3b10120e0c..547ee86c66e4 100644
--- a/toolkit/inc/toolkit/awt/vclxwindows.hxx
+++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx
@@ -292,7 +292,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/controlmodelcontainerbase.hxx b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
index aa4931f6923f..3090eba68749 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 040196f6e68a..17b958aeace9 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);
 
diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx
index 397abc72dfbf..09622d2c8ef8 100644
--- a/toolkit/inc/toolkit/controls/unocontrols.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrols.hxx
@@ -116,7 +116,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;
@@ -1019,7 +1019,7 @@ class UnoSpinFieldControl : public UnoEditControl,
 {
 private:
     SpinListenerMultiplexer     maSpinListeners;
-    BOOL                        mbRepeat;
+    sal_Bool                        mbRepeat;
 
 public:
                                 UnoSpinFieldControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
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 );