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

[Lionel Elie Mamane]

 dbaccess/source/core/api/SingleSelectQueryComposer.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 2ee2e0b99179a08369125743ec0e72d3b5622957
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Jul 10 02:58:32 2013 +0200

    don't use empty table name
    
    Change-Id: I9c8c3882f659747d53a047481ccabf1785835c99
    Reviewed-on: https://gerrit.libreoffice.org/4793
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 7bd978d..d7071a2 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -509,10 +509,13 @@ OUString OSingleSelectQueryComposer::impl_getColumnName_throw(const Reference< X
                     ::dbtools::qualifiedNameComponents(m_xMetaData,sTableName,aCatlog,aSchema,aTable,::dbtools::eInDataManipulation);
                     sTableName = ::dbtools::composeTableName( m_xMetaData, aCatlog, aSchema, aTable, sal_True, ::dbtools::eInDataManipulation );
                 }
-                else
+                else if (!sTableName.isEmpty())
                     sTableName = ::dbtools::quoteName(aQuote,sTableName);
 
-                aNewName =  sTableName + "." + ::dbtools::quoteName(aQuote,sRealName);
+                if(sTableName.isEmpty())
+                    aNewName =  ::dbtools::quoteName(aQuote,sRealName);
+                else
+                    aNewName =  sTableName + "." + ::dbtools::quoteName(aQuote,sRealName);
             }
         }
         else