diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-29 16:21:54 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-04 15:18:00 +0200 |
commit | 2c05d758b2b62c9df413e2514fb3cd233d0f3ec7 (patch) | |
tree | e0a23d3da6fb17ae97d18957fc14f4a4a8de2d3f /connectivity | |
parent | a3088b1e72ef17babe3d3664c610afd02cfe0891 (diff) |
add << operator for css::uno::Exception
Change-Id: Ia23dafd07133779144965682df3b7125a3214235
Reviewed-on: https://gerrit.libreoffice.org/43046
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'connectivity')
6 files changed, 8 insertions, 11 deletions
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 445d0e639275..08770018bbfd 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -974,7 +974,7 @@ try catch(IllegalArgumentException const & exc) { SAL_WARN( "connectivity.commontools", "TransferFormComponentProperties : could not transfer the value for property \"" - << pResult->Name << "\" " << exc.Message); + << pResult->Name << "\" " << exc); } } } @@ -1972,8 +1972,7 @@ void release(oslInterlockedCount& _refCount, _pObject->dispose(); } catch (css::uno::RuntimeException & e) { SAL_WARN( - "connectivity.commontools", - "Caught exception during dispose, " << e.Message); + "connectivity.commontools", "Caught exception during dispose, " << e); } // only the alive ref holds the object diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index 811be298bb07..313ee07246ef 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -386,9 +386,7 @@ Any OPoolCollection::getNodeValue(const OUString& _rPath,const Reference<XInterf } catch(NoSuchElementException& e) { - SAL_WARN("connectivity.cpool", "::getNodeValue: caught a " - "NoSuchElementException while trying to open " << - e.Message << "!" ); + SAL_WARN("connectivity.cpool", e ); } return aReturn; } diff --git a/connectivity/source/drivers/firebird/Blob.cxx b/connectivity/source/drivers/firebird/Blob.cxx index b71c8844cb72..0cd5697992fd 100644 --- a/connectivity/source/drivers/firebird/Blob.cxx +++ b/connectivity/source/drivers/firebird/Blob.cxx @@ -125,7 +125,7 @@ void SAL_CALL Blob::disposing() catch (SQLException &e) { // we cannot throw any exceptions here... - SAL_WARN("connectivity.firebird", "isc_close_blob failed " << e.Message); + SAL_WARN("connectivity.firebird", "isc_close_blob failed " << e); assert(false); } Blob_BASE::disposing(); diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index 4f53c25fc35c..d93fbb363d8a 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -352,7 +352,7 @@ namespace connectivity { if (env->ExceptionCheck()) env->ExceptionClear(); - SAL_WARN("connectivity.hsqldb", "forwarding Exception: " << _aException.Message ); + SAL_WARN("connectivity.hsqldb", "forwarding Exception: " << _aException ); OString cstr( OUStringToOString(_aException.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); env->ThrowNew(env->FindClass("java/io/IOException"), cstr.getStr()); } diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx index ef9a3304534e..769cea7001df 100644 --- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx +++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx @@ -80,7 +80,7 @@ extern "C" SAL_JNI_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_S OSL_FAIL("Exception caught! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement"); if (env->ExceptionCheck()) env->ExceptionClear(); - SAL_WARN("connectivity.hsqldb", "forwarding Exception: " << e.Message); + SAL_WARN("connectivity.hsqldb", "forwarding Exception: " << e); } } return JNI_FALSE; @@ -116,7 +116,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora } catch(const Exception& e) { - SAL_WARN("connectivity.hsqldb", "Exception caught! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement " << e.Message); + SAL_WARN("connectivity.hsqldb", "Exception caught! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement " << e); StorageContainer::throwJavaException(e,env); } } diff --git a/connectivity/source/drivers/writer/WConnection.cxx b/connectivity/source/drivers/writer/WConnection.cxx index 70fae3a0d04f..0a4763e43618 100644 --- a/connectivity/source/drivers/writer/WConnection.cxx +++ b/connectivity/source/drivers/writer/WConnection.cxx @@ -138,7 +138,7 @@ uno::Reference<text::XTextDocument> const& OWriterConnection::acquireDoc() uno::Exception aLoaderError; OSL_VERIFY(aLoaderException >>= aLoaderError); - SAL_WARN("connectivity.writer", "empty m_xDoc, exception type: " << aLoaderException.getValueTypeName() << ", error message: " << aLoaderError.Message); + SAL_WARN("connectivity.writer", "empty m_xDoc, exception type: " << aLoaderException.getValueTypeName() << ", error message: " << aLoaderError); } const OUString sError(m_aResources.getResourceStringWithSubstitution( |