[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source

[Julien Nabet]

 sc/source/ui/docshell/dbdocfun.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4deb3ec0d5d94a36b3941176b30e662184d2297a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Sep 15 22:39:23 2013 +0200

    fdo#69091: Copying data from Base-table to Calc by drag and drop
    
    Depending on whether the data source is registered, either
    rDescriptor[svx::daDataSource]
    or
    rDescriptor[svx::daDatabaseLocation]
    will be filled in (and should be used).
    
    Luckily, ODataAccessDescriptor provides a utility
    function that will automatically return the one
    that is set. Use that instead of hardcoding svx::daDataSource.
    
    Thank you Lionel!
    
    Change-Id: I02673e7924c4323915dea579015326194c3f5077
    Reviewed-on: https://gerrit.libreoffice.org/5960
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 9f4d58d..79130fd 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1535,7 +1535,7 @@ void ScDBDocFunc::UpdateImport( const String& rTarget, const svx::ODataAccessDes
     rtl::OUString sDBName;
     rtl::OUString sDBTable;
     sal_Int32 nCommandType = 0;
-    rDescriptor[svx::daDataSource]  >>= sDBName;
+    sDBName = rDescriptor.getDataSource();
     rDescriptor[svx::daCommand]     >>= sDBTable;
     rDescriptor[svx::daCommandType] >>= nCommandType;