CWS gnumake3: pull in cws removetooltypes01

6 files changed, 19 insertions, 19 deletions

diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index 03352d33f7c6..eefb529d0ca7 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -225,7 +225,7 @@ IMPL_LINK( LicensePage, PageDownHdl, PushButton *, EMPTYARG )
 
 IMPL_LINK( LicensePage, EndReachedHdl, LicenseView *, EMPTYARG )
 {
-    m_bLicenseRead = TRUE;
+    m_bLicenseRead = sal_True;
     updateDialogTravelUI();
     return 0;
 }
@@ -259,20 +259,20 @@ void LicenseView::ScrollDown( ScrollType eScroll )
         pScroll->DoScrollAction( eScroll );
 }
 
-BOOL LicenseView::IsEndReached() const
+sal_Bool LicenseView::IsEndReached() const
 {
-    BOOL bEndReached;
+    sal_Bool bEndReached;
 
     ExtTextView*    pView = GetTextView();
     ExtTextEngine*  pEdit = GetTextEngine();
-    ULONG           nHeight = pEdit->GetTextHeight();
+    sal_uLong           nHeight = pEdit->GetTextHeight();
     Size            aOutSize = pView->GetWindow()->GetOutputSizePixel();
     Point           aBottom( 0, aOutSize.Height() );
 
-    if ( (ULONG) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
-        bEndReached = TRUE;
+    if ( (sal_uLong) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
+        bEndReached = sal_True;
     else
-        bEndReached = FALSE;
+        bEndReached = sal_False;
 
     return bEndReached;
 }
@@ -281,8 +281,8 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if ( rHint.IsA( TYPE(TextHint) ) )
     {
-        BOOL    bLastVal = EndReached();
-        ULONG   nId = ((const TextHint&)rHint).GetId();
+        sal_Bool    bLastVal = EndReached();
+        sal_uLong   nId = ((const TextHint&)rHint).GetId();
 
         if ( nId == TEXT_HINT_PARAINSERTED )
         {
diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx
index a89262e8ec5b..47eae23ff58c 100644
--- a/desktop/source/migration/pages.hxx
+++ b/desktop/source/migration/pages.hxx
@@ -64,7 +64,7 @@ protected:
 
 class LicenseView : public MultiLineEdit, public SfxListener
 {
-    BOOL            mbEndReached;
+    sal_Bool            mbEndReached;
     Link            maEndReachedHdl;
     Link            maScrolledHdl;
 
@@ -74,9 +74,9 @@ public:
 
     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; }
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 3e9836fa2e84..8bb9e82f3810 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -292,7 +292,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript
                     utl::TextSearch  ts(param, LANGUAGE_DONTKNOW);
 
                     xub_StrLen start = 0;
-                    xub_StrLen end   = static_cast<USHORT>(aExtIdentifier.getLength());
+                    xub_StrLen end   = static_cast<sal_uInt16>(aExtIdentifier.getLength());
                     if (ts.SearchFrwrd(aExtIdentifier, &start, &end))
                         return false;
                 }
@@ -317,7 +317,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript
                 utl::TextSearch  ts(param, LANGUAGE_DONTKNOW);
 
                 xub_StrLen start = 0;
-                xub_StrLen end   = static_cast<USHORT>(sDescriptionXmlURL.getLength());
+                xub_StrLen end   = static_cast<sal_uInt16>(sDescriptionXmlURL.getLength());
                 if (ts.SearchFrwrd(sDescriptionXmlURL, &start, &end))
                     return false;
             }
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 1ac8f38dca56..fb73a905db6b 100755
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -176,7 +176,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile )
                 bRet = true;
             else
             {
-                USHORT nLen;
+                sal_uInt16 nLen;
                 pStream->Seek (nSniffPos);
                 *pStream >> nLen;
                 if ( nLen < MAX_HEADER_LENGTH )
diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx
index 150a58ce2729..3489d7186b4f 100644
--- a/desktop/source/migration/wizard.cxx
+++ b/desktop/source/migration/wizard.cxx
@@ -102,7 +102,7 @@ static sal_Int32 getBuildId()
     return nBuildId;
 }
 
-WizardResId::WizardResId( USHORT nId ) :
+WizardResId::WizardResId( sal_uInt16 nId ) :
     ResId( nId, *FirstStartWizard::GetResManager() )
 {
 }
@@ -230,7 +230,7 @@ long FirstStartWizard::PreNotify( NotifyEvent& rNEvt )
     {
         const KeyCode& rKey = rNEvt.GetKeyEvent()->GetKeyCode();
         if( rKey.GetCode() == KEY_F1 && ! rKey.GetModifier() )
-            return TRUE;
+            return sal_True;
     }
     return RoadmapWizard::PreNotify(rNEvt);
 }
diff --git a/desktop/source/migration/wizard.hxx b/desktop/source/migration/wizard.hxx
index 48045f6b035f..96bd74dcd859 100644
--- a/desktop/source/migration/wizard.hxx
+++ b/desktop/source/migration/wizard.hxx
@@ -39,7 +39,7 @@ namespace desktop
 class WizardResId : public ResId
 {
 public:
-    WizardResId( USHORT nId );
+    WizardResId( sal_uInt16 nId );
 };
 
 class FirstStartWizard : public svt::RoadmapWizard