[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dbaccess/source

[Michael Stahl]

 dbaccess/source/core/dataaccess/datasource.cxx |    3 ++-
 dbaccess/source/core/resource/strings.src      |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ae0d2d2eccacc298c0967feb0b434993aae70c05
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 25 15:00:21 2013 +0100

    dbaccess: improve exception message when no driver found
    
    Change-Id: I1734034e05324eb0d66fd52444b0521d4143bc12
    (cherry picked from commit 7ad1c4356bfde3bf37830fa8e4b3267212473f79)

diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 83bb45e..cd349b7 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -735,7 +735,8 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString
 
     if ( !xReturn.is() )
     {
-        OUString sMessage = DBACORE_RESSTRING( nExceptionMessageId );
+        OUString sMessage = DBACORE_RESSTRING( nExceptionMessageId )
+            .replaceAll("$name$", m_pImpl->m_sConnectURL);
 
         SQLContext aContext;
         aContext.Message = DBACORE_RESSTRING(RID_STR_CONNECTION_REQUEST).
diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src
index a6eb1fe..a2099c1 100644
--- a/dbaccess/source/core/resource/strings.src
+++ b/dbaccess/source/core/resource/strings.src
@@ -47,7 +47,7 @@ String RID_STR_COULDNOTCONNECT_UNSPECIFIED
 
 String RID_STR_COULDNOTCONNECT_NODRIVER
 {
-    Text [ en-US ] = "The connection to the external data source could not be established. No SDBC driver was found for the given URL.";
+    Text [ en-US ] = "The connection to the external data source could not be established. No SDBC driver was found for the URL '$name$'.";
 };
 
 String RID_STR_COULDNOTLOAD_MANAGER