diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-17 11:16:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-17 11:17:21 +0200 |
| commit | fee4efcb54c8162955f6fe626d9b68c3b74b3068 (patch) | |
| tree | df8989eab6d8aacb5f37f0673a1a14eb5584a394 /dbaccess/source/ui/dlg | |
| parent | 6907b67d3d3208eb54289db2476132188d86dfec (diff) | |
dbaccess: sal_Bool->bool
Change-Id: Ieb52470f9638b74898954db3890aaf2cf202290a
Diffstat (limited to 'dbaccess/source/ui/dlg')
48 files changed, 410 insertions, 410 deletions
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 854b5f300246..9ddfd7bdda26 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -74,7 +74,7 @@ OCollectionView::OCollectionView( Window * pParent , m_sPath( ModuleRes( STR_PATHNAME ) ) , m_xContent(_xContent) , m_xContext(_rxContext) - , m_bCreateForm(sal_True) + , m_bCreateForm(true) { FreeResource(); @@ -272,7 +272,7 @@ IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView) void OCollectionView::initCurrentPath() { - sal_Bool bEnable = sal_False; + bool bEnable = false; try { if ( m_xContent.is() ) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index ea0654da09ae..25f37ab6dee1 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -113,20 +113,20 @@ namespace dbaui } - void OConnectionHelper::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OConnectionHelper::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); m_aFT_Connection.Show(); m_aConnectionURL.Show(); m_aConnectionURL.ShowPrefix( ::dbaccess::DST_JDBC == m_pCollection->determineType(m_eType) ); - sal_Bool bEnableBrowseButton = m_pCollection->supportsBrowsing( m_eType ); + bool bEnableBrowseButton = m_pCollection->supportsBrowsing( m_eType ); m_aPB_Connection.Show( bEnableBrowseButton ); - sal_Bool bEnableCreateButton = m_pCollection->supportsDBCreation( m_eType ); + bool bEnableCreateButton = m_pCollection->supportsDBCreation( m_eType ); m_aPB_CreateDB.Show( bEnableCreateButton ); SFX_ITEMSET_GET(_rSet, pUrlItem, SfxStringItem, DSID_CONNECTURL, true); @@ -167,7 +167,7 @@ namespace dbaui { Reference< XFolderPicker2 > xFolderPicker = FolderPicker::create(m_xORB); - sal_Bool bDoBrowse = sal_False; + bool bDoBrowse = false; OUString sOldPath = getURLNoPrefix(); do { @@ -181,7 +181,7 @@ namespace dbaui switch (checkPathExistence(sOldPath)) { case RET_RETRY: - bDoBrowse = sal_True; + bDoBrowse = true; break; case RET_CANCEL: return 0L; @@ -198,7 +198,7 @@ namespace dbaui sSelectedDirectory = aSelectedDirectory.GetMainURL( INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8 ); setURLNoPrefix( sSelectedDirectory ); - SetRoadmapStateValue(sal_True); + SetRoadmapStateValue(true); callModifiedHdl(); } catch( const Exception& ) @@ -251,7 +251,7 @@ namespace dbaui if ( getSelectedDataSource(sDataSource,sCurrDatasource) && !sDataSource.isEmpty() ) { setURLNoPrefix(sDataSource); - SetRoadmapStateValue(sal_True); + SetRoadmapStateValue(true); callModifiedHdl(); } else @@ -362,7 +362,7 @@ namespace dbaui return true; } - void OConnectionHelper::impl_setURL( const OUString& _rURL, sal_Bool _bPrefix ) + void OConnectionHelper::impl_setURL( const OUString& _rURL, bool _bPrefix ) { OUString sURL( comphelper::string::stripEnd(_rURL, '*') ); OSL_ENSURE( m_pCollection, "OConnectionHelper::impl_setURL: have no interpreter for the URLs!" ); @@ -405,7 +405,7 @@ namespace dbaui implUpdateURLDependentStates(); } - OUString OConnectionHelper::impl_getURL( sal_Bool _bPrefix ) const + OUString OConnectionHelper::impl_getURL( bool _bPrefix ) const { // get the pure text OUString sURL = _bPrefix ? m_aConnectionURL.GetText() : OUString(m_aConnectionURL.GetTextNoPrefix()); @@ -445,22 +445,22 @@ namespace dbaui void OConnectionHelper::setURL( const OUString& _rURL ) { - impl_setURL( _rURL, sal_True ); + impl_setURL( _rURL, true ); } OUString OConnectionHelper::getURLNoPrefix( ) const { - return impl_getURL( sal_False ); + return impl_getURL( false ); } void OConnectionHelper::setURLNoPrefix( const OUString& _rURL ) { - impl_setURL( _rURL, sal_False ); + impl_setURL( _rURL, false ); } sal_Int32 OConnectionHelper::checkPathExistence(const OUString& _rURL) { - IS_PATH_EXIST e_exists = pathExists(_rURL, sal_False); + IS_PATH_EXIST e_exists = pathExists(_rURL, false); if (!m_pCollection->supportsDBCreation(m_eType) && (( e_exists == PATH_NOT_EXIST) || ( e_exists == PATH_NOT_KNOWN))) { @@ -468,16 +468,16 @@ namespace dbaui OFileNotation aTransformer(_rURL); sQuery = sQuery.replaceFirst("$path$", aTransformer.get(OFileNotation::N_SYSTEM)); - m_bUserGrabFocus = sal_False; + m_bUserGrabFocus = false; QueryBox aQuery(GetParent(), WB_YES_NO | WB_DEF_YES, sQuery); sal_Int32 nQueryResult = aQuery.Execute(); - m_bUserGrabFocus = sal_True; + m_bUserGrabFocus = true; switch (nQueryResult) { case RET_YES: { - sal_Bool bTryCreate = sal_False; + bool bTryCreate = false; do { if ( !createDirectoryDeep(_rURL) ) @@ -485,16 +485,16 @@ namespace dbaui sQuery = ModuleRes(STR_COULD_NOT_CREATE_DIRECTORY); sQuery = sQuery.replaceFirst("$name$", aTransformer.get(OFileNotation::N_SYSTEM)); - m_bUserGrabFocus = sal_False; + m_bUserGrabFocus = false; QueryBox aWhatToDo(GetParent(), WB_RETRY_CANCEL | WB_DEF_RETRY, sQuery); nQueryResult = aWhatToDo.Execute(); - m_bUserGrabFocus = sal_True; + m_bUserGrabFocus = true; if (RET_RETRY == nQueryResult) - bTryCreate = sal_True; + bTryCreate = true; else { - SetRoadmapStateValue(sal_False); + SetRoadmapStateValue(false); callModifiedHdl(); return RET_RETRY; } @@ -510,7 +510,7 @@ namespace dbaui default: // cancelled - SetRoadmapStateValue(sal_False); + SetRoadmapStateValue(false); callModifiedHdl(); return RET_CANCEL; } @@ -520,15 +520,15 @@ namespace dbaui // TODO: error msg return RET_CANCEL; } */ - SetRoadmapStateValue(sal_True); + SetRoadmapStateValue(true); callModifiedHdl(); return RET_OK; } - IS_PATH_EXIST OConnectionHelper::pathExists(const OUString& _rURL, sal_Bool bIsFile) const + IS_PATH_EXIST OConnectionHelper::pathExists(const OUString& _rURL, bool bIsFile) const { ::ucbhelper::Content aCheckExistence; - sal_Bool bExists = sal_False; + bool bExists = false; IS_PATH_EXIST eExists = PATH_NOT_EXIST; Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler( task::InteractionHandler::createWithParent(m_xORB, 0), UNO_QUERY ); @@ -574,7 +574,7 @@ namespace dbaui return OGenericAdministrationPage::PreNotify( _rNEvt ); } - sal_Bool OConnectionHelper::createDirectoryDeep(const OUString& _rPathURL) + bool OConnectionHelper::createDirectoryDeep(const OUString& _rPathURL) { // get an URL object analyzing the URL for us ... INetURLObject aParser; @@ -590,11 +590,11 @@ namespace dbaui { aToBeCreated.push_back(aParser.getName()); // remember the local name for creation aParser.removeSegment(); // cut the local name - eParentExists = pathExists(aParser.GetMainURL(INetURLObject::NO_DECODE), sal_False); + eParentExists = pathExists(aParser.GetMainURL(INetURLObject::NO_DECODE), false); } if (!aParser.getSegmentCount()) - return sal_False; + return false; // create all the missing levels try @@ -630,16 +630,16 @@ namespace dbaui { aNewDirectoryAttributes[0] <<= *aLocalName; if (!aParent.insertNewContent(sContentType, aNewDirectoryProperties, aNewDirectoryAttributes, aParent)) - return sal_False; + return false; } } catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); - return sal_False; + return false; } - return sal_True; + return true; } void OConnectionHelper::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) @@ -654,7 +654,7 @@ namespace dbaui _rControlList.push_back( new OSaveValueWrapper<Edit>( &m_aConnectionURL ) ); } - sal_Bool OConnectionHelper::commitURL() + bool OConnectionHelper::commitURL() { OUString sURL; OUString sOldPath; @@ -674,15 +674,15 @@ namespace dbaui if ( ( ::dbaccess::DST_CALC == eType) || ( ::dbaccess::DST_MSACCESS == eType) || ( ::dbaccess::DST_MSACCESS_2007 == eType) ) { - if( pathExists(sURL, sal_True) == PATH_NOT_EXIST ) + if( pathExists(sURL, true) == PATH_NOT_EXIST ) { OUString sFile = ModuleRes( STR_FILE_DOES_NOT_EXIST ); sFile = sFile.replaceFirst("$file$", aTransformer.get(OFileNotation::N_SYSTEM)); OSQLWarningBox( this, sFile ).Execute(); setURLNoPrefix(sOldPath); - SetRoadmapStateValue(sal_False); + SetRoadmapStateValue(false); callModifiedHdl(); - return sal_False; + return false; } } else @@ -690,14 +690,14 @@ namespace dbaui switch (checkPathExistence(sURL)) { case RET_RETRY: - m_bUserGrabFocus = sal_False; + m_bUserGrabFocus = false; m_aConnectionURL.GrabFocus(); - m_bUserGrabFocus = sal_True; - return sal_False; + m_bUserGrabFocus = true; + return false; case RET_CANCEL: setURLNoPrefix(sOldPath); - return sal_False; + return false; } } } @@ -705,7 +705,7 @@ namespace dbaui setURLNoPrefix(sURL); m_aConnectionURL.SaveValueNoPrefix(); - return sal_True; + return true; } void OConnectionHelper::askForFileName(::sfx2::FileDialogHelper& _aFileOpen) { diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index eab21c756b3b..22ad7957bcfc 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -37,7 +37,7 @@ namespace dbaui class OConnectionHelper : public OGenericAdministrationPage { - sal_Bool m_bUserGrabFocus : 1; + bool m_bUserGrabFocus : 1; public: OConnectionHelper( Window* pParent, const ResId& _rId, const SfxItemSet& _rCoreAttrs); @@ -59,7 +59,7 @@ namespace dbaui virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; // <method>OGenericAdministrationPage::fillWindows</method> virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; // setting/retrieving the current connection URL // necessary because for some types, the URL must be decoded for display purposes @@ -75,9 +75,9 @@ namespace dbaui */ sal_Int32 checkPathExistence(const OUString& _rURL); - IS_PATH_EXIST pathExists(const OUString& _rURL, sal_Bool bIsFile) const; - sal_Bool createDirectoryDeep(const OUString& _rPathNormalized); - sal_Bool commitURL(); + IS_PATH_EXIST pathExists(const OUString& _rURL, bool bIsFile) const; + bool createDirectoryDeep(const OUString& _rPathNormalized); + bool commitURL(); /** opens the FileOpen dialog and asks for a FileName @param _aFileOpen @@ -92,8 +92,8 @@ namespace dbaui private: DECL_LINK(OnBrowseConnections, PushButton*); DECL_LINK(OnCreateDatabase, PushButton*); - OUString impl_getURL( sal_Bool _bPrefix ) const; - void impl_setURL( const OUString& _rURL, sal_Bool _bPrefix ); + OUString impl_getURL( bool _bPrefix ) const; + void impl_setURL( const OUString& _rURL, bool _bPrefix ); void implUpdateURLDependentStates() const; }; diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 19b68baf96cf..9792ce2c8096 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -119,10 +119,10 @@ namespace dbaui { } - void OConnectionTabPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OConnectionTabPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); m_eType = m_pAdminDialog->getDatasourceType(_rSet); @@ -230,7 +230,7 @@ namespace dbaui OUString sUrl = pUrlItem->GetValue(); setURL( sUrl ); - const sal_Bool bEnableJDBC = m_pCollection->determineType(m_eType) == ::dbaccess::DST_JDBC; + const bool bEnableJDBC = m_pCollection->determineType(m_eType) == ::dbaccess::DST_JDBC; if ( !pJdbcDrvItem->GetValue().getLength() ) { OUString sDefaultJdbcDriverName = m_pCollection->getJavaDriverClass(m_eType); @@ -280,13 +280,13 @@ namespace dbaui bool OConnectionTabPage::FillItemSet(SfxItemSet& _rSet) { - sal_Bool bChangedSomething = sal_False; + bool bChangedSomething = false; 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); @@ -303,7 +303,7 @@ namespace dbaui IMPL_LINK(OConnectionTabPage, OnTestJavaClickHdl, PushButton*, /*_pButton*/) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); - sal_Bool bSuccess = sal_False; + bool bSuccess = false; #if HAVE_FEATURE_JAVA try { @@ -327,7 +327,7 @@ namespace dbaui bool OConnectionTabPage::checkTestConnection() { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); - sal_Bool bEnableTestConnection = !m_aConnectionURL.IsVisible() || !m_aConnectionURL.GetTextNoPrefix().isEmpty(); + bool bEnableTestConnection = !m_aConnectionURL.IsVisible() || !m_aConnectionURL.GetTextNoPrefix().isEmpty(); if ( m_pCollection->determineType(m_eType) == ::dbaccess::DST_JDBC ) bEnableTestConnection = bEnableTestConnection && (!m_aJavaDriver.GetText().isEmpty()); m_aTestConnection.Enable(bEnableTestConnection); diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index f037d36e334b..ac26525634db 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -60,7 +60,7 @@ namespace dbaui static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); virtual bool FillItemSet (SfxItemSet& _rCoreAttrs) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; inline void enableConnectionURL() { m_aConnectionURL.SetReadOnly(false); } inline void disableConnectionURL() { m_aConnectionURL.SetReadOnly(); } diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index 922927b2397c..cc25f65f0a51 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -104,7 +104,7 @@ namespace dbaui // OConnectionTabPageSetup OConnectionTabPageSetup::OConnectionTabPageSetup(Window* pParent, sal_uInt16 _rId, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId) :OConnectionHelper(pParent, ModuleRes(_rId), _rCoreAttrs) - ,m_bUserGrabFocus(sal_True) + ,m_bUserGrabFocus(true) ,m_aFT_HelpText(this, ModuleRes(FT_AUTOWIZARDHELPTEXT)) { @@ -143,14 +143,14 @@ namespace dbaui m_aConnectionURL.SetModifyHdl(LINK(this, OConnectionTabPageSetup, OnEditModified)); - SetRoadmapStateValue(sal_False); + SetRoadmapStateValue(false); } OConnectionTabPageSetup::~OConnectionTabPageSetup() { } - void OConnectionTabPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OConnectionTabPageSetup::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { m_eType = m_pAdminDialog->getDatasourceType(_rSet); // special handling for oracle, this can only happen @@ -182,7 +182,7 @@ namespace dbaui bool OConnectionTabPageSetup::FillItemSet(SfxItemSet& _rSet) { - sal_Bool bChangedSomething = sal_False; + bool bChangedSomething = false; fillString(_rSet,&m_aConnectionURL, DSID_CONNECTURL, bChangedSomething); return bChangedSomething; } diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index 71386cfda2f9..f5aac6ec8400 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -36,7 +36,7 @@ namespace dbaui */ class OConnectionTabPageSetup : public OConnectionHelper { - sal_Bool m_bUserGrabFocus : 1; + bool m_bUserGrabFocus : 1; protected: FixedText m_aFT_HelpText; @@ -53,7 +53,7 @@ namespace dbaui virtual bool FillItemSet (SfxItemSet& _rCoreAttrs) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; inline void enableConnectionURL() { m_aConnectionURL.SetReadOnly(false); } diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 307b56d297c4..bf842f00ea8d 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -107,10 +107,10 @@ using namespace ::com::sun::star; OConnectionTabPageSetup::fillWindows(_rControlList); m_pTextConnectionHelper->fillWindows(_rControlList); } - void OTextConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OTextConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // first check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); OConnectionTabPageSetup::implInitControls( _rSet, _bSaveValue); m_pTextConnectionHelper->implInitControls(_rSet, bValid); @@ -118,12 +118,12 @@ using namespace ::com::sun::star; bool OTextConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { - sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); + bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); bChangedSomething = m_pTextConnectionHelper->FillItemSet(_rSet, bChangedSomething); return bChangedSomething; } - sal_Bool OTextConnectionPageSetup::prepareLeave(){ + bool OTextConnectionPageSetup::prepareLeave(){ return m_pTextConnectionHelper->prepareLeave(); } @@ -152,13 +152,13 @@ using namespace ::com::sun::star; m_aETBaseDN.SetModifyHdl(getControlModifiedLink()); m_aNFPortNumber.SetModifyHdl(getControlModifiedLink()); m_aCBUseSSL.SetToggleHdl(getControlModifiedLink()); - SetRoadmapStateValue(sal_False); + SetRoadmapStateValue(false); FreeResource(); } bool OLDAPConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { - sal_Bool bChangedSomething = sal_False; + bool bChangedSomething = false; fillString(_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN, bChangedSomething); fillInt32(_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething); @@ -174,7 +174,7 @@ using namespace ::com::sun::star; OUString sUrl = pCollection->getPrefix( OUString("sdbc:address:ldap:")); sUrl += m_aETHostServer.GetText(); _rSet.Put(SfxStringItem(DSID_CONNECTURL, sUrl)); - bChangedSomething = sal_True; + bChangedSomething = true; } } @@ -196,10 +196,10 @@ using namespace ::com::sun::star; _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTPortNumber)); _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDefaultPortNumber)); } - void OLDAPConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OLDAPConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); SFX_ITEMSET_GET(_rSet, pBaseDN, SfxStringItem, DSID_CONN_LDAP_BASEDN, true); @@ -216,7 +216,7 @@ using namespace ::com::sun::star; IMPL_LINK(OLDAPConnectionPageSetup, OnEditModified, Edit*, /*_pEdit*/) { - sal_Bool bRoadmapState = ((!m_aETHostServer.GetText().isEmpty() ) && ( !m_aETBaseDN.GetText().isEmpty() ) && (!m_aFTPortNumber.GetText().isEmpty() )); + bool bRoadmapState = ((!m_aETHostServer.GetText().isEmpty() ) && ( !m_aETBaseDN.GetText().isEmpty() ) && (!m_aFTPortNumber.GetText().isEmpty() )); SetRoadmapStateValue(bRoadmapState); callModifiedHdl(); return 0L; @@ -256,7 +256,7 @@ using namespace ::com::sun::star; } - void OMySQLIntroPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bSaveValue*/) + void OMySQLIntroPageSetup::implInitControls(const SfxItemSet& _rSet, bool /*_bSaveValue*/) { // show the "Connect directly" option only if the driver is installed DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rSet.GetItem(DSID_TYPECOLLECTION)); @@ -311,7 +311,7 @@ using namespace ::com::sun::star; LayoutHelper::positionBelow( m_aHelpText, m_aMySQLSettings, UnrelatedControls, 0 ); m_aMySQLSettings.Show(); - SetRoadmapStateValue(sal_False); + SetRoadmapStateValue(false); FreeResource(); } @@ -336,7 +336,7 @@ using namespace ::com::sun::star; return m_aMySQLSettings.FillItemSet( _rSet ); } - void MySQLNativeSetupPage::implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) + void MySQLNativeSetupPage::implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) { m_aMySQLSettings.implInitControls( _rSet ); @@ -396,7 +396,7 @@ using namespace ::com::sun::star; m_sDefaultJdbcDriverName = pTypeCollection->getJavaDriverClass(pUrlItem->GetValue()); } - SetRoadmapStateValue(sal_False); + SetRoadmapStateValue(false); FreeResource(); } @@ -443,7 +443,7 @@ using namespace ::com::sun::star; bool OGeneralSpecialJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { - sal_Bool bChangedSomething = sal_False; + bool bChangedSomething = false; fillString(_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); fillString(_rSet,&m_aETHostname,DSID_CONN_HOSTNAME,bChangedSomething); fillString(_rSet,&m_aETDatabasename,DSID_DATABASENAME,bChangedSomething); @@ -451,10 +451,10 @@ using namespace ::com::sun::star; return bChangedSomething; } - void OGeneralSpecialJDBCConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OGeneralSpecialJDBCConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); SFX_ITEMSET_GET(_rSet, pDatabaseName, SfxStringItem, DSID_DATABASENAME, true); @@ -486,7 +486,7 @@ using namespace ::com::sun::star; } callModifiedHdl(); - sal_Bool bRoadmapState = ((!m_aETDatabasename.GetText().isEmpty() ) && (!m_aETHostname.GetText().isEmpty()) && (!m_aNFPortNumber.GetText().isEmpty() ) && ( !m_aETDriverClass.GetText().isEmpty() )); + bool bRoadmapState = ((!m_aETDatabasename.GetText().isEmpty() ) && (!m_aETHostname.GetText().isEmpty()) && (!m_aNFPortNumber.GetText().isEmpty() ) && ( !m_aETDriverClass.GetText().isEmpty() )); SetRoadmapStateValue(bRoadmapState); } @@ -494,7 +494,7 @@ using namespace ::com::sun::star; { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); - sal_Bool bSuccess = sal_False; + bool bSuccess = false; #if HAVE_FEATURE_JAVA try { @@ -520,7 +520,7 @@ using namespace ::com::sun::star; { if ( _pEdit == &m_aETDriverClass ) m_aPBTestJavaDriver.Enable( !m_aETDriverClass.GetText().isEmpty() ); - sal_Bool bRoadmapState = ((!m_aETDatabasename.GetText().isEmpty() ) && ( !m_aETHostname.GetText().isEmpty() ) && (!m_aNFPortNumber.GetText().isEmpty() ) && ( !m_aETDriverClass.GetText().isEmpty() )); + bool bRoadmapState = ((!m_aETDatabasename.GetText().isEmpty() ) && ( !m_aETHostname.GetText().isEmpty() ) && (!m_aNFPortNumber.GetText().isEmpty() ) && ( !m_aETDriverClass.GetText().isEmpty() )); SetRoadmapStateValue(bRoadmapState); callModifiedHdl(); return 0L; @@ -555,15 +555,15 @@ using namespace ::com::sun::star; bool OJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { - sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); + bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); fillString(_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); return bChangedSomething; } - void OJDBCConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OJDBCConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); SFX_ITEMSET_GET(_rSet, pDrvItem, SfxStringItem, DSID_JDBCDRIVERCLASS, true); @@ -585,7 +585,7 @@ using namespace ::com::sun::star; m_aETDriverClass.ClearModifyFlag(); } } - sal_Bool bEnable = pDrvItem->GetValue().getLength() != 0; + bool bEnable = pDrvItem->GetValue().getLength() != 0; m_aPBTestJavaDriver.Enable(bEnable); OConnectionTabPageSetup::implInitControls(_rSet, _bSaveValue); @@ -595,7 +595,7 @@ using namespace ::com::sun::star; bool OJDBCConnectionPageSetup::checkTestConnection() { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); - sal_Bool bEnableTestConnection = !m_aConnectionURL.IsVisible() || !m_aConnectionURL.GetTextNoPrefix().isEmpty(); + bool bEnableTestConnection = !m_aConnectionURL.IsVisible() || !m_aConnectionURL.GetTextNoPrefix().isEmpty(); bEnableTestConnection = bEnableTestConnection && (!m_aETDriverClass.GetText().isEmpty()); return bEnableTestConnection; } @@ -603,7 +603,7 @@ using namespace ::com::sun::star; IMPL_LINK(OJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, /*_pButton*/) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); - sal_Bool bSuccess = sal_False; + bool bSuccess = false; #if HAVE_FEATURE_JAVA try { @@ -665,14 +665,14 @@ using namespace ::com::sun::star; } - void OSpreadSheetConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OSpreadSheetConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { OConnectionTabPageSetup::implInitControls(_rSet, _bSaveValue); } bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { - sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); + bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); fillBool(_rSet,&m_aCBPasswordrequired,DSID_PASSWORDREQUIRED,bChangedSomething); return bChangedSomething; } @@ -720,10 +720,10 @@ using namespace ::com::sun::star; _rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aCBPasswordRequired)); } - void OAuthentificationPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bSaveValue*/) + void OAuthentificationPageSetup::implInitControls(const SfxItemSet& _rSet, bool /*_bSaveValue*/) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); SFX_ITEMSET_GET(_rSet, pUidItem, SfxStringItem, DSID_USER, true); SFX_ITEMSET_GET(_rSet, pAllowEmptyPwd, SfxBoolItem, DSID_PASSWORDREQUIRED, true); @@ -736,13 +736,13 @@ using namespace ::com::sun::star; bool OAuthentificationPageSetup::FillItemSet( SfxItemSet& _rSet ) { - sal_Bool bChangedSomething = sal_False; + bool bChangedSomething = false; if (m_aETUserName.GetText() != m_aETUserName.GetSavedValue()) { _rSet.Put(SfxStringItem(DSID_USER, m_aETUserName.GetText())); _rSet.Put(SfxStringItem(DSID_PASSWORD, OUString())); - bChangedSomething = sal_True; + bChangedSomething = true; } fillBool(_rSet,&m_aCBPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething); return bChangedSomething; @@ -777,17 +777,17 @@ using namespace ::com::sun::star; } - sal_Bool OFinalDBPageSetup::IsDatabaseDocumentToBeRegistered() + bool OFinalDBPageSetup::IsDatabaseDocumentToBeRegistered() { return m_pRBRegisterDataSource->IsChecked() && m_pRBRegisterDataSource->IsEnabled(); } - sal_Bool OFinalDBPageSetup::IsDatabaseDocumentToBeOpened() + bool OFinalDBPageSetup::IsDatabaseDocumentToBeOpened() { return m_pCBOpenAfterwards->IsChecked() && m_pCBOpenAfterwards->IsEnabled(); } - sal_Bool OFinalDBPageSetup::IsTableWizardToBeStarted() + bool OFinalDBPageSetup::IsTableWizardToBeStarted() { return m_pCBStartTableWizard->IsChecked() && m_pCBStartTableWizard->IsEnabled(); } @@ -808,12 +808,12 @@ using namespace ::com::sun::star; _rControlList.push_back(new OSaveValueWrapper<RadioButton>(m_pRBDontregisterDataSource)); } - void OFinalDBPageSetup::implInitControls(const SfxItemSet& /*_rSet*/, sal_Bool /*_bSaveValue*/) + void OFinalDBPageSetup::implInitControls(const SfxItemSet& /*_rSet*/, bool /*_bSaveValue*/) { m_pCBOpenAfterwards->Check(); } - void OFinalDBPageSetup::enableTableWizardCheckBox( sal_Bool _bSupportsTableCreation) + void OFinalDBPageSetup::enableTableWizardCheckBox( bool _bSupportsTableCreation) { m_pCBStartTableWizard->Enable(_bSupportsTableCreation); } diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 48bc687deb6e..f903b6824036 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -48,7 +48,7 @@ namespace dbaui virtual ~OSpreadSheetConnectionPageSetup(); protected: - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; @@ -66,8 +66,8 @@ namespace dbaui protected: virtual ~OTextConnectionPageSetup(); - virtual sal_Bool prepareLeave() SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual bool prepareLeave() SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; bool checkTestConnection() SAL_OVERRIDE; @@ -86,7 +86,7 @@ namespace dbaui virtual Link getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); } protected: - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; DECL_LINK(OnEditModified,Edit*); @@ -122,7 +122,7 @@ namespace dbaui virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual Link getControlModifiedLink() SAL_OVERRIDE; @@ -147,7 +147,7 @@ namespace dbaui protected: virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual Link getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified); } @@ -182,7 +182,7 @@ namespace dbaui virtual bool checkTestConnection() SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; @@ -215,7 +215,7 @@ namespace dbaui protected: virtual bool FillItemSet(SfxItemSet& _rSet) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual ~OMySQLIntroPageSetup(); @@ -250,7 +250,7 @@ namespace dbaui virtual ~OAuthentificationPageSetup(); protected: - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; }; @@ -272,10 +272,10 @@ namespace dbaui FixedText* m_pFTFinalText; OFinalDBPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); - sal_Bool IsDatabaseDocumentToBeRegistered(); - sal_Bool IsDatabaseDocumentToBeOpened(); - sal_Bool IsTableWizardToBeStarted(); - void enableTableWizardCheckBox( sal_Bool _bSupportsTableCreation); + bool IsDatabaseDocumentToBeRegistered(); + bool IsDatabaseDocumentToBeOpened(); + bool IsTableWizardToBeStarted(); + void enableTableWizardCheckBox( bool _bSupportsTableCreation); /// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method> Link getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGenericAdministrationPage, OnControlModified); } @@ -285,7 +285,7 @@ namespace dbaui virtual ~OFinalDBPageSetup(); protected: - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; }; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 6cd39e56ee71..9a326fcb2214 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -89,9 +89,9 @@ using namespace com::sun::star::frame; namespace { - sal_Bool implCheckItemType( SfxItemSet& _rSet, const sal_uInt16 _nId, const TypeId _nExpectedItemType ) + bool implCheckItemType( SfxItemSet& _rSet, const sal_uInt16 _nId, const TypeId _nExpectedItemType ) { - sal_Bool bCorrectType = sal_False; + bool bCorrectType = false; SfxItemPool* pPool = _rSet.GetPool(); OSL_ENSURE( pPool, "implCheckItemType: invalid item pool!" ); @@ -210,11 +210,11 @@ ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Refer } } -sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyValue >& _rDriverParam) +bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyValue >& _rDriverParam) { OSL_ENSURE(m_pItemSetHelper->getOutputSet(), "ODbDataSourceAdministrationHelper::getCurrentSettings : not to be called without an example set!"); if (!m_pItemSetHelper->getOutputSet()) - return sal_False; + return false; ::std::vector< PropertyValue > aReturn; // collecting this in a vector because it has a push_back, in opposite to sequences @@ -281,7 +281,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert // two continuations (Ok and Cancel) ::rtl::Reference< comphelper::OInteractionAbort > pAbort = new comphelper::OInteractionAbort; ::rtl::Reference< dbaccess::OAuthenticationContinuation > pAuthenticate = new dbaccess::OAuthenticationContinuation; - pAuthenticate->setCanChangeUserName( sal_False ); + pAuthenticate->setCanChangeUserName( false ); pAuthenticate->setRememberPassword( RememberAuthentication_SESSION ); // some knittings @@ -300,7 +300,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert DBG_UNHANDLED_EXCEPTION(); } if (!pAuthenticate->wasSelected()) - return sal_False; + return false; sPassword = pAuthenticate->getPassword(); if (pAuthenticate->getRememberPassword()) @@ -319,7 +319,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert // append all the other stuff (charset etc.) fillDatasourceInfo(*m_pItemSetHelper->getOutputSet(), _rDriverParam); - return sal_True; + return true; } void ODbDataSourceAdministrationHelper::successfullyConnected() @@ -454,7 +454,7 @@ OUString ODbDataSourceAdministrationHelper::getDatasourceType( const SfxItemSet& return pCollection->getType(pConnectURL->GetValue()); } -sal_Bool ODbDataSourceAdministrationHelper::hasAuthentication(const SfxItemSet& _rSet) const +bool ODbDataSourceAdministrationHelper::hasAuthentication(const SfxItemSet& _rSet) const { return DataSourceMetaData::getAuthentication( getDatasourceType( _rSet ) ) != AuthNone; } @@ -858,7 +858,7 @@ Any ODbDataSourceAdministrationHelper::implTranslateProperty(const SfxPoolItem* if ( !pOptBoolItem->HasValue() ) aValue.clear(); else - aValue <<= (sal_Bool)pOptBoolItem->GetValue(); + aValue <<= pOptBoolItem->GetValue(); } else if ( pInt32Item ) { @@ -930,7 +930,7 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet case TypeClass_BOOLEAN: if ( implCheckItemType( _rSet, _nId, SfxBoolItem::StaticType() ) ) { - sal_Bool bVal = sal_False; + bool bVal = false; _rValue >>= bVal; _rSet.Put(SfxBoolItem(_nId, bVal)); } @@ -939,7 +939,7 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet OptionalBoolItem aItem( _nId ); if ( _rValue.hasValue() ) { - sal_Bool bValue = sal_False; + bool bValue = false; _rValue >>= bValue; aItem.SetValue( bValue ); } @@ -1081,16 +1081,16 @@ void ODbDataSourceAdministrationHelper::convertUrl(SfxItemSet& _rDest) } -sal_Bool ODbDataSourceAdministrationHelper::saveChanges(const SfxItemSet& _rSource) +bool ODbDataSourceAdministrationHelper::saveChanges(const SfxItemSet& _rSource) { // put the remembered settings into the property set Reference<XPropertySet> xDatasource = getCurrentDataSource(); if ( !xDatasource.is() ) - return sal_False; + return false; translateProperties(_rSource,xDatasource ); - return sal_True; + return true; } void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSourceOrName ) diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index c303443f1b22..de06359af2bd 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -79,7 +79,7 @@ namespace dbaui /** translate the current dialog SfxItems into driver relevant PropertyValues @see successfullyConnected */ - sal_Bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams); + bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams); /** to be called if the settings got from getCurrentSettings have been used for successfully connecting @see getCurrentSettings @@ -146,7 +146,7 @@ namespace dbaui const SfxItemSet& _rSource, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDest); - sal_Bool saveChanges(const SfxItemSet& _rSource); + bool saveChanges(const SfxItemSet& _rSource); protected: /** fill a data source info array with the settings from a given item set */ @@ -164,7 +164,7 @@ namespace dbaui /** check if the data source described by the given set needs authentication<p/> The return value depends on the data source type only. */ - sal_Bool hasAuthentication(const SfxItemSet& _rSet) const; + bool hasAuthentication(const SfxItemSet& _rSet) const; #if OSL_DEBUG_LEVEL > 0 OString translatePropertyId( sal_Int32 _nId ); diff --git a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx index fd37bcdeaa6f..1907630ada63 100644 --- a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx +++ b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx @@ -13,7 +13,7 @@ namespace dbaui { QueryPropertiesDialog::QueryPropertiesDialog( - Window* pParent, const sal_Bool bDistinct, const sal_Int64 nLimit ) + Window* pParent, const bool bDistinct, const sal_Int64 nLimit ) : ModalDialog(pParent, "QueryPropertiesDialog", "dbaccess/ui/querypropertiesdialog.ui") , m_pRB_Distinct( 0 ) , m_pRB_NonDistinct( 0 ) diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index a3baa4a101e1..8d20092b256b 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -50,7 +50,7 @@ using namespace ::dbtools; // class ORelationDialog ORelationDialog::ORelationDialog( OJoinTableView* pParent, const TTableConnectionData::value_type& pConnectionData, - sal_Bool bAllowTableSelect ) + bool bAllowTableSelect ) : ModalDialog(pParent, "RelationDialog", "dbaccess/ui/relationdialog.ui") , m_pTableMap(pParent->GetTabWinMap()) @@ -196,7 +196,7 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ ) DBG_UNHANDLED_EXCEPTION(); } - m_bTriedOneUpdate = sal_True; + m_bTriedOneUpdate = true; // this means that the original connection may be lost (if m_pConnData was not a newly created but an // existent conn to be modified), which we reflect by returning RET_NO (see ::Execute) diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index 33051d3870cb..f7f2789ef8b2 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -44,7 +44,7 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent : SfxSingleTabDialog(pParent, _pItems, "TablesFilterDialog", "dbaccess/ui/tablesfilterdialog.ui") , m_pImpl( new ODbDataSourceAdministrationHelper( _rxORB, pParent, this ) ) - , m_bStopExecution(sal_False) + , m_bStopExecution(false) , m_pOutSet(_pItems) { m_pImpl->setDataSourceOrName(_aDataSourceName); @@ -79,7 +79,7 @@ short OTableSubscriptionDialog::Execute() return nRet; } -sal_Bool OTableSubscriptionDialog::getCurrentSettings(Sequence< PropertyValue >& _rDriverParams) +bool OTableSubscriptionDialog::getCurrentSettings(Sequence< PropertyValue >& _rDriverParams) { return m_pImpl->getCurrentSettings(_rDriverParams); } diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 8edd41944493..bc8b7b2c7c68 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -221,7 +221,7 @@ namespace dbaui IMPL_LINK(OTextConnectionHelper, OnSetExtensionHdl, RadioButton*, /*_pRadioButton*/) { - sal_Bool bDoEnable = m_aRBAccessOtherFiles.IsChecked(); + bool bDoEnable = m_aRBAccessOtherFiles.IsChecked(); m_aETOwnExtension.Enable(bDoEnable); m_aFTExtensionExample.Enable(bDoEnable); m_aGetExtensionHandler.Call(this); @@ -249,7 +249,7 @@ namespace dbaui _rControlList.push_back(new ODisableWrapper<ListBox>(&m_aCharSet)); } - void OTextConnectionHelper::implInitControls(const SfxItemSet& _rSet, sal_Bool _bValid) + void OTextConnectionHelper::implInitControls(const SfxItemSet& _rSet, bool _bValid) { if ( !_bValid ) return; @@ -287,7 +287,7 @@ namespace dbaui } } - sal_Bool OTextConnectionHelper::prepareLeave() + bool OTextConnectionHelper::prepareLeave() { LocalResourceAccess aStringResAccess(PAGE_TEXT, RSC_TABPAGE); // for accessing the strings which are local to our own resource block @@ -356,15 +356,15 @@ namespace dbaui pErrorWin = &m_aETOwnExtension; } else - return sal_True; + return true; ErrorBox(NULL, WB_OK, MnemonicGenerator::EraseAllMnemonicChars( aErrorText)).Execute(); pErrorWin->GrabFocus(); - return 0; + return false; } - sal_Bool OTextConnectionHelper::FillItemSet( SfxItemSet& rSet, const sal_Bool _bChangedSomething ) + bool OTextConnectionHelper::FillItemSet( SfxItemSet& rSet, const bool _bChangedSomething ) { - sal_Bool bChangedSomething = _bChangedSomething; + bool bChangedSomething = _bChangedSomething; if ( ( m_nAvailableSections & TC_EXTENSION ) != 0 ) { @@ -372,7 +372,7 @@ namespace dbaui if( m_aOldExtension != sExtension ) { rSet.Put( SfxStringItem( DSID_TEXTFILEEXTENSION, sExtension ) ); - bChangedSomething = sal_True; + bChangedSomething = true; } } @@ -381,7 +381,7 @@ namespace dbaui if( (m_aRowHeader.GetState() != m_aRowHeader.GetSavedValue()) ) { rSet.Put(SfxBoolItem(DSID_TEXTFILEHEADER, m_aRowHeader.IsChecked())); - bChangedSomething = sal_True; + bChangedSomething = true; } } @@ -390,30 +390,30 @@ namespace dbaui if( m_aFieldSeparator.GetText() != m_aFieldSeparator.GetSavedValue() ) { rSet.Put( SfxStringItem(DSID_FIELDDELIMITER, GetSeparator( m_aFieldSeparator, m_aFieldSeparatorList) ) ); - bChangedSomething = sal_True; + bChangedSomething = true; } if( m_aTextSeparator.GetText() != m_aTextSeparator.GetSavedValue() ) { rSet.Put( SfxStringItem(DSID_TEXTDELIMITER, GetSeparator( m_aTextSeparator, m_aTextSeparatorList) ) ); - bChangedSomething = sal_True; + bChangedSomething = true; } if( m_aDecimalSeparator.GetText() != m_aDecimalSeparator.GetSavedValue() ) { rSet.Put( SfxStringItem(DSID_DECIMALDELIMITER, m_aDecimalSeparator.GetText().copy(0, 1) ) ); - bChangedSomething = sal_True; + bChangedSomething = true; } if( m_aThousandsSeparator.GetText() != m_aThousandsSeparator.GetSavedValue() ) { rSet.Put( SfxStringItem(DSID_THOUSANDSDELIMITER, m_aThousandsSeparator.GetText().copy(0,1) ) ); - bChangedSomething = sal_True; + bChangedSomething = true; } } if ( ( m_nAvailableSections & TC_CHARSET ) != 0 ) { if ( m_aCharSet.StoreSelectedCharSet( rSet, DSID_CHARSET ) ) - bChangedSomething = sal_True; + bChangedSomething = true; } return bChangedSomething; diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index 156bf3377d96..168a6e1fc7a1 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -91,13 +91,13 @@ namespace dbaui void SetExtension(const OUString& _rVal); public: - void implInitControls(const SfxItemSet& _rSet, sal_Bool _bValid); + void implInitControls(const SfxItemSet& _rSet, bool _bValid); void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); void SetClickHandler(const Link& _rHandler) { m_aGetExtensionHandler = _rHandler; } OUString GetExtension(); - sal_Bool FillItemSet( SfxItemSet& rSet, const sal_Bool bChangedSomething ); - sal_Bool prepareLeave(); + bool FillItemSet( SfxItemSet& rSet, const bool bChangedSomething ); + bool prepareLeave(); }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 6fbbc52220a3..aff54572bba8 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -282,7 +282,7 @@ void OUserAdmin::fillWindows(::std::vector< ISaveValueWrapper* >& /*_rControlLis { } -void OUserAdmin::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) +void OUserAdmin::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { m_TableCtrl.setComponentContext(m_xORB); try diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 9d7d508378a8..698fde194b52 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -71,7 +71,7 @@ public: OUString GetUser(); // must be overloaded by subclasses, but it isn't pure virtual - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; // <method>OGenericAdministrationPage::fillControls</method> virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index e2b810fb5a28..594fdc4daa92 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -167,7 +167,7 @@ namespace dbaui { (void)_bEnable; } - sal_Bool OUserAdminDlg::saveDatasource() + bool OUserAdminDlg::saveDatasource() { return PrepareLeaveCurrentPage(); } diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 8e4800cf674d..a33958dc4b7f 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -194,7 +194,7 @@ namespace dbaui bool MySQLNativeSettings::FillItemSet( SfxItemSet& _rSet ) { - sal_Bool bChangedSomething = sal_False; + bool bChangedSomething = false; OGenericAdministrationPage::fillString( _rSet, &m_aHostName, DSID_CONN_HOSTNAME, bChangedSomething ); OGenericAdministrationPage::fillString( _rSet, &m_aDatabaseName, DSID_DATABASENAME, bChangedSomething ); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 6495e5bda1a8..9c194c8b7254 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -60,7 +60,7 @@ namespace dbaui // OGenericAdministrationPage OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const ResId& _rId, const SfxItemSet& _rAttrSet) :SfxTabPage(_pParent, _rId, _rAttrSet) - ,m_abEnableRoadmap(sal_False) + ,m_abEnableRoadmap(false) ,m_pAdminDialog(NULL) ,m_pItemSetHelper(NULL) ,m_pFT_HeaderText(NULL) @@ -71,7 +71,7 @@ namespace dbaui OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet) :SfxTabPage(_pParent, _rId, _rUIXMLDescription, _rAttrSet) - ,m_abEnableRoadmap(sal_False) + ,m_abEnableRoadmap(false) ,m_pAdminDialog(NULL) ,m_pItemSetHelper(NULL) ,m_pFT_HeaderText(NULL) @@ -100,7 +100,7 @@ namespace dbaui void OGenericAdministrationPage::Reset(const SfxItemSet& _rCoreAttrs) { - implInitControls(_rCoreAttrs, sal_False); + implInitControls(_rCoreAttrs, false); } void OGenericAdministrationPage::ActivatePage() { @@ -111,10 +111,10 @@ namespace dbaui } void OGenericAdministrationPage::ActivatePage(const SfxItemSet& _rSet) { - implInitControls(_rSet, sal_True); + implInitControls(_rSet, true); } - void OGenericAdministrationPage::getFlags(const SfxItemSet& _rSet, sal_Bool& _rValid, sal_Bool& _rReadonly) + void OGenericAdministrationPage::getFlags(const SfxItemSet& _rSet, bool& _rValid, bool& _rReadonly) { SFX_ITEMSET_GET(_rSet, pInvalid, SfxBoolItem, DSID_INVALID_SELECTION, true); _rValid = !pInvalid || !pInvalid->GetValue(); @@ -127,7 +127,7 @@ namespace dbaui callModifiedHdl(); return 0L; } - sal_Bool OGenericAdministrationPage::getSelectedDataSource(OUString& _sReturn,OUString& _sCurr) + bool OGenericAdministrationPage::getSelectedDataSource(OUString& _sReturn, OUString& _sCurr) { // collect all ODBC data source names StringBag aOdbcDatasources; @@ -139,7 +139,7 @@ namespace dbaui sError = sError.replaceFirst("#lib#", aEnumeration.getLibraryName()); ErrorBox aDialog(this, WB_OK, sError); aDialog.Execute(); - return sal_False; + return false; } else { @@ -151,13 +151,13 @@ namespace dbaui if ( RET_OK == aSelector.Execute() ) _sReturn = aSelector.GetSelected(); } - return sal_True; + return true; } - void OGenericAdministrationPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OGenericAdministrationPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); ::std::vector< ISaveValueWrapper* > aControlList; @@ -191,11 +191,11 @@ namespace dbaui { return true; } - void OGenericAdministrationPage::fillBool( SfxItemSet& _rSet, CheckBox* _pCheckBox, sal_uInt16 _nID, sal_Bool& _bChangedSomething, bool _bRevertValue ) + void OGenericAdministrationPage::fillBool( SfxItemSet& _rSet, CheckBox* _pCheckBox, sal_uInt16 _nID, bool& _bChangedSomething, bool _bRevertValue ) { if ( (_pCheckBox != NULL ) && ( _pCheckBox->GetState() != _pCheckBox->GetSavedValue() ) ) { - sal_Bool bValue = _pCheckBox->IsChecked(); + bool bValue = _pCheckBox->IsChecked(); if ( _bRevertValue ) bValue = !bValue; @@ -209,23 +209,23 @@ namespace dbaui else _rSet.Put( SfxBoolItem( _nID, bValue ) ); - _bChangedSomething = sal_True; + _bChangedSomething = true; } } - void OGenericAdministrationPage::fillInt32(SfxItemSet& _rSet,NumericField* _pEdit,sal_uInt16 _nID,sal_Bool& _bChangedSomething) + void OGenericAdministrationPage::fillInt32(SfxItemSet& _rSet, NumericField* _pEdit, sal_uInt16 _nID, bool& _bChangedSomething) { if( (_pEdit != NULL) && (_pEdit->GetValue() != _pEdit->GetSavedValue().toInt32()) ) { _rSet.Put(SfxInt32Item(_nID, static_cast<sal_Int32>(_pEdit->GetValue()))); - _bChangedSomething = sal_True; + _bChangedSomething = true; } } - void OGenericAdministrationPage::fillString(SfxItemSet& _rSet,Edit* _pEdit,sal_uInt16 _nID,sal_Bool& _bChangedSomething) + void OGenericAdministrationPage::fillString(SfxItemSet& _rSet, Edit* _pEdit, sal_uInt16 _nID, bool& _bChangedSomething) { if( (_pEdit != NULL) && (_pEdit->GetText() != _pEdit->GetSavedValue()) ) { _rSet.Put(SfxStringItem(_nID, _pEdit->GetText())); - _bChangedSomething = sal_True; + _bChangedSomething = true; } } @@ -239,12 +239,12 @@ namespace dbaui IMPL_LINK(OGenericAdministrationPage, OnTestConnectionClickHdl, PushButton*, /*_pButton*/) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); - sal_Bool bSuccess = sal_False; + bool bSuccess = false; if ( m_pAdminDialog ) { m_pAdminDialog->saveDatasource(); - OGenericAdministrationPage::implInitControls(*m_pItemSetHelper->getOutputSet(), sal_True); - sal_Bool bShowMessage = sal_True; + OGenericAdministrationPage::implInitControls(*m_pItemSetHelper->getOutputSet(), true); + bool bShowMessage = true; try { ::std::pair< Reference<XConnection>,sal_Bool> xConnection = m_pAdminDialog->createConnection(); diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index 514321e873b5..667a7a4683e0 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -94,7 +94,7 @@ namespace dbaui { private: Link m_aModifiedHandler; /// to be called if something on the page has been modified - sal_Bool m_abEnableRoadmap; + bool m_abEnableRoadmap; protected: IDatabaseSettingsDialog* m_pAdminDialog; IItemSetHelper* m_pItemSetHelper; @@ -141,14 +141,14 @@ namespace dbaui @return <FALSE/> if an error occurred, otherwise <TRUE/> */ - sal_Bool getSelectedDataSource(OUString& _sReturn,OUString& _sCurr); + bool getSelectedDataSource(OUString& _sReturn, OUString& _sCurr); // svt::IWizardPageController virtual void initializePage() SAL_OVERRIDE; virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; virtual bool canAdvance() const SAL_OVERRIDE; - void SetRoadmapStateValue( sal_Bool _bDoEnable ) { m_abEnableRoadmap = _bDoEnable; } + void SetRoadmapStateValue( bool _bDoEnable ) { m_abEnableRoadmap = _bDoEnable; } bool GetRoadmapStateValue() const { return m_abEnableRoadmap; } protected: @@ -167,15 +167,15 @@ namespace dbaui void callModifiedHdl() const { if (m_aModifiedHandler.IsSet()) m_aModifiedHandler.Call((void*)this); } /// called from within DeactivatePage. The page is allowed to be deactivated if this method returns sal_True - virtual sal_Bool prepareLeave() { return sal_True; } + virtual bool prepareLeave() { return true; } /** called from within Reset and ActivatePage, use to initialize the controls with the items from the given set @param _bSaveValue if set to sal_True, the implementation should call SaveValue on all relevant controls */ - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue); /// analyze the invalid and the readonly flag which may be present in the set - void getFlags(const SfxItemSet& _rSet, sal_Bool& _rValid, sal_Bool& _rReadonly); + void getFlags(const SfxItemSet& _rSet, bool& _rValid, bool& _rReadonly); /** will be called inside <method>implInitControls</method> to save the value if necessary @param _rControlList @@ -204,7 +204,7 @@ namespace dbaui @param _bRevertValue set to <TRUE/> if the display value should be reverted before putting it into the set */ - static void fillBool( SfxItemSet& _rSet, CheckBox* _pCheckBox, sal_uInt16 _nID, sal_Bool& _bChangedSomething, bool _bRevertValue = false); + static void fillBool( SfxItemSet& _rSet, CheckBox* _pCheckBox, sal_uInt16 _nID, bool& _bChangedSomething, bool _bRevertValue = false); /** fills the int value into the item set when the value changed. @param _rSet @@ -216,7 +216,7 @@ namespace dbaui @param _bChangedSomething <TRUE/> if something changed otherwise <FALSE/> */ - static void fillInt32(SfxItemSet& _rSet,NumericField* _pEdit,sal_uInt16 _nID,sal_Bool& _bChangedSomething); + static void fillInt32(SfxItemSet& _rSet,NumericField* _pEdit,sal_uInt16 _nID, bool& _bChangedSomething); /** fills the String value into the item set when the value changed. @param _rSet @@ -228,7 +228,7 @@ namespace dbaui @param _bChangedSomething <TRUE/> if something changed otherwise <FALSE/> */ - static void fillString(SfxItemSet& _rSet,Edit* _pEdit,sal_uInt16 _nID,sal_Bool& _bChangedSomething); + static void fillString(SfxItemSet& _rSet,Edit* _pEdit,sal_uInt16 _nID, bool& _bChangedSomething); protected: // used to set the right Pane header of a wizard to bold diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 780f1e7e8d64..05e3cd7427ae 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -199,10 +199,10 @@ namespace dbaui _rControlList.push_back(new OSaveValueWrapper<NumericField>(m_pMaxRowScan)); } - void SpecialSettingsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void SpecialSettingsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags( _rSet, bValid, bReadonly ); if ( !bValid ) @@ -266,7 +266,7 @@ namespace dbaui bool SpecialSettingsPage::FillItemSet( SfxItemSet& _rSet ) { - sal_Bool bChangedSomething = sal_False; + bool bChangedSomething = false; // the boolean items for ( BooleanSettingDescs::const_iterator setting = m_aBooleanSettings.begin(); @@ -285,7 +285,7 @@ namespace dbaui if ( m_pBooleanComparisonMode->GetSelectEntryPos() != m_pBooleanComparisonMode->GetSavedValue() ) { _rSet.Put( SfxInt32Item( DSID_BOOLEANCOMPARISON, m_pBooleanComparisonMode->GetSelectEntryPos() ) ); - bChangedSomething = sal_True; + bChangedSomething = true; } } if ( m_bHasMaxRowScan ) @@ -332,10 +332,10 @@ namespace dbaui _rControlList.push_back( new OSaveValueWrapper< Edit >( m_pAutoRetrieving ) ); } - void GeneratedValuesPage::implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) + void GeneratedValuesPage::implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); // collect the items @@ -346,7 +346,7 @@ namespace dbaui // forward the values to the controls if (bValid) { - sal_Bool bEnabled = pAutoRetrieveEnabledItem->GetValue(); + bool bEnabled = pAutoRetrieveEnabledItem->GetValue(); m_pAutoRetrievingEnabled->Check( bEnabled ); m_pAutoIncrement->SetText( pAutoIncrementItem->GetValue() ); @@ -359,7 +359,7 @@ namespace dbaui bool GeneratedValuesPage::FillItemSet(SfxItemSet& _rSet) { - sal_Bool bChangedSomething = sal_False; + bool bChangedSomething = false; fillString( _rSet, m_pAutoIncrement, DSID_AUTOINCREMENTVALUE, bChangedSomething ); fillBool( _rSet, m_pAutoRetrievingEnabled, DSID_AUTORETRIEVEENABLED, bChangedSomething ); @@ -488,7 +488,7 @@ namespace dbaui (void)_bEnable; } - sal_Bool AdvancedSettingsDialog::saveDatasource() + bool AdvancedSettingsDialog::saveDatasource() { return PrepareLeaveCurrentPage(); } diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index 90a6d6fc00b2..acb3532b42f9 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -80,7 +80,7 @@ namespace dbaui virtual ~SpecialSettingsPage(); // OGenericAdministrationPage overridables - virtual void implInitControls (const SfxItemSet& _rSet, sal_Bool _bSaveValue ) SAL_OVERRIDE; + virtual void implInitControls (const SfxItemSet& _rSet, bool _bSaveValue ) SAL_OVERRIDE; // <method>OGenericAdministrationPage::fillControls</method> virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; @@ -117,7 +117,7 @@ namespace dbaui virtual ~GeneratedValuesPage(); // must be overloaded by subclasses, but it isn't pure virtual - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; // <method>OGenericAdministrationPage::fillControls</method> virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index bfd15f183b28..8a39db161eb5 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -226,7 +226,7 @@ void ODbAdminDialog::enableConfirmSettings( bool _bEnable ) (void)_bEnable; } -sal_Bool ODbAdminDialog::saveDatasource() +bool ODbAdminDialog::saveDatasource() { return PrepareLeaveCurrentPage(); } @@ -247,7 +247,7 @@ ODbAdminDialog::ApplyResult ODbAdminDialog::implApplyChanges() // This way, next time they're asked what has changed since now and here, they really // can compare with the status they have _now_ (not the one they had before this apply call). - m_bApplied = sal_True; + m_bApplied = true; return AR_LEAVE_MODIFIED; } diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index ed4ad220fece..e5ff3b6344e0 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -76,7 +76,7 @@ ODbaseIndexDialog::ODbaseIndexDialog(Window * pParent, const OUString& aDataSrcN SetCtrls(); } -sal_Bool ODbaseIndexDialog::GetTable(const OUString& _rName, TableInfoList::iterator& _rPosition) +bool ODbaseIndexDialog::GetTable(const OUString& _rName, TableInfoList::iterator& _rPosition) { for ( _rPosition = m_aTableInfoList.begin(); _rPosition != m_aTableInfoList.end(); @@ -86,15 +86,15 @@ sal_Bool ODbaseIndexDialog::GetTable(const OUString& _rName, TableInfoList::iter if (m_bCaseSensitiv) { if (_rPosition->aTableName == _rName) - return sal_True; + return true; } else { if (_rPosition->aTableName.equalsIgnoreAsciiCase(_rName)) - return sal_True; + return true; } } - return sal_False; + return false; } void ODbaseIndexDialog::checkButtons() @@ -106,7 +106,7 @@ void ODbaseIndexDialog::checkButtons() m_pRemoveAll->Enable(0 != m_pLB_TableIndexes->GetEntryCount()); } -OTableIndex ODbaseIndexDialog::implRemoveIndex(const OUString& _rName, TableIndexList& _rList, ListBox& _rDisplay, sal_Bool _bMustExist) +OTableIndex ODbaseIndexDialog::implRemoveIndex(const OUString& _rName, TableIndexList& _rList, ListBox& _rDisplay, bool _bMustExist) { OTableIndex aReturn; @@ -147,7 +147,7 @@ void ODbaseIndexDialog::implInsertIndex(const OTableIndex& _rIndex, TableIndexLi _rDisplay.SelectEntryPos(0); } -OTableIndex ODbaseIndexDialog::RemoveTableIndex( const OUString& _rTableName, const OUString& _rIndexName, sal_Bool _bMustExist ) +OTableIndex ODbaseIndexDialog::RemoveTableIndex( const OUString& _rTableName, const OUString& _rIndexName, bool _bMustExist ) { OTableIndex aReturn; @@ -186,7 +186,7 @@ IMPL_LINK( ODbaseIndexDialog, AddClickHdl, PushButton*, /*pButton*/ ) { OUString aSelection = m_pLB_FreeIndexes->GetSelectEntry(); OUString aTableName = m_pCB_Tables->GetText(); - OTableIndex aIndex = RemoveFreeIndex( aSelection, sal_True ); + OTableIndex aIndex = RemoveFreeIndex( aSelection, true ); InsertTableIndex( aTableName, aIndex ); checkButtons(); @@ -197,7 +197,7 @@ IMPL_LINK( ODbaseIndexDialog, RemoveClickHdl, PushButton*, /*pButton*/ ) { OUString aSelection = m_pLB_TableIndexes->GetSelectEntry(); OUString aTableName = m_pCB_Tables->GetText(); - OTableIndex aIndex = RemoveTableIndex( aTableName, aSelection, sal_True ); + OTableIndex aIndex = RemoveTableIndex( aTableName, aSelection, true ); InsertFreeIndex( aIndex ); checkButtons(); @@ -210,7 +210,7 @@ IMPL_LINK( ODbaseIndexDialog, AddAllClickHdl, PushButton*, /*pButton*/ ) OUString aTableName = m_pCB_Tables->GetText(); for( sal_uInt16 nPos = 0; nPos < nCnt; ++nPos ) - InsertTableIndex( aTableName, RemoveFreeIndex( m_pLB_FreeIndexes->GetEntry(0), sal_True ) ); + InsertTableIndex( aTableName, RemoveFreeIndex( m_pLB_FreeIndexes->GetEntry(0), true ) ); checkButtons(); return 0; @@ -222,7 +222,7 @@ IMPL_LINK( ODbaseIndexDialog, RemoveAllClickHdl, PushButton*, /*pButton*/ ) OUString aTableName = m_pCB_Tables->GetText(); for( sal_uInt16 nPos = 0; nPos < nCnt; ++nPos ) - InsertFreeIndex( RemoveTableIndex( aTableName, m_pLB_TableIndexes->GetEntry(0), sal_True ) ); + InsertFreeIndex( RemoveTableIndex( aTableName, m_pLB_TableIndexes->GetEntry(0), true ) ); checkButtons(); return 0; @@ -278,7 +278,7 @@ void ODbaseIndexDialog::Init() // String aFileName = aURL.PathToFileName(); m_aDSN = aURL.GetMainURL(INetURLObject::NO_DECODE); ::ucbhelper::Content aFile; - sal_Bool bFolder=sal_True; + bool bFolder=true; try { aFile = ::ucbhelper::Content(m_aDSN,Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext()); @@ -353,7 +353,7 @@ void ODbaseIndexDialog::Init() aUsedIndex != aUsedIndexes.end(); ++aUsedIndex ) - RemoveFreeIndex( *aUsedIndex, sal_False ); + RemoveFreeIndex( *aUsedIndex, false ); if (m_aTableInfoList.size()) { @@ -468,7 +468,7 @@ void OTableInfo::WriteInfFile( const OUString& rDSN ) const try { ::ucbhelper::Content aContent(aURL.GetURLNoPass(),Reference<XCommandEnvironment>(), comphelper::getProcessComponentContext()); - aContent.executeCommand( OUString("delete"),makeAny( sal_Bool( sal_True ) ) ); + aContent.executeCommand( OUString("delete"), makeAny( true ) ); } catch (const Exception& e ) { diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index adebe92af517..e2cc016a9085 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -95,18 +95,18 @@ protected: OUString m_aDSN; TableInfoList m_aTableInfoList; TableIndexList m_aFreeIndexList; - sal_Bool m_bCaseSensitiv; + bool m_bCaseSensitiv; void Init(); void SetCtrls(); - sal_Bool GetTable(const OUString& rName, TableInfoList::iterator& _rPosition); + bool GetTable(const OUString& rName, TableInfoList::iterator& _rPosition); - OTableIndex implRemoveIndex(const OUString& _rName, TableIndexList& _rList, ListBox& _rDisplay, sal_Bool _bMustExist); + OTableIndex implRemoveIndex(const OUString& _rName, TableIndexList& _rList, ListBox& _rDisplay, bool _bMustExist); void implInsertIndex(const OTableIndex& _rIndex, TableIndexList& _rList, ListBox& _rDisplay); - OTableIndex RemoveFreeIndex( const OUString& _rName, sal_Bool _bMustExist ) { return implRemoveIndex(_rName, m_aFreeIndexList, *m_pLB_FreeIndexes, _bMustExist); } + OTableIndex RemoveFreeIndex( const OUString& _rName, bool _bMustExist ) { return implRemoveIndex(_rName, m_aFreeIndexList, *m_pLB_FreeIndexes, _bMustExist); } void InsertFreeIndex( const OTableIndex& _rIndex ) { implInsertIndex(_rIndex, m_aFreeIndexList, *m_pLB_FreeIndexes); } - OTableIndex RemoveTableIndex( const OUString& _rTableName, const OUString& _rIndexName, sal_Bool _bMustExist ); + OTableIndex RemoveTableIndex( const OUString& _rTableName, const OUString& _rIndexName, bool _bMustExist ); void InsertTableIndex( const OUString& _rTableName, const OTableIndex& _rIndex ); void checkButtons(); diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 22212d98d1ab..30779c7ad23b 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -70,9 +70,9 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent ) :OWizardMachine(_pParent, ModuleRes(DLG_DATABASE_TYPE_CHANGE), WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP ) ,m_pOutSet(NULL) - ,m_bResetting(sal_False) - ,m_bApplied(sal_False) - ,m_bUIEnabled( sal_True ) + ,m_bResetting(false) + ,m_bApplied(false) + ,m_bUIEnabled( true ) { m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,this,this)); m_pImpl->setDataSourceOrName(_aDataSourceName); @@ -320,7 +320,7 @@ void ODbTypeWizDialog::enableConfirmSettings( bool _bEnable ) // anormal tab dialog. } -sal_Bool ODbTypeWizDialog::saveDatasource() +bool ODbTypeWizDialog::saveDatasource() { SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(getCurrentState())); if ( pPage ) @@ -330,7 +330,7 @@ sal_Bool ODbTypeWizDialog::saveDatasource() if ( m_pImpl->getCurrentDataSource().is() ) m_pImpl->getCurrentDataSource()->getPropertyValue(PROPERTY_URL) >>= sOldURL; DataSourceInfoConverter::convert( getORB(), m_pCollection,sOldURL,m_eType,m_pImpl->getCurrentDataSource()); - return sal_True; + return true; } IWizardPageController* ODbTypeWizDialog::getPageController( TabPage* _pCurrentPage ) const diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 7067e37f7ede..39a655ba7bcb 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -111,10 +111,10 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP ) , m_pOutSet(NULL) - , m_bResetting(sal_False) - , m_bApplied(sal_False) - , m_bUIEnabled( sal_True ) - , m_bIsConnectable( sal_False) + , m_bResetting(false) + , m_bApplied(false) + , m_bUIEnabled( true ) + , m_bIsConnectable( false) , m_sRM_IntroText( ModuleRes( STR_PAGETITLE_INTROPAGE ) ) , m_sRM_dBaseText( ModuleRes( STR_PAGETITLE_DBASE ) ) , m_sRM_TextText( ModuleRes( STR_PAGETITLE_TEXT ) ) @@ -358,11 +358,11 @@ void ODbTypeWizDialogSetup::activateDatabasePath() void ODbTypeWizDialogSetup::updateTypeDependentStates() { - sal_Bool bDoEnable = sal_False; - sal_Bool bIsConnectionRequired = IsConnectionUrlRequired(); + bool bDoEnable = false; + bool bIsConnectionRequired = IsConnectionUrlRequired(); if (!bIsConnectionRequired) { - bDoEnable = sal_True; + bDoEnable = true; } else if ( m_sURL == m_sOldURL ) { @@ -373,7 +373,7 @@ void ODbTypeWizDialogSetup::updateTypeDependentStates() enableButtons( WZB_FINISH, bDoEnable); } -sal_Bool ODbTypeWizDialogSetup::IsConnectionUrlRequired() +bool ODbTypeWizDialogSetup::IsConnectionUrlRequired() { return m_pCollection->isConnectionUrlRequired(m_sURL); } @@ -638,12 +638,12 @@ void ODbTypeWizDialogSetup::enterState(WizardState _nState) } } -sal_Bool ODbTypeWizDialogSetup::saveDatasource() +bool ODbTypeWizDialogSetup::saveDatasource() { SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(getCurrentState())); if ( pPage ) pPage->FillItemSet(*m_pOutSet); - return sal_True; + return true; } bool ODbTypeWizDialogSetup::leaveState(WizardState _nState) @@ -682,12 +682,12 @@ namespace } } -sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() +bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(getORB(), 0) ); try { - if (callSaveAsDialog() == sal_True) + if (callSaveAsDialog()) { m_pImpl->saveChanges(*m_pOutSet); Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); @@ -698,7 +698,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() CreateDatabase(); ::comphelper::NamedValueCollection aArgs( xModel->getArgs() ); - aArgs.put( "Overwrite", sal_Bool( sal_True ) ); + aArgs.put( "Overwrite", true ); aArgs.put( "InteractionHandler", xHandler ); aArgs.put( "MacroExecutionMode", MacroExecMode::USE_CONFIG ); @@ -708,7 +708,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() if ( !m_pFinalPage || m_pFinalPage->IsDatabaseDocumentToBeRegistered() ) RegisterDataSourceByLocation( sPath ); - return sal_True; + return true; } } catch ( const Exception& e ) @@ -731,29 +731,29 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } } } - return sal_False; + return false; } - sal_Bool ODbTypeWizDialogSetup::IsDatabaseDocumentToBeOpened() const + bool ODbTypeWizDialogSetup::IsDatabaseDocumentToBeOpened() const { if ( m_pGeneralPage->GetDatabaseCreationMode() == OGeneralPageWizard::eOpenExisting ) - return sal_True; + return true; if ( m_pFinalPage != NULL ) return m_pFinalPage->IsDatabaseDocumentToBeOpened(); - return sal_True; + return true; } - sal_Bool ODbTypeWizDialogSetup::IsTableWizardToBeStarted() const + bool ODbTypeWizDialogSetup::IsTableWizardToBeStarted() const { if ( m_pGeneralPage->GetDatabaseCreationMode() == OGeneralPageWizard::eOpenExisting ) - return sal_False; + return false; if ( m_pFinalPage != NULL ) return m_pFinalPage->IsTableWizardToBeStarted(); - return sal_False; + return false; } void ODbTypeWizDialogSetup::CreateDatabase() @@ -794,9 +794,9 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() xDatabaseContext->registerObject(sDatabaseName, xDatasource); } - sal_Bool ODbTypeWizDialogSetup::callSaveAsDialog() + bool ODbTypeWizDialogSetup::callSaveAsDialog() { - sal_Bool bRet = sal_False; + bool bRet = false; ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, 0, this); @@ -826,7 +826,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() if ( ::utl::UCBContentHelper::IsDocument(sFileName) ) ::utl::UCBContentHelper::Kill(sFileName); m_pOutSet->Put(SfxStringItem(DSID_DOCUMENT_URL, sFileName)); - bRet = sal_True; + bRet = true; } } return bRet; @@ -836,12 +836,12 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(getORB())); :: OUString sLastSegmentName = pURL->getName(); - sal_Bool bFolderExists = sal_True; + bool bFolderExists = true; sal_Int32 i = 1; - while (bFolderExists == sal_True) + while (bFolderExists) { bFolderExists = xSimpleFileAccess->isFolder(pURL->GetMainURL( INetURLObject::NO_DECODE )); - if (bFolderExists == sal_True) + if (bFolderExists) { i++; pURL->setName(sLastSegmentName.concat(OUString::number(i))); @@ -854,7 +854,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(getORB())); OUString BaseName = _rURL.getBase(); - sal_Bool bElementExists = sal_True; + bool bElementExists = true; INetURLObject aExistenceCheck( _rURL ); for ( sal_Int32 i = 1; bElementExists; ) diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index de2718c7fc3d..2afb25309438 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -156,10 +156,10 @@ namespace dbaui _rControlList.push_back(new OSaveValueWrapper<ListBox>(m_pCharset)); } - void OCommonBehaviourTabPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OCommonBehaviourTabPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); // collect the items @@ -185,7 +185,7 @@ namespace dbaui bool OCommonBehaviourTabPage::FillItemSet(SfxItemSet& _rSet) { - sal_Bool bChangedSomething = sal_False; + bool bChangedSomething = false; if ((m_nControlFlags & CBTP_USE_OPTIONS) == CBTP_USE_OPTIONS) { @@ -195,7 +195,7 @@ namespace dbaui if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET) { if ( m_pCharset->StoreSelectedCharSet( _rSet, DSID_CHARSET ) ) - bChangedSomething = sal_True; + bChangedSomething = true; } return bChangedSomething; @@ -241,10 +241,10 @@ namespace dbaui _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFT_Message)); _rControlList.push_back(new ODisableWrapper<PushButton>(&m_aIndexes)); } - void ODbaseDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void ODbaseDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); // get the DSN string (needed for the index dialog) @@ -268,7 +268,7 @@ namespace dbaui bool ODbaseDetailsPage::FillItemSet( SfxItemSet& _rSet ) { - sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); + bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); fillBool(_rSet,&m_aShowDeleted,DSID_SHOWDELETEDROWS,bChangedSomething); return bChangedSomething; @@ -332,7 +332,7 @@ namespace dbaui bool OOdbcDetailsPage::FillItemSet( SfxItemSet& _rSet ) { - sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); + bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); fillBool(_rSet,&m_aUseCatalog,DSID_USECATALOG,bChangedSomething); return bChangedSomething; } @@ -346,10 +346,10 @@ namespace dbaui OCommonBehaviourTabPage::fillWindows(_rControlList); _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL_1)); } - void OOdbcDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OOdbcDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); SFX_ITEMSET_GET(_rSet, pUseCatalogItem, SfxBoolItem, DSID_USECATALOG, true); @@ -380,7 +380,7 @@ namespace dbaui bool OUserDriverDetailsPage::FillItemSet( SfxItemSet& _rSet ) { - sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); + bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); fillInt32(_rSet,&m_aNFPortNumber,DSID_CONN_PORTNUMBER,bChangedSomething); fillString(_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething); @@ -401,10 +401,10 @@ namespace dbaui _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHostname)); _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aPortNumber)); } - void OUserDriverDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OUserDriverDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); SFX_ITEMSET_GET(_rSet, pUseCatalogItem, SfxBoolItem, DSID_USECATALOG, true); @@ -513,7 +513,7 @@ namespace dbaui bool OGeneralSpecialJDBCDetailsPage::FillItemSet( SfxItemSet& _rSet ) { - sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); + bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); if ( m_bUseClass ) fillString(_rSet,&m_aEDDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); fillString(_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething); @@ -522,10 +522,10 @@ namespace dbaui return bChangedSomething; } - void OGeneralSpecialJDBCDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OGeneralSpecialJDBCDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); SFX_ITEMSET_GET(_rSet, pDrvItem, SfxStringItem, DSID_JDBCDRIVERCLASS, true); @@ -565,7 +565,7 @@ namespace dbaui OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); OSL_ENSURE(m_bUseClass,"Who called me?"); - sal_Bool bSuccess = sal_False; + bool bSuccess = false; #if HAVE_FEATURE_JAVA try { @@ -640,9 +640,9 @@ namespace dbaui bool MySQLNativePage::FillItemSet( SfxItemSet& _rSet ) { - sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet( _rSet ); + bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet( _rSet ); - bChangedSomething |= (m_aMySQLSettings.FillItemSet( _rSet ) ? 1 : 0); + bChangedSomething |= m_aMySQLSettings.FillItemSet( _rSet ); if ( m_aUserName.GetText() != m_aUserName.GetSavedValue() ) { @@ -654,10 +654,10 @@ namespace dbaui return bChangedSomething; } - void MySQLNativePage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void MySQLNativePage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); m_aMySQLSettings.implInitControls( _rSet ); @@ -720,7 +720,7 @@ namespace dbaui bool OLDAPDetailsPage::FillItemSet( SfxItemSet& _rSet ) { - sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); + bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); fillString(_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN,bChangedSomething); fillInt32(_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething); @@ -763,10 +763,10 @@ namespace dbaui _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTRowCount)); _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL_1)); } - void OLDAPDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OLDAPDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); SFX_ITEMSET_GET(_rSet, pBaseDN, SfxStringItem, DSID_CONN_LDAP_BASEDN, true); @@ -816,10 +816,10 @@ namespace dbaui m_pTextConnectionHelper->fillWindows(_rControlList); } - void OTextDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OTextDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // first check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); m_pTextConnectionHelper->implInitControls(_rSet, bValid); @@ -828,12 +828,12 @@ namespace dbaui bool OTextDetailsPage::FillItemSet( SfxItemSet& rSet ) { - sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(rSet); + bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(rSet); bChangedSomething = m_pTextConnectionHelper->FillItemSet(rSet, bChangedSomething); return bChangedSomething; } - sal_Bool OTextDetailsPage::prepareLeave() + bool OTextDetailsPage::prepareLeave() { return m_pTextConnectionHelper->prepareLeave(); } diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index d0bf013f9dfb..1b0b5c9f76ae 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -76,7 +76,7 @@ namespace dbaui virtual ~OCommonBehaviourTabPage(); // must be overloaded by subclasses, but it isn't pure virtual - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; // <method>OGenericAdministrationPage::fillControls</method> virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; @@ -106,7 +106,7 @@ namespace dbaui virtual ~ODbaseDetailsPage(); protected: - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; @@ -132,7 +132,7 @@ namespace dbaui OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; private: @@ -148,7 +148,7 @@ namespace dbaui OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; private: @@ -179,7 +179,7 @@ namespace dbaui protected: virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; @@ -221,7 +221,7 @@ namespace dbaui protected: virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; }; @@ -234,7 +234,7 @@ namespace dbaui OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; private: @@ -278,9 +278,9 @@ namespace dbaui OUString m_aTextNone; protected: virtual ~OTextDetailsPage(); - virtual sal_Bool prepareLeave() SAL_OVERRIDE; + virtual bool prepareLeave() SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 3928566de3fc..f5cbc0f1bed9 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -270,7 +270,7 @@ namespace dbaui m_pSQL->GrabFocus(); } - void DirectSQLDialog::switchToHistory(sal_Int32 _nHistoryPos, sal_Bool _bUpdateListBox) + void DirectSQLDialog::switchToHistory(sal_Int32 _nHistoryPos, bool _bUpdateListBox) { CHECK_INVARIANTS("DirectSQLDialog::switchToHistory"); @@ -320,7 +320,7 @@ namespace dbaui { const sal_Int32 nSelected = m_pSQLHistory->GetSelectEntryPos(); if (LISTBOX_ENTRY_NOTFOUND != nSelected) - switchToHistory(nSelected, sal_False); + switchToHistory(nSelected, false); } return 0L; } diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index 9f21fbe4e6ca..72219bb317ab 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -255,7 +255,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, m_pImpl->m_pSchema->SetMaxTextLen(nLength); m_pImpl->m_pCatalog->SetMaxTextLen(nLength); - sal_Bool bCheck = _xConnection.is() && isSQL92CheckEnabled(_xConnection); + bool bCheck = _xConnection.is() && isSQL92CheckEnabled(_xConnection); m_pImpl->m_pTitle->setCheck(bCheck); // enable non valid sql chars as well m_pImpl->m_pSchema->setCheck(bCheck); // enable non valid sql chars as well m_pImpl->m_pCatalog->setCheck(bCheck); // enable non valid sql chars as well @@ -334,7 +334,7 @@ void OSaveAsDlg::implInitOnlyTitle(const OUString& _rLabel) m_pImpl->m_pSchema->Hide(); m_pImpl->m_pTitle->SetText(m_pImpl->m_aName); - m_pImpl->m_pTitle->setCheck(sal_False); // enable non valid sql chars as well + m_pImpl->m_pTitle->setCheck(false); // enable non valid sql chars as well } void OSaveAsDlg::implInit() diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index 404c46c57bb7..209aecebb219 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -27,7 +27,7 @@ namespace dbaui #define DEF_ROW_HEIGHT 45 #define DEF_COL_WIDTH 227 -DlgSize::DlgSize( Window* pParent, sal_Int32 nVal, sal_Bool bRow, sal_Int32 _nAlternativeStandard ) +DlgSize::DlgSize( Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard ) : ModalDialog(pParent, bRow ? OString("RowHeightDialog") : OString("ColWidthDialog"), bRow ? OUString("dbaccess/ui/rowheightdialog.ui") : OUString("dbaccess/ui/colwidthdialog.ui")) , m_nPrevValue(nVal) @@ -41,7 +41,7 @@ DlgSize::DlgSize( Window* pParent, sal_Int32 nVal, sal_Bool bRow, sal_Int32 _nAl m_pCB_STANDARD->SetClickHdl(LINK(this,DlgSize,CbClickHdl)); m_pMF_VALUE->EnableEmptyFieldValue(true); - sal_Bool bDefault = -1 == nVal; + bool bDefault = -1 == nVal; m_pCB_STANDARD->Check(bDefault); if (bDefault) { diff --git a/dbaccess/source/ui/dlg/finteraction.cxx b/dbaccess/source/ui/dlg/finteraction.cxx index 1c3517d2a849..f90cd791b446 100644 --- a/dbaccess/source/ui/dlg/finteraction.cxx +++ b/dbaccess/source/ui/dlg/finteraction.cxx @@ -31,7 +31,7 @@ namespace dbaui // OFilePickerInteractionHandler OFilePickerInteractionHandler::OFilePickerInteractionHandler( const Reference< XInteractionHandler >& _rxMaster ) :m_xMaster( _rxMaster ) - ,m_bDoesNotExist(sal_False) + ,m_bDoesNotExist(false) { OSL_ENSURE( m_xMaster.is(), "OFilePickerInteractionHandler::OFilePickerInteractionHandler: invalid master handler!" ); } @@ -47,7 +47,7 @@ namespace dbaui { if ( IOErrorCode_NOT_EXISTING == aIoException.Code ) { - m_bDoesNotExist = sal_True; + m_bDoesNotExist = true; return; } } diff --git a/dbaccess/source/ui/dlg/finteraction.hxx b/dbaccess/source/ui/dlg/finteraction.hxx index f4ba6ff4db26..2d86566894f2 100644 --- a/dbaccess/source/ui/dlg/finteraction.hxx +++ b/dbaccess/source/ui/dlg/finteraction.hxx @@ -37,12 +37,12 @@ namespace dbaui protected: ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > m_xMaster; // our master handler - sal_Bool m_bDoesNotExist; + bool m_bDoesNotExist; public: OFilePickerInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxMaster ); - inline sal_Bool isDoesNotExist( ) const { return m_bDoesNotExist; } + inline bool isDoesNotExist( ) const { return m_bDoesNotExist; } protected: // XInteractionHandler diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index a588a69b066d..83d17bd1e91e 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -57,7 +57,7 @@ namespace dbaui ,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN ) ,m_pSpecialMessage ( NULL ) ,m_eLastMessage ( smNone ) - ,m_bDisplayingInvalid ( sal_False ) + ,m_bDisplayingInvalid ( false ) ,m_bInitTypeList ( true ) ,m_pDatasourceType ( NULL ) ,m_pCollection ( NULL ) @@ -214,7 +214,7 @@ namespace dbaui m_aTypeSelectHandler.Call(this); } - void OGeneralPage::implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) + void OGeneralPage::implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) { initializeTypeList(); @@ -234,7 +234,7 @@ namespace dbaui OUString OGeneralPageWizard::getEmbeddedDBName( const SfxItemSet& _rSet ) { // first check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags( _rSet, bValid, bReadonly ); // if the selection is invalid, disable everything @@ -281,7 +281,7 @@ namespace dbaui OUString OGeneralPage::getDatasourceName( const SfxItemSet& _rSet ) { // first check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags( _rSet, bValid, bReadonly ); // if the selection is invalid, disable everything @@ -455,12 +455,12 @@ namespace dbaui } } - void OGeneralPageDialog::implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) + void OGeneralPageDialog::implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) { OGeneralPage::implInitControls( _rSet, _bSaveValue ); // first check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly ); m_pDatasourceType->Enable( bValid ); @@ -468,7 +468,7 @@ namespace dbaui bool OGeneralPageDialog::FillItemSet( SfxItemSet& _rCoreAttrs ) { - sal_Bool bChangedSomething = sal_False; + bool bChangedSomething = false; sal_uInt16 nEntry = m_pDatasourceType->GetSelectEntryPos(); OUString sURLPrefix = m_aURLPrefixes[ nEntry ]; @@ -476,7 +476,7 @@ namespace dbaui if ( m_pDatasourceType->GetSavedValue() != nEntry ) { _rCoreAttrs.Put( SfxStringItem( DSID_CONNECTURL, sURLPrefix ) ); - bChangedSomething = sal_True; + bChangedSomething = true; } return bChangedSomething; @@ -520,7 +520,7 @@ namespace dbaui ::comphelper::getProcessComponentContext(), OUString( "/org.openoffice.Office.DataAccess/Policies/Features/Base" ) ) ); - sal_Bool bAllowCreateLocalDatabase( sal_True ); + bool bAllowCreateLocalDatabase( true ); OSL_VERIFY( aConfig.getNodeValue( "CreateLocalDatabase" ) >>= bAllowCreateLocalDatabase ); if ( !bAllowCreateLocalDatabase ) bHideCreateNew = true; @@ -560,7 +560,7 @@ namespace dbaui m_pDatasourceType->GrabFocus(); } - void OGeneralPageWizard::implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) + void OGeneralPageWizard::implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) { OGeneralPage::implInitControls( _rSet, _bSaveValue ); @@ -568,7 +568,7 @@ namespace dbaui m_pEmbeddedDBType->SelectEntry( getEmbeddedDBName( _rSet ) ); // first check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags( _rSet, bValid, bReadonly ); SetText( OUString() ); @@ -628,20 +628,20 @@ namespace dbaui bool OGeneralPageWizard::FillItemSet(SfxItemSet& _rCoreAttrs) { - sal_Bool bChangedSomething = sal_False; + bool bChangedSomething = false; bool bCommitTypeSelection = true; if ( m_pRB_CreateDatabase->IsChecked() ) { _rCoreAttrs.Put( SfxStringItem( DSID_CONNECTURL, OUString( "sdbc:dbase:" ) ) ); - bChangedSomething = sal_True; + bChangedSomething = true; bCommitTypeSelection = false; } else if ( m_pRB_OpenExistingDatabase->IsChecked() ) { if ( m_pRB_OpenExistingDatabase->GetSavedValue() != m_pRB_OpenExistingDatabase->IsChecked() ) - bChangedSomething = sal_True; + bChangedSomething = true; // TODO bCommitTypeSelection = false; @@ -657,7 +657,7 @@ namespace dbaui ) { _rCoreAttrs.Put( SfxStringItem( DSID_CONNECTURL,sURLPrefix ) ); - bChangedSomething = sal_True; + bChangedSomething = true; } else implSetCurrentType( sURLPrefix ); diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index 22dea4cbf3a0..54ea0be095eb 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -51,7 +51,7 @@ namespace dbaui SPECIAL_MESSAGE m_eLastMessage; Link m_aTypeSelectHandler; /// to be called if a new type is selected - sal_Bool m_bDisplayingInvalid : 1; // the currently displayed data source is deleted + bool m_bDisplayingInvalid : 1; // the currently displayed data source is deleted bool m_bInitTypeList : 1; bool approveDatasourceType( const OUString& _sURLPrefix, OUString& _inout_rDisplayName ); void insertDatasourceTypeEntryData( const OUString& _sType, const OUString& sDisplayName ); @@ -76,7 +76,7 @@ namespace dbaui // SfxTabPage overridables virtual void Reset( const SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) SAL_OVERRIDE; + virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) SAL_OVERRIDE; virtual OUString getDatasourceName( const SfxItemSet& _rSet ); virtual bool approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName ); @@ -107,7 +107,7 @@ namespace dbaui protected: virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) SAL_OVERRIDE; + virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) SAL_OVERRIDE; virtual void setParentTitle( const OUString& _sURLPrefix ) SAL_OVERRIDE; }; @@ -174,7 +174,7 @@ namespace dbaui virtual void GetFocus() SAL_OVERRIDE; - virtual void implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) SAL_OVERRIDE; + virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) SAL_OVERRIDE; virtual OUString getDatasourceName( const SfxItemSet& _rSet ) SAL_OVERRIDE; virtual bool approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index d6f948ab8377..7cc9953914ab 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -47,21 +47,21 @@ namespace dbaui using namespace ::dbtools; // helper - sal_Bool operator ==(const OIndexField& _rLHS, const OIndexField& _rRHS) + bool operator ==(const OIndexField& _rLHS, const OIndexField& _rRHS) { return (_rLHS.sFieldName == _rRHS.sFieldName) && (_rLHS.bSortAscending == _rRHS.bSortAscending); } - sal_Bool operator !=(const OIndexField& _rLHS, const OIndexField& _rRHS) + bool operator !=(const OIndexField& _rLHS, const OIndexField& _rRHS) { return !(_rLHS == _rRHS); } - sal_Bool operator ==(const IndexFields& _rLHS, const IndexFields& _rRHS) + bool operator ==(const IndexFields& _rLHS, const IndexFields& _rRHS) { if (_rLHS.size() != _rRHS.size()) - return sal_False; + return false; IndexFields::const_iterator aLeft = _rLHS.begin(); IndexFields::const_iterator aLeftEnd = _rLHS.end(); @@ -69,13 +69,13 @@ namespace dbaui for (; aLeft != aLeftEnd; ++aLeft, ++aRight) { if (*aLeft != *aRight) - return sal_False; + return false; } - return sal_True; + return true; } - sal_Bool operator !=(const IndexFields& _rLHS, const IndexFields& _rRHS) + bool operator !=(const IndexFields& _rLHS, const IndexFields& _rRHS) { return !(_rLHS == _rRHS); } @@ -83,7 +83,7 @@ namespace dbaui // DbaIndexList DbaIndexList::DbaIndexList(Window* _pParent, const ResId& _rId) :SvTreeListBox(_pParent, _rId) - ,m_bSuspendSelectHdl(sal_False) + ,m_bSuspendSelectHdl(false) { } @@ -126,13 +126,13 @@ namespace dbaui void DbaIndexList::enableSelectHandler() { OSL_ENSURE(m_bSuspendSelectHdl, "DbaIndexList::enableSelectHandler: invalid call (this is not cumulative)!"); - m_bSuspendSelectHdl = sal_False; + m_bSuspendSelectHdl = false; } void DbaIndexList::disableSelectHandler() { OSL_ENSURE(!m_bSuspendSelectHdl, "DbaIndexList::enableSelectHandler: invalid call (this is not cumulative)!"); - m_bSuspendSelectHdl = sal_True; + m_bSuspendSelectHdl = true; } void DbaIndexList::SelectNoHandlerCall( SvTreeListEntry* _pEntry ) @@ -142,9 +142,9 @@ namespace dbaui enableSelectHandler(); } - sal_Bool DbaIndexList::Select( SvTreeListEntry* pEntry, sal_Bool _bSelect ) + bool DbaIndexList::Select( SvTreeListEntry* pEntry, sal_Bool _bSelect ) { - sal_Bool bReturn = SvTreeListBox::Select(pEntry, _bSelect); + bool bReturn = SvTreeListBox::Select(pEntry, _bSelect); if (m_aSelectHdl.IsSet() && !m_bSuspendSelectHdl && _bSelect) m_aSelectHdl.Call(this); @@ -172,7 +172,7 @@ namespace dbaui ,m_aHelp (this, ModuleRes(HB_HELP)) ,m_pIndexes(NULL) ,m_pPreviousSelection(NULL) - ,m_bEditAgain(sal_False) + ,m_bEditAgain(false) ,m_xContext(_rxContext) { @@ -256,7 +256,7 @@ namespace dbaui m_aActions.EnableItem(ID_INDEX_NEW, !m_aIndexes.IsEditingActive()); SvTreeListEntry* pSelected = m_aIndexes.FirstSelected(); - sal_Bool bSelectedAnything = NULL != pSelected; + bool bSelectedAnything = NULL != pSelected; if (pSelected) { @@ -304,7 +304,7 @@ namespace dbaui } - sal_Bool DbaIndexDialog::implCommit(SvTreeListEntry* _pEntry) + bool DbaIndexDialog::implCommit(SvTreeListEntry* _pEntry) { OSL_ENSURE(_pEntry, "DbaIndexDialog::implCommit: invalid entry!"); @@ -313,8 +313,8 @@ namespace dbaui // if it's not a new index, remove it // (we can't modify indexes, only drop'n'insert) if (!aCommitPos->isNew()) - if (!implDropIndex(_pEntry, sal_False)) - return sal_False; + if (!implDropIndex(_pEntry, false)) + return false; // create the new index SQLExceptionInfo aExceptionInfo; @@ -384,7 +384,7 @@ namespace dbaui updateToolbox(); } - void DbaIndexDialog::OnDropIndex(sal_Bool _bConfirm) + void DbaIndexDialog::OnDropIndex(bool _bConfirm) { // the selected index SvTreeListEntry* pSelected = m_aIndexes.FirstSelected(); @@ -402,21 +402,21 @@ namespace dbaui } // do the drop - implDropIndex(pSelected, sal_True); + implDropIndex(pSelected, true); // reflect the new selection in the toolbox updateToolbox(); } } - sal_Bool DbaIndexDialog::implDropIndex(SvTreeListEntry* _pEntry, sal_Bool _bRemoveFromCollection) + bool DbaIndexDialog::implDropIndex(SvTreeListEntry* _pEntry, bool _bRemoveFromCollection) { // do the drop Indexes::iterator aDropPos = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(_pEntry->GetUserData()); OSL_ENSURE(aDropPos != m_pIndexes->end(), "DbaIndexDialog::OnDropIndex: did not find the index in my collection!"); SQLExceptionInfo aExceptionInfo; - sal_Bool bSuccess = sal_False; + bool bSuccess = false; try { if (_bRemoveFromCollection) @@ -468,7 +468,7 @@ namespace dbaui // save the changes made 'til here // Upon leaving the edit mode, the control will be re-initialized with the // settings from the current entry - implSaveModified(sal_False); + implSaveModified(false); m_aIndexes.EditEntry(pSelected); updateToolbox(); @@ -496,7 +496,7 @@ namespace dbaui if (aResetPos->isNew()) { - OnDropIndex(sal_False); + OnDropIndex(false); return; } @@ -591,7 +591,7 @@ namespace dbaui IMPL_LINK( DbaIndexDialog, OnEditIndexAgain, SvTreeListEntry*, _pEntry ) { - m_bEditAgain = sal_False; + m_bEditAgain = false; m_aIndexes.EditEntry(_pEntry); return 0L; } @@ -614,7 +614,7 @@ namespace dbaui aError.Execute(); updateToolbox(); - m_bEditAgain = sal_True; + m_bEditAgain = true; PostUserEvent(LINK(this, DbaIndexDialog, OnEditIndexAgain), _pEntry); return 0L; } @@ -631,42 +631,42 @@ namespace dbaui if (aPosition->sName != aPosition->getOriginalName()) { - aPosition->setModified(sal_True); + aPosition->setModified(true); updateToolbox(); } return 1L; } - sal_Bool DbaIndexDialog::implSaveModified(sal_Bool _bPlausibility) + bool DbaIndexDialog::implSaveModified(bool _bPlausibility) { if (m_pPreviousSelection) { // try to commit the previously selected index if (m_pFields->IsModified() && !m_pFields->SaveModified()) - return sal_False; + return false; Indexes::iterator aPreviouslySelected = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(m_pPreviousSelection->GetUserData()); // the unique flag aPreviouslySelected->bUnique = m_aUnique.IsChecked(); if (m_aUnique.GetSavedValue() != m_aUnique.GetState()) - aPreviouslySelected->setModified(sal_True); + aPreviouslySelected->setModified(true); // the fields m_pFields->commitTo(aPreviouslySelected->aFields); if (m_pFields->GetSavedValue() != aPreviouslySelected->aFields) - aPreviouslySelected->setModified(sal_True); + aPreviouslySelected->setModified(true); // plausibility checks if (_bPlausibility && !implCheckPlausibility(aPreviouslySelected)) - return sal_False; + return false; } - return sal_True; + return true; } - sal_Bool DbaIndexDialog::implCheckPlausibility(const Indexes::const_iterator& _rPos) + bool DbaIndexDialog::implCheckPlausibility(const Indexes::const_iterator& _rPos) { // need at least one field if (0 == _rPos->aFields.size()) @@ -674,7 +674,7 @@ namespace dbaui ErrorBox aError(this, ModuleRes(ERR_NEED_INDEX_FIELDS)); aError.Execute(); m_pFields->GrabFocus(); - return sal_False; + return false; } // no double fields @@ -692,29 +692,29 @@ namespace dbaui ErrorBox aError(this, WB_OK, sMessage); aError.Execute(); m_pFields->GrabFocus(); - return sal_False; + return false; } aExistentFields.insert(aFieldCheck->sFieldName); } - return sal_True; + return true; } - sal_Bool DbaIndexDialog::implCommitPreviouslySelected() + bool DbaIndexDialog::implCommitPreviouslySelected() { if (m_pPreviousSelection) { Indexes::iterator aPreviouslySelected = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(m_pPreviousSelection->GetUserData()); if (!implSaveModified()) - return sal_False; + return false; // commit the index (if necessary) if (aPreviouslySelected->isModified() && !implCommit(m_pPreviousSelection)) - return sal_False; + return false; } - return sal_True; + return true; } IMPL_LINK( DbaIndexDialog, OnModified, void*, /*NOTINTERESTEDIN*/ ) @@ -722,7 +722,7 @@ namespace dbaui OSL_ENSURE(m_pPreviousSelection, "DbaIndexDialog, OnModified: invalid call!"); Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(m_pPreviousSelection->GetUserData()); - aPosition->setModified(sal_True); + aPosition->setModified(true); updateToolbox(); return 1L; @@ -774,7 +774,7 @@ namespace dbaui } } - sal_Bool bHaveSelection = (NULL != m_aIndexes.FirstSelected()); + bool bHaveSelection = (NULL != m_aIndexes.FirstSelected()); // disable/enable the detail controls m_aIndexDetails.Enable(bHaveSelection); diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 97649f354470..f241969f605b 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -89,7 +89,7 @@ namespace dbaui } // IndexFieldsControl - IndexFieldsControl::IndexFieldsControl( Window* _pParent, const ResId& _rId ,sal_Int32 _nMaxColumnsInIndex,sal_Bool _bAddIndexAppendix) + IndexFieldsControl::IndexFieldsControl( Window* _pParent, const ResId& _rId ,sal_Int32 _nMaxColumnsInIndex,bool _bAddIndexAppendix) :EditBrowseBox(_pParent, _rId, EBBF_SMART_TAB_TRAVEL | EBBF_ACTIVATE_ON_BUTTONDOWN, BROWSER_STANDARD_FLAGS) ,m_aSeekRow(m_aFields.end()) ,m_pSortingCell(NULL) @@ -141,7 +141,7 @@ namespace dbaui _rDev.SetClipRegion(Region(_rRect)); // allow for a disabled control ... - sal_Bool bEnabled = IsEnabled(); + bool bEnabled = IsEnabled(); Color aOriginalColor = _rDev.GetTextColor(); if (!bEnabled) _rDev.SetTextColor(GetSettings().GetStyleSettings().GetDisableColor()); @@ -262,7 +262,7 @@ namespace dbaui return NULL; IndexFields::const_iterator aRow; - sal_Bool bNewField = !implGetFieldDesc(_nRow, aRow); + bool bNewField = !implGetFieldDesc(_nRow, aRow); DbaMouseDownListBoxController* pReturn = NULL; switch (_nColumnId) @@ -286,13 +286,13 @@ namespace dbaui return pReturn; } - sal_Bool IndexFieldsControl::implGetFieldDesc(long _nRow, IndexFields::const_iterator& _rPos) + bool IndexFieldsControl::implGetFieldDesc(long _nRow, IndexFields::const_iterator& _rPos) { _rPos = m_aFields.end(); if ((_nRow < 0) || (_nRow >= (sal_Int32)m_aFields.size())) - return sal_False; + return false; _rPos = m_aFields.begin() + _nRow; - return sal_True; + return true; } bool IndexFieldsControl::IsModified() const @@ -310,7 +310,7 @@ namespace dbaui case COLUMN_ID_FIELDNAME: { OUString sFieldSelected = m_pFieldNameCell->GetSelectEntry(); - sal_Bool bEmptySelected = sFieldSelected.isEmpty(); + bool bEmptySelected = sFieldSelected.isEmpty(); if (isNewField()) { if (!bEmptySelected) @@ -372,7 +372,7 @@ namespace dbaui void IndexFieldsControl::InitController(CellControllerRef& /*_rController*/, long _nRow, sal_uInt16 _nColumnId) { IndexFields::const_iterator aFieldDescription; - sal_Bool bNewField = !implGetFieldDesc(_nRow, aFieldDescription); + bool bNewField = !implGetFieldDesc(_nRow, aFieldDescription); switch (_nColumnId) { diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index cc9fffa51643..a6677a7f9d35 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -112,7 +112,7 @@ OOdbcLibWrapper::OOdbcLibWrapper() #endif -sal_Bool OOdbcLibWrapper::load(const sal_Char* _pLibPath) +bool OOdbcLibWrapper::load(const sal_Char* _pLibPath) { m_sLibPath = OUString::createFromAscii(_pLibPath); #ifdef HAVE_ODBC_SUPPORT @@ -166,7 +166,7 @@ OOdbcEnumeration::OOdbcEnumeration() ,m_pImpl(new OdbcTypesImpl) #endif { - sal_Bool bLoaded = load(ODBC_LIBRARY); + bool bLoaded = load(ODBC_LIBRARY); #ifdef ODBC_LIBRARY_1 if ( !bLoaded ) bLoaded = load(ODBC_LIBRARY_1); @@ -198,23 +198,23 @@ OOdbcEnumeration::~OOdbcEnumeration() } -sal_Bool OOdbcEnumeration::allocEnv() +bool OOdbcEnumeration::allocEnv() { OSL_ENSURE(isLoaded(), "OOdbcEnumeration::allocEnv: not loaded!"); if (!isLoaded()) - return sal_False; + return false; #ifdef HAVE_ODBC_SUPPORT if (m_pImpl->hEnvironment) // nothing to do - return sal_True; + return true; SQLRETURN nResult = NSQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &m_pImpl->hEnvironment); if (SQL_SUCCESS != nResult) // can't do anything without environment - return sal_False; + return false; NSQLSetEnvAttr(m_pImpl->hEnvironment, SQL_ATTR_ODBC_VERSION, (SQLPOINTER)SQL_OV_ODBC3, SQL_IS_INTEGER); - return sal_True; + return true; #else return sal_False; #endif diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index 5e77ae418e3d..3c3737ee9558 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -48,7 +48,7 @@ class OOdbcLibWrapper public: #ifdef HAVE_ODBC_SUPPORT - sal_Bool isLoaded() const { return NULL != m_pOdbcLib; } + bool isLoaded() const { return NULL != m_pOdbcLib; } #else sal_Bool isLoaded() const { return sal_False; } #endif @@ -65,7 +65,7 @@ protected: oslGenericFunction loadSymbol(const sal_Char* _pFunctionName); /// load the lib - sal_Bool load(const sal_Char* _pLibPath); + bool load(const sal_Char* _pLibPath); /// unload the lib void unload(); }; @@ -94,7 +94,7 @@ public: protected: /// ensure that an ODBC environment is allocated - sal_Bool allocEnv(); + bool allocEnv(); /// free any allocated ODBC environment void freeEnv(); }; diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 1cc360b06491..bd5d295d1337 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -65,7 +65,7 @@ namespace dbaui ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND) ,m_xConnection(_rxConnection) ,m_aPredicateInput( rxContext, _rxConnection, getParseContext() ) - ,m_bNeedErrorOnCurrent(sal_True) + ,m_bNeedErrorOnCurrent(true) { if (rxContext.is()) @@ -172,7 +172,7 @@ namespace dbaui if (m_xConnection.is() && m_xFormatter.is()) { OUString sParamValue( m_aParam.GetText() ); - sal_Bool bValid = m_aPredicateInput.normalizePredicateString( sParamValue, xParamAsSet ); + bool bValid = m_aPredicateInput.normalizePredicateString( sParamValue, xParamAsSet ); m_aParam.SetText( sParamValue ); if ( bValid ) { @@ -185,7 +185,7 @@ namespace dbaui if (!m_bNeedErrorOnCurrent) return 1L; - m_bNeedErrorOnCurrent = sal_False; // will be reset in OnValueModified + m_bNeedErrorOnCurrent = false; // will be reset in OnValueModified OUString sName; try @@ -219,7 +219,7 @@ namespace dbaui { // no interpreting of the given values anymore .... m_aParam.SetLoseFocusHdl(Link()); // no direct call from the control anymore ... - m_bNeedErrorOnCurrent = sal_False; // in case of any indirect calls -> no error message + m_bNeedErrorOnCurrent = false; // in case of any indirect calls -> no error message m_aCancelBtn.SetClickHdl(Link()); m_aCancelBtn.Click(); } @@ -228,7 +228,7 @@ namespace dbaui // transfer the current values into the Any if (LINK(this, OParameterDialog, OnEntrySelected).Call(&m_aAllParams) != 0L) { // there was an error interpreting the current text - m_bNeedErrorOnCurrent = sal_True; + m_bNeedErrorOnCurrent = true; // we're are out of the complex web :) of direct and indirect calls to OnValueLoseFocus now, // so the next time it is called we need an error message, again .... // (TODO : there surely are better solutions for this ...) @@ -278,7 +278,7 @@ namespace dbaui m_aAllParams.SelectEntryPos(nNext); LINK(this, OParameterDialog, OnEntrySelected).Call(&m_aAllParams); - m_bNeedErrorOnCurrent = sal_True; + m_bNeedErrorOnCurrent = true; // we're are out of the complex web :) of direct and indirect calls to OnValueLoseFocus now, // so the next time it is called we need an error message, again .... // (TODO : there surely are better solutions for this ...) @@ -378,7 +378,7 @@ namespace dbaui OSL_ENSURE(static_cast<size_t>(m_nCurrentlySelected) < m_aVisitedParams.size(), "OParameterDialog::OnValueModified : invalid entry !"); m_aVisitedParams[m_nCurrentlySelected] |= EF_DIRTY; - m_bNeedErrorOnCurrent = sal_True; + m_bNeedErrorOnCurrent = true; return 0L; } diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index b5d7f883e8f0..21b05b13ce2c 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -123,7 +123,7 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent, if ( eColumnSearch == ColumnSearch::NONE ) continue; - sal_Bool bIsSearchable( sal_True ); + bool bIsSearchable( true ); OSL_VERIFY( xColumn->getPropertyValue( PROPERTY_ISSEARCHABLE ) >>= bIsSearchable ); if ( !bIsSearchable ) continue; @@ -291,13 +291,13 @@ sal_uInt16 DlgFilterCrit::GetSelectionPos(sal_Int32 eType,const ListBox& rListBo return nPos; } -sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rComp,const Edit& _rValue,PropertyValue& _rFilter) const +bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rComp,const Edit& _rValue,PropertyValue& _rFilter) const { - sal_Bool bHaving = sal_False; + bool bHaving = false; try { OUString sTableName; - sal_Bool bFunction = sal_False; + bool bFunction = false; _rFilter.Name = _rField.GetSelectEntry(); Reference< XPropertySet > xColumn = getQueryColumn(_rFilter.Name); if ( xColumn.is() ) @@ -454,7 +454,7 @@ IMPL_LINK( DlgFilterCrit, PredicateLoseFocus, Edit*, _pField ) return 0L; } -void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Bool _bOr ) +void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,bool _bOr ) { OUString aCondition; _rItem.Value >>= aCondition; @@ -817,16 +817,16 @@ void DlgFilterCrit::fillLines(const Sequence<Sequence<PropertyValue > >& _aValue { const Sequence<PropertyValue >* pOrIter = _aValues.getConstArray(); const Sequence<PropertyValue >* pOrEnd = pOrIter + _aValues.getLength(); - sal_Bool bOr = sal_True; + bool bOr = true; for(sal_uInt16 i=0;pOrIter != pOrEnd; ++pOrIter) { - bOr = sal_True; + bOr = true; const PropertyValue* pAndIter = pOrIter->getConstArray(); const PropertyValue* pAndEnd = pAndIter + pOrIter->getLength(); for(;pAndIter != pAndEnd; ++pAndIter) { SetLine( i++,*pAndIter,bOr); - bOr = sal_False; + bOr = false; } } } diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 73dc464c9c0e..47f42749ffcb 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -154,7 +154,7 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow() Reference< XPropertySet > xColumn( xOrderColumns->getByIndex( i ), UNO_QUERY_THROW ); OUString sColumnName; - sal_Bool bIsAscending( sal_True ); + bool bIsAscending( true ); xColumn->getPropertyValue( sNameProperty ) >>= sColumnName; xColumn->getPropertyValue( sAscendingProperty ) >>= bIsAscending; diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 0bf46c8ea410..a12bf477a511 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -158,14 +158,14 @@ namespace dbaui } // uncheck all - CheckAll(sal_False); + CheckAll(false); // check the ones which are in the list OUString sCatalog, sSchema, sName; SvTreeListEntry* pRootEntry = m_pTablesList->getAllObjectsEntry(); - sal_Bool bAllTables = sal_False; - sal_Bool bAllSchemas = sal_False; + bool bAllTables = false; + bool bAllSchemas = false; const OUString* pIncludeTable = _rTables.getConstArray(); for (sal_Int32 i=0; i<_rTables.getLength(); ++i, ++pIncludeTable) @@ -213,23 +213,23 @@ namespace dbaui { if (!_rTableFilter.getLength()) { // no tables visible - CheckAll(sal_False); + CheckAll(false); } else { if ((1 == _rTableFilter.getLength()) && _rTableFilter[0] == "%") { // all tables visible - CheckAll(sal_True); + CheckAll(true); } else implCheckTables( _rTableFilter ); } } - void OTableSubscriptionPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) + void OTableSubscriptionPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); // get the name of the data source we're working for @@ -289,7 +289,7 @@ namespace dbaui Any aTableTypeFilter = xProp->getPropertyValue(PROPERTY_TABLETYPEFILTER); Reference<XModifiable> xModi(getDataSourceOrModel(xProp),UNO_QUERY); - sal_Bool bModified = ( xModi.is() && xModi->isModified() ); + bool bModified = ( xModi.is() && xModi->isModified() ); Sequence< OUString > aNewTableFilter(1); aNewTableFilter[0] = "%"; @@ -337,7 +337,7 @@ namespace dbaui { // in addition, we need some infos about the connection used m_sCatalogSeparator = "."; // (default) - m_bCatalogAtStart = sal_True; // (default) + m_bCatalogAtStart = true; // (default) try { Reference< XDatabaseMetaData > xMeta; @@ -381,7 +381,7 @@ namespace dbaui OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); } - void OTableSubscriptionPage::CheckAll( sal_Bool _bCheck ) + void OTableSubscriptionPage::CheckAll( bool _bCheck ) { SvButtonState eState = _bCheck ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED; SvTreeListEntry* pEntry = m_pTablesList->First(); @@ -457,8 +457,8 @@ namespace dbaui SvTreeListEntry* pEntry = m_pTablesList->GetModel()->Next(const_cast<SvTreeListEntry*>(pAllObjectsEntry)); while(pEntry) { - sal_Bool bCatalogWildcard = sal_False; - sal_Bool bSchemaWildcard = sal_False; + bool bCatalogWildcard = false; + bool bSchemaWildcard = false; SvTreeListEntry* pSchema = NULL; SvTreeListEntry* pCatalog = NULL; @@ -551,7 +551,7 @@ namespace dbaui bool OTableSubscriptionPage::FillItemSet( SfxItemSet& _rCoreAttrs ) { - sal_Bool bValid, bReadonly; + bool bValid, bReadonly; getFlags(_rCoreAttrs, bValid, bReadonly); if (!bValid || bReadonly) diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index fd14e43aaf3d..b0cc2885dc90 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -40,7 +40,7 @@ namespace dbaui OTableTreeListBox* m_pTablesList; OUString m_sCatalogSeparator; - sal_Bool m_bCatalogAtStart : 1; + bool m_bCatalogAtStart : 1; ::osl::Mutex m_aNotifierMutex; @@ -86,9 +86,9 @@ namespace dbaui ::com::sun::star::uno::Sequence< OUString > collectDetailedSelection() const; /// (un)check all entries - void CheckAll( sal_Bool bCheck = sal_True ); + void CheckAll( bool bCheck = true ); - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; // checks the tables according to the filter given // in oppsofite to implCheckTables, this method handles the case of an empty sequence, too ... diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index c4ca7ca2e410..3c924945e3c8 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -57,7 +57,7 @@ namespace dbaui short TextConnectionSettingsDialog::Execute() { - m_pTextConnectionHelper->implInitControls( m_rItems, sal_True ); + m_pTextConnectionHelper->implInitControls( m_rItems, true ); return ModalDialog::Execute(); } @@ -65,7 +65,7 @@ namespace dbaui { if ( m_pTextConnectionHelper->prepareLeave() ) { - sal_Bool bUnused = sal_False; + bool bUnused = false; m_pTextConnectionHelper->FillItemSet( m_rItems, bUnused ); EndDialog( RET_OK ); return 1L; |