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

[Lionel Elie Mamane]

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

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

    don't use empty table name
    
    Conflicts:
    	dbaccess/source/core/api/SingleSelectQueryComposer.cxx
    
    Change-Id: I9c8c3882f659747d53a047481ccabf1785835c99
    Reviewed-on: https://gerrit.libreoffice.org/4794
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 837836d..8d67b87 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -521,12 +521,13 @@ void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference<
                     ::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;
-                aNewName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."));
-                aNewName += ::dbtools::quoteName(aQuote,sRealName);
+                if(sTableName.isEmpty())
+                    aNewName =  ::dbtools::quoteName(aQuote,sRealName);
+                else
+                    aNewName =  sTableName + "." + ::dbtools::quoteName(aQuote,sRealName);
             }
         }
         else