findbar01: Merge changes from m78

13 files changed, 206 insertions, 94 deletions

diff --git a/officecfg/registry/component-update.dtd b/officecfg/registry/component-update.dtd
index 51623f40ba..81acc5e35e 100644
--- a/officecfg/registry/component-update.dtd
+++ b/officecfg/registry/component-update.dtd
@@ -113,7 +113,8 @@
 <!ELEMENT oor:items (item*)>
 <!ATTLIST oor:items>
 
-<!ELEMENT item ((prop | node)*)>
+<!ELEMENT item ((node | prop | value)*)>
 <!ATTLIST item
     oor:path CDATA #REQUIRED>
-        <!-- the absolute path representation of a set or group node -->
+        <!-- the absolute path representation of a localized property or a group
+             or set node -->
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 722ed4df10..bb3c7795a4 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -134,7 +134,7 @@
         <prop oor:name="TemplateRepositoryURL" oor:type="xs:string">
             <value>${STARTCENTER_TEMPLREP_URL}</value>
         </prop>
-        <prop oor:name="StartCenterLayoutStyle" oor:type="xs:int">
+        <prop oor:name="StartCenterLayoutStyle" oor:type="xs:int" install:module="brand">
             <value>${STARTCENTER_LAYOUT_STYLE}</value>
         </prop>
     </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
index 2397810ed2..3d3c89ab15 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
@@ -73,6 +73,90 @@
                     <value>true</value>
                 </prop>
             </node>
+            <node oor:name="private:resource/toolbar/basicshapes" oor:op="replace">
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Basic Shapes</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+            </node>
+            <node oor:name="private:resource/toolbar/symbolshapes" oor:op="replace">
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Symbol Shapes</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+            </node>
+            <node oor:name="private:resource/toolbar/arrowshapes" oor:op="replace">
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Block Arrows</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+            </node>
+            <node oor:name="private:resource/toolbar/flowchartshapes" oor:op="replace">
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Flowchart</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+            </node>
+            <node oor:name="private:resource/toolbar/calloutshapes" oor:op="replace">
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Callouts</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+            </node>
+            <node oor:name="private:resource/toolbar/starshapes" oor:op="replace">
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Stars and Banners</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+            </node>
         </node>
     </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 0fbaba3cfd..9080bf1c1b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -262,7 +262,7 @@
           <value>com.sun.star.comp.chart.ElementSelectorToolbarController</value>
         </prop>
       </node>
-      <node oor:name="c4" oor:op="replace">
+      <node oor:name="com.sun.star.chart2.BasicShapesToolbarController" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:BasicShapes</value>
         </prop>
@@ -270,10 +270,10 @@
           <value>com.sun.star.chart2.ChartDocument</value>
         </prop>
         <prop oor:name="Controller">
-          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+          <value>com.sun.star.comp.chart2.ShapeToolbarController</value>
         </prop>
       </node>
-      <node oor:name="c5" oor:op="replace">
+      <node oor:name="com.sun.star.chart2.SymbolShapesToolbarController" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:SymbolShapes</value>
         </prop>
@@ -281,10 +281,10 @@
           <value>com.sun.star.chart2.ChartDocument</value>
         </prop>
         <prop oor:name="Controller">
-          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+          <value>com.sun.star.comp.chart2.ShapeToolbarController</value>
         </prop>
       </node>
-      <node oor:name="c6" oor:op="replace">
+      <node oor:name="com.sun.star.chart2.ArrowShapesToolbarController" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:ArrowShapes</value>
         </prop>
@@ -292,10 +292,10 @@
           <value>com.sun.star.chart2.ChartDocument</value>
         </prop>
         <prop oor:name="Controller">
-          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+          <value>com.sun.star.comp.chart2.ShapeToolbarController</value>
         </prop>
       </node>
-      <node oor:name="c7" oor:op="replace">
+      <node oor:name="com.sun.star.chart2.FlowChartShapesToolbarController" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:FlowChartShapes</value>
         </prop>
@@ -303,10 +303,10 @@
           <value>com.sun.star.chart2.ChartDocument</value>
         </prop>
         <prop oor:name="Controller">
-          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+          <value>com.sun.star.comp.chart2.ShapeToolbarController</value>
         </prop>
       </node>
-      <node oor:name="c8" oor:op="replace">
+      <node oor:name="com.sun.star.chart2.CalloutShapesToolbarController" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:CalloutShapes</value>
         </prop>
@@ -314,10 +314,10 @@
           <value>com.sun.star.chart2.ChartDocument</value>
         </prop>
         <prop oor:name="Controller">
-          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+          <value>com.sun.star.comp.chart2.ShapeToolbarController</value>
         </prop>
       </node>
-      <node oor:name="c9" oor:op="replace">
+      <node oor:name="com.sun.star.chart2.StarShapesToolbarController" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:StarShapes</value>
         </prop>
@@ -325,7 +325,7 @@
           <value>com.sun.star.chart2.ChartDocument</value>
         </prop>
         <prop oor:name="Controller">
-          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+          <value>com.sun.star.comp.chart2.ShapeToolbarController</value>
         </prop>
       </node>
     </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index e88d0922be..8efec101f6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -725,7 +725,21 @@
                 <prop oor:name="ContextSensitive" oor:type="xs:boolean">
                     <value>true</value>
                 </prop>
-            </node>
-        </node>
+      </node>
+      <node oor:name="private:resource/toolbar/optimizetablebar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Optimize</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+    </node>
     </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 125b8e70eb..68c371b02d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -820,7 +820,21 @@
                 <prop oor:name="ContextSensitive" oor:type="xs:boolean">
                     <value>true</value>
                 </prop>
-           </node>
-        </node>
+      </node>
+      <node oor:name="private:resource/toolbar/optimizetablebar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Optimize</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+    </node>
     </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/Writer.xcu b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
index d19e9e5d78..8add2a0aa1 100644
--- a/officecfg/registry/data/org/openoffice/Office/Writer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
@@ -40,7 +40,7 @@
     <prop oor:name="IsHideEmptyParagraphs" >
      <value>true</value>
     </prop>
-    <prop oor:name="EMailSupported" install:module="javamail">
+    <prop oor:name="EMailSupported">
      <value>true</value>
     </prop>
   </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk
index 5cd876f75b..e65b03371d 100644
--- a/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk
@@ -88,7 +88,6 @@ MODULEFILES= \
     Paths-unxwnt.xcu    \
     Paths-unixdesktop.xcu \
     Writer-cjk.xcu \
-    Writer-javamail.xcu \
     Impress-ogltrans.xcu \
     Embedding-calc.xcu   \
     Embedding-chart.xcu   \
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 087e2cf6c5..5afb19f394 100755
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -767,14 +767,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>
-                org.openoffice.Office.DataAccess/Bibliography
-                org.openoffice.Office.DataAccess/ConnectionPool
-                org.openoffice.Office.DataAccess/DataSources
-                org.openoffice.Office.DataAccess/DriverManager
+                <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>
@@ -785,9 +785,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">
@@ -797,7 +795,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">
@@ -814,77 +812,77 @@
             </prop>
             <prop oor:name="IncludedNodes">
               <value>
-                org.openoffice.Office.Compatibility
-                org.openoffice.Office.Custom
-                org.openoffice.Office.Embedding
-                org.openoffice.Office.Events
-                org.openoffice.Office.ExtendedColorScheme
-                org.openoffice.Office.Common/Accessibility
-                org.openoffice.Office.Common/Accessibility/AutoDetectSystemHC
-                org.openoffice.Office.Common/AsianLayout
-                org.openoffice.Office.Common/AutoCorrect
-                org.openoffice.Office.Common/Cache
-                org.openoffice.Office.Common/DateFormat
-                org.openoffice.Office.Common/ExternalMailer/Program
-                org.openoffice.Office.Common/Filter
-                org.openoffice.Office.Common/Font
-                org.openoffice.Office.Common/Forms
-                org.openoffice.Office.Common/Gallery
-                org.openoffice.Office.Common/Help
-                org.openoffice.Office.Common/History
-                org.openoffice.Office.Common/I18N
-                org.openoffice.Office.Common/InternalMSExport
-                org.openoffice.Office.Common/Load
-                org.openoffice.Office.Common/Misc/FormControlPilotsEnabled
-                org.openoffice.Office.Common/Misc/PluginsEnabled
-                org.openoffice.Office.Common/Misc/SymbolSet
-                org.openoffice.Office.Common/Misc/UseSystemFileDialog
-                org.openoffice.Office.Common/Misc/UseSystemPrintDialog
-                org.openoffice.Office.Common/Misc/SymbolStyle
-                org.openoffice.Office.Common/Passwords
-                org.openoffice.Office.Common/Print/PrintingModifiesDocument
-                org.openoffice.Office.Common/Print/Warning
-                org.openoffice.Office.Common/Vectorize
-                org.openoffice.Office.Common/Save
-                org.openoffice.Office.Common/SearchOptions
-                org.openoffice.Office.Common/Undo
-                org.openoffice.Office.Common/View/Dialog/Dialog/MiddleMouseButton
-                org.openoffice.Office.Common/View/Dialog/MousePositioning
-                org.openoffice.Office.Common/View/Localization
-                org.openoffice.Office.Common/View/Menu
-                org.openoffice.Office.Common/_3D_Engine
+                <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>
-                org.openoffice.Office.Common/_3D_Engine/OpenGL
-                org.openoffice.Office.Common/Help/Registration
+                <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">
@@ -892,36 +890,36 @@
               <value>com.sun.star.migration.Wordbooks</value>
             </prop>
             <prop oor:name="IncludedNodes">
-              <value>org.openoffice.Office.Linguistic</value>
+              <value>/org.openoffice.Office.Linguistic</value>
             </prop>
             <prop oor:name="ExcludedNodes">
-              <value>org.openoffice.Office.Linguistic/ServiceManager</value>
+              <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>
-                org.openoffice.Office.Writer
-                org.openoffice.Office.WriterWeb
+                <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>
+              <value>/org.openoffice.Office.Writer/Wizard</value>
             </prop>
           </node>
         </node>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index b5232c21eb..ffe5388caf 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -782,13 +782,13 @@
 							<desc>MAX</desc>
 						</info>
 					</enumeration>
-					<enumeration oor:value="5">
+					<enumeration oor:value="6">
 						<info>
 							<desc>IF</desc>
 						</info>
 					</enumeration>
 				</constraints>
-				<value>224 226 222 223 5</value>
+				<value>224 226 222 223 6</value>
 			</prop>
 			<prop oor:name="AutoInput" oor:type="xs:boolean">
 				<!-- OldPath: Calc/Input -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index a1e203a293..cb19bb01e1 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5338,6 +5338,13 @@
 						</info>
 						<value>true</value>
                     </prop>
+                    <prop oor:name="EmbedStandardFonts" oor:type="xs:boolean">
+						<info>
+							<author>pl</author>
+							<desc>Specifies whether to embed the 14 standard PDF fonts or not.</desc>
+						</info>
+						<value>false</value>
+                    </prop>
 					<prop oor:name="FormsType" oor:type="xs:int">
 						<info>
 							<desc>Specifies the submitted format of a PDF form.</desc>
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
index de8a64e2b0..a3d5ba6e5d 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -53,11 +53,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>
-          <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>
           <desc>a list of wildcards relative to the old userdata origin that are to be copied</desc>
diff --git a/officecfg/util/alllang.xsl b/officecfg/util/alllang.xsl
index 339c6685fa..dafb45c85c 100644
--- a/officecfg/util/alllang.xsl
+++ b/officecfg/util/alllang.xsl
@@ -100,7 +100,7 @@
 		<xsl:if test="@xml:lang=$locale and not(@install:module)">
 			<xsl:copy>
 				<xsl:apply-templates select = "@*" mode="locale"/>
-				<xsl:value-of select="."/>
+				<xsl:copy-of select="node()"/>
 			</xsl:copy>
 		</xsl:if>
 	</xsl:template>
@@ -275,7 +275,7 @@
             <xsl:otherwise>
                 <xsl:copy>
                     <xsl:apply-templates select = "@*"/>
-                    <xsl:value-of select="."/>
+                    <xsl:copy-of select="node()"/>
                 </xsl:copy>
             </xsl:otherwise>
 		</xsl:choose>
@@ -285,7 +285,7 @@
 		<xsl:if test="@xml:lang=$fallback-locale and not(@install:module)">
             <xsl:copy>
                 <xsl:apply-templates select = "@*"/>
-                <xsl:value-of select="."/>
+                <xsl:copy-of select="node()"/>
             </xsl:copy>
 		</xsl:if>
 	</xsl:template>