[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - officecfg/registry

[Petr Mladek]

 officecfg/registry/data/org/openoffice/Setup.xcu |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit b3f49f41be14c79b828963d339117a2475ef0006
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Feb 22 14:38:08 2013 +0100

    migrate even more configuration setting (fdo#57061)
    
    + application windows size
        + I was afraid to migrate any /org.openoffice.Setup stuff
          because there seemed to be many hardcoded values;
          But the parts mentioned in registrymodifications.xcu
          should be configurable and thus safe to migrate
    + „Enable macro recording“ and „Enable experimental features“ options
        + sigh, we do not want to migrate
          /org.openoffice.Office.Common/Misc/FirstRun; thus we need to
          explicitely mention all the other items which is error prone
    + Tools/Options/LibreOffice/Paths/My documents
        + ah, the paths are handled on two locations: /org.openoffice.Office.Paths
          and /org.openoffice.Office.Common/Path
    + Macros
        + I was afraid to copy user/basic because there were some content
          out of box. I though that it might be version specific. In fact,
          the default content is just empty templates that look the same
          even in old releases => it should be secure to copy it after all
    
    Change-Id: Ie1c04e9df36f6b6961bbaaeb922e29d64128ade4
    Reviewed-on: https://gerrit.libreoffice.org/2339
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Tested-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index b4e5e7c..6bca381 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -824,6 +824,7 @@
               <value>
                 <it>.*/autotext/.*</it>
                 <it>.*/autocorr/.*</it>
+                <it>.*/basic/.*</it>
                 <it>.*/config/.*\.so[bcdegh]</it>
                 <it>.*/config/soffice.cfg/modules/.*/menubar/.*\.xml</it>
                 <it>.*/config/soffice.cfg/modules/.*/statusbar/.*\.xml</it>
@@ -860,16 +861,23 @@
                 <it>/org.openoffice.Office.Common/I18N</it>
                 <it>/org.openoffice.Office.Common/InternalMSExport</it>
                 <it>/org.openoffice.Office.Common/Load</it>
+                <it>/org.openoffice.Office.Common/Misc/AlwaysAllowSave</it>
+                <it>/org.openoffice.Office.Common/Misc/DisableUICustomization</it>
+                <it>/org.openoffice.Office.Common/Misc/ExperimentalMode</it>
                 <it>/org.openoffice.Office.Common/Misc/FormControlPilotsEnabled</it>
+                <it>/org.openoffice.Office.Common/Misc/MacroRecorderMode</it>
                 <it>/org.openoffice.Office.Common/Misc/PluginsEnabled</it>
+                <it>/org.openoffice.Office.Common/Misc/ShowLinkWarningDialog</it>
                 <it>/org.openoffice.Office.Common/Misc/SymbolSet</it>
+                <it>/org.openoffice.Office.Common/Misc/SymbolStyle</it>
+                <it>/org.openoffice.Office.Common/Misc/ToolboxStyle</it>
                 <it>/org.openoffice.Office.Common/Misc/UseSystemFileDialog</it>
                 <it>/org.openoffice.Office.Common/Misc/UseSystemPrintDialog</it>
-                <it>/org.openoffice.Office.Common/Misc/SymbolStyle</it>
                 <it>/org.openoffice.Office.Common/Misc/FilePickerPlacesNames</it>
                 <it>/org.openoffice.Office.Common/Misc/FilePickerPlacesUrls</it>
                 <it>/org.openoffice.Office.Common/ODF</it>
                 <it>/org.openoffice.Office.Common/Passwords</it>
+                <it>/org.openoffice.Office.Common/Path</it>
                 <it>/org.openoffice.Office.Common/Print/PrintingModifiesDocument</it>
                 <it>/org.openoffice.Office.Common/Print/Warning</it>
                 <it>/org.openoffice.Office.Common/Vectorize</it>
@@ -937,6 +945,11 @@
               <value>/org.openoffice.Office.Security</value>
             </prop>
           </node>
+          <node oor:name="Setup" oor:op="replace">
+            <prop oor:name="IncludedNodes">
+              <value>/org.openoffice.Setup/Office/Factories</value>
+            </prop>
+          </node>
           <node oor:name="UI" oor:op="replace">
             <prop oor:name="IncludedNodes">
               <value>/org.openoffice.Office.UI/ColorScheme</value>