[Libreoffice-commits] core.git: 2 commits - connectivity/source dbaccess/qa

[Caolán McNamara]

 connectivity/source/drivers/firebird/Driver.cxx |    6 ------
 dbaccess/qa/unit/hsql_binary_import.cxx         |    4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 5ab28e4f7d17b73eb564b330d89c25a7ee0c159c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 3 10:16:47 2018 +0100

    coverity#1433774 Unchecked return value
    
    Change-Id: I401f469a07548752d51ac6a8b2e9b30770add156
    Reviewed-on: https://gerrit.libreoffice.org/52296
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/qa/unit/hsql_binary_import.cxx b/dbaccess/qa/unit/hsql_binary_import.cxx
index 3afe7bd55396..1378dcd7c549 100644
--- a/dbaccess/qa/unit/hsql_binary_import.cxx
+++ b/dbaccess/qa/unit/hsql_binary_import.cxx
@@ -60,7 +60,7 @@ void HsqlBinaryImportTest::testBinaryImport()
     uno::Reference<XRow> xRow(xRes, UNO_QUERY_THROW);
 
     // assert first row
-    xRes->next();
+    CPPUNIT_ASSERT(xRes->next());
     constexpr sal_Int16 idExpected = 1;
     CPPUNIT_ASSERT_EQUAL(idExpected, xRow->getShort(1));
     CPPUNIT_ASSERT_EQUAL(OUString{ "45.32" }, xRow->getString(2)); // numeric
@@ -74,7 +74,7 @@ void HsqlBinaryImportTest::testBinaryImport()
     CPPUNIT_ASSERT_EQUAL(sal_Int16{ 1996 }, date.Year);
 
     // assert second row
-    xRes->next();
+    CPPUNIT_ASSERT(xRes->next());
     constexpr sal_Int16 secondIdExpected = 2;
     CPPUNIT_ASSERT_EQUAL(secondIdExpected, xRow->getShort(1)); // ID
     CPPUNIT_ASSERT_EQUAL(OUString{ "54.12" }, xRow->getString(2)); // numeric
commit 4f62a5cc66dc56cd208a76a7d85f6d15b9196e62
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 3 10:15:07 2018 +0100

    coverity#1433773 Useless call
    
    Change-Id: I8d9ff2495f9db573a6f3d1dc40e43dfba3ba8271
    Reviewed-on: https://gerrit.libreoffice.org/52295
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 8a6ebafdb897..c93b4876875d 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -72,12 +72,6 @@ FirebirdDriver::FirebirdDriver(const css::uno::Reference< css::uno::XComponentCo
     , m_firebirdTMPDirectory(nullptr, true)
     , m_firebirdLockDirectory(nullptr, true)
 {
-    // Note: TempFile caches the URL on first access; call this here so that
-    // ~FirebirdDriver is not the first access, because that is called
-    // when the ServiceManager is disposing, so GetURL() would fail!
-    m_firebirdTMPDirectory.GetURL();
-    m_firebirdLockDirectory.GetURL();
-
     // ::utl::TempFile uses a unique temporary directory (subdirectory of
     // /tmp or other user specific tmp directory) per instance in which
     // we can create directories for firebird at will.