From 0f28c8612f4269cec95688b53d182c7c0169236d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 23 Jan 2018 16:45:23 +0200 Subject: loplugin:unused-returns in basegfx..cppcanvas Change-Id: I32dc8c92871c8349651d2f4204a332d387e6e1b2 Reviewed-on: https://gerrit.libreoffice.org/48428 Tested-by: Jenkins Reviewed-by: Noel Grandin --- connectivity/source/commontools/parameters.cxx | 5 ++--- connectivity/source/drivers/dbase/DIndex.cxx | 4 +--- connectivity/source/drivers/evoab2/NResultSet.cxx | 12 ++++-------- connectivity/source/drivers/evoab2/NResultSet.hxx | 2 +- connectivity/source/drivers/file/FResultSet.cxx | 6 ++---- connectivity/source/drivers/mork/MResultSet.cxx | 4 ++-- connectivity/source/drivers/mork/MResultSet.hxx | 2 +- connectivity/source/inc/dbase/DIndex.hxx | 2 +- connectivity/source/inc/file/FResultSet.hxx | 2 +- 9 files changed, 15 insertions(+), 24 deletions(-) (limited to 'connectivity/source') diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index cd77c028157e..10d445d0e8c5 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -770,11 +770,11 @@ namespace dbtools } - bool ParameterManager::getConnection( Reference< XConnection >& /* [out] */ _rxConnection ) + void ParameterManager::getConnection( Reference< XConnection >& /* [out] */ _rxConnection ) { OSL_PRECOND( isAlive(), "ParameterManager::getConnection: not initialized, or already disposed!" ); if ( !isAlive() ) - return false; + return; _rxConnection.clear(); try @@ -788,7 +788,6 @@ namespace dbtools { SAL_WARN( "connectivity.commontools", "ParameterManager::getConnection: could not retrieve the connection of the !" ); } - return _rxConnection.is(); } diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 4d333438538e..4dec39d2b1ca 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -134,7 +134,7 @@ ONDXPagePtr const & ODbaseIndex::getRoot() return m_aRoot; } -bool ODbaseIndex::openIndexFile() +void ODbaseIndex::openIndexFile() { if(!m_pFileStream) { @@ -160,8 +160,6 @@ bool ODbaseIndex::openIndexFile() ::dbtools::throwGenericSQLException( sError, *this ); } } - - return m_pFileStream != nullptr; } OIndexIterator* ODbaseIndex::createIterator() diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 517e7b1a7f8e..d838d07e9033 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -442,13 +442,12 @@ public: m_pContacts = nullptr; } - virtual bool executeQuery (EBook* pBook, EBookQuery* pQuery, OString &/*rPassword*/) override + virtual void executeQuery (EBook* pBook, EBookQuery* pQuery, OString &/*rPassword*/) override { freeContacts(); char *sexp = e_book_query_to_string( pQuery ); - bool bSuccess = e_book_client_get_contacts_sync( pBook, sexp, &m_pContacts, nullptr, nullptr ); + e_book_client_get_contacts_sync( pBook, sexp, &m_pContacts, nullptr, nullptr ); g_free (sexp); - return bSuccess; } virtual EContact *getContact(sal_Int32 nIndex) override @@ -568,12 +567,11 @@ public: m_pContacts = nullptr; } - virtual bool executeQuery (EBook* pBook, EBookQuery* pQuery, OString &rPassword) override + virtual void executeQuery (EBook* pBook, EBookQuery* pQuery, OString &rPassword) override { freeContacts(); ESource *pSource = e_book_get_source( pBook ); - bool bSuccess = false; bool bAuthSuccess = true; if( isAuthRequired( pBook ) ) @@ -584,9 +582,7 @@ public: } if (bAuthSuccess) - bSuccess = e_book_get_contacts( pBook, pQuery, &m_pContacts, nullptr ); - - return bSuccess; + e_book_get_contacts( pBook, pQuery, &m_pContacts, nullptr ); } virtual EContact *getContact(sal_Int32 nIndex) override diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 4dc2d6d422ed..f1128a77bd7b 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.hxx @@ -53,7 +53,7 @@ namespace connectivity { public: virtual EBook* openBook(const char *abname) = 0; - virtual bool executeQuery (EBook* pBook, EBookQuery* pQuery, OString &rPassword) = 0; + virtual void executeQuery (EBook* pBook, EBookQuery* pQuery, OString &rPassword) = 0; virtual void freeContacts() = 0; virtual bool isLDAP( EBook *pBook ) = 0; virtual bool isLocal( EBook *pBook ) = 0; diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 50bb8f9f1c5f..079295402cee 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -1166,7 +1166,7 @@ void OResultSet::sortRows() } -bool OResultSet::OpenImpl() +void OResultSet::OpenImpl() { OSL_ENSURE(m_pSQLAnalyzer,"No analyzer set with setSqlAnalyzer!"); if(!m_pTable.is()) @@ -1383,7 +1383,7 @@ bool OResultSet::OpenImpl() if(!m_pTable->InsertRow(*m_aAssignValues, m_xColsIdx)) { m_nFilePos = 0; - return false; + return; } m_nRowCountResult = 1; @@ -1395,8 +1395,6 @@ bool OResultSet::OpenImpl() // reset FilePos m_nFilePos = 0; - - return true; } Sequence< sal_Int8 > OResultSet::getUnoTunnelImplementationId() diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index e69022912e04..dd3b25ecb263 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -1332,7 +1332,8 @@ bool OResultSet::validRow( sal_uInt32 nRow) return true; } -bool OResultSet::fillKeySet(sal_Int32 nMaxCardNumber) + +void OResultSet::fillKeySet(sal_Int32 nMaxCardNumber) { impl_ensureKeySet(); if (m_CurrentRowCount < nMaxCardNumber) @@ -1345,7 +1346,6 @@ bool OResultSet::fillKeySet(sal_Int32 nMaxCardNumber) m_pKeySet->get().push_back( nKeyValue ); m_CurrentRowCount = nMaxCardNumber; } - return true; } sal_Int32 OResultSet::deletedCount() diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 88f93354de5a..7f89d5f06623 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -260,7 +260,7 @@ protected: bool validRow( sal_uInt32 nRow ); bool seekRow( eRowPosition pos, sal_Int32 nOffset = 0 ); sal_Int32 deletedCount(); - bool fillKeySet(sal_Int32 nMaxCardNumber); //When we get new rows, fill the m_pKeySet items for them + void fillKeySet(sal_Int32 nMaxCardNumber); //When we get new rows, fill the m_pKeySet items for them sal_Int32 getRowForCardNumber(sal_Int32 nCardNum); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index da0a1d657651..6e4356c4c3ee 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.hxx @@ -92,7 +92,7 @@ namespace connectivity ODbaseIndex(ODbaseTable* _pTable); ODbaseIndex(ODbaseTable* _pTable,const NDXHeader& _aHeader,const OUString& Name); - bool openIndexFile(); + void openIndexFile(); virtual void refreshColumns() override; // css::lang::XUnoTunnel diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 6c0d06fe8af4..5ccbbd369101 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -258,7 +258,7 @@ namespace connectivity // special methods inline sal_Int32 mapColumn(sal_Int32 column); - bool OpenImpl(); + void OpenImpl(); void doTableSpecials(const OSQLTable& _xTable); sal_Int32 getRowCountResult() const { return m_nRowCountResult; } -- cgit v1.2.3