sb121: #i110203# added configmgr::update::insertModificationXcuFile and adapted old configuration data migration to it; some cleanup

2 files changed, 64 insertions, 70 deletions

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 6720ab5c37a3..bc34875bc47d 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -762,14 +762,14 @@
                 <prop oor:name="ExcludedFiles">
                 </prop>
                 <prop oor:name="IncludedNodes">
-          <value>org.openoffice.Office.DataAccess</value>
+                    <value>/org.openoffice.Office.DataAccess</value>
                 </prop>
                 <prop oor:name="ExcludedNodes">
                     <value>
-                        <it>org.openoffice.Office.DataAccess/Bibliography</it>
-                        <it>org.openoffice.Office.DataAccess/ConnectionPool</it>
-                        <it>org.openoffice.Office.DataAccess/DataSources</it>
-                        <it>org.openoffice.Office.DataAccess/DriverManager</it>
+                        <it>/org.openoffice.Office.DataAccess/Bibliography</it>
+                        <it>/org.openoffice.Office.DataAccess/ConnectionPool</it>
+                        <it>/org.openoffice.Office.DataAccess/DataSources</it>
+                        <it>/org.openoffice.Office.DataAccess/DriverManager</it>
                     </value>
                 </prop>
             </node>
@@ -780,7 +780,7 @@
             </node>
             <node oor:name="Inet" oor:op="replace">
                 <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Inet</value>
+                    <value>/org.openoffice.Inet</value>
                 </prop>
             </node>
             <node oor:name="Basic" oor:op="replace">
@@ -790,7 +790,7 @@
             </node>
       <node oor:name="UserProfile" oor:op="replace">
                 <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.UserProfile</value>
+                    <value>/org.openoffice.UserProfile</value>
                 </prop>
             </node>
       <node oor:name="Common" oor:op="replace">
@@ -807,77 +807,77 @@
                 </prop>
         <prop oor:name="IncludedNodes">
           <value>
-            <it>org.openoffice.Office.Compatibility</it>
-            <it>org.openoffice.Office.Custom</it>
-            <it>org.openoffice.Office.Embedding</it>
-            <it>org.openoffice.Office.Events</it>
-            <it>org.openoffice.Office.ExtendedColorScheme</it>
-            <it>org.openoffice.Office.Common/Accessibility</it>
-            <it>org.openoffice.Office.Common/Accessibility/AutoDetectSystemHC</it>
-            <it>org.openoffice.Office.Common/AsianLayout</it>
-            <it>org.openoffice.Office.Common/AutoCorrect</it>
-            <it>org.openoffice.Office.Common/Cache</it>
-            <it>org.openoffice.Office.Common/DateFormat</it>
-            <it>org.openoffice.Office.Common/ExternalMailer/Program</it>
-            <it>org.openoffice.Office.Common/Filter</it>
-            <it>org.openoffice.Office.Common/Font</it>
-            <it>org.openoffice.Office.Common/Forms</it>
-            <it>org.openoffice.Office.Common/Gallery</it>
-            <it>org.openoffice.Office.Common/Help</it>
-            <it>org.openoffice.Office.Common/History</it>
-            <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/FormControlPilotsEnabled</it>
-            <it>org.openoffice.Office.Common/Misc/PluginsEnabled</it>
-            <it>org.openoffice.Office.Common/Misc/SymbolSet</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/Passwords</it>
-            <it>org.openoffice.Office.Common/Print/PrintingModifiesDocument</it>
-            <it>org.openoffice.Office.Common/Print/Warning</it>
-            <it>org.openoffice.Office.Common/Vectorize</it>
-            <it>org.openoffice.Office.Common/Save</it>
-            <it>org.openoffice.Office.Common/SearchOptions</it>
-            <it>org.openoffice.Office.Common/Undo</it>
-            <it>org.openoffice.Office.Common/View/Dialog/Dialog/MiddleMouseButton</it>
-            <it>org.openoffice.Office.Common/View/Dialog/MousePositioning</it>
-            <it>org.openoffice.Office.Common/View/Localization</it>
-            <it>org.openoffice.Office.Common/View/Menu</it>
-            <it>org.openoffice.Office.Common/_3D_Engine</it>
+            <it>/org.openoffice.Office.Compatibility</it>
+            <it>/org.openoffice.Office.Custom</it>
+            <it>/org.openoffice.Office.Embedding</it>
+            <it>/org.openoffice.Office.Events</it>
+            <it>/org.openoffice.Office.ExtendedColorScheme</it>
+            <it>/org.openoffice.Office.Common/Accessibility</it>
+            <it>/org.openoffice.Office.Common/Accessibility/AutoDetectSystemHC</it>
+            <it>/org.openoffice.Office.Common/AsianLayout</it>
+            <it>/org.openoffice.Office.Common/AutoCorrect</it>
+            <it>/org.openoffice.Office.Common/Cache</it>
+            <it>/org.openoffice.Office.Common/DateFormat</it>
+            <it>/org.openoffice.Office.Common/ExternalMailer/Program</it>
+            <it>/org.openoffice.Office.Common/Filter</it>
+            <it>/org.openoffice.Office.Common/Font</it>
+            <it>/org.openoffice.Office.Common/Forms</it>
+            <it>/org.openoffice.Office.Common/Gallery</it>
+            <it>/org.openoffice.Office.Common/Help</it>
+            <it>/org.openoffice.Office.Common/History</it>
+            <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/FormControlPilotsEnabled</it>
+            <it>/org.openoffice.Office.Common/Misc/PluginsEnabled</it>
+            <it>/org.openoffice.Office.Common/Misc/SymbolSet</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/Passwords</it>
+            <it>/org.openoffice.Office.Common/Print/PrintingModifiesDocument</it>
+            <it>/org.openoffice.Office.Common/Print/Warning</it>
+            <it>/org.openoffice.Office.Common/Vectorize</it>
+            <it>/org.openoffice.Office.Common/Save</it>
+            <it>/org.openoffice.Office.Common/SearchOptions</it>
+            <it>/org.openoffice.Office.Common/Undo</it>
+            <it>/org.openoffice.Office.Common/View/Dialog/Dialog/MiddleMouseButton</it>
+            <it>/org.openoffice.Office.Common/View/Dialog/MousePositioning</it>
+            <it>/org.openoffice.Office.Common/View/Localization</it>
+            <it>/org.openoffice.Office.Common/View/Menu</it>
+            <it>/org.openoffice.Office.Common/_3D_Engine</it>
           </value>
         </prop>
                  <prop oor:name="ExcludedNodes">
           <value>
-            <it>org.openoffice.Office.Common/_3D_Engine/OpenGL</it>
-            <it>org.openoffice.Office.Common/Help/Registration</it>
+            <it>/org.openoffice.Office.Common/_3D_Engine/OpenGL</it>
+            <it>/org.openoffice.Office.Common/Help/Registration</it>
           </value>
                 </prop>
       </node>
              <node oor:name="Calc" oor:op="replace">
                 <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Calc</value>
+                    <value>/org.openoffice.Office.Calc</value>
                 </prop>
             </node>
       <node oor:name="Chart" oor:op="replace">
                 <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Chart</value>
+                    <value>/org.openoffice.Office.Chart</value>
                 </prop>
             </node>
       <node oor:name="Draw" oor:op="replace">
                 <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Draw</value>
+                    <value>/org.openoffice.Office.Draw</value>
                 </prop>
             </node>
       <node oor:name="Impress" oor:op="replace">
                 <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Impress</value>
+                    <value>/org.openoffice.Office.Impress</value>
                 </prop>
             </node>
       <node oor:name="Labels" oor:op="replace">
                 <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Labels</value>
+                    <value>/org.openoffice.Office.Labels</value>
                 </prop>
             </node>
       <node oor:name="Linguistic" oor:op="replace">
@@ -885,37 +885,37 @@
           <value>com.sun.star.migration.Wordbooks</value>
         </prop>
         <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Linguistic</value>
-                </prop>
-                 <prop oor:name="ExcludedNodes">
-          <value>org.openoffice.Office.Linguistic/ServiceManager</value>
+            <value>/org.openoffice.Office.Linguistic</value>
+        </prop>
+        <prop oor:name="ExcludedNodes">
+            <value>/org.openoffice.Office.Linguistic/ServiceManager</value>
         </prop>
             </node>
       <node oor:name="Math" oor:op="replace">
                 <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Math</value>
+                    <value>/org.openoffice.Office.Math</value>
                 </prop>
             </node>
       <node oor:name="Security" oor:op="replace">
                 <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.Security</value>
+                    <value>/org.openoffice.Office.Security</value>
                 </prop>
             </node>
       <node oor:name="UI" oor:op="replace">
                 <prop oor:name="IncludedNodes">
-                    <value>org.openoffice.Office.UI/ColorScheme</value>
+                    <value>/org.openoffice.Office.UI/ColorScheme</value>
                 </prop>
             </node>
       <node oor:name="Writer" oor:op="replace">
                 <prop oor:name="IncludedNodes">
                     <value>
-                        <it>org.openoffice.Office.Writer</it>
-                        <it>org.openoffice.Office.WriterWeb</it>
+                        <it>/org.openoffice.Office.Writer</it>
+                        <it>/org.openoffice.Office.WriterWeb</it>
                     </value>
                 </prop>
                 <prop oor:name="ExcludedNodes">
-          <value>org.openoffice.Office.Writer/Wizard</value>
-        </prop>
+                    <value>/org.openoffice.Office.Writer/Wizard</value>
+                </prop>
           </node>
         </node>
     </node>
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
index 9e5551bda18a..69e54c347a31 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -55,12 +55,6 @@
 					<desc>an optional uno service that is called after files and nodes have been copied in order to perform custom migration actions. The service needs to support XInitializable and XJob interfaces according do http://specs.openoffice.org/appwide/migration/spec_migration.sxw</desc>
 				</info>
 			</prop>
-			<prop oor:name="ServiceConfigComponents" oor:type="oor:string-list">
-				<info>
-					<author>LO</author>
-					<desc>a list of config components that are to be passed to service</desc>
-				</info>
-			</prop>
 			<prop oor:name="IncludedFiles" oor:type="oor:string-list">
 				<info>
 					<author>LO</author>