removetooltypes01: #i112600# Last fixes for VCL

2 files changed, 5 insertions, 5 deletions

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() )
     {