summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2015-09-03 22:37:31 +0200
committerCaolán McNamara <caolanm@redhat.com>2015-09-14 10:24:46 +0000
commit868ddebc1ad874ca17e0b7bee873dfeb5f6521ea (patch)
tree0f486c583fccdef9ac049ab5a17b2a707772523d
parent7108b46723750dd390d28afda37ecf1e85581f6a (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.cxx8
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 );
}
}