From 01547985ceee8c199dc189071845ef5fcda11782 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Thu, 3 Sep 2015 22:37:31 +0200 Subject: [PATCH] tdf#92794: '$' should be replaced in error dialog of addressbook MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic57611be96f160037fbff2e9452f9206083c80e4 Reviewed-on: https://gerrit.libreoffice.org/18324 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- connectivity/source/drivers/mork/MConnection.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index cba95797463b..76159128b406 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -142,7 +142,9 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& if (!m_pBook->open(strPath.getStr())) { SAL_WARN("connectivity.mork", "Can not parse abook mork file: " << strPath); - throwGenericSQLException( STR_COULD_NOT_LOAD_FILE, *this ); + const OUString sError( getResources().getResourceStringWithSubstitution( + STR_COULD_NOT_LOAD_FILE, "$filename$", abook)); + ::dbtools::throwGenericSQLException( sError, *this ); } // read history only in production @@ -152,7 +154,9 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& if (!m_pHistory->open(strPath.getStr())) { SAL_WARN("connectivity.mork", "Can not parse history mork file: " << strPath); - throwGenericSQLException( STR_COULD_NOT_LOAD_FILE, *this ); + const OUString sError( getResources().getResourceStringWithSubstitution( + STR_COULD_NOT_LOAD_FILE, "$filename$", history)); + ::dbtools::throwGenericSQLException( sError, *this ); } }