[Libreoffice-commits] core.git: officecfg/registry

[Gabor Kelemen]

 officecfg/registry/data/org/openoffice/Setup.xcu   |    6 ------
 officecfg/registry/schema/org/openoffice/Setup.xcs |   18 ------------------
 2 files changed, 24 deletions(-)

New commits:
commit 45d1e227f910b6c3746b12fb2eebfac498c14ba5
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Wed Aug 16 15:55:27 2017 +0200

    Drop unused ooXMLFileFormat* config keys
    
    These are unused since 2013, see:
    https://cgit.freedesktop.org/libreoffice/core/commit/?id=041d2b88a473cc7ba9b68113f7642dd8417369e4
    https://cgit.freedesktop.org/libreoffice/core/commit/?id=abd3338486a515380d50c4ee5f4ab242fb5fd4bd
    
    Change-Id: I0265b476797f0be6703fbf710f0baf983c47d489
    Reviewed-on: https://gerrit.libreoffice.org/41216
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 9ab52430ce2b..68dcd1771835 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -37,12 +37,6 @@
     <prop oor:name="ooSetupExtension">
       <value>${PRODUCTEXTENSION}</value>
     </prop>
-    <prop oor:name="ooXMLFileFormatVersion">
-      <value>1.0</value>
-    </prop>
-    <prop oor:name="ooXMLFileFormatName">
-      <value>OpenOffice.org</value>
-    </prop>
     <prop oor:name="ooOpenSourceContext">
       <value>1</value>
     </prop>
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
index 3eecf9728b4c..50126b84f25d 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -251,24 +251,6 @@
         <!-- JB: Empty default inserted into empty property node. Remove if NIL
              was intended -->
       </prop>
-      <prop oor:name="ooXMLFileFormatVersion" oor:type="xs:string" oor:nillable="false">
-        <info>
-          <desc>Specifies the version of the SO 6/7 or OOo 1.0 xml file
-          formats.</desc>
-        </info>
-        <value/>
-        <!-- JB: Empty default inserted into empty property node. Remove if NIL
-             was intended -->
-      </prop>
-      <prop oor:name="ooXMLFileFormatName" oor:type="xs:string" oor:nillable="false">
-        <info>
-          <desc>Specifies the name of the SO6/7 or OOo1.0 xml file
-          formats.</desc>
-        </info>
-        <value/>
-        <!-- JB: Empty default inserted into empty property node. Remove if NIL
-             was intended -->
-      </prop>
       <prop oor:name="ooSetupVersion" oor:type="xs:string" oor:nillable="false">
         <info>
           <desc>Specifies the version number of the product that appears on the