From 695e793619c7bcb851cf434f722e4668638056ab Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 2 Jun 2012 13:53:22 -0500 Subject: targeted string re-work Change-Id: I2ee4fbb1e166a926b36b100c47e6da4cf39d51b4 --- filter/source/config/cache/filterfactory.cxx | 38 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'filter/source/config/cache') diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index fb24a6546b49..82924059788a 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -82,17 +82,17 @@ namespace css = ::com::sun::star; #define SEPERATOR_QUERYPARAM ((sal_Unicode)':') #define SEPERATOR_QUERYPARAMVALUE ((sal_Unicode)'=') -#define QUERYPARAM_IFLAGS ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "iflags" )) -#define QUERYPARAM_EFLAGS ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "eflags" )) -#define QUERYPARAM_SORT_PROP ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sort_prop" )) +#define QUERYPARAM_IFLAGS ::rtl::OUString( "iflags" ) +#define QUERYPARAM_EFLAGS ::rtl::OUString( "eflags" ) +#define QUERYPARAM_SORT_PROP ::rtl::OUString( "sort_prop" ) -#define QUERYPARAM_DESCENDING ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "descending" )) -#define QUERYPARAM_USE_ORDER ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "use_order" )) -#define QUERYPARAM_DEFAULT_FIRST ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "default_first" )) -#define QUERYPARAM_CASE_SENSITIVE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "case_sensitive" )) +#define QUERYPARAM_DESCENDING ::rtl::OUString( "descending" ) +#define QUERYPARAM_USE_ORDER ::rtl::OUString( "use_order" ) +#define QUERYPARAM_DEFAULT_FIRST ::rtl::OUString( "default_first" ) +#define QUERYPARAM_CASE_SENSITIVE ::rtl::OUString( "case_sensitive" ) -#define QUERYPARAMVALUE_SORT_PROP_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "name" )) -#define QUERYPARAMVALUE_SORT_PROP_UINAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uiname" )) +#define QUERYPARAMVALUE_SORT_PROP_NAME ::rtl::OUString( "name" ) +#define QUERYPARAMVALUE_SORT_PROP_UINAME ::rtl::OUString( "uiname" ) @@ -241,7 +241,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea // convert "_query_xxx:..." to "getByDocService=xxx:..." ::rtl::OUString sNewQuery(sQuery); - sal_Int32 pos = sNewQuery.indexOf(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_query_" )),0); + sal_Int32 pos = sNewQuery.indexOf(::rtl::OUString( "_query_" ),0); if (pos != -1) { OSL_FAIL("DEPRECATED!\nPlease use new query format: 'matchByDocumentService=...'"); @@ -306,43 +306,43 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize if ( sDocumentService == "writer" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" )); + sDocumentService = ::rtl::OUString( "com.sun.star.text.TextDocument" ); } else if ( sDocumentService == "web" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.WebDocument" )); + sDocumentService = ::rtl::OUString( "com.sun.star.text.WebDocument" ); } else if ( sDocumentService == "global" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.GlobalDocument" )); + sDocumentService = ::rtl::OUString( "com.sun.star.text.GlobalDocument" ); } else if ( sDocumentService == "calc" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" )); + sDocumentService = ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ); } else if ( sDocumentService == "draw" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" )); + sDocumentService = ::rtl::OUString( "com.sun.star.drawing.DrawingDocument" ); } else if ( sDocumentService == "impress" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" )); + sDocumentService = ::rtl::OUString( "com.sun.star.presentation.PresentationDocument" ); } else if ( sDocumentService == "math" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.formula.FormulaProperties" )); + sDocumentService = ::rtl::OUString( "com.sun.star.formula.FormulaProperties" ); } #endif @@ -645,7 +645,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS ::rtl::OUString FilterFactory::impl_getImplementationName() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.FilterFactory" )); + return ::rtl::OUString( "com.sun.star.comp.filter.config.FilterFactory" ); } @@ -653,7 +653,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS css::uno::Sequence< ::rtl::OUString > FilterFactory::impl_getSupportedServiceNames() { css::uno::Sequence< ::rtl::OUString > lServiceNames(1); - lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )); + lServiceNames[0] = ::rtl::OUString( "com.sun.star.document.FilterFactory" ); return lServiceNames; } -- cgit