#i101955# adapted desktop and gconf platform backends to new interface (gconf still needs support for ENABLE_LOCKDOWN-only Setup/Office/Factories .xcu entries), more to come; regcomplazy consequently no longer needs to support [Data] sections

10 files changed, 263 insertions, 13 deletions

diff --git a/officecfg/registry/data/org/openoffice/Inet.xcu b/officecfg/registry/data/org/openoffice/Inet.xcu
index bb3fa8e1a618..07afec58085c 100644
--- a/officecfg/registry/data/org/openoffice/Inet.xcu
+++ b/officecfg/registry/data/org/openoffice/Inet.xcu
@@ -29,10 +29,72 @@
  *
  ************************************************************************ -->
 <!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
-<oor:component-data oor:name="Inet" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<oor:component-data oor:name="Inet" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <node oor:name="Settings">
+    <prop oor:name="ooInetNoProxy">
+      <value install:module="macosx" oor:external=
+          "com.sun.star.configuration.backend.MacOSXBackend ooInetNoProxy"/>
+      <value install:module="unixdesktop" oor:external=
+          "com.sun.star.configuration.backend.DesktopBackend ooInetNoProxy"/>
+      <value install:module="wnt" oor:external=
+          "com.sun.star.configuration.backend.WinInetBackend ooInetNoProxy"/>
+    </prop>
     <prop oor:name="ooInetProxyType">
       <value>1</value>
+      <value install:module="macosx" oor:external=
+          "com.sun.star.configuration.backend.MacOSXBackend ooInetProxyType"/>
+      <value install:module="unixdesktop" oor:external=
+          "com.sun.star.configuration.backend.DesktopBackend ooInetProxyType"/>
+      <value install:module="wnt" oor:external=
+          "com.sun.star.configuration.backend.WinInetBackend ooInetProxyType"/>
+    </prop>
+    <prop oor:name="ooInetFTPProxyName">
+      <value install:module="macosx" oor:external=
+         "com.sun.star.configuration.backend.MacOSXBackend ooInetFTPProxyName"/>
+      <value install:module="unixdesktop" oor:external=
+        "com.sun.star.configuration.backend.DesktopBackend ooInetFTPProxyName"/>
+      <value install:module="wnt" oor:external=
+        "com.sun.star.configuration.backend.WinInetBackend ooInetFTPProxyName"/>
+    </prop>
+    <prop oor:name="ooInetFTPProxyPort">
+      <value install:module="macosx" oor:external=
+         "com.sun.star.configuration.backend.MacOSXBackend ooInetFTPProxyPort"/>
+      <value install:module="unixdesktop" oor:external=
+        "com.sun.star.configuration.backend.DesktopBackend ooInetFTPProxyPort"/>
+      <value install:module="wnt" oor:external=
+        "com.sun.star.configuration.backend.WinInetBackend ooInetFTPProxyPort"/>
+    </prop>
+    <prop oor:name="ooInetHTTPProxyName">
+      <value install:module="macosx" oor:external=
+        "com.sun.star.configuration.backend.MacOSXBackend ooInetHTTPProxyName"/>
+      <value install:module="unixdesktop" oor:external=
+       "com.sun.star.configuration.backend.DesktopBackend ooInetHTTPProxyName"/>
+      <value install:module="wnt" oor:external=
+       "com.sun.star.configuration.backend.WinInetBackend ooInetHTTPProxyName"/>
+    </prop>
+    <prop oor:name="ooInetHTTPProxyPort">
+      <value install:module="macosx" oor:external=
+        "com.sun.star.configuration.backend.MacOSXBackend ooInetHTTPProxyPort"/>
+      <value install:module="unixdesktop" oor:external=
+       "com.sun.star.configuration.backend.DesktopBackend ooInetHTTPProxyPort"/>
+      <value install:module="wnt" oor:external=
+       "com.sun.star.configuration.backend.WinInetBackend ooInetHTTPProxyPort"/>
+    </prop>
+    <prop oor:name="ooInetHTTPSProxyName">
+      <value install:module="macosx" oor:external=
+       "com.sun.star.configuration.backend.MacOSXBackend ooInetHTTPSProxyName"/>
+      <value install:module="unixdesktop" oor:external=
+      "com.sun.star.configuration.backend.DesktopBackend ooInetHTTPSProxyName"/>
+      <value install:module="wnt" oor:external=
+      "com.sun.star.configuration.backend.WinInetBackend ooInetHTTPSProxyName"/>
+    </prop>
+    <prop oor:name="ooInetHTTPSProxyPort">
+      <value install:module="macosx" oor:external=
+       "com.sun.star.configuration.backend.MacOSXBackend ooInetHTTPSProxyPort"/>
+      <value install:module="unixdesktop" oor:external=
+      "com.sun.star.configuration.backend.DesktopBackend ooInetHTTPSProxyPort"/>
+      <value install:module="wnt" oor:external=
+      "com.sun.star.configuration.backend.WinInetBackend ooInetHTTPSProxyPort"/>
     </prop>
   </node>
   <node oor:name="DefaultSearchEngine" install:module="defaultsearchengine">
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index c9747dc9dea0..fcbb1601d05e 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -103,6 +103,27 @@
           <value xml:lang="zh-TW">13</value>
     </prop>
     </node>
+    <node oor:name="FontAntiAliasing" install:module="gconflockdown">
+      <prop oor:name="Enabled">
+        <value oor:external=
+     "com.sun.star.configuration.backend.GconfBackend FontAntiAliasingEnabled"/>
+      </prop>
+      <prop oor:name="MinPixelHeight">
+        <value oor:external=
+"com.sun.star.configuration.backend.GconfBackend FontAntiAliasingMinPixelHeight"
+/>
+      </prop>
+    </node>
+    <node oor:name="Menu" install:module="gconflockdown">
+      <prop oor:name="DontHideDisabledEntry">
+        <value oor:external=
+       "com.sun.star.configuration.backend.GconfBackend DontHideDisabledEntry"/>
+      </prop>
+      <prop oor:name="ShowIconsInMenues">
+        <value oor:external=
+           "com.sun.star.configuration.backend.GconfBackend ShowIconsInMenues"/>
+      </prop>
+    </node>
   </node>
   <node oor:name="Help">
     <node oor:name="StartCenter">
@@ -541,18 +562,32 @@
     </node>
   </node>
   <node oor:name="Misc">
-    <prop oor:name="UseSystemFileDialog"  install:module="UseOOoFileDialogs">
-      <value>false</value>
+    <prop oor:name="UseSystemFileDialog">
+      <value install:module="UseOOoFileDialogs">false</value>
+      <value install:module="gconflockdown" oor:external=
+         "com.sun.star.configuration.backend.GconfBackend UseSystemFileDialog"/>
     </prop>
     <prop oor:name="UseSystemPrintDialog"  install:module="macosx">
       <value>true</value>
     </prop>
+    <prop oor:name="SymbolSet" install:module="gconflockdown">
+      <value oor:external=
+          "com.sun.star.configuration.backend.GconfBackend SymbolSet"/>
+    </prop>
   </node>
   <node oor:name="Save">
     <node oor:name="Document">
       <prop oor:name="SaveBackwardCompatibleODF" oor:type="xs:boolean">
         <value>true</value>
       </prop>
+      <prop oor:name="CreateBackup" install:module="gconflockdown">
+        <value oor:external=
+            "com.sun.star.configuration.backend.GconfBackend CreateBackup"/>
+      </prop>
+      <prop oor:name="WarnAlienFormat" install:module="gconflockdown">
+        <value oor:external=
+            "com.sun.star.configuration.backend.GconfBackend WarnAlienFormat"/>
+      </prop>
     </node>
     <node oor:name="ODF">
       <prop oor:name="DefaultVersion" oor:type="xs:short">
@@ -565,6 +600,36 @@
       <prop oor:name="HyperlinksWithCtrlClick" oor:type="xs:boolean">
         <value>true</value>
       </prop>
+      <prop oor:name="MacroSecurityLevel" install:module="gconflockdown">
+        <value oor:external=
+          "com.sun.star.configuration.backend.GconfBackend MacroSecurityLevel"/>
+      </prop>
+      <prop oor:name="RecommendPasswordProtection"
+          install:module="gconflockdown">
+        <value oor:external=
+ "com.sun.star.configuration.backend.GconfBackend RecommendPasswordProtection"/>
+      </prop>
+      <prop oor:name="RemovePersonalInfoOnSaving"
+          install:module="gconflockdown">
+        <value oor:external=
+  "com.sun.star.configuration.backend.GconfBackend RemovePersonalInfoOnSaving"/>
+      </prop>
+      <prop oor:name="WarnCreatePDF" install:module="gconflockdown">
+        <value oor:external=
+            "com.sun.star.configuration.backend.GconfBackend WarnCreatePDF"/>
+      </prop>
+      <prop oor:name="WarnPrintDoc" install:module="gconflockdown">
+        <value oor:external=
+            "com.sun.star.configuration.backend.GconfBackend WarnPrintDoc"/>
+      </prop>
+      <prop oor:name="WarnSaveOrSendDoc" install:module="gconflockdown">
+        <value oor:external=
+           "com.sun.star.configuration.backend.GconfBackend WarnSaveOrSendDoc"/>
+      </prop>
+      <prop oor:name="WarnSignDoc" install:module="gconflockdown">
+        <value oor:external=
+            "com.sun.star.configuration.backend.GconfBackend WarnSignDoc"/>
+      </prop>
     </node>
   </node>
   <node oor:name="Path">
@@ -576,4 +641,60 @@
       </prop>
     </node>
   </node>
+  <node oor:name="ExternalMailer" install:module="unixdesktop">
+    <prop oor:name="Program">
+      <value oor:external=
+          "com.sun.star.configuration.backend.DesktopBackend ExternalMailer"/>
+    </prop>
+  </node>
+  <node oor:name="Font">
+    <node oor:name="SourceViewFont" install:module="unixdesktop">
+      <prop oor:name="FontName">
+        <value oor:external=
+        "com.sun.star.configuration.backend.DesktopBackend SourceViewFontName"/>
+      </prop>
+      <prop oor:name="FontHeight">
+        <value oor:external=
+      "com.sun.star.configuration.backend.DesktopBackend SourceViewFontHeight"/>
+      </prop>
+    </node>
+    <node oor:name="View" install:module="gconflockdown">
+      <prop oor:name="History">
+        <value oor:external=
+             "com.sun.star.configuration.backend.GconfBackend FontViewHistory"/>
+      </prop>
+      <prop oor:name="ShowFontBoxWYSIWYG">
+        <value oor:external=
+          "com.sun.star.configuration.backend.GconfBackend ShowFontBoxWYSIWYG"/>
+      </prop>
+    </node>
+  </node>
+  <node oor:name="Accessibility" install:module="gconflockdown">
+    <prop oor:name="IsSystemFont">
+      <value oor:external=
+   "com.sun.star.configuration.backend.GconfBackend AccessibilityIsSystemFont"/>
+    </prop>
+  </node>
+  <node oor:name="Print" install:module="gconflockdown">
+    <prop oor:name="PrintingModifiesDocument">
+      <value oor:external=
+    "com.sun.star.configuration.backend.GconfBackend PrintingModifiesDocument"/>
+    </prop>
+  </node>
+  <node oor:name="Undo" install:module="gconflockdown">
+    <prop oor:name="Steps">
+      <value oor:external=
+          "com.sun.star.configuration.backend.GconfBackend UndoSteps"/>
+    </prop>
+  </node>
+  <node oor:name="_3D_Engine" install:module="gconflockdown">
+    <prop oor:name="OpenGL">
+      <value oor:external=
+          "com.sun.star.configuration.backend.GconfBackend OpenGL"/>
+    </prop>
+    <prop oor:name="OpenGL_Faster">
+      <value oor:external=
+          "com.sun.star.configuration.backend.GconfBackend OpenGL_Faster"/>
+    </prop>
+  </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index b979f0f097c3..c16dfeef624d 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -226,6 +226,13 @@
             </prop>
         </node>
     </node>
-
+    <node oor:name="Variables">
+        <prop oor:name="Work">
+            <value install:module="macosx" oor:external=
+           "com.sun.star.configuration.backend.MacOSXBackend WorkPathVariable"/>
+            <value install:module="unixdesktop" oor:external=
+          "com.sun.star.configuration.backend.DesktopBackend WorkPathVariable"/>
+        </prop>
+    </node>
 </oor:component-data>
 
diff --git a/officecfg/registry/data/org/openoffice/Office/Recovery.xcu b/officecfg/registry/data/org/openoffice/Office/Recovery.xcu
new file mode 100644
index 000000000000..bd6aab12361b
--- /dev/null
+++ b/officecfg/registry/data/org/openoffice/Office/Recovery.xcu
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2009 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: code,v $
+*
+* $Revision: 1.4 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+**********************************************************************-->
+
+<oor:component-data xmlns:install="http://openoffice.org/2004/installation"
+    xmlns:oor="http://openoffice.org/2001/registry"
+    oor:package="org.openoffice.Office" oor:name="Recovery">
+  <node oor:name="AutoSave" install:module="gconflockdown">
+    <prop oor:name="Enabled">
+      <value oor:external=
+          "com.sun.star.configuration.backend.GconfBackend AutoSaveEnabled"/>
+    </prop>
+    <prop oor:name="TimeIntervall">
+      <value oor:external=
+       "com.sun.star.configuration.backend.GconfBackend AutoSaveTimeIntervall"/>
+    </prop>
+  </node>
+</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk
index 50b67954aeef..c27c5d7dfc8f 100644
--- a/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk
@@ -78,6 +78,8 @@ MODULEFILES= \
     Common-base.xcu   \
     Common-math.xcu   \
     Common-unx.xcu   \
+    Common-unixdesktop.xcu \
+    Common-gconflockdown.xcu \
     Common-macosx.xcu   \
     Common-wnt.xcu   \
     Common-UseOOoFileDialogs.xcu \
@@ -88,6 +90,7 @@ MODULEFILES= \
     Common-korea.xcu   \
     Paths-macosx.xcu    \
     Paths-unxwnt.xcu    \
+    Paths-unixdesktop.xcu \
     Writer-cjk.xcu \
     Writer-defaultfontarial.xcu \
     Writer-directcursor.xcu \
@@ -100,8 +103,8 @@ MODULEFILES= \
     Embedding-math.xcu   \
     Embedding-base.xcu   \
     Embedding-writer.xcu \
-    UI-brand.xcu
-
+    UI-brand.xcu \
+    Recovery-gconflockdown.xcu
 
 LOCALIZEDFILES= \
     Accelerators.xcu \
diff --git a/officecfg/registry/data/org/openoffice/System.xcu b/officecfg/registry/data/org/openoffice/System.xcu
index 53d8e4ead960..ef7c008d3830 100644
--- a/officecfg/registry/data/org/openoffice/System.xcu
+++ b/officecfg/registry/data/org/openoffice/System.xcu
@@ -28,7 +28,6 @@
 * for a copy of the LGPLv3 License.
 **********************************************************************-->
 
-<!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry"
     oor:package="org.openoffice" oor:name="System">
   <node oor:name="L10N">
diff --git a/officecfg/registry/data/org/openoffice/UserProfile.xcu b/officecfg/registry/data/org/openoffice/UserProfile.xcu
index 69def88b1a53..632753bc3c7a 100644
--- a/officecfg/registry/data/org/openoffice/UserProfile.xcu
+++ b/officecfg/registry/data/org/openoffice/UserProfile.xcu
@@ -37,5 +37,12 @@
   <prop oor:name="fathersname" oor:type="xs:string">
    <value/>
   </prop>
+  <prop oor:name="givenname" install:module="gconflockdown">
+    <value oor:external=
+        "com.sun.star.configuration.backend.GconfBackend givenname"/>
+  </prop>
+  <prop oor:name="sn" install:module="gconflockdown">
+    <value oor:external="com.sun.star.configuration.backend.GconfBackend sn"/>
+  </prop>
  </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index 90d4bcd8b8cf..29b32149c337 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,16 +29,20 @@
  *
  ************************************************************************ -->
 <!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
-<oor:component-data oor:name="VCL" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<oor:component-data oor:name="VCL" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <node oor:name="Settings">
     <node oor:name="Accessibility" oor:op="replace">
       <prop oor:name="EnableATToolSupport" oor:type="xs:string" oor:op="replace">
         <value>false</value>
+        <value install:module="unixdesktop" oor:external=
+       "com.sun.star.configuration.backend.DesktopBackend EnableATToolSupport"/>
       </prop>
     </node>
     <node oor:name="DesktopManagement" oor:op="replace">
       <prop oor:name="DisablePrinting" oor:type="xs:string" oor:op="replace">
         <value>false</value>
+        <value install:module="gconflockdown" oor:external=
+            "com.sun.star.configuration.backend.GconfBackend DisablePrinting"/>
       </prop>
     </node>
     <node oor:name="Transfer" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/makefile.mk b/officecfg/registry/data/org/openoffice/makefile.mk
index c4739df22ee9..97b52b3a9d44 100644
--- a/officecfg/registry/data/org/openoffice/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/makefile.mk
@@ -49,6 +49,9 @@ XCUFILES= \
 
 MODULEFILES= \
     Inet-defaultsearchengine.xcu \
+    Inet-macosx.xcu \
+    Inet-unixdesktop.xcu \
+    Inet-wnt.xcu \
     Setup-brand.xcu \
     Setup-writer.xcu   \
     Setup-calc.xcu   \
@@ -57,7 +60,10 @@ MODULEFILES= \
     Setup-base.xcu   \
     Setup-math.xcu \
     Setup-report.xcu \
-    Setup-start.xcu
+    Setup-start.xcu \
+    UserProfile-gconflockdown.xcu \
+    VCL-gconflockdown.xcu \
+    VCL-unixdesktop.xcu
 
 LOCALIZEDFILES=Setup.xcu
 
diff --git a/officecfg/util/data_val.xsl b/officecfg/util/data_val.xsl
index bdf7c1ba2546..d22814dd19f5 100644
--- a/officecfg/util/data_val.xsl
+++ b/officecfg/util/data_val.xsl
@@ -206,9 +206,6 @@
             <xsl:if test="following-sibling::value[@install:module=$module and @xml:lang=$lang]">
                 <xsl:message terminate="yes">ERROR: Property '<xsl:value-of select="$path"/>' has multiple values for module <xsl:value-of select="$module"/> and locale <xsl:value-of select="$lang"/>!</xsl:message>
             </xsl:if>
-            <xsl:if test="../value[not(@install:module)]">
-                <xsl:message terminate="yes">ERROR: Property '<xsl:value-of select="$path"/>' has values both with and without module. This is currently not supported. Please contact jb@openoffice.org, if you need this!</xsl:message>
-            </xsl:if>
             <xsl:if test="not(preceding-sibling::value/@install:module)">
                 <xsl:message>ATTENTION: Property '<xsl:value-of select="$path"/>' has different values for different modules. Make sure the modules are mutually exclusive!</xsl:message>
             </xsl:if>