removetooltypes01: #i112600# remove tooltypes from toolkit, svtools and framework

5 files changed, 45 insertions, 45 deletions

diff --git a/svtools/bmpmaker/bmp.cxx b/svtools/bmpmaker/bmp.cxx
index 5b473b0289c2..204fd404d329 100644
--- a/svtools/bmpmaker/bmp.cxx
+++ b/svtools/bmpmaker/bmp.cxx
@@ -54,19 +54,19 @@ class BmpApp : public BmpCreator
 private:
 
     String          aOutputFileName;
-    BYTE            cExitCode;
+    sal_uInt8           cExitCode;
 
-    BOOL            GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rSwitchParam );
-    BOOL            GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rSwitchParams );
+    sal_Bool            GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rSwitchParam );
+    sal_Bool            GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rSwitchParams );
 
-    void            SetExitCode( BYTE cExit )
+    void            SetExitCode( sal_uInt8 cExit )
                     {
                         if( ( EXIT_NOERROR == cExitCode ) || ( cExit != EXIT_NOERROR ) )
                             cExitCode = cExit;
                     }
     void            ShowUsage();
 
-    virtual void    Message( const String& rText, BYTE cExitCode );
+    virtual void    Message( const String& rText, sal_uInt8 cExitCode );
 
 public:
 
@@ -90,9 +90,9 @@ BmpApp::~BmpApp()
 
 // -----------------------------------------------------------------------
 
-BOOL BmpApp::GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam )
+sal_Bool BmpApp::GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     for( int i = 0, nCount = rArgs.size(); ( i < nCount ) && !bRet; i++ )
     {
@@ -104,7 +104,7 @@ BOOL BmpApp::GetCommandOption( const ::std::vector< String >& rArgs, const Strin
 
             if( aTestStr.CompareIgnoreCaseToAscii( rArgs[ i ] ) == COMPARE_EQUAL )
             {
-                bRet = TRUE;
+                bRet = sal_True;
 
                 if( i < ( nCount - 1 ) )
                     rParam = rArgs[ i + 1 ];
@@ -122,9 +122,9 @@ BOOL BmpApp::GetCommandOption( const ::std::vector< String >& rArgs, const Strin
 
 // -----------------------------------------------------------------------
 
-BOOL BmpApp::GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rParams )
+sal_Bool BmpApp::GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rParams )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     for( int i = 0, nCount = rArgs.size(); ( i < nCount ); i++ )
     {
@@ -154,7 +154,7 @@ BOOL BmpApp::GetCommandOptions( const ::std::vector< String >& rArgs, const Stri
 
 // -----------------------------------------------------------------------
 
-void BmpApp::Message( const String& rText, BYTE cExit )
+void BmpApp::Message( const String& rText, sal_uInt8 cExit )
 {
     if( EXIT_NOERROR != cExit )
         SetExitCode( cExit );
@@ -188,7 +188,7 @@ int BmpApp::Start( const ::std::vector< String >& rArgs )
     if( rArgs.size() >= 6 )
     {
         LangInfo                aLangInfo;
-        USHORT                  nCurCmd = 0;
+        sal_uInt16                  nCurCmd = 0;
         const String            aSrsName( rArgs[ nCurCmd++ ] );
         ::std::vector< String > aInDirVector;
         ByteString              aLangDir;
diff --git a/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx
index 9e134c06a670..ed3ae80b2788 100644
--- a/svtools/bmpmaker/bmpcore.cxx
+++ b/svtools/bmpmaker/bmpcore.cxx
@@ -72,7 +72,7 @@ BmpCreator::~BmpCreator()
 
 // -----------------------------------------------------------------------------
 
-void BmpCreator::Message( const String&, BYTE )
+void BmpCreator::Message( const String&, sal_uInt8 )
 {
 }
 
@@ -329,7 +329,7 @@ void BmpCreator::Create( const String& rSRSName,
 {
     DirEntry                    aFileName( ImplGetSystemFileName( rSRSName ) ), aOutDir( ImplGetSystemFileName( rOutName ) );
     ::std::vector< DirEntry >   aInDirs;
-    BOOL                        bDone = FALSE;
+    sal_Bool                        bDone = sal_False;
 
     aFileName.ToAbs();
     aOutDir.ToAbs();
@@ -361,7 +361,7 @@ void BmpCreator::Create( const String& rSRSName,
     {
         String      aText;
         ByteString  aByteText;
-        BOOL        bLangDep = FALSE;
+        sal_Bool        bLangDep = sal_False;
 
         do
         {
@@ -389,7 +389,7 @@ void BmpCreator::Create( const String& rSRSName,
                     aByteText.Search( '[' ) != STRING_NOTFOUND &&
                     aByteText.Search( ']' ) != STRING_NOTFOUND )
                 {
-                    bLangDep = TRUE;
+                    bLangDep = sal_True;
                 }
 
                 if (!pSRS->ReadLine(aByteText))
@@ -401,13 +401,13 @@ void BmpCreator::Create( const String& rSRSName,
             // if image list is not language dependent, don't do anything for languages except german
             if( aText.Len() )
             {
-                bDone = TRUE;
+                bDone = sal_True;
                 ImplCreate( aInDirs, aOutDir, aName, rLang );
             }
 /*          else if( ( rLang.mnLangNum != 49 ) && !bLangDep )
             {
                 Message( String( RTL_CONSTASCII_USTRINGPARAM( "INFO: ImageList is not language dependent! Nothing to do for this language." ) ) );
-                bDone = TRUE;
+                bDone = sal_True;
             }*/
         }
         while ( aText.Len() );
diff --git a/svtools/bmpmaker/bmpcore.hxx b/svtools/bmpmaker/bmpcore.hxx
index ece4fa09cf78..6b28af103717 100644
--- a/svtools/bmpmaker/bmpcore.hxx
+++ b/svtools/bmpmaker/bmpcore.hxx
@@ -55,7 +55,7 @@
 struct LangInfo
 {
     char    maLangDir[ 257 ];
-    USHORT  mnLangNum;
+    sal_uInt16  mnLangNum;
 };
 
 // --------------
@@ -71,8 +71,8 @@ private:
     Size            aTotSize;
     Point           aPos;
     SvFileStream*   pSRS;
-    ULONG           nTotCount;
-    USHORT          nPos;
+    sal_uIntPtr         nTotCount;
+    sal_uInt16          nPos;
 
     void            ImplCreate( const ::std::vector< DirEntry >& rInDirs,
                                 const DirEntry& rOut,
@@ -81,7 +81,7 @@ private:
 
 protected:
 
-    virtual void    Message( const String& rText, BYTE cExitCode = EXIT_NOERROR );
+    virtual void    Message( const String& rText, sal_uInt8 cExitCode = EXIT_NOERROR );
 
 public:
 
diff --git a/svtools/bmpmaker/bmpsum.cxx b/svtools/bmpmaker/bmpsum.cxx
index 7c264e694a12..0ac43ce57148 100644
--- a/svtools/bmpmaker/bmpsum.cxx
+++ b/svtools/bmpmaker/bmpsum.cxx
@@ -58,16 +58,16 @@ private:
 
     sal_uInt32      cExitCode;
 
-    BOOL            GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rSwitchParam );
-    BOOL            GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rSwitchParams );
+    sal_Bool            GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rSwitchParam );
+    sal_Bool            GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rSwitchParams );
 
-    void            SetExitCode( BYTE cExit )
+    void            SetExitCode( sal_uInt8 cExit )
                     {
                         if( ( EXIT_NOERROR == cExitCode ) || ( cExit != EXIT_NOERROR ) )
                             cExitCode = cExit;
                     }
     void            ShowUsage();
-    void            Message( const String& rText, BYTE cExitCode );
+    void            Message( const String& rText, sal_uInt8 cExitCode );
 
     sal_uInt64      GetCRC( const BitmapEx& rBmpEx );
 
@@ -96,9 +96,9 @@ BmpSum::~BmpSum()
 
 // -----------------------------------------------------------------------
 
-BOOL BmpSum::GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam )
+sal_Bool BmpSum::GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     for( int i = 0, nCount = rArgs.size(); ( i < nCount ) && !bRet; i++ )
     {
@@ -110,7 +110,7 @@ BOOL BmpSum::GetCommandOption( const ::std::vector< String >& rArgs, const Strin
 
             if( aTestStr.CompareIgnoreCaseToAscii( rArgs[ i ] ) == COMPARE_EQUAL )
             {
-                bRet = TRUE;
+                bRet = sal_True;
 
                 if( i < ( nCount - 1 ) )
                     rParam = rArgs[ i + 1 ];
@@ -128,9 +128,9 @@ BOOL BmpSum::GetCommandOption( const ::std::vector< String >& rArgs, const Strin
 
 // -----------------------------------------------------------------------
 
-BOOL BmpSum::GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rParams )
+sal_Bool BmpSum::GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rParams )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     for( int i = 0, nCount = rArgs.size(); ( i < nCount ); i++ )
     {
@@ -160,7 +160,7 @@ BOOL BmpSum::GetCommandOptions( const ::std::vector< String >& rArgs, const Stri
 
 // -----------------------------------------------------------------------
 
-void BmpSum::Message( const String& rText, BYTE nExitCode )
+void BmpSum::Message( const String& rText, sal_uInt8 nExitCode )
 {
     if( EXIT_NOERROR != nExitCode )
         SetExitCode( nExitCode );
diff --git a/svtools/bmpmaker/g2g.cxx b/svtools/bmpmaker/g2g.cxx
index 6f4ee0f86279..0a308cccda40 100644
--- a/svtools/bmpmaker/g2g.cxx
+++ b/svtools/bmpmaker/g2g.cxx
@@ -56,13 +56,13 @@ class G2GApp
 {
 private:
 
-    BYTE            cExitCode;
+    sal_uInt8           cExitCode;
 
     void            ShowUsage();
-    BOOL            GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam );
-    void            SetExitCode( BYTE cExit ) { if( ( EXIT_NOERROR == cExitCode ) || ( cExit != EXIT_NOERROR ) ) cExitCode = cExit; }
+    sal_Bool            GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam );
+    void            SetExitCode( sal_uInt8 cExit ) { if( ( EXIT_NOERROR == cExitCode ) || ( cExit != EXIT_NOERROR ) ) cExitCode = cExit; }
 
-    virtual void    Message( const String& rText, BYTE cExitCode = EXIT_NOERROR );
+    virtual void    Message( const String& rText, sal_uInt8 cExitCode = EXIT_NOERROR );
 
 public:
 
@@ -86,9 +86,9 @@ G2GApp::~G2GApp()
 
 // -----------------------------------------------------------------------
 
-BOOL G2GApp::GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam )
+sal_Bool G2GApp::GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rParam )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     for( int i = 0, nCount = rArgs.size(); ( i < nCount ) && !bRet; i++ )
     {
@@ -100,7 +100,7 @@ BOOL G2GApp::GetCommandOption( const ::std::vector< String >& rArgs, const Strin
 
             if( aTestStr.CompareIgnoreCaseToAscii( rArgs[ i ] ) == COMPARE_EQUAL )
             {
-                bRet = TRUE;
+                bRet = sal_True;
 
                 if( i < ( nCount - 1 ) )
                     rParam = rArgs[ i + 1 ];
@@ -118,7 +118,7 @@ BOOL G2GApp::GetCommandOption( const ::std::vector< String >& rArgs, const Strin
 
 // -----------------------------------------------------------------------
 
-void G2GApp::Message( const String& rText, BYTE nExitCode )
+void G2GApp::Message( const String& rText, sal_uInt8 nExitCode )
 {
     if( EXIT_NOERROR != nExitCode )
         SetExitCode( nExitCode );
@@ -148,7 +148,7 @@ void G2GApp::ShowUsage()
 int G2GApp::Start( const ::std::vector< String >& rArgs )
 {
     int     nCmdCount = rArgs.size();
-    USHORT  nCurCmd = 0;
+    sal_uInt16  nCurCmd = 0;
 
     cExitCode = EXIT_NOERROR;
 
@@ -167,7 +167,7 @@ int G2GApp::Start( const ::std::vector< String >& rArgs )
 
         if( aInFile.Len() && aOutFile.Len() && aFilterStr.Len() )
         {
-            const USHORT nExportFilter = aFilter.GetExportFormatNumberForShortName( aFilterStr );
+            const sal_uInt16 nExportFilter = aFilter.GetExportFormatNumberForShortName( aFilterStr );
 
             if( GRFILTER_FORMAT_NOTFOUND == nExportFilter )
                 Message( String( RTL_CONSTASCII_USTRINGPARAM( "invalid graphic filter" ) ), EXIT_INVALID_GRAPHICFILTER );
@@ -198,9 +198,9 @@ int G2GApp::Start( const ::std::vector< String >& rArgs )
 
                             if( bHex )
                             {
-                                const BYTE cTransR = ( LOWERHEXTONUM( aHexStr.GetChar( 0 ) ) << 4 ) | LOWERHEXTONUM( aHexStr.GetChar( 1 ) );
-                                const BYTE cTransG = ( LOWERHEXTONUM( aHexStr.GetChar( 2 ) ) << 4 ) | LOWERHEXTONUM( aHexStr.GetChar( 3 ) );
-                                const BYTE cTransB = ( LOWERHEXTONUM( aHexStr.GetChar( 4 ) ) << 4 ) | LOWERHEXTONUM( aHexStr.GetChar( 5 ) );
+                                const sal_uInt8 cTransR = ( LOWERHEXTONUM( aHexStr.GetChar( 0 ) ) << 4 ) | LOWERHEXTONUM( aHexStr.GetChar( 1 ) );
+                                const sal_uInt8 cTransG = ( LOWERHEXTONUM( aHexStr.GetChar( 2 ) ) << 4 ) | LOWERHEXTONUM( aHexStr.GetChar( 3 ) );
+                                const sal_uInt8 cTransB = ( LOWERHEXTONUM( aHexStr.GetChar( 4 ) ) << 4 ) | LOWERHEXTONUM( aHexStr.GetChar( 5 ) );
 
                                 BitmapEx    aBmpEx( aGraphic.GetBitmapEx() );
                                 Bitmap      aOldBmp( aBmpEx.GetBitmap() );