strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Frank Schoenheit [fs] 2010-11-01 12:37:19 +01:00
parent c070ae66b9
commit 4451fc307f
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
svx/source/form/formcontroller.cxx
View file

@ -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() )
{