Avoid reserved identifiers

Change-Id: I175de0aa53559fb092644d18e05e2d890fe05fca

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);

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;

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);

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);

filter/source/config/cache/macros.hxx

@@ -22,16 +22,16 @@
 
 #include <rtl/ustring.hxx>
 
-#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
 

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