summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-01-23 16:45:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-01-25 13:51:24 +0100
commit0f28c8612f4269cec95688b53d182c7c0169236d (patch)
treed840fa85243c10376fc4fb60b4972c028953483a /connectivity/source/drivers
parent8fd13c356d78fb72ba5dd288a495551f23e15363 (diff)
loplugin:unused-returns in basegfx..cppcanvas
Change-Id: I32dc8c92871c8349651d2f4204a332d387e6e1b2 Reviewed-on: https://gerrit.libreoffice.org/48428 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity/source/drivers')
-rw-r--r--connectivity/source/drivers/dbase/DIndex.cxx4
-rw-r--r--connectivity/source/drivers/evoab2/NResultSet.cxx12
-rw-r--r--connectivity/source/drivers/evoab2/NResultSet.hxx2
-rw-r--r--connectivity/source/drivers/file/FResultSet.cxx6
-rw-r--r--connectivity/source/drivers/mork/MResultSet.cxx4
-rw-r--r--connectivity/source/drivers/mork/MResultSet.hxx2
6 files changed, 11 insertions, 19 deletions
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