summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-11-01 12:37:19 +0100
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-11-01 12:37:19 +0100
commit5f381c3379381645d8471da7242e064307675427 (patch)
tree88a947986797fe08ca936d4270b22aeceb619b4c
parent1d705f7df77ac8d4e99e76d8b0fbd8c08726229d (diff)
dba34a: #i115312# partly reverted the fix for issue #i114403#: don't quote string literals in the form controller, this is the responsibility of the filter control, which can decide much better in which situations this is necessary
-rw-r--r--svx/source/form/formcontroller.cxx16
1 files changed, 2 insertions, 14 deletions
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 627f2a832b..9bb8e9839e 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -873,23 +873,11 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
Reference< XPropertySet > xModelProps( xControl->getModel(), UNO_QUERY_THROW );
Reference< XPropertySet > xField( xModelProps->getPropertyValue( FM_PROP_BOUNDFIELD ), UNO_QUERY_THROW );
- sal_Int32 nDataType = DataType::OTHER;
- OSL_VERIFY( xField->getPropertyValue( FM_PROP_FIELDTYPE ) >>= nDataType );
- const bool isTextColumn = ( ( nDataType == DataType::CHAR )
- || ( nDataType == DataType::VARCHAR )
- || ( nDataType == DataType::LONGVARCHAR )
- );
-
- ::rtl::OUStringBuffer aPredicateValue;
- if ( isTextColumn )
- aPredicateValue.append( sal_Unicode( '\'' ) );
- aPredicateValue.append( condition->second );
- if ( isTextColumn )
- aPredicateValue.append( sal_Unicode( '\'' ) );
+ ::rtl::OUString sFilterValue( condition->second );
::rtl::OUString sErrorMsg, sCriteria;
const ::rtl::Reference< ISQLParseNode > xParseNode =
- predicateTree( sErrorMsg, aPredicateValue.makeStringAndClear(), xFormatter, xField );
+ predicateTree( sErrorMsg, sFilterValue, xFormatter, xField );
OSL_ENSURE( xParseNode.is(), "FormController::getFastPropertyValue: could not parse the field value predicate!" );
if ( xParseNode.is() )
{