diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:22:44 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:00:26 +0000 |
commit | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch) | |
tree | 2dbddceebf0f96492adc5652697e8efce8a8ba06 /forms/source/component/Filter.cxx | |
parent | fe8eba5faa59ddf9ee82f3eb009daac72a0ec846 (diff) |
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex:
s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms
Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'forms/source/component/Filter.cxx')
-rw-r--r-- | forms/source/component/Filter.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 9afc606ecfeb..d2bc3239260b 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -158,22 +158,22 @@ namespace frm switch (m_nControlClass) { case FormComponentType::RADIOBUTTON: - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("radiobutton") ); + aServiceName = rtl::OUString("radiobutton"); break; case FormComponentType::CHECKBOX: - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("checkbox") ); + aServiceName = rtl::OUString("checkbox"); break; case FormComponentType::COMBOBOX: - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("combobox") ); + aServiceName = rtl::OUString("combobox"); break; case FormComponentType::LISTBOX: - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("listbox") ); + aServiceName = rtl::OUString("listbox"); break; default: if (m_bMultiLine) - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLineEdit") ); + aServiceName = rtl::OUString("MultiLineEdit"); else - aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Edit") ); + aServiceName = rtl::OUString("Edit"); } return aServiceName; } @@ -405,7 +405,7 @@ namespace frm // create a query composer Reference< XColumnsSupplier > xSuppColumns; - xFormProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSuppColumns; + xFormProps->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSuppColumns; const Reference< XConnection > xConnection( ::dbtools::getConnection( xForm ), UNO_SET_THROW ); const Reference< XNameAccess > xFieldNames( xSuppColumns->getColumns(), UNO_SET_THROW ); @@ -899,15 +899,15 @@ namespace frm //--------------------------------------------------------------------- ::rtl::OUString SAL_CALL OFilterControl::getImplementationName_Static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.OFilterControl" ) ); + return ::rtl::OUString( "com.sun.star.comp.forms.OFilterControl" ); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL OFilterControl::getSupportedServiceNames_Static() { Sequence< ::rtl::OUString > aNames( 2 ); - aNames[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.control.FilterControl" ) ); - aNames[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControl" ) ); + aNames[ 0 ] = ::rtl::OUString( "com.sun.star.form.control.FilterControl" ); + aNames[ 1 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" ); return aNames; } |