diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2015-09-03 22:37:31 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-09-19 21:32:14 +0200 |
| commit | 3f7f3df5d9ab6b5266a90b899b6ecf5c04ca096d (patch) | |
| tree | a11c746002a9d0a296e9984a739a141ca84b7873 | |
| parent | 737f1a616b28439e9186969aa4deb24a1622db25 (diff) | |
tdf#92794: '$' should be replaced in error dialog of addressbook
Change-Id: Ic57611be96f160037fbff2e9452f9206083c80e4
Reviewed-on: https://gerrit.libreoffice.org/18324
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 01547985ceee8c199dc189071845ef5fcda11782)
Reviewed-on: https://gerrit.libreoffice.org/18520
| -rw-r--r-- | connectivity/source/drivers/mork/MConnection.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index 8112a16d3d20..3f8baafa3b5b 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -143,7 +143,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 @@ -153,7 +155,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 ); } } |