diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx index 183b4d945191..57c69adc7399 100644 --- a/filter/source/config/cache/cacheitem.cxx +++ b/filter/source/config/cache/cacheitem.cxx @@ -123,7 +123,7 @@ bool isSubSet(const css::uno::Any& aSubSet, if (!aT1.equals(aT2)) { - _FILTER_CONFIG_LOG_("isSubSet() ... types of any values are different => return FALSE\n") + FILTER_CONFIG_LOG_("isSubSet() ... types of any values are different => return FALSE\n") return false; } @@ -143,7 +143,7 @@ bool isSubSet(const css::uno::Any& aSubSet, case css::uno::TypeClass_DOUBLE : { bool bIs = (aSubSet == aSet); - _FILTER_CONFIG_LOG_1_("isSubSet() ... check for atomic types => return %s\n", bIs ? "TRUE" : "FALSE") + FILTER_CONFIG_LOG_1_("isSubSet() ... check for atomic types => return %s\n", bIs ? "TRUE" : "FALSE") return bIs; } @@ -159,7 +159,7 @@ bool isSubSet(const css::uno::Any& aSubSet, ) { bool bIs = (v1.equals(v2)); - _FILTER_CONFIG_LOG_1_("isSubSet() ... check for string types => return %s\n", bIs ? "TRUE" : "FALSE") + FILTER_CONFIG_LOG_1_("isSubSet() ... check for string types => return %s\n", bIs ? "TRUE" : "FALSE") return bIs; } } @@ -177,7 +177,7 @@ bool isSubSet(const css::uno::Any& aSubSet, ) { bool bIs = (isSubSet(v1, v2)); - _FILTER_CONFIG_LOG_1_("isSubSet() ... check for packed any types => return %s\n", bIs ? "TRUE" : "FALSE") + FILTER_CONFIG_LOG_1_("isSubSet() ... check for packed any types => return %s\n", bIs ? "TRUE" : "FALSE") return bIs; } } @@ -198,7 +198,7 @@ bool isSubSet(const css::uno::Any& aSubSet, (p1.Name.equals(p2.Name) ) && (isSubSet(p1.Value, p2.Value)) ); - _FILTER_CONFIG_LOG_1_("isSubSet() ... check for structured types [PropertyValue] => return %s\n", bIs ? "TRUE" : "FALSE") + FILTER_CONFIG_LOG_1_("isSubSet() ... check for structured types [PropertyValue] => return %s\n", bIs ? "TRUE" : "FALSE") return bIs; } @@ -214,7 +214,7 @@ bool isSubSet(const css::uno::Any& aSubSet, (n1.Name.equals(n2.Name) ) && (isSubSet(n1.Value, n2.Value)) ); - _FILTER_CONFIG_LOG_1_("isSubSet() ... check for structured types [NamedValue] => return %s\n", bIs ? "TRUE" : "FALSE") + FILTER_CONFIG_LOG_1_("isSubSet() ... check for structured types [NamedValue] => return %s\n", bIs ? "TRUE" : "FALSE") return bIs; } } @@ -240,12 +240,12 @@ bool isSubSet(const css::uno::Any& aSubSet, { if (::std::find(stl_s2.begin(), stl_s2.end(), *it1) == stl_s2.end()) { - _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [OUString] ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(*it1)) + FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [OUString] ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(*it1)) return false; } - _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [OUString] ... found \"%s\" => continue loop\n", _FILTER_CONFIG_TO_ASCII_(*it1)) + FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [OUString] ... found \"%s\" => continue loop\n", _FILTER_CONFIG_TO_ASCII_(*it1)) } - _FILTER_CONFIG_LOG_("isSubSet() ... check for list types [OUString] => return TRUE\n") + FILTER_CONFIG_LOG_("isSubSet() ... check for list types [OUString] => return TRUE\n") return true; } @@ -267,17 +267,17 @@ bool isSubSet(const css::uno::Any& aSubSet, ::comphelper::SequenceAsHashMap::const_iterator it2 = stl_p2.find(it1->first); if (it2 == stl_p2.end()) { - _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [PropertyValue] ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first)) + FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [PropertyValue] ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first)) return false; } if (!isSubSet(it1->second, it2->second)) { - _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [PropertyValue] ... found \"%s\" but has different value => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first)) + FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [PropertyValue] ... found \"%s\" but has different value => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first)) return false; } - _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [PropertyValue] ... found \"%s\" with right value => continue loop\n", _FILTER_CONFIG_TO_ASCII_(it1->first)) + FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [PropertyValue] ... found \"%s\" with right value => continue loop\n", _FILTER_CONFIG_TO_ASCII_(it1->first)) } - _FILTER_CONFIG_LOG_("isSubSet() ... check for list types [PropertyValue] => return TRUE\n") + FILTER_CONFIG_LOG_("isSubSet() ... check for list types [PropertyValue] => return TRUE\n") return true; } @@ -299,17 +299,17 @@ bool isSubSet(const css::uno::Any& aSubSet, ::comphelper::SequenceAsHashMap::const_iterator it2 = stl_n2.find(it1->first); if (it2 == stl_n2.end()) { - _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [NamedValue] ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first)) + FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [NamedValue] ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first)) return false; } if (!isSubSet(it1->second, it2->second)) { - _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [NamedValue] ... found \"%s\" but has different value => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first)) + FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [NamedValue] ... found \"%s\" but has different value => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first)) return false; } - _FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [NamedValue] ... found \"%s\" with right value => continue loop\n", _FILTER_CONFIG_TO_ASCII_(it1->first)) + FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [NamedValue] ... found \"%s\" with right value => continue loop\n", _FILTER_CONFIG_TO_ASCII_(it1->first)) } - _FILTER_CONFIG_LOG_("isSubSet() ... check for list types [NamedValue] => return TRUE\n") + FILTER_CONFIG_LOG_("isSubSet() ... check for list types [NamedValue] => return TRUE\n") return true; } } @@ -332,14 +332,14 @@ bool CacheItem::haveProps(const CacheItem& lProps) const const_iterator pItThis = this->find(pIt->first); if (pItThis == this->end()) { - _FILTER_CONFIG_LOG_1_("CacheItem::haveProps() ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(pIt->first)) + FILTER_CONFIG_LOG_1_("CacheItem::haveProps() ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(pIt->first)) return false; } // ii) one item does not have the right value => return false if (!isSubSet(pIt->second, pItThis->second)) { - _FILTER_CONFIG_LOG_1_("CacheItem::haveProps() ... item \"%s\" has different value => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(pIt->first)) + FILTER_CONFIG_LOG_1_("CacheItem::haveProps() ... item \"%s\" has different value => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(pIt->first)) return false; } } @@ -347,7 +347,7 @@ bool CacheItem::haveProps(const CacheItem& lProps) const // this method was not breaked before => // the given property set seems to match with our // own properties in its minimum => return TRUE - _FILTER_CONFIG_LOG_("CacheItem::haveProps() ... => return TRUE\n") + FILTER_CONFIG_LOG_("CacheItem::haveProps() ... => return TRUE\n") return true; } @@ -365,7 +365,7 @@ bool CacheItem::dontHaveProps(const CacheItem& lProps) const const_iterator pItThis = this->find(pIt->first); if (pItThis == this->end()) { - _FILTER_CONFIG_LOG_1_("CacheItem::dontHaveProps() ... not found \"%s\" => continue loop!\n", _FILTER_CONFIG_TO_ASCII_(pIt->first)) + FILTER_CONFIG_LOG_1_("CacheItem::dontHaveProps() ... not found \"%s\" => continue loop!\n", _FILTER_CONFIG_TO_ASCII_(pIt->first)) continue; } @@ -374,7 +374,7 @@ bool CacheItem::dontHaveProps(const CacheItem& lProps) const // But we checked for "don't have it" here. if (isSubSet(pIt->second, pItThis->second)) { - _FILTER_CONFIG_LOG_1_("CacheItem::dontHaveProps() ... item \"%s\" has same value => return FALSE!\n", _FILTER_CONFIG_TO_ASCII_(pIt->first)) + FILTER_CONFIG_LOG_1_("CacheItem::dontHaveProps() ... item \"%s\" has same value => return FALSE!\n", _FILTER_CONFIG_TO_ASCII_(pIt->first)) return false; } } @@ -382,7 +382,7 @@ bool CacheItem::dontHaveProps(const CacheItem& lProps) const // this method was not breaked before => // That means: this item has no matching property // of the given set. It "don't have" it ... => return true. - _FILTER_CONFIG_LOG_("CacheItem::dontHaveProps() ... => return TRUE\n") + FILTER_CONFIG_LOG_("CacheItem::dontHaveProps() ... => return TRUE\n") return true; } diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index 1afda54d13b1..fd4d9e0b26e1 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -68,7 +68,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea OUString sRealHandler = sHandler; - #ifdef _FILTER_CONFIG_MIGRATION_Q_ + #ifdef FILTER_CONFIG_MIGRATION_Q_ /* -> TODO - HACK check if the given handler name really exists ... @@ -80,7 +80,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea if (!cache.hasItem(FilterCache::E_CONTENTHANDLER, sHandler) && cache.hasItem(FilterCache::E_TYPE, sHandler)) { - _FILTER_CONFIG_LOG_("ContentHandlerFactory::createInstanceWithArguments() ... simulate old type search functionality!\n"); + FILTER_CONFIG_LOG_("ContentHandlerFactory::createInstanceWithArguments() ... simulate old type search functionality!\n"); css::uno::Sequence< OUString > lTypes { sHandler }; @@ -102,7 +102,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea /* <- HACK */ - #endif // _FILTER_CONFIG_MIGRATION_Q_ + #endif // FILTER_CONFIG_MIGRATION_Q_ // search handler on cache CacheItem aHandler = cache.getItem(FilterCache::E_CONTENTHANDLER, sRealHandler); diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index ac3b91fe10d6..7a6323eff56e 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -222,7 +222,7 @@ void FilterCache::load(EFillState eRequired) impl_getDirectCFGValue(CFGDIRECTKEY_OFFICELOCALE) >>= m_sActLocale; if (m_sActLocale.isEmpty()) { - _FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify office locale => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_OFFICELOCALE)); + FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify office locale => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_OFFICELOCALE)); m_sActLocale = DEFAULT_OFFICELOCALE; } @@ -270,8 +270,8 @@ OUStringList FilterCache::getMatchingItemsByProps( EItemType eType , pIt != rList.end() ; ++pIt ) { - _FILTER_CONFIG_LOG_1_("getMatchingProps for \"%s\" ...\n", - _FILTER_CONFIG_TO_ASCII_(pIt->first)) + FILTER_CONFIG_LOG_1_("getMatchingProps for \"%s\" ...\n", + FILTER_CONFIG_TO_ASCII_(pIt->first)) if ( (pIt->second.haveProps(lIProps) ) && (pIt->second.dontHaveProps(lEProps)) @@ -1560,7 +1560,7 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe OUString sMsg("Fallback scenario for filter or type '" + sName + "' and locale '" + sActLocale + "' failed. Please check your filter configuration."); - OSL_FAIL(_FILTER_CONFIG_TO_ASCII_(sMsg)); + OSL_FAIL(FILTER_CONFIG_TO_ASCII_(sMsg)); #endif return; } @@ -1766,7 +1766,7 @@ CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType if (bItemInConfig) { (*pList)[sItem] = impl_loadItem(xSet, eType, sItem, E_READ_ALL); - _FILTER_CONFIG_LOG_2_("impl_loadItemOnDemand(%d, \"%s\") ... OK", (int)eType, _FILTER_CONFIG_TO_ASCII_(sItem).getStr()) + FILTER_CONFIG_LOG_2_("impl_loadItemOnDemand(%d, \"%s\") ... OK", (int)eType, _FILTER_CONFIG_TO_ASCII_(sItem).getStr()) } else { @@ -2081,7 +2081,7 @@ void FilterCache::impl_interpretDataVal4Filter(const OUString& sValue, if (nOrder > 0) { SAL_WARN( "filter.config", "FilterCache::impl_interpretDataVal4Filter()\nCan not move Order value from filter to type on demand!"); - _FILTER_CONFIG_LOG_2_("impl_interpretDataVal4Filter(%d, \"%s\") ... OK", (int)eType, _FILTER_CONFIG_TO_ASCII_(rItem).getStr()) + FILTER_CONFIG_LOG_2_("impl_interpretDataVal4Filter(%d, \"%s\") ... OK", (int)eType, _FILTER_CONFIG_TO_ASCII_(rItem).getStr()) } } break; diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 4381264b37bf..079bd648b5b3 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -84,7 +84,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan OUString sRealFilter = sFilter; - #ifdef _FILTER_CONFIG_MIGRATION_Q_ + #ifdef FILTER_CONFIG_MIGRATION_Q_ /* -> TODO - HACK check if the given filter name really exist ... @@ -97,7 +97,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan if (!cache.hasItem(FilterCache::E_FILTER, sFilter) && cache.hasItem(FilterCache::E_TYPE, sFilter)) { OSL_FAIL("Who use this deprecated functionality?"); - _FILTER_CONFIG_LOG_("FilterFactory::createInstanceWithArguments() ... simulate old type search functionality!\n"); + FILTER_CONFIG_LOG_("FilterFactory::createInstanceWithArguments() ... simulate old type search functionality!\n"); css::uno::Sequence< css::beans::NamedValue > lQuery { { PROPNAME_TYPE, css::uno::makeAny(sFilter) } }; @@ -117,7 +117,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan /* <- HACK */ - #endif // _FILTER_CONFIG_MIGRATION_Q_ + #endif // FILTER_CONFIG_MIGRATION_Q_ // search filter on cache CacheItem aFilter = cache.getItem(FilterCache::E_FILTER, sRealFilter); diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index 0baf60160f9d..09d545a366d2 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -65,7 +65,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI OUString sRealLoader = sLoader; - #ifdef _FILTER_CONFIG_MIGRATION_Q_ + #ifdef FILTER_CONFIG_MIGRATION_Q_ /* -> TODO - HACK check if the given loader name really exist ... @@ -77,7 +77,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI if (!cache.hasItem(FilterCache::E_FRAMELOADER, sLoader) && cache.hasItem(FilterCache::E_TYPE, sLoader)) { - _FILTER_CONFIG_LOG_("FrameLoaderFactory::createInstanceWithArguments() ... simulate old type search functionality!\n"); + FILTER_CONFIG_LOG_("FrameLoaderFactory::createInstanceWithArguments() ... simulate old type search functionality!\n"); css::uno::Sequence< OUString > lTypes { sLoader }; @@ -99,7 +99,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI /* <- HACK */ - #endif // _FILTER_CONFIG_MIGRATION_Q_ + #endif // FILTER_CONFIG_MIGRATION_Q_ // search loader on cache CacheItem aLoader = cache.getItem(m_eType, sRealLoader); diff --git a/filter/source/config/cache/macros.hxx b/filter/source/config/cache/macros.hxx index 9534c33adb36..5450f502375a 100644 --- a/filter/source/config/cache/macros.hxx +++ b/filter/source/config/cache/macros.hxx @@ -22,16 +22,16 @@ #include -#ifdef _FILTER_CONFIG_TO_ASCII_ +#ifdef FILTER_CONFIG_TO_ASCII_ #error "who already defined such macro :-(" #endif -#define _FILTER_CONFIG_TO_ASCII_(UNICODE_STRING) \ +#define FILTER_CONFIG_TO_ASCII_(UNICODE_STRING) \ OUStringToOString(UNICODE_STRING, RTL_TEXTENCODING_UTF8).getStr() -#define _FILTER_CONFIG_LOG_(TEXT) -#define _FILTER_CONFIG_LOG_1_(FORMAT, ARG1) -#define _FILTER_CONFIG_LOG_2_(FORMAT, ARG1, ARG2) +#define FILTER_CONFIG_LOG_(TEXT) +#define FILTER_CONFIG_LOG_1_(FORMAT, ARG1) +#define FILTER_CONFIG_LOG_2_(FORMAT, ARG1, ARG2) #endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_MACROS_HXX diff --git a/filter/source/config/cache/versions.hxx b/filter/source/config/cache/versions.hxx index d6728330657a..6c3fe13ba890 100644 --- a/filter/source/config/cache/versions.hxx +++ b/filter/source/config/cache/versions.hxx @@ -21,7 +21,7 @@ #define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_VERSIONS_HXX -#define _FILTER_CONFIG_MIGRATION_Q_ // useful for migration time, to support some old functionality temp. :-) +#define FILTER_CONFIG_MIGRATION_Q_ // useful for migration time, to support some old functionality temp. :-) #endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_VERSIONS_HXX