sfx2: sal_Bool->bool

Change-Id: I1fd02cc148fd9a54d2092dad1e548f51a0813a14

16 files changed, 58 insertions, 56 deletions

diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 8c3cc7ae2e1c..19b68baf96cf 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -278,7 +278,7 @@ namespace dbaui
         OConnectionHelper::fillControls(_rControlList);
     }
 
-    sal_Bool OConnectionTabPage::FillItemSet(SfxItemSet& _rSet)
+    bool OConnectionTabPage::FillItemSet(SfxItemSet& _rSet)
     {
         sal_Bool bChangedSomething = sal_False;
 
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 863077136561..468a1cc7fa38 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -58,7 +58,7 @@ namespace dbaui
 
     public:
         static  SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet );
-        virtual sal_Bool        FillItemSet (SfxItemSet& _rCoreAttrs);
+        virtual bool        FillItemSet (SfxItemSet& _rCoreAttrs);
 
         virtual void        implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
 
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 1f199285544a..922927b2397c 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -180,7 +180,7 @@ namespace dbaui
         return commitURL();
     }
 
-    sal_Bool OConnectionTabPageSetup::FillItemSet(SfxItemSet& _rSet)
+    bool OConnectionTabPageSetup::FillItemSet(SfxItemSet& _rSet)
     {
         sal_Bool bChangedSomething = sal_False;
         fillString(_rSet,&m_aConnectionURL, DSID_CONNECTURL, bChangedSomething);
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index b6d54b32d614..8d5372ee0f1f 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -51,7 +51,7 @@ namespace dbaui
         static  OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
         static  OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
 
-        virtual sal_Bool        FillItemSet (SfxItemSet& _rCoreAttrs);
+        virtual bool        FillItemSet (SfxItemSet& _rCoreAttrs);
 
         virtual void        implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
         virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 24bec7cb8f6a..11d6871e48fc 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -116,7 +116,7 @@ using namespace ::com::sun::star;
         m_pTextConnectionHelper->implInitControls(_rSet, bValid);
     }
 
-    sal_Bool OTextConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
+    bool OTextConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
     {
         sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
         bChangedSomething = m_pTextConnectionHelper->FillItemSet(_rSet, bChangedSomething);
@@ -156,7 +156,7 @@ using namespace ::com::sun::star;
         FreeResource();
     }
 
-    sal_Bool OLDAPConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
+    bool OLDAPConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
     {
            sal_Bool bChangedSomething = sal_False;
         fillString(_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN, bChangedSomething);
@@ -281,10 +281,10 @@ using namespace ::com::sun::star;
     {
     }
 
-    sal_Bool OMySQLIntroPageSetup::FillItemSet(SfxItemSet& /*_rSet*/)
+    bool OMySQLIntroPageSetup::FillItemSet(SfxItemSet& /*_rSet*/)
     {
         OSL_FAIL("Who called me?! Please ask oj for more information.");
-        return sal_True;
+        return true;
     }
 
     OMySQLIntroPageSetup::ConnectionType OMySQLIntroPageSetup::getMySQLMode()
@@ -329,7 +329,7 @@ using namespace ::com::sun::star;
         m_aMySQLSettings.fillWindows( _rControlList );
     }
 
-    sal_Bool MySQLNativeSetupPage::FillItemSet( SfxItemSet& _rSet )
+    bool MySQLNativeSetupPage::FillItemSet( SfxItemSet& _rSet )
     {
         return m_aMySQLSettings.FillItemSet( _rSet );
     }
@@ -439,7 +439,7 @@ using namespace ::com::sun::star;
         _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass));
     }
 
-    sal_Bool OGeneralSpecialJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
+    bool OGeneralSpecialJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
     {
         sal_Bool bChangedSomething = sal_False;
         fillString(_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething);
@@ -551,7 +551,7 @@ using namespace ::com::sun::star;
         _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass));
     }
 
-    sal_Bool OJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
+    bool OJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
     {
         sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
         fillString(_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething);
@@ -668,7 +668,7 @@ using namespace ::com::sun::star;
         OConnectionTabPageSetup::implInitControls(_rSet, _bSaveValue);
     }
 
-    sal_Bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
+    bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet& _rSet )
     {
         sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
         fillBool(_rSet,&m_aCBPasswordrequired,DSID_PASSWORDREQUIRED,bChangedSomething);
@@ -732,7 +732,7 @@ using namespace ::com::sun::star;
         m_aETUserName.ClearModifyFlag();
     }
 
-    sal_Bool OAuthentificationPageSetup::FillItemSet( SfxItemSet& _rSet )
+    bool OAuthentificationPageSetup::FillItemSet( SfxItemSet& _rSet )
     {
         sal_Bool bChangedSomething = sal_False;
 
@@ -816,10 +816,11 @@ using namespace ::com::sun::star;
         m_pCBStartTableWizard->Enable(_bSupportsTableCreation);
     }
 
-    sal_Bool OFinalDBPageSetup::FillItemSet( SfxItemSet& /*_rSet*/ )
+    bool OFinalDBPageSetup::FillItemSet( SfxItemSet& /*_rSet*/ )
     {
-        return sal_True;
+        return true;
     }
+
     IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, CheckBox*, _pBox)
     {
         m_pCBStartTableWizard->Enable( _pBox->IsEnabled() && _pBox->IsChecked() );
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index f2e850284abb..150640c2d4ec 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -39,7 +39,7 @@ namespace dbaui
     class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup
     {
     public:
-        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
         static  OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
         OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs);
 
@@ -58,7 +58,7 @@ namespace dbaui
     class OTextConnectionPageSetup : public OConnectionTabPageSetup
     {
     public:
-        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
            static   OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
         OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs );
         OTextConnectionHelper*  m_pTextConnectionHelper;
@@ -80,7 +80,7 @@ namespace dbaui
     class OLDAPConnectionPageSetup : public OGenericAdministrationPage
     {
     public:
-        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
         static  OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
         OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs );
         virtual Link getControlModifiedLink() { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); }
@@ -121,7 +121,7 @@ namespace dbaui
         virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList );
         virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList );
 
-        virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs );
+        virtual bool FillItemSet( SfxItemSet& _rCoreAttrs );
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
 
         virtual Link getControlModifiedLink();
@@ -146,7 +146,7 @@ namespace dbaui
     static  OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
 
     protected:
-        virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs );
+        virtual bool FillItemSet( SfxItemSet& _rCoreAttrs );
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
@@ -181,7 +181,7 @@ namespace dbaui
     protected:
         virtual bool checkTestConnection();
 
-        virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs );
+        virtual bool FillItemSet( SfxItemSet& _rCoreAttrs );
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
@@ -214,7 +214,7 @@ namespace dbaui
         DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*);
 
     protected:
-        virtual sal_Bool FillItemSet(SfxItemSet& _rSet);
+        virtual bool FillItemSet(SfxItemSet& _rSet);
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
@@ -236,7 +236,7 @@ namespace dbaui
     class OAuthentificationPageSetup : public OGenericAdministrationPage
     {
     public:
-        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
         static  OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
         OAuthentificationPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs);
 
@@ -259,7 +259,7 @@ namespace dbaui
     class OFinalDBPageSetup : public OGenericAdministrationPage
     {
     public:
-        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
            static   OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet);
 
         FixedText*   m_pFTFinalHeader;
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 39db3d096089..b8690b1a03e5 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -192,7 +192,7 @@ namespace dbaui
         _rControlList.push_back( new ODisableWrapper< RadioButton >( &m_aNamedPipeRadio ) );
     }
 
-    sal_Bool MySQLNativeSettings::FillItemSet( SfxItemSet& _rSet )
+    bool MySQLNativeSettings::FillItemSet( SfxItemSet& _rSet )
     {
         sal_Bool bChangedSomething = sal_False;
 
diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx
index 95b729cde6cc..3e1cf8fc6302 100644
--- a/dbaccess/source/ui/dlg/admincontrols.hxx
+++ b/dbaccess/source/ui/dlg/admincontrols.hxx
@@ -58,7 +58,7 @@ namespace dbaui
         void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList );
         void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList );
 
-        sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs );
+        bool FillItemSet( SfxItemSet& _rCoreAttrs );
         void implInitControls( const SfxItemSet& _rSet );
 
         bool canAdvance() const;
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 55399ccf6279..780f1e7e8d64 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -264,7 +264,7 @@ namespace dbaui
         OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
     }
 
-    sal_Bool SpecialSettingsPage::FillItemSet( SfxItemSet& _rSet )
+    bool SpecialSettingsPage::FillItemSet( SfxItemSet& _rSet )
     {
         sal_Bool bChangedSomething = sal_False;
 
@@ -357,7 +357,7 @@ namespace dbaui
         OGenericAdministrationPage::implInitControls( _rSet, _bSaveValue );
     }
 
-    sal_Bool GeneratedValuesPage::FillItemSet(SfxItemSet& _rSet)
+    bool GeneratedValuesPage::FillItemSet(SfxItemSet& _rSet)
     {
         sal_Bool bChangedSomething = sal_False;
 
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index de516292be6e..d3196bcfa8a1 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -72,7 +72,7 @@ namespace dbaui
         bool                m_bHasMaxRowScan;
 
     public:
-        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
         SpecialSettingsPage(Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta );
 
@@ -108,7 +108,7 @@ namespace dbaui
                     m_aControlDependencies;
 
     public:
-        virtual sal_Bool        FillItemSet (SfxItemSet& _rCoreAttrs);
+        virtual bool        FillItemSet (SfxItemSet& _rCoreAttrs);
 
         GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
     protected:
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 69f9bb241f16..de2718c7fc3d 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -182,7 +182,8 @@ namespace dbaui
         }
         OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
     }
-    sal_Bool OCommonBehaviourTabPage::FillItemSet(SfxItemSet& _rSet)
+
+    bool OCommonBehaviourTabPage::FillItemSet(SfxItemSet& _rSet)
     {
         sal_Bool bChangedSomething = sal_False;
 
@@ -265,7 +266,7 @@ namespace dbaui
         OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
     }
 
-    sal_Bool ODbaseDetailsPage::FillItemSet( SfxItemSet& _rSet )
+    bool ODbaseDetailsPage::FillItemSet( SfxItemSet& _rSet )
     {
         sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet);
 
@@ -329,7 +330,7 @@ namespace dbaui
         return ( new OOdbcDetailsPage( pParent, _rAttrSet ) );
     }
 
-    sal_Bool OOdbcDetailsPage::FillItemSet( SfxItemSet& _rSet )
+    bool OOdbcDetailsPage::FillItemSet( SfxItemSet& _rSet )
     {
         sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet);
         fillBool(_rSet,&m_aUseCatalog,DSID_USECATALOG,bChangedSomething);
@@ -377,7 +378,7 @@ namespace dbaui
         return ( new OUserDriverDetailsPage( pParent, _rAttrSet ) );
     }
 
-    sal_Bool OUserDriverDetailsPage::FillItemSet( SfxItemSet& _rSet )
+    bool OUserDriverDetailsPage::FillItemSet( SfxItemSet& _rSet )
     {
         sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet);
 
@@ -510,7 +511,7 @@ namespace dbaui
         _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL_1));
     }
 
-    sal_Bool OGeneralSpecialJDBCDetailsPage::FillItemSet( SfxItemSet& _rSet )
+    bool OGeneralSpecialJDBCDetailsPage::FillItemSet( SfxItemSet& _rSet )
     {
         sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet);
         if ( m_bUseClass )
@@ -637,17 +638,17 @@ namespace dbaui
         _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aUserNameLabel));
     }
 
-    sal_Bool MySQLNativePage::FillItemSet( SfxItemSet& _rSet )
+    bool MySQLNativePage::FillItemSet( SfxItemSet& _rSet )
     {
         sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet( _rSet );
 
-        bChangedSomething |= m_aMySQLSettings.FillItemSet( _rSet );
+        bChangedSomething |= (m_aMySQLSettings.FillItemSet( _rSet ) ? 1 : 0);
 
         if ( m_aUserName.GetText() != m_aUserName.GetSavedValue() )
         {
             _rSet.Put( SfxStringItem( DSID_USER, m_aUserName.GetText() ) );
             _rSet.Put( SfxStringItem( DSID_PASSWORD, OUString()));
-            bChangedSomething = sal_True;
+            bChangedSomething = true;
         }
         fillBool(_rSet,&m_aPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething);
 
@@ -717,7 +718,7 @@ namespace dbaui
         return ( new OLDAPDetailsPage( pParent, _rAttrSet ) );
     }
 
-    sal_Bool OLDAPDetailsPage::FillItemSet( SfxItemSet& _rSet )
+    bool OLDAPDetailsPage::FillItemSet( SfxItemSet& _rSet )
     {
         sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet);
 
@@ -825,7 +826,7 @@ namespace dbaui
         OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
     }
 
-    sal_Bool OTextDetailsPage::FillItemSet( SfxItemSet& rSet )
+    bool OTextDetailsPage::FillItemSet( SfxItemSet& rSet )
     {
         sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(rSet);
         bChangedSomething = m_pTextConnectionHelper->FillItemSet(rSet, bChangedSomething);
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index d042a3da93e7..4ea050dd4efc 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -67,7 +67,7 @@ namespace dbaui
         sal_uInt32          m_nControlFlags;
 
     public:
-        virtual sal_Bool        FillItemSet (SfxItemSet& _rCoreAttrs);
+        virtual bool        FillItemSet (SfxItemSet& _rCoreAttrs);
 
         OCommonBehaviourTabPage(Window* pParent, sal_uInt16 nResId, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags,bool _bFreeResource = true);
     protected:
@@ -89,7 +89,7 @@ namespace dbaui
     class ODbaseDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
         ODbaseDetailsPage(Window* pParent, const SfxItemSet& _rCoreAttrs);
     private:
@@ -128,7 +128,7 @@ namespace dbaui
     class OOdbcDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
         OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
     protected:
@@ -144,7 +144,7 @@ namespace dbaui
     class OUserDriverDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
         OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
     protected:
@@ -178,7 +178,7 @@ namespace dbaui
 
     protected:
 
-        virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs );
+        virtual bool FillItemSet( SfxItemSet& _rCoreAttrs );
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
@@ -220,7 +220,7 @@ namespace dbaui
         CheckBox            m_aPasswordRequired;
 
     protected:
-        virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs );
+        virtual bool FillItemSet( SfxItemSet& _rCoreAttrs );
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
@@ -230,7 +230,7 @@ namespace dbaui
     class OLDAPDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
         OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
     protected:
@@ -266,7 +266,7 @@ namespace dbaui
     class OTextDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
         OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
         OTextConnectionHelper*  m_pTextConnectionHelper;
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index ff2b8395e09a..a588a69b066d 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -466,7 +466,7 @@ namespace dbaui
         m_pDatasourceType->Enable( bValid );
     }
 
-    sal_Bool OGeneralPageDialog::FillItemSet( SfxItemSet& _rCoreAttrs )
+    bool OGeneralPageDialog::FillItemSet( SfxItemSet& _rCoreAttrs )
     {
         sal_Bool bChangedSomething = sal_False;
 
@@ -626,7 +626,7 @@ namespace dbaui
         return OGeneralPage::approveDatasourceType( eType, _inout_rDisplayName );
     }
 
-    sal_Bool OGeneralPageWizard::FillItemSet(SfxItemSet& _rCoreAttrs)
+    bool OGeneralPageWizard::FillItemSet(SfxItemSet& _rCoreAttrs)
     {
         sal_Bool bChangedSomething = sal_False;
 
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index aa4442751d25..6a712784f4b5 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -105,7 +105,7 @@ namespace dbaui
         OGeneralPageDialog( Window* pParent, const SfxItemSet& _rItems );
 
     protected:
-        virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs );
+        virtual bool FillItemSet( SfxItemSet& _rCoreAttrs );
 
         virtual void implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue );
         virtual void setParentTitle( const OUString& _sURLPrefix );
@@ -170,7 +170,7 @@ namespace dbaui
         DocumentDescriptor      GetSelectedDocument() const;
 
     protected:
-        virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs );
+        virtual bool FillItemSet( SfxItemSet& _rCoreAttrs );
 
         virtual void GetFocus();
 
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 1a76c21ebaf5..0bf46c8ea410 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -549,14 +549,14 @@ namespace dbaui
         return pReturn;
     }
 
-    sal_Bool OTableSubscriptionPage::FillItemSet( SfxItemSet& _rCoreAttrs )
+    bool OTableSubscriptionPage::FillItemSet( SfxItemSet& _rCoreAttrs )
     {
         sal_Bool bValid, bReadonly;
         getFlags(_rCoreAttrs, bValid, bReadonly);
 
         if (!bValid || bReadonly)
             // don't store anything if the data we're working with is invalid or readonly
-            return sal_True;
+            return true;
 
         // create the output string which contains all the table names
         if ( m_xCurrentConnection.is() )
@@ -574,7 +574,7 @@ namespace dbaui
             _rCoreAttrs.Put( OStringListItem(DSID_TABLEFILTER, aTableFilter) );
         }
 
-        return sal_True;
+        return true;
     }
 
     void OTableSubscriptionPage::fillControls(::std::vector< ISaveValueWrapper* >& /*_rControlList*/)
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index 0309fda62306..229170e19172 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -51,7 +51,7 @@ namespace dbaui
         OTableSubscriptionDialog* m_pTablesDlg;
 
     public:
-        virtual sal_Bool            FillItemSet(SfxItemSet& _rCoreAttrs);
+        virtual bool            FillItemSet(SfxItemSet& _rCoreAttrs);
         virtual int             DeactivatePage(SfxItemSet* _pSet);
         using OGenericAdministrationPage::DeactivatePage;