summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-11-01 12:50:56 +0100
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-11-01 12:50:56 +0100
commit38e8748f3b2fc3928ce24dc634ced5bac88c8075 (patch)
tree5ed6af20418d4862ff10d3d657c41ac9b1f32c6e
parent5f381c3379381645d8471da7242e064307675427 (diff)
dba34a: properly append the OR when retrieving the filter clause
-rw-r--r--svx/source/form/formcontroller.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 9bb8e9839e..6709cb38ac 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -862,9 +862,6 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
if ( rRow.empty() )
continue;
- if ( aFilter.getLength() )
- aFilter.appendAscii( " OR " );
-
::rtl::OUStringBuffer aRowFilter;
for ( FmFilterRow::const_iterator condition = rRow.begin(); condition != rRow.end(); ++condition )
{
@@ -890,6 +887,9 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
}
if ( aRowFilter.getLength() > 0 )
{
+ if ( aFilter.getLength() )
+ aFilter.appendAscii( " OR " );
+
aFilter.appendAscii( "( " );
aFilter.append( aRowFilter.makeStringAndClear() );
aFilter.appendAscii( " )" );