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/relationdesign | |
parent | 6907b67d3d3208eb54289db2476132188d86dfec (diff) |
dbaccess: sal_Bool->bool
Change-Id: Ieb52470f9638b74898954db3890aaf2cf202290a
Diffstat (limited to 'dbaccess/source/ui/relationdesign')
3 files changed, 25 insertions, 25 deletions
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index a046a0ea9675..98a72c8587c8 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -75,7 +75,7 @@ ORelationTableConnectionData::~ORelationTableConnectionData() { } -sal_Bool ORelationTableConnectionData::DropRelation() +bool ORelationTableConnectionData::DropRelation() { ::osl::MutexGuard aGuard( m_aMutex ); // delete relation @@ -102,7 +102,7 @@ sal_Bool ORelationTableConnectionData::DropRelation() } } } - return sal_True; + return true; } void ORelationTableConnectionData::ChangeOrientation() @@ -145,7 +145,7 @@ void ORelationTableConnectionData::SetCardinality() } -sal_Bool ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropertySet>& i_xTable,EConnectionSide _eEConnectionSide) const +bool ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropertySet>& i_xTable,EConnectionSide _eEConnectionSide) const { // check if Table has the primary key column dependig on _eEConnectionSide sal_uInt16 nPrimKeysCount = 0, @@ -172,15 +172,15 @@ sal_Bool ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropert } } if ( nPrimKeysCount != aKeyColumns.getLength() ) - return sal_False; + return false; } if ( !nPrimKeysCount || nPrimKeysCount != nValidLinesCount ) - return sal_False; + return false; - return sal_True; + return true; } -sal_Bool ORelationTableConnectionData::IsConnectionPossible() +bool ORelationTableConnectionData::IsConnectionPossible() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -188,7 +188,7 @@ sal_Bool ORelationTableConnectionData::IsConnectionPossible() if ( IsSourcePrimKey() && !IsDestPrimKey() ) ChangeOrientation(); - return sal_True; + return true; } OConnectionLineDataRef ORelationTableConnectionData::CreateLineDataObj() @@ -248,14 +248,14 @@ bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableCon } -sal_Bool ORelationTableConnectionData::Update() +bool ORelationTableConnectionData::Update() { ::osl::MutexGuard aGuard( m_aMutex ); // delete old relation { DropRelation(); if( !IsConnectionPossible() ) - return sal_False; + return false; } // reassign the keys because the orientaion could be changed @@ -263,7 +263,7 @@ sal_Bool ORelationTableConnectionData::Update() Reference< XIndexAccess> xKeys ( getReferencingTable()->getKeys()); if ( !xKeys.is() ) - return sal_False; + return false; // create new relation Reference<XDataDescriptorFactory> xKeyFactory(xKeys,UNO_QUERY); OSL_ENSURE(xKeyFactory.is(),"No XDataDescriptorFactory Interface!"); @@ -421,7 +421,7 @@ xKey.clear(); // determine cardinality SetCardinality(); - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 261f687e68f8..230d845feeeb 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -121,7 +121,7 @@ Reference< XInterface > SAL_CALL ORelationController::Create(const Reference<XMu ORelationController::ORelationController(const Reference< XComponentContext >& _rM) : OJoinController(_rM) ,m_nThreadEvent(0) - ,m_bRelationsPossible(sal_True) + ,m_bRelationsPossible(true) { InvalidateAll(); } @@ -201,7 +201,7 @@ void ORelationController::impl_initialize() {// check if this database supports relations setEditable(false); - m_bRelationsPossible = sal_False; + m_bRelationsPossible = false; { OUString sTitle(ModuleRes(STR_RELATIONDESIGN)); sTitle = sTitle.copy(3); @@ -354,7 +354,7 @@ namespace if ( aFind == m_aTableData.end() ) { aFind = m_aTableData.insert(TTableDataHelper::value_type(sSourceName,::boost::shared_ptr<OTableWindowData>(new OTableWindowData(xTableProp,sSourceName, sSourceName)))).first; - aFind->second->ShowAll(sal_False); + aFind->second->ShowAll(false); } TTableWindowData::value_type pReferencingTable = aFind->second; Reference<XIndexAccess> xKeys = pReferencingTable->getKeys(); @@ -387,7 +387,7 @@ namespace { Reference<XPropertySet> xReferencedTable(m_xTables->getByName(sReferencedTable),UNO_QUERY); aRefFind = m_aTableData.insert(TTableDataHelper::value_type(sReferencedTable,::boost::shared_ptr<OTableWindowData>(new OTableWindowData(xReferencedTable,sReferencedTable, sReferencedTable)))).first; - aRefFind->second->ShowAll(sal_False); + aRefFind->second->ShowAll(false); } else continue; // table name could not be found so we do not show this table releation @@ -441,7 +441,7 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData ::std::copy( _aConnectionData.begin(), _aConnectionData.end(), ::std::back_inserter( m_vTableConnectionData )); //const Reference< XDatabaseMetaData> xMetaData = getConnection()->getMetaData(); - const sal_Bool bCase = sal_True;//xMetaData.is() && xMetaData->supportsMixedCaseQuotedIdentifiers(); + const bool bCase = true;//xMetaData.is() && xMetaData->supportsMixedCaseQuotedIdentifiers(); // here we are finished, so we can collect the table from connection data TTableConnectionData::iterator aConnDataIter = m_vTableConnectionData.begin(); TTableConnectionData::iterator aConnDataEnd = m_vTableConnectionData.end(); @@ -531,7 +531,7 @@ void ORelationController::loadData() } } -TTableWindowData::value_type ORelationController::existsTable(const OUString& _rComposedTableName,sal_Bool _bCase) const +TTableWindowData::value_type ORelationController::existsTable(const OUString& _rComposedTableName,bool _bCase) const { ::comphelper::UStringMixEqual bCase(_bCase); TTableWindowData::const_iterator aIter = m_vTableData.begin(); diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 5a882da981b1..564439f4844a 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -132,7 +132,7 @@ void ORelationTableView::ReSync() { // gibt es die beiden Tabellen zur Connection ? OUString strTabExistenceTest = pTabConnData->getReferencingTable()->GetTableName(); - sal_Bool bInvalid = ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); + bool bInvalid = ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); strTabExistenceTest = pTabConnData->getReferencedTable()->GetTableName(); bInvalid = bInvalid || ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); @@ -144,14 +144,14 @@ void ORelationTableView::ReSync() } } - addConnection( new ORelationTableConnection(this, *aConIter), sal_False ); // don't add the data again + addConnection( new ORelationTableConnection(this, *aConIter), false ); // don't add the data again } if ( !GetTabWinMap()->empty() ) GetTabWinMap()->begin()->second->GrabFocus(); } -sal_Bool ORelationTableView::IsAddAllowed() +bool ORelationTableView::IsAddAllowed() { return !m_pView->getController().isReadOnly(); @@ -244,9 +244,9 @@ void ORelationTableView::AddNewRelation() { TTableConnectionData::value_type pNewConnData( new ORelationTableConnectionData() ); - ORelationDialog aRelDlg(this, pNewConnData, sal_True); + ORelationDialog aRelDlg(this, pNewConnData, true); - sal_Bool bSuccess = (aRelDlg.Execute() == RET_OK); + bool bSuccess = (aRelDlg.Execute() == RET_OK); if (bSuccess) { // already updated by the dialog @@ -274,7 +274,7 @@ bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_ return false; } -void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUString& rWinName, sal_Bool /*bNewTable*/) +void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUString& rWinName, bool /*bNewTable*/) { OSL_ENSURE(!_rComposedName.isEmpty(),"There must be a table name supplied!"); OJoinTableView::OTableWindowMap::iterator aIter = GetTabWinMap()->find(_rComposedName); @@ -290,7 +290,7 @@ void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUStrin // enter the new data structure into DocShell TTableWindowData::value_type pNewTabWinData(createTableWindowData( _rComposedName, rWinName,rWinName )); - pNewTabWinData->ShowAll(sal_False); + pNewTabWinData->ShowAll(false); // Neues Fenster in Fensterliste eintragen OTableWindow* pNewTabWin = createWindow( pNewTabWinData ); |