[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - connectivity/source

[Julien Nabet]

 connectivity/source/drivers/mork/MConnection.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 868ddebc1ad874ca17e0b7bee873dfeb5f6521ea
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Sep 3 22:37:31 2015 +0200

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 01547985ceee8c199dc189071845ef5fcda11782)
    Reviewed-on: https://gerrit.libreoffice.org/18520

diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx
index 8112a16..3f8baaf 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 );
         }
     }