From 9866efe3e5a670bab54d931be31e1989aeb382a7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 5 Apr 2016 08:03:35 +0200 Subject: loplugin:constantparam Change-Id: I821ed77a6c6014c9a82d31a4b117ed6f1b4abf18 Reviewed-on: https://gerrit.libreoffice.org/23832 Tested-by: Jenkins Reviewed-by: Noel Grandin --- dbaccess/source/ui/inc/RelationController.hxx | 2 +- dbaccess/source/ui/relationdesign/RelationController.cxx | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 9488158b848c..05e5d37b9351 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -41,7 +41,7 @@ namespace dbaui virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; void loadData(); - TTableWindowData::value_type existsTable(const OUString& _rComposedTableName,bool _bCase) const; + TTableWindowData::value_type existsTable(const OUString& _rComposedTableName) const; // load the window positions out of the datasource void loadLayoutInformation(); diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 3572e348f35b..f884dccd4c7c 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -443,18 +443,16 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData ::osl::MutexGuard aGuard( getMutex() ); ::std::copy( _aConnectionData.begin(), _aConnectionData.end(), ::std::back_inserter( m_vTableConnectionData )); - //const Reference< XDatabaseMetaData> xMetaData = getConnection()->getMetaData(); - const bool bCase = true;//xMetaData.is() && xMetaData->supportsMixedCaseQuotedIdentifiers(); // here we are finished, so we can collect the table from connection data TTableConnectionData::const_iterator aConnDataIter = m_vTableConnectionData.begin(); TTableConnectionData::const_iterator aConnDataEnd = m_vTableConnectionData.end(); for(;aConnDataIter != aConnDataEnd;++aConnDataIter) { - if ( !existsTable((*aConnDataIter)->getReferencingTable()->GetComposedName(),bCase) ) + if ( !existsTable((*aConnDataIter)->getReferencingTable()->GetComposedName()) ) { m_vTableData.push_back((*aConnDataIter)->getReferencingTable()); } - if ( !existsTable((*aConnDataIter)->getReferencedTable()->GetComposedName(),bCase) ) + if ( !existsTable((*aConnDataIter)->getReferencedTable()->GetComposedName()) ) { m_vTableData.push_back((*aConnDataIter)->getReferencedTable()); } @@ -533,9 +531,9 @@ void ORelationController::loadData() } } -TTableWindowData::value_type ORelationController::existsTable(const OUString& _rComposedTableName,bool _bCase) const +TTableWindowData::value_type ORelationController::existsTable(const OUString& _rComposedTableName) const { - ::comphelper::UStringMixEqual bCase(_bCase); + ::comphelper::UStringMixEqual bCase(true); TTableWindowData::const_iterator aIter = m_vTableData.begin(); TTableWindowData::const_iterator aEnd = m_vTableData.end(); for(;aIter != aEnd;++aIter) -- cgit