diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-12 16:15:27 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-12 16:15:27 +0200 |
commit | b396ae62f7e224dbc5fe71d19d987804a02f398f (patch) | |
tree | f5e0c94211a54295dbb2a8c9ba92d5bda508f4e4 /dbaccess | |
parent | 6fb5bf5266e678b6d10fc012fefaad69e2589f3f (diff) |
dbaccess: sal_Bool -> bool
Change-Id: Ifad71823e72be71cbd9f9f58a51f4553ff54e4d4
Diffstat (limited to 'dbaccess')
37 files changed, 77 insertions, 77 deletions
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 83e28fc06d71..65c5e83cfcda 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -573,17 +573,17 @@ bool SAL_CALL OCacheSet::previous( ) throw(SQLException, RuntimeException) return m_xDriverSet->previous(); } -bool OCacheSet::last_checked( sal_Bool /*i_bFetchRow*/) +bool OCacheSet::last_checked( bool /*i_bFetchRow*/) { return last(); } -bool OCacheSet::previous_checked( sal_Bool /*i_bFetchRow*/ ) +bool OCacheSet::previous_checked( bool /*i_bFetchRow*/ ) { return previous(); } -bool OCacheSet::absolute_checked( sal_Int32 row,sal_Bool /*i_bFetchRow*/ ) +bool OCacheSet::absolute_checked( sal_Int32 row,bool /*i_bFetchRow*/ ) { return absolute(row); } diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index a42c3ee57fa3..822827856287 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -141,9 +141,9 @@ namespace dbaccess virtual bool columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow,const ORowSetValueVector::Vector& i_aRow); virtual bool updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const ::std::vector<sal_Int32>& i_aChangedColumns); virtual void fillMissingValues(ORowSetValueVector::Vector& io_aRow) const; - virtual bool previous_checked( sal_Bool i_bFetchRow ); - virtual bool absolute_checked( sal_Int32 row,sal_Bool i_bFetchRow ); - virtual bool last_checked( sal_Bool i_bFetchRow); + virtual bool previous_checked( bool i_bFetchRow ); + virtual bool absolute_checked( sal_Int32 row,bool i_bFetchRow ); + virtual bool last_checked( bool i_bFetchRow); }; } #endif // INCLUDED_DBACCESS_SOURCE_CORE_API_CACHESET_HXX diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index a9ed584b7175..2c75718a4ab3 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -1210,10 +1210,10 @@ bool SAL_CALL OKeySet::first( ) throw(SQLException, RuntimeException) bool SAL_CALL OKeySet::last( ) throw(SQLException, RuntimeException) { - return last_checked(sal_True); + return last_checked(true); } -bool OKeySet::last_checked( sal_Bool /* i_bFetchRow */ ) +bool OKeySet::last_checked( bool /* i_bFetchRow */ ) { m_bInserted = m_bUpdated = m_bDeleted = false; bool fetchedRow = fillAllRows(); @@ -1237,10 +1237,10 @@ sal_Int32 SAL_CALL OKeySet::getRow( ) throw(SQLException, RuntimeException) bool SAL_CALL OKeySet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) { - return absolute_checked(row,sal_True); + return absolute_checked(row,true); } -bool OKeySet::absolute_checked( sal_Int32 row, sal_Bool /* i_bFetchRow */ ) +bool OKeySet::absolute_checked( sal_Int32 row, bool /* i_bFetchRow */ ) { m_bInserted = m_bUpdated = m_bDeleted = false; OSL_ENSURE(row,"absolute(0) isn't allowed!"); @@ -1309,7 +1309,7 @@ bool SAL_CALL OKeySet::relative( sal_Int32 rows ) throw(SQLException, RuntimeExc return absolute(getRow()+rows); } -bool OKeySet::previous_checked( sal_Bool /* i_bFetchRow */ ) +bool OKeySet::previous_checked( bool /* i_bFetchRow */ ) { m_bInserted = m_bUpdated = m_bDeleted = false; if(m_aKeyIter != m_aKeyMap.begin()) @@ -1322,7 +1322,7 @@ bool OKeySet::previous_checked( sal_Bool /* i_bFetchRow */ ) bool SAL_CALL OKeySet::previous( ) throw(SQLException, RuntimeException) { - return previous_checked(sal_True); + return previous_checked(true); } bool OKeySet::doTryRefetch_throw() throw(SQLException, RuntimeException) diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index 5cc816b3b61e..49e60fb4c162 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -228,9 +228,9 @@ namespace dbaccess virtual void SAL_CALL moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual bool previous_checked( sal_Bool i_bFetchRow ) SAL_OVERRIDE; - virtual bool absolute_checked( sal_Int32 row,sal_Bool i_bFetchRow ) SAL_OVERRIDE; - virtual bool last_checked( sal_Bool i_bFetchRow) SAL_OVERRIDE; + virtual bool previous_checked( bool i_bFetchRow ) SAL_OVERRIDE; + virtual bool absolute_checked( sal_Int32 row,bool i_bFetchRow ) SAL_OVERRIDE; + virtual bool last_checked( bool i_bFetchRow) SAL_OVERRIDE; }; } #endif // INCLUDED_DBACCESS_SOURCE_CORE_API_KEYSET_HXX diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index f4e84dc98617..07cfa1912d01 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -722,7 +722,7 @@ bool ORowSetCache::afterLast( ) if(!m_bRowCountFinal) { - m_pCacheSet->last_checked(sal_False); + m_pCacheSet->last_checked(false); m_bRowCountFinal = true; m_nRowCount = m_pCacheSet->getRow();// + 1 removed } @@ -774,7 +774,7 @@ bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos, sal_Int32 &_nNewEndPos) if(!m_bRowCountFinal) { - if(m_pCacheSet->previous_checked(sal_False)) // because we stand after the last row + if(m_pCacheSet->previous_checked(false)) // because we stand after the last row m_nRowCount = m_pCacheSet->getRow(); // here we have the row count if(!m_nRowCount) m_nRowCount = i-1; // it can be that getRow return zero @@ -815,7 +815,7 @@ bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos, sal_Int32 &_nNewEndPos) { if(!m_pCacheSet->next()) { - if(m_pCacheSet->previous_checked(sal_False)) // because we stand after the last row + if(m_pCacheSet->previous_checked(false)) // because we stand after the last row m_nRowCount = m_pCacheSet->getRow(); // here we have the row count m_bRowCountFinal = true; } @@ -853,7 +853,7 @@ bool ORowSetCache::moveWindow() // but only when we don't know it already if ( !m_bRowCountFinal ) { - bOk = m_pCacheSet->absolute_checked( m_nPosition + 1,sal_False ); + bOk = m_pCacheSet->absolute_checked( m_nPosition + 1,false ); if ( bOk ) m_nRowCount = std::max(sal_Int32(m_nPosition+1),m_nRowCount); } @@ -861,7 +861,7 @@ bool ORowSetCache::moveWindow() if(!bOk && !m_bRowCountFinal) { // because we stand after the last row - m_nRowCount = m_pCacheSet->previous_checked(sal_False) ? m_pCacheSet->getRow() : 0; + m_nRowCount = m_pCacheSet->previous_checked(false) ? m_pCacheSet->getRow() : 0; m_bRowCountFinal = true; } } @@ -1018,7 +1018,7 @@ bool ORowSetCache::moveWindow() bOk = m_pCacheSet->next(); if(!bOk) { - m_pCacheSet->previous_checked(sal_False); // because we stand after the last row + m_pCacheSet->previous_checked(false); // because we stand after the last row m_nRowCount = nPos; // here we have the row count OSL_ENSURE(nPos == m_pCacheSet->getRow(),"nPos is not valid!"); m_bRowCountFinal = true; @@ -1045,7 +1045,7 @@ bool ORowSetCache::moveWindow() if ( !m_bRowCountFinal ) { - m_pCacheSet->previous_checked(sal_False); // because we stand after the last row + m_pCacheSet->previous_checked(false); // because we stand after the last row m_nRowCount = std::max(m_nRowCount, nPos); // here we have the row count OSL_ENSURE(nPos == m_pCacheSet->getRow(),"nPos isn't valid!"); m_bRowCountFinal = true; @@ -1058,7 +1058,7 @@ bool ORowSetCache::moveWindow() aIter = m_pMatrix->begin(); nPos = m_nStartPos + 1; - bCheck = m_pCacheSet->absolute_checked(nPos, sal_True); + bCheck = m_pCacheSet->absolute_checked(nPos, true); for(; !aIter->is() && bCheck;++aIter, ++nPos) { OSL_ENSURE(aIter != m_pMatrix->end(),"Invalid iterator"); diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index 7b5bc4328eb9..7d57df1dd984 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -88,7 +88,7 @@ bool OCommandDefinition::getEscapeProcessing() throw( ::com::sun::star::uno::Run return getCommandDefinition().m_bEscapeProcessing; } -void OCommandDefinition::setEscapeProcessing(sal_Bool p1) throw( ::com::sun::star::uno::RuntimeException ) +void OCommandDefinition::setEscapeProcessing(bool p1) throw( ::com::sun::star::uno::RuntimeException ) { setPropertyValue(PROPERTY_ESCAPE_PROCESSING, Any(p1) ); } diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx index 940be33fd606..476fd0b20521 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.hxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx @@ -129,7 +129,7 @@ public: virtual OUString getCommand() throw( ::com::sun::star::uno::RuntimeException ); virtual void setCommand(const OUString&) throw( ::com::sun::star::uno::RuntimeException ); virtual bool getEscapeProcessing() throw( ::com::sun::star::uno::RuntimeException ); - virtual void setEscapeProcessing(sal_Bool) throw( ::com::sun::star::uno::RuntimeException ); + virtual void setEscapeProcessing(bool) throw( ::com::sun::star::uno::RuntimeException ); virtual OUString getUpdateTableName() throw( ::com::sun::star::uno::RuntimeException ); virtual void setUpdateTableName(const OUString&) throw( ::com::sun::star::uno::RuntimeException ); virtual OUString getUpdateCatalogName() throw( ::com::sun::star::uno::RuntimeException ); diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index 226ab22fea70..189612c5de19 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -381,10 +381,10 @@ Any SAL_CALL ODefinitionContainer::getByName( const OUString& _rName ) throw(NoS { MutexGuard aGuard(m_aMutex); - return makeAny( implGetByName( _rName, sal_True ) ); + return makeAny( implGetByName( _rName, true ) ); } -Reference< XContent > ODefinitionContainer::implGetByName(const OUString& _rName, sal_Bool _bReadIfNecessary) throw (NoSuchElementException) +Reference< XContent > ODefinitionContainer::implGetByName(const OUString& _rName, bool _bReadIfNecessary) throw (NoSuchElementException) { Documents::iterator aMapPos = m_aDocumentMap.find(_rName); if (aMapPos == m_aDocumentMap.end()) diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index dad805bc7157..28c334906215 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -656,7 +656,7 @@ OUString SAL_CALL ODocumentContainer::composeHierarchicalName( const OUString& i ::rtl::Reference<OContentHelper> pContent = NULL; try { - Reference<XUnoTunnel> xUnoTunnel(const_cast<ODocumentContainer*>(this)->implGetByName( _sName, sal_True ), UNO_QUERY ); + Reference<XUnoTunnel> xUnoTunnel(const_cast<ODocumentContainer*>(this)->implGetByName( _sName, true ), UNO_QUERY ); if ( xUnoTunnel.is() ) pContent = reinterpret_cast<OContentHelper*>(xUnoTunnel->getSomething(OContentHelper::getUnoTunnelImplementationId())); } @@ -721,7 +721,7 @@ void SAL_CALL ODocumentContainer::removeByName( const OUString& _rName ) throw(N if (!checkExistence(_rName)) throw NoSuchElementException(_rName,*this); - Reference< XCommandProcessor > xContent( implGetByName( _rName, sal_True ), UNO_QUERY ); + Reference< XCommandProcessor > xContent( implGetByName( _rName, true ), UNO_QUERY ); if ( xContent.is() ) { Command aCommand; diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 167a52e97e7b..7573bef2f10a 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -237,7 +237,7 @@ namespace dbaccess virtual void SAL_CALL saveObject( ) throw (ObjectSaveVetoException, Exception, RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL onShowWindow( sal_Bool /*bVisible*/ ) throw (RuntimeException) + virtual void SAL_CALL onShowWindow( bool /*bVisible*/ ) throw (RuntimeException) { } // XComponentSupplier diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index fac93736f1b7..f1abf03c86d3 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -232,7 +232,7 @@ protected: @see createObject */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > - implGetByName(const OUString& _rName, sal_Bool _bCreateIfNecessary) throw (::com::sun::star::container::NoSuchElementException); + implGetByName(const OUString& _rName, bool _bCreateIfNecessary) throw (::com::sun::star::container::NoSuchElementException); /** quickly checks if there already is an element with a given name. No access to the configuration occurs, i.e. if there is such an object which is not already loaded, it won't be loaded now. diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index e275b7daa573..96ee1a44b88a 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2127,7 +2127,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property break; case ID_BROWSER_SAVERECORD: - if ( SaveModified( sal_False ) ) + if ( SaveModified( false ) ) setCurrentModified( false ); break; @@ -2166,7 +2166,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property } } -bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor) +bool SbaXDataBrowserController::SaveModified(bool bAskFor) { if ( bAskFor && GetState(ID_BROWSER_SAVERECORD).bEnabled ) { @@ -2463,7 +2463,7 @@ void SbaXDataBrowserController::criticalFail() m_nRowSetPrivileges = 0; } -void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/) +void SbaXDataBrowserController::LoadFinished(bool /*bWasSynch*/) { m_nRowSetPrivileges = 0; diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 44b9d1350544..abdaf7c24934 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -374,7 +374,7 @@ void SbaExternalSourceBrowser::Attach(const Reference< XRowSet > & xMaster) } #endif - LoadFinished(sal_True); + LoadFinished(true); Reference< XResultSetUpdate > xUpdate(xMaster, UNO_QUERY); try diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 4e8e4e707617..a088b29feaf6 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1621,7 +1621,7 @@ void SbaTableQueryBrowser::criticalFail() unloadAndCleanup( false ); } -void SbaTableQueryBrowser::LoadFinished(sal_Bool _bWasSynch) +void SbaTableQueryBrowser::LoadFinished(bool _bWasSynch) { SbaXDataBrowserController::LoadFinished(_bWasSynch); @@ -2421,7 +2421,7 @@ bool SbaTableQueryBrowser::implLoadAnything(const OUString& _rDataSourceName, co if ( m_bPreview ) initializePreviewMode(); - LoadFinished(sal_True); + LoadFinished(true); } InvalidateAll(); @@ -3703,7 +3703,7 @@ bool SbaTableQueryBrowser::preReloadForm() void SbaTableQueryBrowser::postReloadForm() { InitializeGridModel(getFormComponent()); - LoadFinished(sal_True); + LoadFinished(true); } Reference< XEmbeddedScripts > SAL_CALL SbaTableQueryBrowser::getScriptContainer() throw (RuntimeException, std::exception) diff --git a/dbaccess/source/ui/control/FieldControls.cxx b/dbaccess/source/ui/control/FieldControls.cxx index a155fe26c067..3a14cdd3d2cf 100644 --- a/dbaccess/source/ui/control/FieldControls.cxx +++ b/dbaccess/source/ui/control/FieldControls.cxx @@ -48,7 +48,7 @@ OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent, } void -OPropColumnEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +OPropColumnEditCtrl::SetSpecialReadOnly(bool _bReadOnly) { SetReadOnly(_bReadOnly); lcl_setSpecialReadOnly(_bReadOnly,this); @@ -64,14 +64,14 @@ OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPositio } void -OPropEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +OPropEditCtrl::SetSpecialReadOnly(bool _bReadOnly) { SetReadOnly(_bReadOnly); lcl_setSpecialReadOnly(_bReadOnly,this); } void -OPropNumericEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +OPropNumericEditCtrl::SetSpecialReadOnly(bool _bReadOnly) { SetReadOnly(_bReadOnly); lcl_setSpecialReadOnly(_bReadOnly,this); @@ -93,7 +93,7 @@ OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nP } void -OPropListBoxCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +OPropListBoxCtrl::SetSpecialReadOnly(bool _bReadOnly) { SetReadOnly(_bReadOnly); lcl_setSpecialReadOnly(_bReadOnly,this); diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 63d5351ee0e2..28d33723dae6 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -221,7 +221,7 @@ TTableConnectionData::value_type ORelationDialog::getConnectionData() const return m_pConnData; } -void ORelationDialog::setValid(sal_Bool _bValid) +void ORelationDialog::setValid(bool _bValid) { m_pPB_OK->Enable(_bValid); } diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 5584549871f6..3d7c3cd45890 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -41,7 +41,7 @@ namespace dbaui short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); + virtual void SetSpecialReadOnly(bool _bReadOnly); }; @@ -59,7 +59,7 @@ namespace dbaui short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); + virtual void SetSpecialReadOnly(bool _bReadOnly); }; class OPropNumericEditCtrl : public NumericField @@ -75,7 +75,7 @@ namespace dbaui short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); + virtual void SetSpecialReadOnly(bool _bReadOnly); }; @@ -92,7 +92,7 @@ namespace dbaui short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); + virtual void SetSpecialReadOnly(bool _bReadOnly); }; diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index ed824bca3261..be666126f457 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -44,7 +44,7 @@ namespace dbaui virtual ~OJoinDesignView(); // set the view readonly or not - virtual void setReadOnly(sal_Bool _bReadOnly); + virtual void setReadOnly(bool _bReadOnly); // set the statement for representation /// late construction virtual void Construct() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index aa266ab9f8ca..f3e39b917018 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -150,7 +150,7 @@ namespace dbaui @return an iterator to next valid connection, so it can be used in any loop */ - virtual bool RemoveConnection(OTableConnection* _pConnection,sal_Bool _bDelete); + virtual bool RemoveConnection(OTableConnection* _pConnection,bool _bDelete); /** allows to add new connections to join table view diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index 0bf604a67bc1..c09a01400144 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -86,7 +86,7 @@ namespace dbaui // clears the whole query virtual void clear() SAL_OVERRIDE; // set the view readonly or not - virtual void setReadOnly(sal_Bool _bReadOnly) SAL_OVERRIDE; + virtual void setReadOnly(bool _bReadOnly) SAL_OVERRIDE; // check if the statement is correct when not returning false virtual bool checkStatement(); // set the statement for representation diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index 889156e1439a..f42285e4fc01 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -75,7 +75,7 @@ namespace dbaui /// base class overwritten: create and delete Connections virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) SAL_OVERRIDE; - virtual bool RemoveConnection( OTableConnection* _pConn ,sal_Bool _bDelete) SAL_OVERRIDE; + virtual bool RemoveConnection( OTableConnection* _pConn ,bool _bDelete) SAL_OVERRIDE; // transfer of connections from and to UndoAction diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index 178d5db87d1a..f1f7c0422733 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -44,7 +44,7 @@ namespace dbaui // clears the whole query virtual void clear(); // set the view readonly or not - virtual void setReadOnly(sal_Bool _bReadOnly); + virtual void setReadOnly(bool _bReadOnly); // check if the statement is correct when not returning false virtual bool checkStatement(); // set the statement for representation diff --git a/dbaccess/source/ui/inc/RelControliFace.hxx b/dbaccess/source/ui/inc/RelControliFace.hxx index 7a602556ba9b..a499b2120dad 100644 --- a/dbaccess/source/ui/inc/RelControliFace.hxx +++ b/dbaccess/source/ui/inc/RelControliFace.hxx @@ -37,7 +37,7 @@ namespace dbaui /** setValid set the valid inside, can be used for OK buttons @param _bValid true when the using control allows an update */ - virtual void setValid(sal_Bool _bValid) = 0; + virtual void setValid(bool _bValid) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() = 0; diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 83167ac041fa..18685520d959 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -79,7 +79,7 @@ namespace dbaui /** setValid set the valid inside, can be used for OK buttons @param _bValid true when the using control allows an update */ - virtual void setValid(sal_Bool _bValid) SAL_OVERRIDE; + virtual void setValid(bool _bValid) SAL_OVERRIDE; /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists @param _pConnectionData the connection which exists between the new tables diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx index cbc2b7abc065..aec50985d581 100644 --- a/dbaccess/source/ui/inc/RelationTableView.hxx +++ b/dbaccess/source/ui/inc/RelationTableView.hxx @@ -57,7 +57,7 @@ namespace dbaui virtual void RemoveTabWin( OTableWindow* pTabWin ) SAL_OVERRIDE; virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) SAL_OVERRIDE; - virtual bool RemoveConnection(OTableConnection* pConn,sal_Bool _bDelete) SAL_OVERRIDE; + virtual bool RemoveConnection(OTableConnection* pConn,bool _bDelete) SAL_OVERRIDE; virtual void ReSync() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 1b72e38e5719..bb2d19c087a6 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -278,7 +278,7 @@ namespace dbaui // the default implementation also calls LoadFinished after a syncronous load, so be sure to do the same if you override // this metod and don't call the base class' method - virtual void LoadFinished(sal_Bool bWasSynch); + virtual void LoadFinished(bool bWasSynch); // called if the loading (the _complete_ loading process) is done (no matter if synchron or asynchron). virtual void criticalFail(); @@ -290,7 +290,7 @@ namespace dbaui // empty the frame where our view resides virtual bool CommitCurrent(); // commit the current column (i.e. cell) - virtual bool SaveModified(sal_Bool bAskFor = sal_True); + virtual bool SaveModified(bool bAskFor = true); // save the modified record ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getBoundField(sal_uInt16 nViewPos = (sal_uInt16)-1) const; diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx index 2a1b4037e4a9..467b09f040b0 100644 --- a/dbaccess/source/ui/inc/queryview.hxx +++ b/dbaccess/source/ui/inc/queryview.hxx @@ -39,7 +39,7 @@ namespace dbaui // clears the whole query virtual void clear() = 0; // set the view readonly or not - virtual void setReadOnly(sal_Bool _bReadOnly) SAL_OVERRIDE = 0; + virtual void setReadOnly(bool _bReadOnly) SAL_OVERRIDE = 0; // set the statement for representation virtual void setStatement(const OUString& _rsStatement) = 0; // returns the current sql statement diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index b86083aab07a..1c004917d8d8 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -217,7 +217,7 @@ namespace dbaui virtual void AddColumnListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xCol) SAL_OVERRIDE; virtual void RemoveColumnListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xCol) SAL_OVERRIDE; - virtual void LoadFinished(sal_Bool _bWasSynch) SAL_OVERRIDE; + virtual void LoadFinished(bool _bWasSynch) SAL_OVERRIDE; virtual void criticalFail() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index 6372e154038c..45014975512b 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -91,7 +91,7 @@ void OJoinDesignView::resizeDocumentView(Rectangle& _rPlayground) _rPlayground.SetSize( Size( 0, 0 ) ); } -void OJoinDesignView::setReadOnly(sal_Bool /*_bReadOnly*/) +void OJoinDesignView::setReadOnly(bool /*_bReadOnly*/) { } diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index e9d7dc8b392d..9a954eaf6750 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -228,7 +228,7 @@ sal_uLong OJoinTableView::GetTabWinCount() return m_aTableMap.size(); } -bool OJoinTableView::RemoveConnection( OTableConnection* _pConn,sal_Bool _bDelete ) +bool OJoinTableView::RemoveConnection( OTableConnection* _pConn,bool _bDelete ) { DeselectConn(_pConn); @@ -349,7 +349,7 @@ void OJoinTableView::RemoveTabWin( OTableWindow* pTabWin ) ( pData == pTabConn->GetData()->getReferencedTable()) ) { - bRemove = RemoveConnection( pTabConn ,sal_True); + bRemove = RemoveConnection( pTabConn ,true); aIter = m_vTableConnection.rbegin(); } else @@ -845,7 +845,7 @@ void OJoinTableView::KeyInput( const KeyEvent& rEvt ) if( !bCtrl && !bShift && (nCode==KEY_DELETE) ) { if (GetSelectedConn()) - RemoveConnection( GetSelectedConn() ,sal_True); + RemoveConnection( GetSelectedConn() ,true); } else Window::KeyInput( rEvt ); @@ -973,7 +973,7 @@ void OJoinTableView::ClearAll() ::std::vector<OTableConnection*>::iterator aIter = m_vTableConnection.begin(); ::std::vector<OTableConnection*>::iterator aEnd = m_vTableConnection.end(); for(;aIter != aEnd;++aIter) - RemoveConnection( *aIter ,sal_True); + RemoveConnection( *aIter ,true); m_vTableConnection.clear(); m_pLastFocusTabWin = NULL; @@ -1122,7 +1122,7 @@ void OJoinTableView::executePopup(const Point& _aPos,OTableConnection* _pSelConn switch (aContextMenu.Execute(this, _aPos)) { case SID_DELETE: - RemoveConnection( _pSelConnection ,sal_True); + RemoveConnection( _pSelConnection ,true); break; case ID_QUERY_EDIT_JOINCONNECTION: ConnDoubleClicked( _pSelConnection ); // is the same as double clicked diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 1049b5d1e648..3601fd0b0127 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2625,7 +2625,7 @@ void OQueryDesignView::resizeDocumentView(Rectangle& _rPlayground) _rPlayground.SetSize( Size( 0, 0 ) ); } -void OQueryDesignView::setReadOnly(sal_Bool _bReadOnly) +void OQueryDesignView::setReadOnly(bool _bReadOnly) { m_pSelectionBox->SetReadOnly(_bReadOnly); } diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 4626706c5cc5..0d44b0ded818 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -683,11 +683,11 @@ void OQueryTableView::createNewConnection() } } -bool OQueryTableView::RemoveConnection( OTableConnection* _pConnection,sal_Bool /*_bDelete*/ ) +bool OQueryTableView::RemoveConnection( OTableConnection* _pConnection,bool /*_bDelete*/ ) { // we don't want that our connection will be deleted, we put it in the undo manager - bool bRet = OJoinTableView::RemoveConnection( _pConnection,sal_False); + bool bRet = OJoinTableView::RemoveConnection( _pConnection,false); // add undo action addUndoAction( this, @@ -802,7 +802,7 @@ void OQueryTableView::DropConnection(OQueryTableConnection* pConn) { // Pay attention to the selection // remove from me and the document - RemoveConnection( pConn ,sal_False); + RemoveConnection( pConn ,false); } void OQueryTableView::HideTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction ) @@ -852,7 +852,7 @@ void OQueryTableView::HideTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAc // call base class because we append an undo action // but this time we are in a undo action list - OJoinTableView::RemoveConnection(pTmpEntry,sal_False); + OJoinTableView::RemoveConnection(pTmpEntry,false); aIter2 = rTabConList.begin(); ++nCnt; } diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index b0d8364c986e..3d1f4b0cfcaa 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -79,7 +79,7 @@ OUString OQueryTextView::getStatement() return m_pEdit->GetText(); } -void OQueryTextView::setReadOnly(sal_Bool _bReadOnly) +void OQueryTextView::setReadOnly(bool _bReadOnly) { m_pEdit->SetReadOnly(_bReadOnly); } diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 23db605d8501..6263d0cd52a7 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -276,7 +276,7 @@ TTableConnectionData::value_type DlgQryJoin::getConnectionData() const return m_pConnData; } -void DlgQryJoin::setValid(sal_Bool _bValid) +void DlgQryJoin::setValid(bool _bValid) { m_pPB_OK->Enable(_bValid || eJoinType == CROSS_JOIN ); } diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index 6dd08572502c..e8ce875cbdea 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -79,7 +79,7 @@ namespace dbaui /** setValid set the valid inside, can be used for OK buttons @param _bValid true when the using control allows an update */ - virtual void setValid(sal_Bool _bValid) SAL_OVERRIDE; + virtual void setValid(bool _bValid) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() SAL_OVERRIDE { return m_xConnection; } diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index e54dcc6add61..84a84f5cc792 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -228,7 +228,7 @@ void ORelationTableView::ConnDoubleClicked( OTableConnection* pConnection ) case RET_NO: // tried at least one update, but did not succeed -> the original connection is lost - RemoveConnection( pConnection ,sal_True); + RemoveConnection( pConnection ,true); break; case RET_CANCEL: @@ -255,13 +255,13 @@ void ORelationTableView::AddNewRelation() } } -bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_bDelete*/) +bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,bool /*_bDelete*/) { ORelationTableConnectionData* pTabConnData = (ORelationTableConnectionData*)pConn->GetData().get(); try { if ( m_bInRemove || pTabConnData->DropRelation()) - return OJoinTableView::RemoveConnection( pConn ,sal_True); + return OJoinTableView::RemoveConnection( pConn ,true); } catch(SQLException& e) { diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 14f24e6ee3e3..dfdbcf4aa7dc 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -1396,7 +1396,7 @@ void OTableController::assignTable() setEditable( xMeta.is() && !xMeta->isReadOnly() && (isAlterAllowed() || isDropAllowed() || isAddAllowed()) ); if(!isEditable()) { - sal_Bool t( sal_True ); + bool t( true ); ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( t ))); } m_bNew = false; |