svtools: sal_Bool->bool

Change-Id: I42a341b5805e0b2a7d619ba552700db35815afd5

13 files changed, 48 insertions, 47 deletions

diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 3e0fc452beea..29e3c4c99cbe 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -243,20 +243,20 @@ namespace dbmm
         }
     }
 
-    sal_Bool MacroMigrationDialog::prepareLeaveCurrentState( CommitPageReason _eReason )
+    bool MacroMigrationDialog::prepareLeaveCurrentState( CommitPageReason _eReason )
     {
         if ( !MacroMigrationDialog_Base::prepareLeaveCurrentState( _eReason ) )
-            return sal_False;
+            return false;
 
         switch ( getCurrentState() )
         {
         case STATE_CLOSE_SUB_DOCS:
             if ( !impl_closeSubDocs_nothrow() )
-                return sal_False;
+                return false;
             break;
         case STATE_BACKUP_DBDOC:
             if ( !impl_backupDocument_nothrow() )
-                return sal_False;
+                return false;
             break;
         case STATE_MIGRATE:
             break;
@@ -266,10 +266,10 @@ namespace dbmm
             OSL_FAIL( "MacroMigrationDialog::prepareLeaveCurrentState: unhandled state!" );
         }
 
-        return sal_True;
+        return true;
     }
 
-    sal_Bool MacroMigrationDialog::leaveState( WizardState _nState )
+    bool MacroMigrationDialog::leaveState( WizardState _nState )
     {
         return MacroMigrationDialog_Base::leaveState( _nState );
     }
@@ -279,7 +279,7 @@ namespace dbmm
         return MacroMigrationDialog_Base::determineNextState( _nCurrentState );
     }
 
-    sal_Bool MacroMigrationDialog::onFinish()
+    bool MacroMigrationDialog::onFinish()
     {
         return MacroMigrationDialog_Base::onFinish();
     }
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
index 43e6e12012ae..e55a770fef2e 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
@@ -50,10 +50,10 @@ namespace dbmm
     protected:
         // OWizardMachine overridables
         virtual void            enterState( WizardState _nState );
-        virtual sal_Bool        prepareLeaveCurrentState( CommitPageReason _eReason );
-        virtual sal_Bool        leaveState( WizardState _nState );
+        virtual bool            prepareLeaveCurrentState( CommitPageReason _eReason );
+        virtual bool            leaveState( WizardState _nState );
         virtual WizardState     determineNextState( WizardState _nCurrentState ) const;
-        virtual sal_Bool        onFinish();
+        virtual bool            onFinish();
 
         // Dialog overridables
         virtual bool    Close();
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index d76ade61dbcc..762a5e99decd 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -152,18 +152,18 @@ namespace dbmm
         return !m_aSaveAsLocation.GetText().isEmpty();
     }
 
-    sal_Bool SaveDBDocPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+    bool SaveDBDocPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
     {
         if ( !MacroMigrationPage::commitPage( _eReason ) )
-            return sal_False;
+            return false;
 
         if ( ::svt::WizardTypes::eTravelBackward == _eReason )
-            return sal_True;
+            return true;
 
         if ( !m_aLocationController.prepareCommit() )
-            return sal_False;
+            return false;
 
-        return sal_True;
+        return true;
     }
 
     TabPage* SaveDBDocPage::Create( ::svt::RoadmapWizard& _rParentDialog )
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index 8e36d4909c56..8b6a87dd4426 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -95,7 +95,7 @@ namespace dbmm
     protected:
         // IWizardPageController overridables
         virtual void        initializePage();
-        virtual sal_Bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+        virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
         virtual bool        canAdvance() const;
 
     private:
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 76d0f9b24815..1f199285544a 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -174,7 +174,8 @@ namespace dbaui
 
         callModifiedHdl();
     }
-       sal_Bool OConnectionTabPageSetup::commitPage( ::svt::WizardTypes::CommitPageReason /*_eReason*/ )
+
+    bool OConnectionTabPageSetup::commitPage( ::svt::WizardTypes::CommitPageReason /*_eReason*/ )
     {
         return commitURL();
     }
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index 59cfa0fdad68..b6d54b32d614 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -54,7 +54,7 @@ namespace dbaui
         virtual sal_Bool        FillItemSet (SfxItemSet& _rCoreAttrs);
 
         virtual void        implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
-        virtual sal_Bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+        virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
 
         inline void enableConnectionURL() { m_aConnectionURL.SetReadOnly(false); }
         inline void disableConnectionURL() { m_aConnectionURL.SetReadOnly(); }
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 57e817419fa0..6495e5bda1a8 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -183,9 +183,9 @@ namespace dbaui
         if ( m_pItemSetHelper )
             Reset(*m_pItemSetHelper->getOutputSet());
     }
-    sal_Bool OGenericAdministrationPage::commitPage( ::svt::WizardTypes::CommitPageReason )
+    bool OGenericAdministrationPage::commitPage( ::svt::WizardTypes::CommitPageReason )
     {
-        return sal_True;
+        return true;
     }
     bool OGenericAdministrationPage::canAdvance() const
     {
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index c7e551957455..60124052fd7f 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -145,7 +145,7 @@ namespace dbaui
 
         // svt::IWizardPageController
         virtual void initializePage();
-        virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+        virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
         virtual bool canAdvance() const;
 
         void                SetRoadmapStateValue( sal_Bool _bDoEnable ) { m_abEnableRoadmap = _bDoEnable; }
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 39b820da226a..22212d98d1ab 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -83,9 +83,9 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent
     m_eType = m_pImpl->getDatasourceType(*m_pOutSet);
 
     SetPageSizePixel(LogicToPixel(::Size(PAGE_X, PAGE_Y), MAP_APPFONT));
-    ShowButtonFixedLine(sal_True);
+    ShowButtonFixedLine(true);
     defaultButton(WZB_NEXT);
-    enableButtons(WZB_FINISH, sal_False);
+    enableButtons(WZB_FINISH, false);
     enableAutomaticNextButtonState( true );
 
     m_pPrevPage->SetHelpId(HID_DBWIZ_PREVIOUS);
@@ -296,12 +296,12 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState)
     return pPage;
 }
 
-sal_Bool ODbTypeWizDialog::leaveState(WizardState _nState)
+bool ODbTypeWizDialog::leaveState(WizardState _nState)
 {
     SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(_nState));
     if ( pPage )
         pPage->FillItemSet(*m_pOutSet);
-    return sal_True;
+    return true;
 }
 
 void ODbTypeWizDialog::setTitle(const OUString& _sTitle)
@@ -339,10 +339,10 @@ IWizardPageController* ODbTypeWizDialog::getPageController( TabPage* _pCurrentPa
     return pPage;
 }
 
-sal_Bool ODbTypeWizDialog::onFinish()
+bool ODbTypeWizDialog::onFinish()
 {
     saveDatasource();
-    return m_pImpl->saveChanges(*m_pOutSet) ? OWizardMachine::onFinish() : sal_False;
+    return m_pImpl->saveChanges(*m_pOutSet) && OWizardMachine::onFinish();
 }
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 2816b9fa9bb7..9e50c1846ab6 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -153,9 +153,9 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
     m_pImpl->translateProperties(xDatasource, *m_pOutSet);
 
     SetPageSizePixel(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MAP_APPFONT));
-    ShowButtonFixedLine(sal_True);
+    ShowButtonFixedLine(true);
     defaultButton(WZB_NEXT);
-    enableButtons(WZB_FINISH, sal_True);
+    enableButtons(WZB_FINISH, true);
     enableAutomaticNextButtonState();
 
     ::dbaccess::ODsnTypeCollection::TypeIterator aIter = m_pCollection->begin();
@@ -324,7 +324,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath()
         activatePath( static_cast< PathId >( nCreateNewDBIndex + 1 ), true );
 
         enableState(PAGE_DBSETUPWIZARD_FINAL, true );
-        enableButtons( WZB_FINISH, sal_True);
+        enableButtons( WZB_FINISH, true);
     }
     break;
     case OGeneralPageWizard::eConnectExternal:
@@ -576,7 +576,7 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPage*, _
     enableState(PAGE_DBSETUPWIZARD_FINAL, m_bIsConnectable);
     enableState(PAGE_DBSETUPWIZARD_AUTHENTIFICATION, m_bIsConnectable);
     if (getCurrentState() == PAGE_DBSETUPWIZARD_FINAL)
-        enableButtons( WZB_FINISH, sal_True);
+        enableButtons( WZB_FINISH, true);
     else
         enableButtons( WZB_FINISH, m_bIsConnectable);
     enableButtons( WZB_NEXT, m_bIsConnectable  && (getCurrentState() != PAGE_DBSETUPWIZARD_FINAL));
@@ -631,7 +631,7 @@ void ODbTypeWizDialogSetup::enterState(WizardState _nState)
             m_sOldURL = m_sURL;
             break;
         case PAGE_DBSETUPWIZARD_FINAL:
-            enableButtons( WZB_FINISH, sal_True);
+            enableButtons( WZB_FINISH, true);
             if ( m_pFinalPage )
                 m_pFinalPage->enableTableWizardCheckBox(m_pCollection->supportsTableCreation(m_sURL));
             break;
@@ -646,10 +646,10 @@ sal_Bool ODbTypeWizDialogSetup::saveDatasource()
     return sal_True;
 }
 
-sal_Bool ODbTypeWizDialogSetup::leaveState(WizardState _nState)
+bool ODbTypeWizDialogSetup::leaveState(WizardState _nState)
 {
     if (_nState == PAGE_DBSETUPWIZARD_MYSQL_INTRO)
-        return sal_True;
+        return true;
     if ( _nState == PAGE_DBSETUPWIZARD_INTRO && m_sURL != m_sOldURL )
     {
         resetPages(m_pImpl->getCurrentDataSource());
@@ -983,7 +983,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
         }
     }
 
-    sal_Bool ODbTypeWizDialogSetup::onFinish()
+    bool ODbTypeWizDialogSetup::onFinish()
     {
         if ( m_pGeneralPage->GetDatabaseCreationMode() == OGeneralPageWizard::eOpenExisting )
         {
@@ -991,8 +991,8 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             // wants us to load could be a non-database document. Instead, we asynchronously
             // open the selected document. Thus, the wizard's return value is RET_CANCEL,
             // which means to not continue loading the database document
-            if ( !OWizardMachine::Finnish( RET_CANCEL ) )
-                return sal_False;
+            if ( !OWizardMachine::Finish( RET_CANCEL ) )
+                return false;
 
             try
             {
@@ -1005,7 +1005,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
                 DBG_UNHANDLED_EXCEPTION();
             }
 
-            return sal_True;
+            return true;
         }
 
         if (getCurrentState() != PAGE_DBSETUPWIZARD_FINAL)
@@ -1013,11 +1013,11 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             skipUntil(PAGE_DBSETUPWIZARD_FINAL);
         }
         if (getCurrentState() == PAGE_DBSETUPWIZARD_FINAL)
-            return SaveDatabaseDocument() ? OWizardMachine::onFinish() : sal_False;
+            return SaveDatabaseDocument() && OWizardMachine::onFinish();
         else
         {
-               enableButtons( WZB_FINISH, sal_False );
-            return sal_False;
+            enableButtons( WZB_FINISH, false );
+            return false;
         }
     }
 
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index b67895307fa4..53ebf42b7e18 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -94,10 +94,10 @@ protected:
     /// to override to create new pages
     virtual TabPage*    createPage(WizardState _nState);
     virtual WizardState determineNextState(WizardState _nCurrentState) const;
-    virtual sal_Bool    leaveState(WizardState _nState);
+    virtual bool        leaveState(WizardState _nState);
     virtual ::svt::IWizardPageController*
                         getPageController( TabPage* _pCurrentPage ) const;
-    virtual sal_Bool    onFinish();
+    virtual bool        onFinish();
 
 protected:
     inline sal_Bool isUIEnabled() const { return m_bUIEnabled; }
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index b0500ede3d2c..5b43eb913f00 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -128,10 +128,10 @@ public:
 protected:
     /// to override to create new pages
     virtual TabPage*    createPage(WizardState _nState);
-    virtual sal_Bool    leaveState(WizardState _nState);
-    virtual void enterState(WizardState _nState);
+    virtual bool        leaveState(WizardState _nState);
+    virtual void        enterState(WizardState _nState);
     virtual ::svt::IWizardPageController* getPageController( TabPage* _pCurrentPage ) const;
-    virtual sal_Bool onFinish();
+    virtual bool        onFinish();
 
 protected:
     inline sal_Bool isUIEnabled() const { return m_bUIEnabled; }
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 9ffaa14f4a37..88e9fedccf0a 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -667,7 +667,7 @@ void OCopyTableWizard::construct()
     SetPrevButton( &m_pbPrev );
     SetNextButton( &m_pbNext );
 
-    ShowButtonFixedLine( sal_True );
+    ShowButtonFixedLine( true );
 
     m_pbNext.GrabFocus();