remove run-time replacement of %WRITERCOMPATIBILITYVERSIONOOO11

Instead hard-code OpenOffice.org 1.1 as the value, since StarOffice and
StarSuite are irrelevant.

Change-Id: I9ab3d1cf38cf64cd4e440b3ae43158f748ead7d2

7 files changed, 5 insertions, 31 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 2e3ee0e20efb..267d60afef4b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -472,8 +472,6 @@ namespace
         : public rtl::Static< OUString, XMLFileFormatName > {};
     struct XMLFileFormatVersion
         : public rtl::Static< OUString, XMLFileFormatVersion > {};
-    struct WriterCompatibilityVersionOOo11
-        : public rtl::Static< OUString, WriterCompatibilityVersionOOo11 > {};
 }
 
 OUString ReplaceStringHookProc( const OUString& rStr )
@@ -528,19 +526,6 @@ OUString ReplaceStringHookProc( const OUString& rStr )
         sRet = sRet.replaceAll( "%OOOVENDOR", sOOOVendor );
     }
 
-    if ( sRet.indexOf( "%WRITERCOMPATIBILITYVERSIONOOO11" ) != -1 )
-    {
-        OUString sWriterCompatibilityVersionOOo11 = WriterCompatibilityVersionOOo11::get();
-        if ( sWriterCompatibilityVersionOOo11.isEmpty() )
-        {
-            sWriterCompatibilityVersionOOo11 =
-                utl::ConfigManager::getWriterCompatibilityVersionOOo_1_1();
-        }
-
-        sRet = sRet.replaceAll( "%WRITERCOMPATIBILITYVERSIONOOO11",
-                                        sWriterCompatibilityVersionOOo11 );
-    }
-
     return sRet;
 }
 
diff --git a/include/unotools/configmgr.hxx b/include/unotools/configmgr.hxx
index f5964a505cf4..b8bc42d675cf 100644
--- a/include/unotools/configmgr.hxx
+++ b/include/unotools/configmgr.hxx
@@ -58,8 +58,6 @@ public:
 
     static OUString getVendor();
 
-    static OUString getWriterCompatibilityVersionOOo_1_1();
-
     static void storeConfigItems();
 
     SAL_DLLPRIVATE static ConfigManager & getConfigManager();
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index b526ec2c84cd..39acd6f036cc 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -57,7 +57,6 @@ LibreOffice
             UPDATEURL http://update.libreoffice.org/check.php
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
             ADDSYSTEMINTEGRATION 1
-            WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
             PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
             PACKAGEREVISION {buildid}
             LICENSENAME LGPL
@@ -109,7 +108,6 @@ LibreOffice_Dev
             UPDATEURL http://update.libreoffice.org/check.php
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
             ADDSYSTEMINTEGRATION 1
-            WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
             PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
             PACKAGEREVISION {buildid}
             LICENSENAME LGPL
diff --git a/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu b/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu
index 6ba5066db896..a1c5820abe4d 100644
--- a/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu
@@ -20,7 +20,7 @@
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:install="http://openoffice.org/2004/installation" oor:name="Compatibility" oor:package="org.openoffice.Office">
   <node oor:name="WriterCompatibilityVersion">
     <prop oor:name="OOo11" oor:type="xs:string">
-      <value>${WRITERCOMPATIBILITYVERSIONOOO11}</value>
+      <value>OpenOffice.org 1.1</value>
     </prop>
   </node>
   <node oor:name="AllFileFormats">
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index b353f7a928eb..d60bd0ddc60a 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -558,7 +558,6 @@ postprocess_main_SED := \
 	-e 's,$${STARTCENTER_INFO_URL},http://www.libreoffice.org/,g' \
 	-e 's,$${STARTCENTER_HIDE_EXTERNAL_LINKS},0,g' \
 	-e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g' \
-	-e 's,$${WRITERCOMPATIBILITYVERSIONOOO11},OpenOffice.org 1.1,g' \
 
 $(call gb_CustomTarget_get_workdir,postprocess/registry)/main.xcd : \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui b/sw/uiconfig/swriter/ui/optcompatpage.ui
index d0c28b941ce0..77fc5467040f 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -56,12 +56,12 @@
                       <item translatable="yes">Use printer metrics for document formatting</item>
                       <item translatable="yes">Add spacing between paragraphs and tables (in current document)</item>
                       <item translatable="yes">Add paragraph and table spacing at tops of pages (in current document)</item>
-                      <item translatable="yes">Use %WRITERCOMPATIBILITYVERSIONOOO11 tabstop formatting</item>
+                      <item translatable="yes">Use OpenOffice.org 1.1 tabstop formatting</item>
                       <item translatable="yes">Do not add leading (extra space) between lines of text</item>
-                      <item translatable="yes">Use %WRITERCOMPATIBILITYVERSIONOOO11 line spacing</item>
+                      <item translatable="yes">Use OpenOffice.org 1.1 line spacing</item>
                       <item translatable="yes">Add paragraph and table spacing at bottom of table cells</item>
-                      <item translatable="yes">Use %WRITERCOMPATIBILITYVERSIONOOO11 object positioning</item>
-                      <item translatable="yes">Use %WRITERCOMPATIBILITYVERSIONOOO11 text wrapping around objects</item>
+                      <item translatable="yes">Use OpenOffice.org 1.1 object positioning</item>
+                      <item translatable="yes">Use OpenOffice.org 1.1 text wrapping around objects</item>
                       <item translatable="yes">Consider wrapping style when positioning objects</item>
                       <item translatable="yes">Expand word space on lines with manual line breaks in justified paragraphs</item>
                       <item translatable="yes">&lt;User settings&gt;</item>
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index cac6b8babe3d..bd50f9666129 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -147,12 +147,6 @@ OUString utl::ConfigManager::getVendor() {
         OUString("Product/ooVendor"));
 }
 
-OUString utl::ConfigManager::getWriterCompatibilityVersionOOo_1_1() {
-    return getConfigurationString(
-        OUString("/org.openoffice.Office.Compatibility"),
-        OUString("WriterCompatibilityVersion/OOo11"));
-}
-
 void utl::ConfigManager::storeConfigItems() {
     getConfigManager().doStoreConfigItems();
 }