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

[Noel Grandin]

 dbaccess/source/sdbtools/connection/connectiontools.cxx |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit bf51a0b97c63801654c3052c36f9408873c5ad36
Author: Noel Grandin <noel at peralex.com>
Date:   Thu May 30 08:18:16 2013 +0200

    fdo#64984 - EDITING: Creating table with GUI - table could not be saved
    
    This bug was introduced by my commit
    002aab309055b7feeeeeb25c1835b6abe6646729
    "fdo#46808, convert sdb::tools::ConnectionTools to new style"
    
    (cherry picked from commit 73a809cba87eefbb495c5ba53f89b48d671f8230)
    
    Change-Id: Ib10f97bbe46d20db663047d2f35ec4850df839fa

diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx
index 4b46d41..868ee3c 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.cxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx
@@ -152,10 +152,15 @@ namespace sdbtools
     {
         ::osl::MutexGuard aGuard( getMutex() );
 
-        ::comphelper::NamedValueCollection aArguments( _rArguments );
-
         Reference< XConnection > xConnection;
-        aArguments.get( "Connection" ) >>= xConnection;
+        if (_rArguments.getLength()==1 && (_rArguments[0] >>= xConnection))
+        {
+        }
+        else
+        {
+            ::comphelper::NamedValueCollection aArguments( _rArguments );
+            aArguments.get( "Connection" ) >>= xConnection;
+        }
         if ( !xConnection.is() )
             throw IllegalArgumentException();