[PATCH] fdo#57950: Remove some chained appends in dbaccess

Marcos Souza (via Code Review) gerrit at gerrit.libreoffice.org
Mon Jan 7 01:53:30 PST 2013


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1559

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/1559/1

fdo#57950: Remove some chained appends in dbaccess

Also simplify logic a little bit.

Change-Id: I342f8d1d22e70023d23c6c8ca3976d501e18fb90
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
---
M dbaccess/source/core/api/SingleSelectQueryComposer.cxx
1 file changed, 4 insertions(+), 12 deletions(-)



diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 6f1c57f..cb92644 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -775,25 +775,17 @@
         bCase = m_xMetaData->supportsMixedCaseQuotedIdentifiers();
         aSelectColumns = m_aSqlIterator.getSelectColumns();
 
-        ::rtl::OUStringBuffer aSQL;
-        aSQL.append( m_aPureSelectSQL );
-        aSQL.append( STR_WHERE );
+        OUStringBuffer aSQL( m_aPureSelectSQL + STR_WHERE + " ( 0 = 1 )");
 
         // preserve the original WHERE clause
         // #i102234#
-        ::rtl::OUString sOriginalWhereClause = getSQLPart( Where, m_aSqlIterator, sal_False );
+        OUString sOriginalWhereClause = getSQLPart( Where, m_aSqlIterator, sal_False );
         if ( !sOriginalWhereClause.isEmpty() )
         {
-            aSQL.appendAscii( " ( 0 = 1 ) AND ( " );
-            aSQL.append( sOriginalWhereClause );
-            aSQL.appendAscii( " ) " );
-        }
-        else
-        {
-            aSQL.appendAscii( " ( 0 = 1 ) " );
+            aSQL.append( " AND ( " + sOriginalWhereClause + " ) " );
         }
 
-        ::rtl::OUString sGroupBy = getSQLPart( Group, m_aSqlIterator, sal_True );
+        OUString sGroupBy = getSQLPart( Group, m_aSqlIterator, sal_True );
         if ( !sGroupBy.isEmpty() )
             aSQL.append( sGroupBy );
 

-- 
To view, visit https://gerrit.libreoffice.org/1559
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I342f8d1d22e70023d23c6c8ca3976d501e18fb90
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza.org at gmail.com>



More information about the LibreOffice mailing list