[ooo-build-commit] Branch 'ooo/OOO320' - dbaccess/source

[Jan Holesovsky]

 dbaccess/source/core/api/KeySet.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit afed528a11eb5745e2911b13323da6caaa6bb975
Author: Oliver Bolte <obo at openoffice.org>
Date:   Fri Dec 11 10:57:41 2009 +0000

    CWS-TOOLING: integrate CWS ooo32gsl09
    2009-12-07 16:21:13 +0100 tl  r277744 : #i105988# accessibility crash
    2009-12-07 14:59:17 +0100 od  r277743 : #i107365# method <ViewShell::ImplEndAction(..)>
    	  - take care of transparent child windows after direct paint.
    2009-12-07 12:22:08 +0100 fs  r277739 : #i107485#
    2009-12-04 15:28:51 +0100 pl  r277736 : #i107358# fix uninitialized value (thanks cmc)
    2009-12-04 15:24:57 +0100 pl  r277735 : #i106833# fix subset font encoding

diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 56c87c7..47cf5d2 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -310,7 +310,10 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet)
     const ::rtl::OUString sOldFilter = xAnalyzer->getFilter();
     if ( sOldFilter.getLength() )
     {
-        aFilter = sOldFilter + aAnd + aFilter.makeStringAndClear();
+        FilterCreator aFilterCreator;
+        aFilterCreator.append( aFilter.makeStringAndClear() );
+        aFilterCreator.append( sOldFilter );
+        aFilter = aFilterCreator.getComposedAndClear();
     }
     xAnalyzer->setFilter(aFilter.makeStringAndClear());
     m_xStatement = m_xConnection->prepareStatement(xAnalyzer->getQueryWithSubstitution());