From 78c6a111548eafe636845256a3ec08d5a58b7e67 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 16 Aug 2018 12:07:00 +0200 Subject: loplugin:returnconstant in dbaccess Change-Id: I37b7dc7f0a7786089034acc279cb6ed7a6ef863f Reviewed-on: https://gerrit.libreoffice.org/58426 Tested-by: Jenkins Reviewed-by: Noel Grandin --- dbaccess/source/ui/relationdesign/RTableConnectionData.cxx | 10 +++------- dbaccess/source/ui/relationdesign/RelationTableView.cxx | 5 +++-- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index 741c36adebf6..6934ed27fe78 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -75,7 +75,7 @@ ORelationTableConnectionData::~ORelationTableConnectionData() { } -bool ORelationTableConnectionData::DropRelation() +void ORelationTableConnectionData::DropRelation() { ::osl::MutexGuard aGuard( m_aMutex ); // delete relation @@ -102,7 +102,6 @@ bool ORelationTableConnectionData::DropRelation() } } } - return true; } void ORelationTableConnectionData::ChangeOrientation() @@ -173,15 +172,13 @@ bool ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropertySet return nPrimKeysCount && nPrimKeysCount == nValidLinesCount; } -bool ORelationTableConnectionData::IsConnectionPossible() +void ORelationTableConnectionData::IsConnectionPossible() { ::osl::MutexGuard aGuard( m_aMutex ); // if the SourceFields are a PrimKey, it's only the orientation which is wrong if ( IsSourcePrimKey() && !IsDestPrimKey() ) ChangeOrientation(); - - return true; } OConnectionLineDataRef ORelationTableConnectionData::CreateLineDataObj() @@ -244,8 +241,7 @@ bool ORelationTableConnectionData::Update() // delete old relation { DropRelation(); - if( !IsConnectionPossible() ) - return false; + IsConnectionPossible(); } // reassign the keys because the orientation could be changed diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 86b5b44e48be..233120cc6f37 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -262,8 +262,9 @@ bool ORelationTableView::RemoveConnection(VclPtr& rConn, bool ORelationTableConnectionData* pTabConnData = static_cast(rConn->GetData().get()); try { - if ( m_bInRemove || pTabConnData->DropRelation()) - return OJoinTableView::RemoveConnection(rConn, true); + if (!m_bInRemove) + pTabConnData->DropRelation(); + return OJoinTableView::RemoveConnection(rConn, true); } catch(SQLException& e) { -- cgit