filter config: stop replacing %productname% / %formatversion%

... at runtime.  Hard-code these to OpenOffice.org 1.0, since nobody
will ever build a "StarOffice" or "StarSuite" any more.

Change-Id: I1785dea8dfd15a9384f9fecd92935a6043d995bc

24 files changed, 22 insertions, 75 deletions

diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx
index 6deb60f9db20..2061ae200dc0 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -94,8 +94,6 @@
 #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_FORMATNAME            _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/Product/ooXMLFileFormatName"             )
-#define  CFGDIRECTKEY_FORMATVERSION         _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/Product/ooXMLFileFormatVersion"          )
 #define  CFGDIRECTKEY_PRODUCTNAME           _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/Product/ooName"                          )
 
 // Note that these flag bits have parallel names in
@@ -170,8 +168,6 @@
 /** @short  some default values.
  */
 #define  DEFAULT_OFFICELOCALE       _FILTER_CONFIG_FROM_ASCII_("en-US")
-#define  DEFAULT_FORMATNAME         _FILTER_CONFIG_FROM_ASCII_("OpenOffice.org")
-#define  DEFAULT_FORMATVERSION      _FILTER_CONFIG_FROM_ASCII_("1.0")
 
 /** @short  used for the queries of the FilterFactory service.
  */
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 0c6bd3789077..adbb01c57efd 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -95,8 +95,6 @@ FilterCache* FilterCache::clone() const
     pClone->m_lURLPattern2Types          = m_lURLPattern2Types;
 
     pClone->m_sActLocale                 = m_sActLocale;
-    pClone->m_sFormatName                = m_sFormatName;
-    pClone->m_sFormatVersion             = m_sFormatVersion;
 
     pClone->m_eFillState                 = m_eFillState;
 
@@ -152,8 +150,6 @@ void FilterCache::takeOver(const FilterCache& rClone)
     m_lChangedContentHandlers.clear();
 
     m_sActLocale     = rClone.m_sActLocale;
-    m_sFormatName    = rClone.m_sFormatName;
-    m_sFormatVersion = rClone.m_sFormatVersion;
 
     m_eFillState     = rClone.m_eFillState;
 
@@ -209,23 +205,6 @@ void FilterCache::load(EFillState eRequired,
             m_sActLocale = DEFAULT_OFFICELOCALE;
         }
 
-        impl_getDirectCFGValue(CFGDIRECTKEY_FORMATNAME) >>= m_sFormatName;
-        if (m_sFormatName.isEmpty())
-            impl_getDirectCFGValue(CFGDIRECTKEY_PRODUCTNAME) >>= m_sFormatName;
-
-        if (m_sFormatName.isEmpty())
-        {
-            _FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify format name => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_FORMATNAME));
-            m_sFormatName = DEFAULT_FORMATNAME;
-        }
-
-        impl_getDirectCFGValue(CFGDIRECTKEY_FORMATVERSION) >>= m_sFormatVersion;
-        if (m_sFormatVersion.isEmpty())
-        {
-            _FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify format version => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_FORMATVERSION));
-            m_sFormatVersion = DEFAULT_FORMATVERSION;
-        }
-
         // Support the old configuration support. Read it only one times during office runtime!
         impl_readOldFormat();
 
@@ -1580,8 +1559,6 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
 
     // SAFE -> ----------------------------------
     ::osl::ResettableMutexGuard aLock(m_aLock);
-    OUString sFormatName    = m_sFormatName   ;
-    OUString sFormatVersion = m_sFormatVersion;
     OUString sActLocale     = m_sActLocale    ;
     aLock.clear();
     // <- SAFE ----------------------------------
@@ -1595,9 +1572,6 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
           ::comphelper::SequenceAsVector< OUString >::const_iterator pLocale ;
           ::comphelper::SequenceAsHashMap                                   lUINames;
 
-    const char FORMATNAME_VAR[] = "%productname%";
-    const char FORMATVERSION_VAR[] = "%formatversion%";
-    // patch %PRODUCTNAME and %FORMATNAME
     for (  pLocale  = lLocales.begin();
            pLocale != lLocales.end()  ;
          ++pLocale                    )
@@ -1607,21 +1581,6 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
         OUString sValue;
         xUIName->getByName(sLocale) >>= sValue;
 
-        // replace %productname%
-        sal_Int32 nIndex = sValue.indexOf(FORMATNAME_VAR);
-        while(nIndex != -1)
-        {
-            sValue = sValue.replaceAt(nIndex, RTL_CONSTASCII_LENGTH(FORMATNAME_VAR), sFormatName);
-            nIndex = sValue.indexOf(FORMATNAME_VAR, nIndex);
-        }
-        // replace %formatversion%
-        nIndex = sValue.indexOf(FORMATVERSION_VAR);
-        while(nIndex != -1)
-        {
-            sValue = sValue.replaceAt(nIndex, RTL_CONSTASCII_LENGTH(FORMATVERSION_VAR), sFormatVersion);
-            nIndex = sValue.indexOf(FORMATVERSION_VAR, nIndex);
-        }
-
         lUINames[sLocale] <<= sValue;
     }
 
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index 92defa6d4433..e1f2a8c77f81 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -223,14 +223,6 @@ class FilterCache : public BaseLock
         OUString m_sActLocale;
 
         //---------------------------------------
-        /** TODO */
-        OUString m_sFormatName;
-
-        //---------------------------------------
-        /** TODO */
-        OUString m_sFormatVersion;
-
-        //---------------------------------------
         /** @short  contains status, which cache items/properties
                     was already loaded from the underlying configuration.
 
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
index a5868a305e20..722ea2a963de 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="StarOffice XML (Calc)">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Spreadsheet</value>
+            <value xml:lang="en-US">OpenOffice.org 1.0 Spreadsheet</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
index 534b9633491f..ebc2d3557102 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="StarOffice XML (Chart)">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Chart</value>
+            <value xml:lang="en-US">OpenOffice.org 1.0 Chart</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
index 43e0600aaeaf..063a4153b8e9 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="StarOffice XML (Draw)">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Drawing</value>
+            <value xml:lang="en-US">OpenOffice.org 1.0 Drawing</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
index 7747e57464ca..351d5addbb9b 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="StarOffice XML (Impress)">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Presentation</value>
+            <value xml:lang="en-US">OpenOffice.org 1.0 Presentation</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
index 48c3aef2438d..e93ac4d37c47 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="StarOffice XML (Math)">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Formula</value>
+            <value xml:lang="en-US">OpenOffice.org 1.0 Formula</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
index 581624e24a94..40f1485c96d1 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="StarOffice XML (Writer)">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Text Document</value>
+            <value xml:lang="en-US">OpenOffice.org 1.0 Text Document</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
index 84b7b1e92561..2a64e72befab 100644
--- a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
+++ b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="calc_StarOffice_XML_Calc_Template">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Spreadsheet Template</value>
+            <value xml:lang="en-US">OpenOffice.org 1.0 Spreadsheet Template</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
index 0106bf157988..644e10667142 100644
--- a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
+++ b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="draw_StarOffice_XML_Draw_Template">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Drawing Template</value>
+            <value xml:lang="en-US">OpenOffice.org 1.0 Drawing Template</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
index 40214fbd1b95..9f2a41ada9de 100644
--- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
+++ b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="impress_StarOffice_XML_Draw">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Drawing (Impress)</value>
+            <value xml:lang="en-US">OpenOffice.org 1.0 Drawing (Impress)</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
index 4114bcad32c9..54e73b648d5d 100644
--- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
+++ b/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="impress_StarOffice_XML_Impress_Template">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Presentation Template</value>
+            <value xml:lang="en-US">OpenOffice.org 1.0 Presentation Template</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu b/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
index 73dbe7ccdc68..6420df815134 100644
--- a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
+++ b/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="writer_StarOffice_XML_Writer_Template">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Text Document Template</value>
+            <value xml:lang="en-US">OpenOffice.org 1.0 Text Document Template</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
index 1327f32b69d8..592f27b86d98 100644
--- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
+++ b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="writer_globaldocument_StarOffice_XML_Writer_GlobalDocument">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Master Document</value>
+            <value xml:lang="en-US">OpenOffice.org 1.0 Master Document</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
index 680cb5c984a2..904c259556c7 100644
--- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
+++ b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="writer_globaldocument_StarOffice_XML_Writer">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Text Document</value>
+            <value xml:lang="en-US">OpenOffice.org 1.0 Text Document</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
index 95406aebb6a0..1965b431c478 100644
--- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
+++ b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="writer_web_StarOffice_XML_Writer_Web_Template">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% HTML Template</value>
+            <value xml:lang="en-US">OpenOffice.org 1.0 HTML Template</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
index 7a2d642a20e1..31d58339a098 100644
--- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
+++ b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="writer_web_StarOffice_XML_Writer">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% %formatversion% Text Document (Writer/Web)</value>
+            <value xml:lang="en-US">OpenOffice.org 1.0 Text Document (Writer/Web)</value>
         </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu b/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu
index 299b59b72a57..2dda07cd6ffb 100644
--- a/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu
+++ b/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu
@@ -17,6 +17,6 @@
 -->
     <node oor:name="writerweb8_writer">
         <prop oor:name="UIName">
-            <value xml:lang="en-US">%productname% Text (Writer/Web)</value>
-                    </prop>
+            <value xml:lang="en-US">Text (Writer/Web)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu b/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
index 4c454df58827..1a34933e573a 100644
--- a/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
+++ b/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
@@ -23,7 +23,7 @@
         <prop oor:name="Preferred"><value>false</value></prop>
         <prop oor:name="PreferredFilter"><value>StarOffice XML (Draw)</value></prop>
         <prop oor:name="UIName">
-            <value>%productname% %formatversion% Zeichnung</value>
+            <value>OpenOffice.org 1.0 Drawing</value>
         </prop>
         <prop oor:name="ClipboardFormat"><value>Draw 6.0</value></prop>
     </node>
diff --git a/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu b/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
index 8376bb452eeb..4e39cd8d2e72 100644
--- a/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
+++ b/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
@@ -23,7 +23,7 @@
         <prop oor:name="Preferred"><value>false</value></prop>
         <prop oor:name="PreferredFilter"><value>StarOffice XML (Impress)</value></prop>
         <prop oor:name="UIName">
-            <value>%productname% %formatversion% Präsentation</value>
+            <value>OpenOffice.org 1.0 Presentation</value>
         </prop>
         <prop oor:name="ClipboardFormat"><value>Impress 6.0</value></prop>
     </node>
diff --git a/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu b/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
index 2373067b0a16..051c381aa92f 100644
--- a/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
+++ b/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
@@ -23,7 +23,7 @@
         <prop oor:name="Preferred"><value>false</value></prop>
         <prop oor:name="PreferredFilter"><value>StarOffice XML (Math)</value></prop>
         <prop oor:name="UIName">
-            <value>%productname% %formatversion% Formel</value>
+            <value>OpenOffice.org 1.0 Formula</value>
         </prop>
         <prop oor:name="ClipboardFormat"><value>Math 6.0</value></prop>
     </node>
diff --git a/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu b/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
index fe626d38fa5e..34db4e33e7b8 100644
--- a/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
+++ b/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
@@ -23,7 +23,7 @@
         <prop oor:name="Preferred"><value>false</value></prop>
         <prop oor:name="PreferredFilter"><value>StarOffice XML (Writer)</value></prop>
         <prop oor:name="UIName">
-            <value>%productname% %formatversion% Textdokument</value>
+            <value>OpenOffice.org 1.0 Text Document</value>
         </prop>
         <prop oor:name="ClipboardFormat"><value>Writer 6.0</value></prop>
     </node>
diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu
index 9c4032773775..973d2e1ff75c 100644
--- a/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu
+++ b/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu
@@ -59,7 +59,7 @@
         <value>com.sun.star.chart2.ChartDocument</value>
       </prop>
       <prop oor:name="UIName">
-        <value xml:lang="en-US">%productname% %formatversion% Report Chart</value>
+        <value xml:lang="en-US">OpenOffice.org 1.0 Report Chart</value>
       </prop>
     </node>
   </node>