Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
automation/source/communi/communi.cxx
automation/source/server/recorder.cxx
automation/source/server/server.cxx
basctl/source/basicide/basobj2.cxx

1 files changed, 5 insertions, 5 deletions

diff --git a/extensions/source/preload/oemwiz.hxx b/extensions/source/preload/oemwiz.hxx
index e7b0c36db46b..b051eab9614f 100644
--- a/extensions/source/preload/oemwiz.hxx
+++ b/extensions/source/preload/oemwiz.hxx
@@ -91,7 +91,7 @@ namespace preload
     };
     class LicenceView : public MultiLineEdit, public SfxListener
     {
-        BOOL            mbEndReached;
+        sal_Bool            mbEndReached;
         Link            maEndReachedHdl;
         Link            maScrolledHdl;
 
@@ -101,9 +101,9 @@ namespace preload
 
         void            ScrollDown( ScrollType eScroll );
 
-        BOOL            IsEndReached() const;
-        BOOL            EndReached() const { return mbEndReached; }
-        void            SetEndReached( BOOL bEnd ) { mbEndReached = bEnd; }
+        sal_Bool            IsEndReached() const;
+        sal_Bool            EndReached() const { return mbEndReached; }
+        void            SetEndReached( sal_Bool bEnd ) { mbEndReached = bEnd; }
 
         void            SetEndReachedHdl( const Link& rHdl )  { maEndReachedHdl = rHdl; }
         const Link&     GetAutocompleteHdl() const { return maEndReachedHdl; }
@@ -129,7 +129,7 @@ namespace preload
         String          aStrAccept;
         String          aStrNotAccept;
         String          aOldCancelText;
-        BOOL            bEndReached;
+        sal_Bool            bEndReached;
 
         OEMPreloadDialog* pPreloadDialog;