rebase to DEV300_m100

14 files changed, 156 insertions, 156 deletions

diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 0f398c7e480a..e3d94a05d0ef 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -61,18 +61,18 @@ APChooseDevicePage::APChooseDevicePage( AddPrinterDialog* pParent ) :
         m_aOverTxt( this, PaResId( RID_ADDP_CHDEV_TXT_OVER ) )
 {
     FreeResource();
-    m_aPrinterBtn.Check( TRUE );
-    m_aFaxBtn.Check( FALSE );
-    m_aPDFBtn.Check( FALSE );
-    m_aOldBtn.Check( FALSE );
+    m_aPrinterBtn.Check( sal_True );
+    m_aFaxBtn.Check( sal_False );
+    m_aPDFBtn.Check( sal_False );
+    m_aOldBtn.Check( sal_False );
     if( ! AddPrinterDialog::getOldPrinterLocation().Len() )
-        m_aOldBtn.Enable( FALSE );
+        m_aOldBtn.Enable( sal_False );
     if( ! PrinterInfoManager::get().addOrRemovePossible() )
     {
-        m_aPrinterBtn.Check( FALSE );
-        m_aFaxBtn.Check( TRUE );
-        m_aPrinterBtn.Enable( FALSE );
-        m_aOldBtn.Enable( FALSE );
+        m_aPrinterBtn.Check( sal_False );
+        m_aFaxBtn.Check( sal_True );
+        m_aPrinterBtn.Enable( sal_False );
+        m_aOldBtn.Enable( sal_False );
     }
 }
 
@@ -129,7 +129,7 @@ bool APChooseDriverPage::check()
 
 void APChooseDriverPage::fill( PrinterInfo& rInfo )
 {
-    USHORT nPos = m_aDriverBox.GetSelectEntryPos();
+    sal_uInt16 nPos = m_aDriverBox.GetSelectEntryPos();
     String* pDriver = (String*)m_aDriverBox.GetEntryData( nPos );
     rInfo.m_aDriverName = *pDriver;
 #if OSL_DEBUG_LEVEL > 1
@@ -332,15 +332,15 @@ APNamePage::APNamePage( AddPrinterDialog* pParent, const String& rInitName, Devi
 {
     FreeResource();
     if( eKind != DeviceKind::Printer )
-        m_aDefaultBox.Show( FALSE );
+        m_aDefaultBox.Show( sal_False );
     else
         m_aNameEdt.SetText( rInitName );
     if( eKind != DeviceKind::Fax )
-        m_aFaxSwallowBox.Show( FALSE );
+        m_aFaxSwallowBox.Show( sal_False );
 
     m_aNameEdt.SetText( AddPrinterDialog::uniquePrinterName( m_aNameEdt.GetText() ) );
-    m_aDefaultBox.Check( FALSE );
-    m_aFaxSwallowBox.Check( FALSE );
+    m_aDefaultBox.Check( sal_False );
+    m_aFaxSwallowBox.Check( sal_False );
 }
 
 APNamePage::~APNamePage()
@@ -374,16 +374,16 @@ APCommandPage::APCommandPage( AddPrinterDialog* pParent, DeviceKind::type eKind
     ::std::list< String > aCommands;
     if( m_eKind == DeviceKind::Printer )
     {
-        m_aHelpBtn.Show( FALSE );
+        m_aHelpBtn.Show( sal_False );
         Size aSize = m_aCommandTxt.GetSizePixel();
         aSize.Width() = m_aCommandBox.GetSizePixel().Width();
         m_aCommandTxt.SetSizePixel( aSize );
     }
     if( m_eKind != DeviceKind::Pdf )
     {
-        m_aPdfDirBtn.Show( FALSE );
-        m_aPdfDirEdt.Show( FALSE );
-        m_aPdfDirTxt.Show( FALSE );
+        m_aPdfDirBtn.Show( sal_False );
+        m_aPdfDirEdt.Show( sal_False );
+        m_aPdfDirTxt.Show( sal_False );
     }
     switch( m_eKind )
     {
@@ -675,8 +675,8 @@ APFaxDriverPage::APFaxDriverPage( AddPrinterDialog* pParent )
 {
     FreeResource();
 
-    m_aDefBtn.Check( TRUE );
-    m_aSelectBtn.Check( FALSE );
+    m_aDefBtn.Check( sal_True );
+    m_aSelectBtn.Check( sal_False );
     m_aSelectBtn.SetStyle( m_aSelectBtn.GetStyle() | WB_WORDBREAK );
 }
 
@@ -708,9 +708,9 @@ APPdfDriverPage::APPdfDriverPage( AddPrinterDialog* pParent )
 {
     FreeResource();
 
-    m_aDefBtn.Check( TRUE );
-    m_aDistBtn.Check( FALSE );
-    m_aSelectBtn.Check( FALSE );
+    m_aDefBtn.Check( sal_True );
+    m_aDistBtn.Check( sal_False );
+    m_aSelectBtn.Check( sal_False );
     m_aSelectBtn.SetStyle( m_aSelectBtn.GetStyle() | WB_WORDBREAK );
 }
 
@@ -758,9 +758,9 @@ AddPrinterDialog::AddPrinterDialog( Window* pParent )
 {
     FreeResource();
     m_pCurrentPage = m_pChooseDevicePage = new APChooseDevicePage( this );
-    m_pCurrentPage->Show( TRUE );
-    m_aFinishPB.Enable( FALSE );
-    m_aPrevPB.Enable( FALSE );
+    m_pCurrentPage->Show( sal_True );
+    m_aFinishPB.Enable( sal_False );
+    m_aPrevPB.Enable( sal_False );
 
     m_aNextPB.SetClickHdl( LINK( this, AddPrinterDialog, ClickBtnHdl ) );
     m_aPrevPB.SetClickHdl( LINK( this, AddPrinterDialog, ClickBtnHdl ) );
@@ -822,7 +822,7 @@ void AddPrinterDialog::DataChanged( const DataChangedEvent& rEv )
 
 void AddPrinterDialog::advance()
 {
-    m_pCurrentPage->Show( FALSE );
+    m_pCurrentPage->Show( sal_False );
     if( m_pCurrentPage == m_pChooseDevicePage )
     {
         if( m_pChooseDevicePage->isPrinter() )
@@ -830,30 +830,30 @@ void AddPrinterDialog::advance()
             if( ! m_pChooseDriverPage )
                 m_pChooseDriverPage = new APChooseDriverPage( this );
             m_pCurrentPage = m_pChooseDriverPage;
-            m_aPrevPB.Enable( TRUE );
+            m_aPrevPB.Enable( sal_True );
         }
         else if( m_pChooseDevicePage->isOld() )
         {
             if( ! m_pOldPrinterPage )
                 m_pOldPrinterPage = new APOldPrinterPage( this );
             m_pCurrentPage = m_pOldPrinterPage;
-            m_aPrevPB.Enable( TRUE );
-            m_aFinishPB.Enable( TRUE );
-            m_aNextPB.Enable( FALSE );
+            m_aPrevPB.Enable( sal_True );
+            m_aFinishPB.Enable( sal_True );
+            m_aNextPB.Enable( sal_False );
         }
         else if( m_pChooseDevicePage->isFax() )
         {
             if( ! m_pFaxDriverPage )
                 m_pFaxDriverPage = new APFaxDriverPage( this );
             m_pCurrentPage = m_pFaxDriverPage;
-            m_aPrevPB.Enable( TRUE );
+            m_aPrevPB.Enable( sal_True );
         }
         else if( m_pChooseDevicePage->isPDF() )
         {
             if( ! m_pPdfDriverPage )
                 m_pPdfDriverPage = new APPdfDriverPage( this );
             m_pCurrentPage = m_pPdfDriverPage;
-            m_aPrevPB.Enable( TRUE );
+            m_aPrevPB.Enable( sal_True );
         }
     }
     else if( m_pCurrentPage == m_pChooseDriverPage )
@@ -869,8 +869,8 @@ void AddPrinterDialog::advance()
         else
             m_pNamePage->setText( m_aPrinter.m_aPrinterName );
         m_pCurrentPage = m_pNamePage;
-        m_aFinishPB.Enable( TRUE );
-        m_aNextPB.Enable( FALSE );
+        m_aFinishPB.Enable( sal_True );
+        m_aNextPB.Enable( sal_False );
     }
     else if( m_pCurrentPage == m_pFaxDriverPage )
     {
@@ -898,8 +898,8 @@ void AddPrinterDialog::advance()
         if( ! m_pFaxNamePage )
             m_pFaxNamePage = new APNamePage( this, String(), DeviceKind::Fax );
         m_pCurrentPage = m_pFaxNamePage;
-        m_aNextPB.Enable( FALSE );
-        m_aFinishPB.Enable( TRUE );
+        m_aNextPB.Enable( sal_False );
+        m_aFinishPB.Enable( sal_True );
     }
     else if( m_pCurrentPage == m_pPdfDriverPage )
     {
@@ -927,26 +927,26 @@ void AddPrinterDialog::advance()
         if( ! m_pPdfNamePage )
             m_pPdfNamePage = new APNamePage( this, String(), DeviceKind::Pdf );
         m_pCurrentPage = m_pPdfNamePage;
-        m_aNextPB.Enable( FALSE );
-        m_aFinishPB.Enable( TRUE );
+        m_aNextPB.Enable( sal_False );
+        m_aFinishPB.Enable( sal_True );
     }
 
-    m_pCurrentPage->Show( TRUE );
+    m_pCurrentPage->Show( sal_True );
     m_aTitleImage.SetText( m_pCurrentPage->getTitle() );
 }
 
 void AddPrinterDialog::back()
 {
-    m_pCurrentPage->Show( FALSE );
+    m_pCurrentPage->Show( sal_False );
     if( m_pCurrentPage == m_pChooseDriverPage )
     {
         m_pCurrentPage = m_pChooseDevicePage;
-        m_aPrevPB.Enable( FALSE );
+        m_aPrevPB.Enable( sal_False );
     }
     else if( m_pCurrentPage == m_pNamePage )
     {
         m_pCurrentPage = m_pCommandPage;
-        m_aNextPB.Enable( TRUE );
+        m_aNextPB.Enable( sal_True );
     }
     else if( m_pCurrentPage == m_pCommandPage )
     {
@@ -955,13 +955,13 @@ void AddPrinterDialog::back()
     else if( m_pCurrentPage == m_pOldPrinterPage )
     {
         m_pCurrentPage = m_pChooseDevicePage;
-        m_aPrevPB.Enable( FALSE );
-        m_aNextPB.Enable( TRUE );
+        m_aPrevPB.Enable( sal_False );
+        m_aNextPB.Enable( sal_True );
     }
     else if( m_pCurrentPage == m_pFaxDriverPage )
     {
         m_pCurrentPage = m_pChooseDevicePage;
-        m_aPrevPB.Enable( FALSE );
+        m_aPrevPB.Enable( sal_False );
     }
     else if( m_pCurrentPage == m_pFaxSelectDriverPage )
     {
@@ -970,17 +970,17 @@ void AddPrinterDialog::back()
     else if( m_pCurrentPage == m_pFaxNamePage )
     {
         m_pCurrentPage = m_pFaxCommandPage;
-        m_aNextPB.Enable( TRUE );
+        m_aNextPB.Enable( sal_True );
     }
     else if( m_pCurrentPage == m_pFaxCommandPage )
     {
         m_pCurrentPage = m_pFaxDriverPage->isDefault() ? (APTabPage*)m_pFaxDriverPage : (APTabPage*)m_pFaxSelectDriverPage;
-        m_aNextPB.Enable( TRUE );
+        m_aNextPB.Enable( sal_True );
     }
     else if( m_pCurrentPage == m_pPdfDriverPage )
     {
         m_pCurrentPage = m_pChooseDevicePage;
-        m_aPrevPB.Enable( FALSE );
+        m_aPrevPB.Enable( sal_False );
     }
     else if( m_pCurrentPage == m_pPdfSelectDriverPage )
     {
@@ -989,14 +989,14 @@ void AddPrinterDialog::back()
     else if( m_pCurrentPage == m_pPdfNamePage )
     {
         m_pCurrentPage = m_pPdfCommandPage;
-        m_aNextPB.Enable( TRUE );
+        m_aNextPB.Enable( sal_True );
     }
     else if( m_pCurrentPage == m_pPdfCommandPage )
     {
         m_pCurrentPage = m_pPdfDriverPage->isDefault() || m_pPdfDriverPage->isDist() ? (APTabPage*)m_pPdfDriverPage : (APTabPage*)m_pPdfSelectDriverPage;
-        m_aNextPB.Enable( TRUE );
+        m_aNextPB.Enable( sal_True );
     }
-    m_pCurrentPage->Show( TRUE );
+    m_pCurrentPage->Show( sal_True );
     m_aTitleImage.SetText( m_pCurrentPage->getTitle() );
 }
 
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index 76d181fb8e5e..d1fad0189b45 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -270,10 +270,10 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
     m_aPdfDirectoryButton.SetClickHdl( LINK( this, RTSCommandPage, ClickBtnHdl ) );
     m_aExternalCB.SetToggleHdl( LINK( this, RTSCommandPage, ClickBtnHdl ) );
 
-    m_aPdfDirectoryButton.Show( FALSE );
-    m_aPdfDirectoryEdit.Show( FALSE );
-    m_aPdfDirectoryText.Show( FALSE );
-    m_aFaxSwallowBox.Show( FALSE );
+    m_aPdfDirectoryButton.Show( sal_False );
+    m_aPdfDirectoryEdit.Show( sal_False );
+    m_aPdfDirectoryText.Show( sal_False );
+    m_aFaxSwallowBox.Show( sal_False );
     m_aCommandsCB.SetText( m_pParent->m_aJobData.m_aCommand );
     m_aQuickCB.SetText( m_pParent->m_aJobData.m_aQuickCommand );
 
@@ -287,9 +287,9 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
         if( ! aToken.compareToAscii( "fax", 3 ) )
         {
             m_bWasFax = true;
-            m_aFaxSwallowBox.Show( TRUE );
+            m_aFaxSwallowBox.Show( sal_True );
             sal_Int32 nPos = 0;
-            m_aFaxSwallowBox.Check( ! aToken.getToken( 1, '=', nPos ).compareToAscii( "swallow", 7 ) ? TRUE : FALSE );
+            m_aFaxSwallowBox.Check( ! aToken.getToken( 1, '=', nPos ).compareToAscii( "swallow", 7 ) ? sal_True : sal_False );
             m_aConfigureBox.SelectEntryPos( m_nFaxEntry );
         }
         else if( ! aToken.compareToAscii( "pdf=", 4 ) )
@@ -297,9 +297,9 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
             m_bWasPdf = true;
             sal_Int32 nPos = 0;
             m_aPdfDirectoryEdit.SetText( aToken.getToken( 1, '=', nPos ) );
-            m_aPdfDirectoryEdit.Show( TRUE );
-            m_aPdfDirectoryButton.Show( TRUE );
-            m_aPdfDirectoryText.Show( TRUE );
+            m_aPdfDirectoryEdit.Show( sal_True );
+            m_aPdfDirectoryButton.Show( sal_True );
+            m_aPdfDirectoryText.Show( sal_True );
             m_aConfigureBox.SelectEntryPos( m_nPdfEntry );
         }
         else if( ! aToken.compareToAscii( "external_dialog" ) )
@@ -425,17 +425,17 @@ IMPL_LINK( RTSCommandPage, SelectHdl, Control*, pBox )
 {
     if( pBox == &m_aConfigureBox )
     {
-        BOOL bEnable = m_aConfigureBox.GetSelectEntryPos() == m_nPdfEntry ? TRUE : FALSE;
+        sal_Bool bEnable = m_aConfigureBox.GetSelectEntryPos() == m_nPdfEntry ? sal_True : sal_False;
         m_aPdfDirectoryButton.Show( bEnable );
         m_aPdfDirectoryEdit.Show( bEnable );
         m_aPdfDirectoryText.Show( bEnable );
-        bEnable = m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry ? TRUE : FALSE;
+        bEnable = m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry ? sal_True : sal_False;
         m_aFaxSwallowBox.Show( bEnable );
         UpdateCommands();
     }
     else if( pBox == &m_aCommandsCB )
     {
-        m_aRemovePB.Enable( TRUE );
+        m_aRemovePB.Enable( sal_True );
     }
 
     return 0;
diff --git a/padmin/source/cmddlg.hxx b/padmin/source/cmddlg.hxx
index 9e6d12cf4277..0b1e07dd1db7 100644
--- a/padmin/source/cmddlg.hxx
+++ b/padmin/source/cmddlg.hxx
@@ -79,9 +79,9 @@ private:
 
     FixedText                       m_aConfigureText;
     ListBox                         m_aConfigureBox;
-    USHORT                          m_nPrinterEntry;
-    USHORT                          m_nFaxEntry;
-    USHORT                          m_nPdfEntry;
+    sal_uInt16                          m_nPrinterEntry;
+    sal_uInt16                          m_nFaxEntry;
+    sal_uInt16                          m_nPdfEntry;
     FixedText                       m_aPdfDirectoryText;
     PushButton                      m_aPdfDirectoryButton;
     Edit                            m_aPdfDirectoryEdit;
diff --git a/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx
index f67d2c0d18d6..93ed87e221a9 100644
--- a/padmin/source/fontentry.cxx
+++ b/padmin/source/fontentry.cxx
@@ -143,7 +143,7 @@ FontNameDlg::FontNameDlg( Window *pParent ) :
 {
     FreeResource();
 
-    m_aFontBox.EnableMultiSelection( TRUE );
+    m_aFontBox.EnableMultiSelection( sal_True );
 
     m_aOKButton.SetClickHdl( LINK( this, FontNameDlg, ClickBtnHdl ) );
     m_aRenameButton.SetClickHdl( LINK( this, FontNameDlg, ClickBtnHdl ) );
@@ -256,8 +256,8 @@ void FontNameDlg::init()
     ::std::list< fontID > aFonts;
     m_rFontManager.getFontList( aFonts );
     m_aFontBox.Clear();
-    m_aRemoveButton.Enable( FALSE );
-    m_aRenameButton.Enable( FALSE );
+    m_aRemoveButton.Enable( sal_False );
+    m_aRenameButton.Enable( sal_False );
 
     ::std::hash_map< OUString, int, OUStringHash > aFamilies;
     ::std::list< fontID >::iterator font_it;
@@ -300,7 +300,7 @@ void FontNameDlg::init()
             }
             else
                 aEntry = fillFontEntry( aInfo, String( ByteString( aFile ), osl_getThreadTextEncoding() ), aFamilies[ aInfo.m_aFamilyName ] > 1  );
-            USHORT nEntry = m_aFontBox.InsertEntry( aEntry );
+            sal_uInt16 nEntry = m_aFontBox.InsertEntry( aEntry );
             m_aFontBox.SetEntryData( nEntry, (void*)(*font_it) );
         }
     }
@@ -310,7 +310,7 @@ IMPL_LINK( FontNameDlg, SelectHdl, ListBox*, pBox )
 {
     if( pBox == &m_aFontBox )
     {
-        BOOL bEnable = m_aFontBox.GetSelectEntryCount() ? TRUE : FALSE;
+        sal_Bool bEnable = m_aFontBox.GetSelectEntryCount() ? sal_True : sal_False;
         m_aRemoveButton.Enable( bEnable );
         m_aRenameButton.Enable( bEnable );
     }
@@ -442,7 +442,7 @@ FontImportDialog::FontImportDialog( Window* pParent ) :
 {
     FreeResource();
 
-    m_aNewFontsBox.EnableMultiSelection( TRUE );
+    m_aNewFontsBox.EnableMultiSelection( sal_True );
 
     m_aOKBtn.SetClickHdl( LINK( this, FontImportDialog, ClickBtnHdl ) );
     m_aSelectAllBtn.SetClickHdl( LINK( this, FontImportDialog, ClickBtnHdl ) );
@@ -450,8 +450,8 @@ FontImportDialog::FontImportDialog( Window* pParent ) :
     m_aFromDirEdt.SetModifyHdl( LINK( this, FontImportDialog, ModifyHdl ) );
     m_aRefreshTimer.SetTimeoutHdl( LINK( this, FontImportDialog, RefreshTimeoutHdl ) );
     m_aRefreshTimer.SetTimeout( 2000 );
-    m_aLinkOnlyBox.Check( FALSE );
-    m_aSubDirsBox.Check( TRUE );
+    m_aLinkOnlyBox.Check( sal_False );
+    m_aSubDirsBox.Check( sal_True );
     m_aSubDirsBox.SetToggleHdl( LINK( this, FontImportDialog, ToggleHdl ) );
 
     Config& rPadminRC( getPadminRC() );
@@ -595,7 +595,7 @@ void FontImportDialog::fillFontBox()
             aEntry = FontNameDlg::fillFontEntry( it->second.front(), aFile, aFamilies[ it->second.front().m_aFamilyName ] > 1 );
         else
             aEntry = FontNameDlg::fillFontEntry( it->second, aFile );
-        USHORT nPos = m_aNewFontsBox.InsertEntry( aEntry );
+        sal_uInt16 nPos = m_aNewFontsBox.InsertEntry( aEntry );
         m_aNewFontsBox.SetEntryData( nPos, (void*)&(it->first) );
     }
 }
@@ -616,12 +616,12 @@ void FontImportDialog::copyFonts()
         m_pProgress = new ProgressDialog( this );
         m_pProgress->setRange( 0, aFiles.size() );
         m_pProgress->startOperation( m_aImportOperation );
-        m_pProgress->Show( TRUE );
+        m_pProgress->Show( sal_True );
         m_pProgress->setValue( 0 );
         m_pProgress->Invalidate();
         m_pProgress->Sync();
         nSuccess = m_rFontManager.importFonts( aFiles, m_aLinkOnlyBox.IsChecked() ? true : false, this );
-        m_pProgress->Show( FALSE );
+        m_pProgress->Show( sal_False );
         delete m_pProgress;
         m_pProgress = NULL;
     }
@@ -649,10 +649,10 @@ IMPL_LINK( FontImportDialog, ClickBtnHdl, Button*, pButton )
     }
     else if( pButton == &m_aSelectAllBtn )
     {
-        m_aNewFontsBox.SetUpdateMode( FALSE );
+        m_aNewFontsBox.SetUpdateMode( sal_False );
         for( int i = 0; i < m_aNewFontsBox.GetEntryCount(); i++ )
-            m_aNewFontsBox.SelectEntryPos( i, TRUE );
-        m_aNewFontsBox.SetUpdateMode( TRUE );
+            m_aNewFontsBox.SelectEntryPos( i, sal_True );
+        m_aNewFontsBox.SetUpdateMode( sal_True );
     }
     return 0;
 }
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx
index b81d37df5cb1..cab3bc9bde71 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.cxx
@@ -219,13 +219,13 @@ QueryString::QueryString( Window* pParent, String& rQuery, String& rRet, const :
         m_aComboBox.InsertEntry( m_rReturnValue );
         for( ::std::list<String>::const_iterator it = rChoices.begin(); it != rChoices.end(); ++it )
             m_aComboBox.InsertEntry( *it );
-        m_aEdit.Show( FALSE );
+        m_aEdit.Show( sal_False );
         m_bUseEdit = false;
     }
     else
     {
         m_aEdit.SetText( m_rReturnValue );
-        m_aComboBox.Show( FALSE );
+        m_aComboBox.Show( sal_False );
         m_bUseEdit = true;
     }
     SetText( Application::GetDisplayName() );
@@ -251,13 +251,13 @@ IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton )
  *  AreYouSure
  */
 
-BOOL padmin::AreYouSure( Window* pParent, int nRid )
+sal_Bool padmin::AreYouSure( Window* pParent, int nRid )
 {
     if( nRid == -1 )
         nRid = RID_YOU_SURE;
     QueryBox aQueryBox( pParent, WB_YES_NO | WB_DEF_NO,
                         String( PaResId( nRid ) ) );
-    return aQueryBox.Execute() == RET_NO ? FALSE : TRUE;
+    return aQueryBox.Execute() == RET_NO ? sal_False : sal_True;
 }
 
 /*
diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx
index 4a9468c50725..5b7b710679a8 100644
--- a/padmin/source/helper.hxx
+++ b/padmin/source/helper.hxx
@@ -117,7 +117,7 @@ public:
     ~QueryString();
 };
 
-BOOL AreYouSure( Window*, int nRid = -1 );
+sal_Bool AreYouSure( Window*, int nRid = -1 );
 
 ResId PaResId( sal_uInt32 nId );
 
diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx
index e1760c28db30..636e2d7435ea 100644
--- a/padmin/source/newppdlg.cxx
+++ b/padmin/source/newppdlg.cxx
@@ -152,7 +152,7 @@ void PPDImportDialog::Import()
             continue;
         }
 
-        USHORT nPos = m_aDriverLB.InsertEntry( aPrinterName );
+        sal_uInt16 nPos = m_aDriverLB.InsertEntry( aPrinterName );
         m_aDriverLB.SetEntryData( nPos, new String( aPath.PathToFileName() ) );
     }
 }
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index d91ebea0c73d..bd81fe5d002b 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -68,12 +68,12 @@ using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 
-PADialog* PADialog::Create( Window* pParent, BOOL bAdmin )
+PADialog* PADialog::Create( Window* pParent, sal_Bool bAdmin )
 {
     return new PADialog( pParent, bAdmin );
 }
 
-PADialog::PADialog( Window* pParent, BOOL /*bAdmin*/ ) :
+PADialog::PADialog( Window* pParent, sal_Bool /*bAdmin*/ ) :
         ModalDialog( pParent, PaResId( RID_PADIALOG ) ),
         m_aDevicesLB( this, PaResId( RID_PA_LB_DEV ) ),
         m_aConfPB( this, PaResId( RID_PA_BTN_CONF ) ),
@@ -130,7 +130,7 @@ void PADialog::Init()
     UpdateDevice();
     UpdateText();
 
-    m_aRemPB.Enable( FALSE );
+    m_aRemPB.Enable( sal_False );
 
     m_aDevicesLB.SetDoubleClickHdl( LINK( this, PADialog, DoubleClickHdl ) );
     m_aDevicesLB.SetSelectHdl( LINK( this, PADialog, SelectHdl ) );
@@ -146,23 +146,23 @@ void PADialog::Init()
 
     ::psp::PrintFontManager& rFontManager( ::psp::PrintFontManager::get() );
     if( ! rFontManager.checkImportPossible() )
-        m_aFontsPB.Enable( FALSE );
+        m_aFontsPB.Enable( sal_False );
     if( rFontManager.hasFontconfig() )
     {
-        m_aFontsPB.Enable( FALSE );
-        m_aFontsPB.Show( FALSE );
+        m_aFontsPB.Enable( sal_False );
+        m_aFontsPB.Show( sal_False );
     }
 
     // at this point no actual changes will be  written
     // but the write will have checked whether any writeable config exists
     if( ! m_rPIManager.writePrinterConfig() )
     {
-        m_aAddPB.Enable( FALSE );
-        m_aRemPB.Enable( FALSE );
-        m_aConfPB.Enable( FALSE );
-        m_aRenamePB.Enable( FALSE );
-        m_aStdPB.Enable( FALSE );
-        m_aCUPSCB.Enable( FALSE );
+        m_aAddPB.Enable( sal_False );
+        m_aRemPB.Enable( sal_False );
+        m_aConfPB.Enable( sal_False );
+        m_aRenamePB.Enable( sal_False );
+        m_aStdPB.Enable( sal_False );
+        m_aCUPSCB.Enable( sal_False );
         ErrorBox aBox( GetParent(), WB_OK | WB_DEF_OK, String( PaResId( RID_ERR_NOWRITE ) ) );
         aBox.Execute();
     }
@@ -260,9 +260,9 @@ IMPL_LINK( PADialog, SelectHdl, ListBox*, pListBox )
         String sSelect = getSelectedDevice();
         String sDefPrt = m_rPIManager.getDefaultPrinter();
         if( sDefPrt == sSelect || ! m_rPIManager.removePrinter( sSelect, true ) )
-            m_aRemPB.Enable( FALSE );
+            m_aRemPB.Enable( sal_False );
         else
-            m_aRemPB.Enable( TRUE );
+            m_aRemPB.Enable( sal_True );
         UpdateText();
     }
     return 0;
@@ -277,7 +277,7 @@ void PADialog::UpdateDefPrt()
 
     if( m_aRemPB.HasFocus() )
         m_aDevicesLB.GetFocus();
-    m_aRemPB.Enable( FALSE );
+    m_aRemPB.Enable( sal_False );
 }
 
 void PADialog::UpdateText()
@@ -331,7 +331,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() )
     {
@@ -456,7 +456,7 @@ void SpaPrinterController::printPage( int ) const
     static const struct
     {
             const char* const pDirect;
-            USHORT nResId;
+            sal_uInt16 nResId;
     } aResIds[] =
         {
             { NULL, RID_TXT_TESTPAGE_NAME },
@@ -653,7 +653,7 @@ void PADialog::RemDevice()
     {
         if( m_aDevicesLB.GetEntry( i ).CompareTo( aDefPrinter, aDefPrinter.Len() ) == COMPARE_EQUAL )
         {
-            m_aDevicesLB.SelectEntryPos( i, TRUE );
+            m_aDevicesLB.SelectEntryPos( i, sal_True );
             UpdateText();
             break;
         }
@@ -662,7 +662,7 @@ void PADialog::RemDevice()
     m_aDevicesLB.GetFocus();
 
     if( m_aDevicesLB.GetEntryCount() < 2 )
-        m_aRemPB.Enable( FALSE );
+        m_aRemPB.Enable( sal_False );
 }
 
 void PADialog::ConfigureDevice()
diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx
index 053d9501ee7e..a0cee7b2af7d 100644
--- a/padmin/source/padialog.hxx
+++ b/padmin/source/padialog.hxx
@@ -92,7 +92,7 @@ namespace padmin {
         DECL_LINK( SelectHdl, ListBox* );
         DECL_LINK( DelPressedHdl, ListBox* );
 
-        PADialog( Window*,  BOOL );
+        PADialog( Window*,  sal_Bool );
         void Init();
 
         void UpdateDefPrt();
@@ -112,7 +112,7 @@ namespace padmin {
     public:
         ~PADialog();
 
-        static PADialog* Create( Window*,  BOOL );
+        static PADialog* Create( Window*,  sal_Bool );
     };
 
 } // namespace
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index f46a2c8a3149..a780dddd915f 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -59,7 +59,7 @@ class MyApp : public Application
 {
 public:
     void            Main();
-    virtual USHORT  Exception( USHORT nError );
+    virtual sal_uInt16  Exception( sal_uInt16 nError );
 
     static void ReadStringHook( String& );
 };
@@ -82,7 +82,7 @@ void MyApp::ReadStringHook( String& rStr )
 
 // -----------------------------------------------------------------------
 
-USHORT MyApp::Exception( USHORT nError )
+sal_uInt16 MyApp::Exception( sal_uInt16 nError )
 {
     switch( nError & EXC_MAJORTYPE )
     {
@@ -149,7 +149,7 @@ void MyApp::Main()
 
     if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
     {
-        BOOL bQuitApp;
+        sal_Bool bQuitApp;
         if( !InitAccessBridge( true, bQuitApp ) )
             if( bQuitApp )
                 return;
@@ -160,7 +160,7 @@ void MyApp::Main()
 
     ResMgr::SetReadStringHook( MyApp::ReadStringHook );
 
-    pPADialog = PADialog::Create( NULL , FALSE );
+    pPADialog = PADialog::Create( NULL , sal_False );
     Application::SetDisplayName( pPADialog->GetText() );
     pPADialog->SetIcon(501);
     pPADialog->Execute();
diff --git a/padmin/source/progress.cxx b/padmin/source/progress.cxx
index 03ef67db8da9..9a7cf537a842 100644
--- a/padmin/source/progress.cxx
+++ b/padmin/source/progress.cxx
@@ -41,7 +41,7 @@
 using namespace padmin;
 
 ProgressDialog::ProgressDialog( Window* pParent,
-                                BOOL bCancelable,
+                                sal_Bool bCancelable,
                                 int nMin, int nMax ) :
         ModelessDialog( pParent, PaResId( RID_PROGRESS_DLG ) ),
         maOperation( this, PaResId( RID_PROGRESS_OPERATION_TXT ) ),
@@ -51,7 +51,7 @@ ProgressDialog::ProgressDialog( Window* pParent,
         maProgressBar( this, PaResId( RID_PROGRESS_STATUSBAR ) ),
         mnMax( nMax ),
         mnMin( nMin ),
-        mbCanceled( FALSE )
+        mbCanceled( sal_False )
 {
     maFilename.SetStyle( maFilename.GetStyle() | WB_PATHELLIPSIS );
     if( ! bCancelable )
@@ -75,9 +75,9 @@ void ProgressDialog::startOperation( const String& rOperation )
 {
     maOperation.SetText( rOperation );
     maProgressBar.SetValue( 0 );
-    mbCanceled = FALSE;
+    mbCanceled = sal_False;
     if( ! IsVisible() )
-        Show( TRUE );
+        Show( sal_True );
 }
 
 void ProgressDialog::setValue( int nValue )
@@ -97,7 +97,7 @@ IMPL_LINK( ProgressDialog, ClickBtnHdl, Button*, pButton )
 {
     if( pButton == &maCancelButton )
     {
-        mbCanceled = TRUE;
+        mbCanceled = sal_True;
     }
     return 0;
 }
diff --git a/padmin/source/progress.hxx b/padmin/source/progress.hxx
index 552a049c3572..f249732549c6 100644
--- a/padmin/source/progress.hxx
+++ b/padmin/source/progress.hxx
@@ -45,10 +45,10 @@ namespace padmin {
         ProgressBar                     maProgressBar;
 
         int mnMax, mnMin;
-        BOOL mbCanceled;
+        sal_Bool mbCanceled;
 
     public:
-        ProgressDialog( Window*, BOOL bCancelable = TRUE, int nMin = 0, int nMax = 100 );
+        ProgressDialog( Window*, sal_Bool bCancelable = sal_True, int nMin = 0, int nMax = 100 );
         ~ProgressDialog();
 
         DECL_LINK( ClickBtnHdl, Button* );
@@ -58,7 +58,7 @@ namespace padmin {
         void startOperation( const String& );
         void setFilename( const String& );
 
-        BOOL isCanceled() { return mbCanceled; }
+        sal_Bool isCanceled() { return mbCanceled; }
     };
 
 } // namespace
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 1d105618b648..ad73d48ae48b 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -47,7 +47,7 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con
         return;
 
     const PPDValue* pValue = NULL;
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     String aOptionText;
 
     for( int i = 0; i < pKey->countValues(); i++ )
@@ -150,7 +150,7 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl )
     if( pTabCtrl != &m_aTabControl )
         return 0;
 
-    USHORT nId = m_aTabControl.GetCurPageId();
+    sal_uInt16 nId = m_aTabControl.GetCurPageId();
 
     if ( ! m_aTabControl.GetTabPage( nId ) )
     {
@@ -242,7 +242,7 @@ RTSPaperPage::RTSPaperPage( RTSDialog* pParent ) :
 
     FreeResource();
 
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
 
     m_aOrientBox.InsertEntry( PORTRAIT_STRING );
     m_aOrientBox.InsertEntry( LSCAPE_STRING );
@@ -284,8 +284,8 @@ void RTSPaperPage::update()
     }
     else
     {
-        m_aDuplexText.Enable( FALSE );
-        m_aDuplexBox.Enable( FALSE );
+        m_aDuplexText.Enable( sal_False );
+        m_aDuplexBox.Enable( sal_False );
     }
 
     // paper
@@ -296,8 +296,8 @@ void RTSPaperPage::update()
     }
     else
     {
-        m_aPaperText.Enable( FALSE );
-        m_aPaperBox.Enable( FALSE );
+        m_aPaperText.Enable( sal_False );
+        m_aPaperBox.Enable( sal_False );
     }
 
     // input slots
@@ -308,8 +308,8 @@ void RTSPaperPage::update()
     }
     else
     {
-        m_aSlotText.Enable( FALSE );
-        m_aSlotBox.Enable( FALSE );
+        m_aSlotText.Enable( sal_False );
+        m_aSlotBox.Enable( sal_False );
     }
 }
 
@@ -386,14 +386,14 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) :
         case  1: m_aSpaceBox.SelectEntry( m_aSpaceColor );break;
     }
 
-    ULONG nLevelEntryData = 0;
+    sal_uLong nLevelEntryData = 0;
     if( m_pParent->m_aJobData.m_nPDFDevice > 0 )
         nLevelEntryData = 10;
     else
         nLevelEntryData = m_pParent->m_aJobData.m_nPSLevel+1;
-    for( USHORT i = 0; i < m_aLevelBox.GetEntryCount(); i++ )
+    for( sal_uInt16 i = 0; i < m_aLevelBox.GetEntryCount(); i++ )
     {
-        if( (ULONG)m_aLevelBox.GetEntryData( i ) == nLevelEntryData )
+        if( (sal_uLong)m_aLevelBox.GetEntryData( i ) == nLevelEntryData )
         {
             m_aLevelBox.SelectEntryPos( i );
             break;
@@ -416,7 +416,7 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) :
                 )
             {
                 String aEntry( m_pParent->m_aJobData.m_pParser->translateKey( pKey->getKey() ) );
-                USHORT nPos = m_aPPDKeyBox.InsertEntry( aEntry );
+                sal_uInt16 nPos = m_aPPDKeyBox.InsertEntry( aEntry );
                 m_aPPDKeyBox.SetEntryData( nPos, (void*)pKey );
             }
         }
@@ -437,17 +437,17 @@ void RTSDevicePage::update()
 
 // ------------------------------------------------------------------
 
-ULONG RTSDevicePage::getLevel()
+sal_uLong RTSDevicePage::getLevel()
 {
-    ULONG nLevel = (ULONG)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() );
+    sal_uLong nLevel = (sal_uLong)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() );
     return nLevel < 10 ? nLevel-1 : 0;
 }
 
 // ------------------------------------------------------------------
 
-ULONG RTSDevicePage::getPDFDevice()
+sal_uLong RTSDevicePage::getPDFDevice()
 {
-    ULONG nLevel = (ULONG)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() );
+    sal_uLong nLevel = (sal_uLong)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() );
     return nLevel > 9 ? 1 : 0;
 }
 
@@ -490,7 +490,7 @@ void RTSDevicePage::FillValueBox( const PPDKey* pKey )
             m_pParent->m_aJobData.m_pParser )
         {
             String aEntry( m_pParent->m_aJobData.m_pParser->translateOption( pKey->getKey(), pValue->m_aOption ) );
-            USHORT nPos = m_aPPDValueBox.InsertEntry( aEntry );
+            sal_uInt16 nPos = m_aPPDValueBox.InsertEntry( aEntry );
             m_aPPDValueBox.SetEntryData( nPos, (void*)pValue );
         }
     }
@@ -521,10 +521,10 @@ RTSOtherPage::RTSOtherPage( RTSDialog* pParent ) :
 {
     FreeResource();
 
-    m_aTopLB.EnableEmptyFieldValue( TRUE );
-    m_aBottomLB.EnableEmptyFieldValue( TRUE );
-    m_aLeftLB.EnableEmptyFieldValue( TRUE );
-    m_aRightLB.EnableEmptyFieldValue( TRUE );
+    m_aTopLB.EnableEmptyFieldValue( sal_True );
+    m_aBottomLB.EnableEmptyFieldValue( sal_True );
+    m_aLeftLB.EnableEmptyFieldValue( sal_True );
+    m_aRightLB.EnableEmptyFieldValue( sal_True );
 
     m_aDefaultBtn.SetClickHdl( LINK( this, RTSOtherPage, ClickBtnHdl ) );
 
@@ -658,16 +658,16 @@ RTSFontSubstPage::RTSFontSubstPage( RTSDialog* pParent ) :
     }
 
     m_aEnableBox.Check( m_pParent->m_aJobData.m_bPerformFontSubstitution );
-    m_aRemoveButton.Enable( FALSE );
+    m_aRemoveButton.Enable( sal_False );
     if( ! m_pParent->m_aJobData.m_bPerformFontSubstitution )
     {
-        m_aSubstitutionsBox.Enable( FALSE );
-        m_aSubstitutionsText.Enable( FALSE );
-        m_aAddButton.Enable( FALSE );
-        m_aToFontBox.Enable( FALSE );
-        m_aToFontText.Enable( FALSE );
-        m_aFromFontBox.Enable( FALSE );
-        m_aFromFontText.Enable( FALSE );
+        m_aSubstitutionsBox.Enable( sal_False );
+        m_aSubstitutionsText.Enable( sal_False );
+        m_aAddButton.Enable( sal_False );
+        m_aToFontBox.Enable( sal_False );
+        m_aToFontText.Enable( sal_False );
+        m_aFromFontBox.Enable( sal_False );
+        m_aFromFontText.Enable( sal_False );
     }
 
     update();
@@ -686,7 +686,7 @@ RTSFontSubstPage::~RTSFontSubstPage()
 void RTSFontSubstPage::update()
 {
     m_aSubstitutionsBox.Clear();
-    m_aRemoveButton.Enable( FALSE );
+    m_aRemoveButton.Enable( sal_False );
     // fill substitutions box
     ::std::hash_map< OUString, OUString, OUStringHash >::const_iterator it;
     for( it = m_pParent->m_aJobData.m_aFontSubstitutes.begin();
@@ -728,7 +728,7 @@ IMPL_LINK( RTSFontSubstPage, ClickBtnHdl, Button*, pButton )
         for( int i = 0; i < m_aSubstitutionsBox.GetSelectEntryCount(); i++ )
         {
             String aEntry( m_aSubstitutionsBox.GetSelectEntry( i ) );
-            USHORT nPos = aEntry.SearchAscii( " -> " );
+            sal_uInt16 nPos = aEntry.SearchAscii( " -> " );
             aEntry.Erase( nPos );
             m_pParent->m_aJobData.m_aFontSubstitutes.erase( aEntry );
         }
diff --git a/padmin/source/prtsetup.hxx b/padmin/source/prtsetup.hxx
index 72e3d81ee8d7..02a9325726fc 100644
--- a/padmin/source/prtsetup.hxx
+++ b/padmin/source/prtsetup.hxx
@@ -147,10 +147,10 @@ public:
 
     void update();
 
-    ULONG getLevel();
-    ULONG getPDFDevice();
-    ULONG getDepth() { return m_aDepthBox.GetSelectEntry().ToInt32(); }
-    ULONG getColorDevice()
+    sal_uLong getLevel();
+    sal_uLong getPDFDevice();
+    sal_uLong getDepth() { return m_aDepthBox.GetSelectEntry().ToInt32(); }
+    sal_uLong getColorDevice()
     {
         String aSpace( m_aSpaceBox.GetSelectEntry() );
         return aSpace == m_aSpaceColor ? 1 : ( aSpace == m_aSpaceGray ? -1 : 0 );