diff options
-rw-r--r-- | filter/source/config/cache/constant.hxx | 103 | ||||
-rw-r--r-- | filter/source/config/cache/filtercache.cxx | 60 | ||||
-rw-r--r-- | filter/source/config/cache/filterfactory.cxx | 2 | ||||
-rw-r--r-- | filter/source/config/cache/macros.hxx | 9 |
4 files changed, 81 insertions, 93 deletions
diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index 7cb60d134ecb..98327f097af7 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -27,7 +27,6 @@ // #define LOAD_IMPLICIT - /** @short used to identify a some generic item properties against the configuration API and can be used at all name containers (based on this filtercache) too. @@ -71,18 +70,18 @@ /** @short used to identify the list of sorted filters for a specific office module */ -#define PROPNAME_SORTEDFILTERLIST _FILTER_CONFIG_FROM_ASCII_("SortedFilterList") +#define PROPNAME_SORTEDFILTERLIST "SortedFilterList" /** @short implicit properties. which are used at the container interface only. */ -#define PROPNAME_FINALIZED _FILTER_CONFIG_FROM_ASCII_("Finalized") -#define PROPNAME_MANDATORY _FILTER_CONFIG_FROM_ASCII_("Mandatory") +#define PROPNAME_FINALIZED "Finalized" +#define PROPNAME_MANDATORY "Mandatory" /** @short used to identify a set of items against the configuration API. */ -#define CFGSET_TYPES _FILTER_CONFIG_FROM_ASCII_("Types" ) -#define CFGSET_FILTERS _FILTER_CONFIG_FROM_ASCII_("Filters" ) -#define CFGSET_FRAMELOADERS _FILTER_CONFIG_FROM_ASCII_("FrameLoaders" ) -#define CFGSET_CONTENTHANDLERS _FILTER_CONFIG_FROM_ASCII_("ContentHandlers") +#define CFGSET_TYPES "Types" +#define CFGSET_FILTERS "Filters" +#define CFGSET_FRAMELOADERS "FrameLoaders" +#define CFGSET_CONTENTHANDLERS "ContentHandlers" /** @short used to address some configuration keys directly. @@ -91,40 +90,40 @@ @TODO define these direct keys ... */ -#define CFGDIRECTKEY_OFFICELOCALE _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/L10N/ooLocale" ) -#define CFGDIRECTKEY_DEFAULTFRAMELOADER _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.TypeDetection.Misc/Defaults/DefaultFrameLoader") -#define CFGDIRECTKEY_OFFICELOCALE _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/L10N/ooLocale" ) -#define CFGDIRECTKEY_PRODUCTNAME _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/Product/ooName" ) +#define CFGDIRECTKEY_OFFICELOCALE "/org.openoffice.Setup/L10N/ooLocale" +#define CFGDIRECTKEY_DEFAULTFRAMELOADER "/org.openoffice.TypeDetection.Misc/Defaults/DefaultFrameLoader" +#define CFGDIRECTKEY_OFFICELOCALE "/org.openoffice.Setup/L10N/ooLocale" +#define CFGDIRECTKEY_PRODUCTNAME "/org.openoffice.Setup/Product/ooName" // Note that these flag bits have parallel names in // comphelper/inc/comphelper/documentconstants.hxx . See that file for // documentation on their meaning. /** @short names of filter flags, sorted in alphabetical order */ -#define FLAGNAME_3RDPARTYFILTER _FILTER_CONFIG_FROM_ASCII_("3RDPARTYFILTER" ) -#define FLAGNAME_ALIEN _FILTER_CONFIG_FROM_ASCII_("ALIEN" ) -#define FLAGNAME_ASYNCHRON _FILTER_CONFIG_FROM_ASCII_("ASYNCHRON" ) -#define FLAGNAME_BROWSERPREFERRED _FILTER_CONFIG_FROM_ASCII_("BROWSERPREFERRED" ) -#define FLAGNAME_CONSULTSERVICE _FILTER_CONFIG_FROM_ASCII_("CONSULTSERVICE" ) -#define FLAGNAME_DEFAULT _FILTER_CONFIG_FROM_ASCII_("DEFAULT" ) -#define FLAGNAME_ENCRYPTION _FILTER_CONFIG_FROM_ASCII_("ENCRYPTION" ) -#define FLAGNAME_EXPORT _FILTER_CONFIG_FROM_ASCII_("EXPORT" ) -#define FLAGNAME_IMPORT _FILTER_CONFIG_FROM_ASCII_("IMPORT" ) -#define FLAGNAME_INTERNAL _FILTER_CONFIG_FROM_ASCII_("INTERNAL" ) -#define FLAGNAME_NOTINCHOOSER _FILTER_CONFIG_FROM_ASCII_("NOTINCHOOSER" ) -#define FLAGNAME_NOTINFILEDIALOG _FILTER_CONFIG_FROM_ASCII_("NOTINFILEDIALOG" ) -#define FLAGNAME_NOTINSTALLED _FILTER_CONFIG_FROM_ASCII_("NOTINSTALLED" ) -#define FLAGNAME_OWN _FILTER_CONFIG_FROM_ASCII_("OWN" ) -#define FLAGNAME_PACKED _FILTER_CONFIG_FROM_ASCII_("PACKED" ) -#define FLAGNAME_PASSWORDTOMODIFY _FILTER_CONFIG_FROM_ASCII_("PASSWORDTOMODIFY" ) -#define FLAGNAME_PREFERRED _FILTER_CONFIG_FROM_ASCII_("PREFERRED" ) -#define FLAGNAME_STARTPRESENTATION _FILTER_CONFIG_FROM_ASCII_("STARTPRESENTATION") -#define FLAGNAME_READONLY _FILTER_CONFIG_FROM_ASCII_("READONLY" ) -#define FLAGNAME_SUPPORTSSELECTION _FILTER_CONFIG_FROM_ASCII_("SUPPORTSSELECTION") -#define FLAGNAME_TEMPLATE _FILTER_CONFIG_FROM_ASCII_("TEMPLATE" ) -#define FLAGNAME_TEMPLATEPATH _FILTER_CONFIG_FROM_ASCII_("TEMPLATEPATH" ) -#define FLAGNAME_USESOPTIONS _FILTER_CONFIG_FROM_ASCII_("USESOPTIONS" ) -#define FLAGNAME_COMBINED _FILTER_CONFIG_FROM_ASCII_("COMBINED" ) +#define FLAGNAME_3RDPARTYFILTER "3RDPARTYFILTER" +#define FLAGNAME_ALIEN "ALIEN" +#define FLAGNAME_ASYNCHRON "ASYNCHRON" +#define FLAGNAME_BROWSERPREFERRED "BROWSERPREFERRED" +#define FLAGNAME_CONSULTSERVICE "CONSULTSERVICE" +#define FLAGNAME_DEFAULT "DEFAULT" +#define FLAGNAME_ENCRYPTION "ENCRYPTION" +#define FLAGNAME_EXPORT "EXPORT" +#define FLAGNAME_IMPORT "IMPORT" +#define FLAGNAME_INTERNAL "INTERNAL" +#define FLAGNAME_NOTINCHOOSER "NOTINCHOOSER" +#define FLAGNAME_NOTINFILEDIALOG "NOTINFILEDIALOG" +#define FLAGNAME_NOTINSTALLED "NOTINSTALLED" +#define FLAGNAME_OWN "OWN" +#define FLAGNAME_PACKED "PACKED" +#define FLAGNAME_PASSWORDTOMODIFY "PASSWORDTOMODIFY" +#define FLAGNAME_PREFERRED "PREFERRED" +#define FLAGNAME_STARTPRESENTATION "STARTPRESENTATION" +#define FLAGNAME_READONLY "READONLY" +#define FLAGNAME_SUPPORTSSELECTION "SUPPORTSSELECTION" +#define FLAGNAME_TEMPLATE "TEMPLATE" +#define FLAGNAME_TEMPLATEPATH "TEMPLATEPATH" +#define FLAGNAME_USESOPTIONS "USESOPTIONS" +#define FLAGNAME_COMBINED "COMBINED" /** @short values of filter flags, sorted based on value */ #define FLAGVAL_IMPORT 0x00000001 // 1 @@ -155,31 +154,31 @@ /** @short some uno service names. */ -#define SERVICE_CONFIGURATIONUPDATEACCESS _FILTER_CONFIG_FROM_ASCII_("com.sun.star.configuration.ConfigurationUpdateAccess" ) -#define SERVICE_CONFIGURATIONACCESS _FILTER_CONFIG_FROM_ASCII_("com.sun.star.configuration.ConfigurationAccess" ) +#define SERVICE_CONFIGURATIONUPDATEACCESS "com.sun.star.configuration.ConfigurationUpdateAccess" +#define SERVICE_CONFIGURATIONACCESS "com.sun.star.configuration.ConfigurationAccess" /** @short some configuration paths. */ -#define CFGPACKAGE_TD_TYPES _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.TypeDetection.Types" ) -#define CFGPACKAGE_TD_FILTERS _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.TypeDetection.Filter") -#define CFGPACKAGE_TD_OTHERS _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.TypeDetection.Misc" ) -#define CFGPACKAGE_TD_OLD _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Office.TypeDetection") +#define CFGPACKAGE_TD_TYPES "/org.openoffice.TypeDetection.Types" +#define CFGPACKAGE_TD_FILTERS "/org.openoffice.TypeDetection.Filter" +#define CFGPACKAGE_TD_OTHERS "/org.openoffice.TypeDetection.Misc" +#define CFGPACKAGE_TD_OLD "/org.openoffice.Office.TypeDetection" /** @short some default values. */ -#define DEFAULT_OFFICELOCALE _FILTER_CONFIG_FROM_ASCII_("en-US") +#define DEFAULT_OFFICELOCALE "en-US" /** @short used for the queries of the FilterFactory service. */ -#define QUERY_IDENTIFIER_MATCHBYDOCUMENTSERVICE _FILTER_CONFIG_FROM_ASCII_("matchByDocumentService" ) -#define QUERY_IDENTIFIER_GETPREFERREDFILTERFORTYPE _FILTER_CONFIG_FROM_ASCII_("getDefaultFilterForType") -#define QUERY_IDENTIFIER_GET_SORTED_FILTERLIST _FILTER_CONFIG_FROM_ASCII_("getSortedFilterList()" ) - -#define QUERY_PARAM_IFLAGS _FILTER_CONFIG_FROM_ASCII_("iflags") -#define QUERY_PARAM_EFLAGS _FILTER_CONFIG_FROM_ASCII_("eflags") -#define QUERY_PARAM_MODULE _FILTER_CONFIG_FROM_ASCII_("module") -#define QUERY_PARAM_DEFAULTFIRST _FILTER_CONFIG_FROM_ASCII_("default_first") -#define QUERY_CONSTVALUE_ALL _FILTER_CONFIG_FROM_ASCII_("all") +#define QUERY_IDENTIFIER_MATCHBYDOCUMENTSERVICE "matchByDocumentService" +#define QUERY_IDENTIFIER_GETPREFERREDFILTERFORTYPE "getDefaultFilterForType" +#define QUERY_IDENTIFIER_GET_SORTED_FILTERLIST "getSortedFilterList()" + +#define QUERY_PARAM_IFLAGS "iflags" +#define QUERY_PARAM_EFLAGS "eflags" +#define QUERY_PARAM_MODULE "module" +#define QUERY_PARAM_DEFAULTFIRST "default_first" +#define QUERY_CONSTVALUE_ALL "all" #endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CONSTANT_HXX diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index f3f5321aedaf..def3991ad389 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -901,15 +901,15 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess css::beans::NamedValue aParam; // set root path - aParam.Name = _FILTER_CONFIG_FROM_ASCII_("nodepath"); + aParam.Name = "nodepath"; aParam.Value <<= sRoot; lParams.push_back(css::uno::makeAny(aParam)); // enable "all locales mode" ... if required if (bLocalesMode) { - aParam.Name = _FILTER_CONFIG_FROM_ASCII_("locale"); - aParam.Value <<= _FILTER_CONFIG_FROM_ASCII_("*" ); + aParam.Name = "locale"; + aParam.Value <<= OUString("*"); lParams.push_back(css::uno::makeAny(aParam)); } @@ -924,7 +924,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess // Let message empty. The normal exception text show enough information to the user. if (! xCfg.is()) throw css::uno::Exception( - _FILTER_CONFIG_FROM_ASCII_("Got NULL reference on opening configuration file ... but no exception."), + "Got NULL reference on opening configuration file ... but no exception.", css::uno::Reference< css::uno::XInterface >()); } catch(const css::uno::Exception& ex) @@ -1605,7 +1605,6 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: } #endif - // The internal name of an item must(!) be part of the property // set too. Of course its already used as key into the e.g. outside // used hash map ... but some of our API methods provide // this property set as result only. But the user of this CacheItem @@ -1614,7 +1613,6 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: aItem[PROPNAME_NAME] = css::uno::makeAny(sItem); switch(eType) { - case E_TYPE : { // read standard properties of a type @@ -1917,125 +1915,125 @@ sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< sal_Int32 nField = 0; const OUString* pNames = lNames.getConstArray(); - sal_Int32 c = lNames.getLength(); + sal_Int32 c = lNames.getLength(); for (sal_Int32 i=0; i<c; ++i) { - if (pNames[i].equals(FLAGNAME_3RDPARTYFILTER)) + if (pNames[i] == FLAGNAME_3RDPARTYFILTER) { nField |= FLAGVAL_3RDPARTYFILTER; continue; } - if (pNames[i].equals(FLAGNAME_ALIEN)) + if (pNames[i] == FLAGNAME_ALIEN) { nField |= FLAGVAL_ALIEN; continue; } - if (pNames[i].equals(FLAGNAME_ASYNCHRON)) + if (pNames[i] == FLAGNAME_ASYNCHRON) { nField |= FLAGVAL_ASYNCHRON; continue; } - if (pNames[i].equals(FLAGNAME_BROWSERPREFERRED)) + if (pNames[i] == FLAGNAME_BROWSERPREFERRED) { nField |= FLAGVAL_BROWSERPREFERRED; continue; } - if (pNames[i].equals(FLAGNAME_CONSULTSERVICE)) + if (pNames[i] == FLAGNAME_CONSULTSERVICE) { nField |= FLAGVAL_CONSULTSERVICE; continue; } - if (pNames[i].equals(FLAGNAME_DEFAULT)) + if (pNames[i] == FLAGNAME_DEFAULT) { nField |= FLAGVAL_DEFAULT; continue; } - if (pNames[i].equals(FLAGNAME_ENCRYPTION)) + if (pNames[i] == FLAGNAME_ENCRYPTION) { nField |= FLAGVAL_ENCRYPTION; continue; } - if (pNames[i].equals(FLAGNAME_EXPORT)) + if (pNames[i] == FLAGNAME_EXPORT) { nField |= FLAGVAL_EXPORT; continue; } - if (pNames[i].equals(FLAGNAME_IMPORT)) + if (pNames[i] == FLAGNAME_IMPORT) { nField |= FLAGVAL_IMPORT; continue; } - if (pNames[i].equals(FLAGNAME_INTERNAL)) + if (pNames[i] == FLAGNAME_INTERNAL) { nField |= FLAGVAL_INTERNAL; continue; } - if (pNames[i].equals(FLAGNAME_NOTINCHOOSER)) + if (pNames[i] == FLAGNAME_NOTINCHOOSER) { nField |= FLAGVAL_NOTINCHOOSER; continue; } - if (pNames[i].equals(FLAGNAME_NOTINFILEDIALOG)) + if (pNames[i] == FLAGNAME_NOTINFILEDIALOG) { nField |= FLAGVAL_NOTINFILEDIALOG; continue; } - if (pNames[i].equals(FLAGNAME_NOTINSTALLED)) + if (pNames[i] == FLAGNAME_NOTINSTALLED) { nField |= FLAGVAL_NOTINSTALLED; continue; } - if (pNames[i].equals(FLAGNAME_OWN)) + if (pNames[i] == FLAGNAME_OWN) { nField |= FLAGVAL_OWN; continue; } - if (pNames[i].equals(FLAGNAME_PACKED)) + if (pNames[i] == FLAGNAME_PACKED) { nField |= FLAGVAL_PACKED; continue; } - if (pNames[i].equals(FLAGNAME_PASSWORDTOMODIFY)) + if (pNames[i] == FLAGNAME_PASSWORDTOMODIFY) { nField |= FLAGVAL_PASSWORDTOMODIFY; continue; } - if (pNames[i].equals(FLAGNAME_PREFERRED)) + if (pNames[i] == FLAGNAME_PREFERRED) { nField |= FLAGVAL_PREFERRED; continue; } - if (pNames[i].equals(FLAGNAME_STARTPRESENTATION)) + if (pNames[i] == FLAGNAME_STARTPRESENTATION) { nField |= FLAGVAL_STARTPRESENTATION; continue; } - if (pNames[i].equals(FLAGNAME_READONLY)) + if (pNames[i] == FLAGNAME_READONLY) { nField |= FLAGVAL_READONLY; continue; } - if (pNames[i].equals(FLAGNAME_SUPPORTSSELECTION)) + if (pNames[i] == FLAGNAME_SUPPORTSSELECTION) { nField |= FLAGVAL_SUPPORTSSELECTION; continue; } - if (pNames[i].equals(FLAGNAME_TEMPLATE)) + if (pNames[i] == FLAGNAME_TEMPLATE) { nField |= FLAGVAL_TEMPLATE; continue; } - if (pNames[i].equals(FLAGNAME_TEMPLATEPATH)) + if (pNames[i] == FLAGNAME_TEMPLATEPATH) { nField |= FLAGVAL_TEMPLATEPATH; continue; } - if (pNames[i].equals(FLAGNAME_USESOPTIONS)) + if (pNames[i] == FLAGNAME_USESOPTIONS) { nField |= FLAGVAL_USESOPTIONS; continue; } - if (pNames[i].equals(FLAGNAME_COMBINED)) + if (pNames[i] == FLAGNAME_COMBINED) { nField |= FLAGVAL_COMBINED; continue; diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 9e68b6e0bc38..1f23168747a3 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -191,7 +191,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea // reject old deprecated queries ... if (sQuery.matchAsciiL("_filterquery_",13,0)) throw css::uno::RuntimeException( - _FILTER_CONFIG_FROM_ASCII_("Use of deprecated and now unsupported query!"), + "Use of deprecated and now unsupported query!", static_cast< css::container::XContainerQuery* >(this)); // convert "_query_xxx:..." to "getByDocService=xxx:..." diff --git a/filter/source/config/cache/macros.hxx b/filter/source/config/cache/macros.hxx index 8a2e5319453b..9534c33adb36 100644 --- a/filter/source/config/cache/macros.hxx +++ b/filter/source/config/cache/macros.hxx @@ -20,21 +20,12 @@ #ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_MACROS_HXX #define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_MACROS_HXX - - #include <rtl/ustring.hxx> -#ifdef _FILTER_CONFIG_FROM_ASCII_ - #error "who already defined such macro :-(" -#endif - #ifdef _FILTER_CONFIG_TO_ASCII_ #error "who already defined such macro :-(" #endif -#define _FILTER_CONFIG_FROM_ASCII_(ASCII_STRING) \ - OUString(ASCII_STRING) - #define _FILTER_CONFIG_TO_ASCII_(UNICODE_STRING) \ OUStringToOString(UNICODE_STRING, RTL_TEXTENCODING_UTF8).getStr() |