[Libreoffice-commits] core.git: sc/source

[Julien Nabet]

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

New commits:
commit f499acb2af1d879c776987bdc2366acb5d5964e6
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

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