removetooltypes01: #i112600# Last fixes for VCL

8 files changed, 28 insertions, 28 deletions

diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 4f9a739ea85a..f58f49865f7c 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -193,14 +193,14 @@ SalFrame* GtkInstance::CreateFrame( SalFrame* pParent, sal_uInt32 nStyle )
     return new GtkSalFrame( pParent, nStyle );
 }
 
-SalFrame* GtkInstance::CreateChildFrame( SystemParentData* pParentData, ULONG )
+SalFrame* GtkInstance::CreateChildFrame( SystemParentData* pParentData, sal_uInt32 )
 {
     SalFrame* pFrame = new GtkSalFrame( pParentData );
 
     return pFrame;
 }
 
-SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow )
+SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow )
 {
     // there is no method to set a visual for a GtkWidget
     // so we need the X11SalObject in that case
diff --git a/vcl/unx/source/printer/jobdata.cxx b/vcl/unx/source/printer/jobdata.cxx
index d4211eae31df..046c7fd681b9 100644
--- a/vcl/unx/source/printer/jobdata.cxx
+++ b/vcl/unx/source/printer/jobdata.cxx
@@ -167,7 +167,7 @@ bool JobData::getStreamBuffer( void*& pData, int& bytes )
 
     // now append the PPDContext stream buffer
     aStream.WriteLine( "PPDContexData" );
-    ULONG nBytes;
+    sal_uInt32 nBytes;
     void* pContextBuffer = m_aContext.getStreamableBuffer( nBytes );
     if( nBytes )
         aStream.Write( pContextBuffer, nBytes );
diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/source/printer/ppdparser.cxx
index 587e58be5bc7..3cdd4c35f3ec 100644
--- a/vcl/unx/source/printer/ppdparser.cxx
+++ b/vcl/unx/source/printer/ppdparser.cxx
@@ -311,7 +311,7 @@ void PPDDecompressStream::Open( const rtl::OUString& i_rFile )
     mpFileStream->Seek( 0 );
 
     // check for compress'ed or gzip'ed file
-    ULONG nCompressMethod = 0;
+    sal_uInt32 nCompressMethod = 0;
     if( aLine.Len() > 1 && static_cast<unsigned char>(aLine.GetChar( 0 )) == 0x1f )
     {
         if( static_cast<unsigned char>(aLine.GetChar( 1 )) == 0x8b ) // check for gzip
@@ -1110,7 +1110,7 @@ void PPDParser::parse( ::std::list< ByteString >& rLines )
             m_pTranslator->insertValue( aUniKey, aOption, aValue, aValueTranslation, aTransLocale );
 
         // eventually update query and remove from option list
-        if( bQuery && pKey->m_bQueryValue == FALSE )
+        if( bQuery && pKey->m_bQueryValue == sal_False )
         {
             pKey->m_aQueryValue = *pValue;
             pKey->m_bQueryValue = true;
@@ -1125,7 +1125,7 @@ void PPDParser::parse( ::std::list< ByteString >& rLines )
         if( aLine.CompareTo( "*Default", 8 ) == COMPARE_EQUAL )
         {
             String aKey( aLine.Copy( 8 ), RTL_TEXTENCODING_MS_1252 );
-            USHORT nPos = aKey.Search( ':' );
+            sal_uInt16 nPos = aKey.Search( ':' );
             if( nPos != STRING_NOTFOUND )
             {
                 aKey.Erase( nPos );
@@ -1417,7 +1417,7 @@ String PPDParser::getSlot( int nSlot ) const
     if( nSlot > 0 && nSlot < m_pInputSlots->countValues() )
         return m_pInputSlots->getValue( nSlot )->m_aOption;
     else if( m_pInputSlots->countValues() > 0 )
-        return m_pInputSlots->getValue( (ULONG)0 )->m_aOption;
+        return m_pInputSlots->getValue( (sal_uInt32)0 )->m_aOption;
 
     return String();
 }
@@ -1430,7 +1430,7 @@ String PPDParser::getSlotCommand( int nSlot ) const
     if( nSlot > 0 && nSlot < m_pInputSlots->countValues() )
         return m_pInputSlots->getValue( nSlot )->m_aValue;
     else if( m_pInputSlots->countValues() > 0 )
-        return m_pInputSlots->getValue( (ULONG)0 )->m_aValue;
+        return m_pInputSlots->getValue( (sal_uInt32)0 )->m_aValue;
 
     return String();
 }
@@ -1457,7 +1457,7 @@ String PPDParser::getPaperDimension( int nPaperDimension ) const
     if( nPaperDimension > 0 && nPaperDimension < m_pPaperDimensions->countValues() )
         return m_pPaperDimensions->getValue( nPaperDimension )->m_aOption;
     else if( m_pPaperDimensions->countValues() > 0 )
-        return m_pPaperDimensions->getValue( (ULONG)0 )->m_aOption;
+        return m_pPaperDimensions->getValue( (sal_uInt32)0 )->m_aOption;
 
     return String();
 }
@@ -1470,7 +1470,7 @@ String PPDParser::getPaperDimensionCommand( int nPaperDimension ) const
     if( nPaperDimension > 0 && nPaperDimension < m_pPaperDimensions->countValues() )
         return m_pPaperDimensions->getValue( nPaperDimension )->m_aValue;
     else if( m_pPaperDimensions->countValues() > 0 )
-        return m_pPaperDimensions->getValue( (ULONG)0 )->m_aValue;
+        return m_pPaperDimensions->getValue( (sal_uInt32)0 )->m_aValue;
 
     return String();
 }
@@ -1578,7 +1578,7 @@ String PPDParser::getDuplex( int nDuplex ) const
     if( nDuplex > 0 && nDuplex < m_pDuplexTypes->countValues() )
         return m_pDuplexTypes->getValue( nDuplex )->m_aOption;
     else if( m_pDuplexTypes->countValues() > 0 )
-        return m_pDuplexTypes->getValue( (ULONG)0 )->m_aOption;
+        return m_pDuplexTypes->getValue( (sal_uInt32)0 )->m_aOption;
 
     return String();
 }
@@ -1591,7 +1591,7 @@ String PPDParser::getDuplexCommand( int nDuplex ) const
     if( nDuplex > 0 && nDuplex < m_pDuplexTypes->countValues() )
         return m_pDuplexTypes->getValue( nDuplex )->m_aValue;
     else if( m_pDuplexTypes->countValues() > 0 )
-        return m_pDuplexTypes->getValue( (ULONG)0 )->m_aValue;
+        return m_pDuplexTypes->getValue( (sal_uInt32)0 )->m_aValue;
 
     return String();
 }
@@ -2033,7 +2033,7 @@ void PPDContext::getUnconstrainedValues( const PPDKey* pKey, ::std::list< const
 
 // -------------------------------------------------------------------
 
-void* PPDContext::getStreamableBuffer( ULONG& rBytes ) const
+void* PPDContext::getStreamableBuffer( sal_uInt32& rBytes ) const
 {
     rBytes = 0;
     if( ! m_aCurrentValues.size() )
@@ -2079,7 +2079,7 @@ void* PPDContext::getStreamableBuffer( ULONG& rBytes ) const
 
 // -------------------------------------------------------------------
 
-void PPDContext::rebuildFromStreamBuffer( void* pBuffer, ULONG nBytes )
+void PPDContext::rebuildFromStreamBuffer( void* pBuffer, sal_uInt32 nBytes )
 {
     if( ! m_pParser )
         return;
diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/source/printer/printerinfomanager.cxx
index af189b1b01b5..421ce74b98d8 100644
--- a/vcl/unx/source/printer/printerinfomanager.cxx
+++ b/vcl/unx/source/printer/printerinfomanager.cxx
@@ -328,7 +328,7 @@ void PrinterInfoManager::initialize()
                         m_aGlobalDefaults.m_aContext.
                         setValue( pKey,
                         aValue.Equals( "*nil" ) ? NULL : pKey->getValue( String( aValue, RTL_TEXTENCODING_ISO_8859_1 ) ),
-                        TRUE );
+                        sal_True );
                     }
                 }
                 else if( aKey.Len() > 10 && aKey.CompareTo("SubstFont_", 10 ) == COMPARE_EQUAL )
@@ -533,7 +533,7 @@ void PrinterInfoManager::initialize()
                             aPrinter.m_aInfo.m_aContext.
                             setValue( pKey,
                             aValue.Equals( "*nil" ) ? NULL : pKey->getValue( String( aValue, RTL_TEXTENCODING_ISO_8859_1 ) ),
-                            TRUE );
+                            sal_True );
                         }
                     }
                     else if( aKey.Len() > 10 && aKey.CompareTo("SubstFont_", 10 ) == COMPARE_EQUAL )
diff --git a/vcl/unx/source/printergfx/common_gfx.cxx b/vcl/unx/source/printergfx/common_gfx.cxx
index 6bb31acfcbbe..fa032c46a74b 100644
--- a/vcl/unx/source/printergfx/common_gfx.cxx
+++ b/vcl/unx/source/printergfx/common_gfx.cxx
@@ -527,9 +527,9 @@ PrinterGfx::DrawPolyPolygon (sal_uInt32 nPoly, const sal_uInt32* pSizes, const P
  */
 
 void
-PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const BYTE* pFlgAry)
+PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const sal_uInt8* pFlgAry)
 {
-    const sal_uInt32 nBezString = 1024;
+    const sal_uInt32 nBezString= 1024;
     sal_Char pString[nBezString];
 
     if ( nPoints > 1 && maLineColor.Is() && pPath )
@@ -578,7 +578,7 @@ PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const BY
 }
 
 void
-PrinterGfx::DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const BYTE* pFlgAry)
+PrinterGfx::DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const sal_uInt8* pFlgAry)
 {
     const sal_uInt32 nBezString = 1024;
     sal_Char pString[nBezString];
@@ -634,7 +634,7 @@ PrinterGfx::DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const BYT
 }
 
 void
-PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints, const Point* const * pPtAry, const BYTE* const* pFlgAry)
+PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints, const Point* const * pPtAry, const sal_uInt8* const* pFlgAry)
 {
     const sal_uInt32 nBezString = 1024;
     sal_Char pString[nBezString];
diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/source/printergfx/printerjob.cxx
index af2cf14b1a0c..947eb290ec60 100644
--- a/vcl/unx/source/printergfx/printerjob.cxx
+++ b/vcl/unx/source/printergfx/printerjob.cxx
@@ -410,7 +410,7 @@ PrinterJob::StartJob (
     rtl::OUString aFilterWS;
 
     // Creator (this application)
-    aFilterWS = WhitespaceToSpace( rAppName, FALSE );
+    aFilterWS = WhitespaceToSpace( rAppName, sal_False );
     WritePS (mpJobHeader, "%%Creator: (");
     WritePS (mpJobHeader, aFilterWS);
     WritePS (mpJobHeader, ")\n");
@@ -448,14 +448,14 @@ PrinterJob::StartJob (
     * use the filename, if it contains only ascii
     * else omit %%Title
     */
-    aFilterWS = WhitespaceToSpace( rJobName, FALSE );
+    aFilterWS = WhitespaceToSpace( rJobName, sal_False );
     rtl::OUString aTitle( aFilterWS );
     if( ! isAscii( aTitle ) )
     {
         sal_Int32 nIndex = 0;
         while( nIndex != -1 )
             aTitle = rFileName.getToken( 0, '/', nIndex );
-        aTitle = WhitespaceToSpace( aTitle, FALSE );
+        aTitle = WhitespaceToSpace( aTitle, sal_False );
         if( ! isAscii( aTitle ) )
             aTitle = rtl::OUString();
     }
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 61ed22ca95e7..605ca1fe5fa2 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -140,7 +140,7 @@ public:
     void        Paint( const Rectangle& rRect );
     void        Resize();
 
-    BOOL        Close();
+    sal_Bool        Close();
 
     void parseList( const rtl::OString& rList );
     rtl::OString processCommand( const rtl::OString& rCommand );
@@ -189,9 +189,9 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
     m_aQuitButton.Show();
 }
 
-BOOL MyWin::Close()
+sal_Bool MyWin::Close()
 {
-    BOOL bRet = WorkWindow::Close();
+    sal_Bool bRet = WorkWindow::Close();
     if( bRet )
         Application::Quit();
     return bRet;
@@ -272,7 +272,7 @@ IMPL_LINK( MyWin, QuitHdl, Button*, )
 IMPL_LINK( MyWin, SelectHdl, ListBox*, )
 {
     String aEntry = m_aSvpBitmaps.GetSelectEntry();
-    USHORT nPos = aEntry.SearchAscii( ": " );
+    sal_uInt16 nPos = aEntry.SearchAscii( ": " );
     if( nPos != STRING_NOTFOUND )
     {
         OStringBuffer aCommand( 64 );
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 8f901d1c200b..aec1eb4ae63a 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -188,7 +188,7 @@ static Point project( const Point& rPoint )
 static Color approachColor( const Color& rFrom, const Color& rTo )
 {
     Color aColor;
-    UINT8 nDiff;
+    sal_uInt8 nDiff;
     // approach red
     if( rFrom.GetRed() < rTo.GetRed() )
     {