cbosdo01: merge with DEV300_m69

5 files changed, 56 insertions, 17 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index c9747dc9dea0..c9e64be54ee5 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -521,6 +521,14 @@
         <prop oor:name="DynamicBorderColors" oor:type="xs:boolean">
           <value>true</value>
         </prop>
+        <prop oor:name="UseDocumentTextMetrics" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+      </node>
+      <node oor:name="com.sun.star.sheet.SpreadsheetDocument">
+        <prop oor:name="UseDocumentTextMetrics" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
       </node>
     </node>
   </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index fa69145371f4..0dced3ed2f88 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2713,7 +2713,7 @@
             </node>
             <node oor:name=".uno:ChineseConversion" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Chinese translation...</value>
+                    <value xml:lang="en-US">Chinese Conversion...</value>
                 </prop>
             </node>
             <node oor:name=".uno:InsertListbox" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index b30a43202300..2a17b4ecdd55 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -1648,9 +1648,9 @@
           <value>Default,Serif</value>
         </prop>
       </node>
-      <node oor:name="bitstreamveramono" oor:op="replace">
+      <node oor:name="bitstreamverasansmono" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>dejavumono</value>
+          <value>dejavusansmono;couriernew;liberationmono</value>
         </prop>
         <prop oor:name="SubstFontsHTML"><value>monospace</value></prop>
         <prop oor:name="FontWeight"><value>Normal</value></prop>
@@ -2377,7 +2377,7 @@
       </node>
       <node oor:name="couriernew" oor:op="replace">
     <prop oor:name="SubstFonts">
-      <value>cumberland;cumberlandamt;liberationmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+      <value>cumberland;cumberlandamt;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
         </prop>
     <prop oor:name="SubstFontsMS"><value></value></prop>
     <prop oor:name="SubstFontsPS"><value>Courier</value></prop>
@@ -2388,7 +2388,7 @@
       </node>
       <node oor:name="cumberland" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>cumberlandamt;couriernew;liberationmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+          <value>cumberlandamt;couriernew;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>Courier New</value>
@@ -2411,7 +2411,7 @@
       </node>
       <node oor:name="cumberlandamt" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>cumberland;couriernew;liberationmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+          <value>cumberland;couriernew;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>Courier New</value>
@@ -2498,9 +2498,9 @@
           <value>Default,Serif</value>
         </prop>
       </node>
-      <node oor:name="dejavumono" oor:op="replace">
+      <node oor:name="dejavusansmono" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>bitstreamveramono</value>
+          <value>bitstreamverasansmono;couriernew;liberationmono</value>
         </prop>
         <prop oor:name="SubstFontsHTML"><value>monospace</value></prop>
         <prop oor:name="FontWeight"><value>Normal</value></prop>
@@ -4739,7 +4739,7 @@
       </node>
       <node oor:name="liberationmono" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>cumberland;cumberlandamt;couriernew;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+          <value>cumberland;cumberlandamt;couriernew;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>Courier New</value>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 8fa14691907d..9e06d9976035 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -844,11 +844,28 @@
 			</prop>
 			<prop oor:name="DynamicBorderColors" oor:type="xs:boolean">
 				<info>
-					<desc>specifies whether the controls should use dynamic border coloring, if possible.
-Dymamic border coloring means that when the mouse is hovered over a control, and when a control receives the focus, this is indicated with special border colors.</desc>
+          <desc>
+            specifies whether the controls should use dynamic border coloring, if possible.
+            Dymamic border coloring means that when the mouse is hovered over a control, and when a control receives the focus, this is indicated with special border colors.
+          </desc>
 				</info>
 				<value>false</value>
 			</prop>
+      <prop oor:name="UseDocumentTextMetrics" oor:type="xs:boolean">
+        <info>
+          <desc>
+            controls whether form controls, when they render their text, use the same metrics as the document
+            does. If this is set to &lt;true&gt;, then the control text's appearance better matches the text
+            in the surrounding document.&lt;/p&gt;
+            &lt;p&gt;Technically, documents use a reference device for formatting, which usually has a higher
+            resolution than the actual output device. The option decides whether form controls should use
+            the same reference device as the surrounding document. However, some of OOo's document implementations
+            do not properly use their reference device in all situations, in which case the option might better
+            be disabled.&lt;p&gt;
+          </desc>
+        </info>
+        <value>true</value>
+      </prop>
 		</group>
 		<group oor:name="ProductVersionID">
 			<info>
@@ -1158,8 +1175,8 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
           <desc>
             This switch decides if Interactions in the DrawingLayer are visualized using Wireframe or Full-Object
             previews. If false, only Wireframe will be used. If true, Full-Object preview which gives a much better
-            feedback about the object interaction will be used. This mode is used for modification and creation of 
-            objects. During interaction, a geometric copy of the object(s) is shown with 50% transparence in the 
+            feedback about the object interaction will be used. This mode is used for modification and creation of
+            objects. During interaction, a geometric copy of the object(s) is shown with 50% transparence in the
             foreground. That copy shows exactly what You will get when You end the interaction.
           </desc>
           <label>This switch determines if DrawingLayer Interactions show Wireframe or Full-Object preview.</label>
@@ -1181,7 +1198,8 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
       <prop oor:name="QuadraticFormControlRenderLimit" oor:type="xs:int">
         <info>
           <author>AW</author>
-          <desc>This defines a Limitation for the default raster conversion of FormControls in edit mode.
+          <desc>
+            This defines a Limitation for the default raster conversion of FormControls in edit mode.
                 These have the ability to be displayed using this fallback to Bitmaps.
                 The number is the maximum number of pixels to use, e.g. 300x150 Pixels is allowed as default.
                 When FormControls would need more Pixels than this, the Bitmap will be limited and scaled to the needed pixel size at paint time.
@@ -1194,8 +1212,8 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
         <info>
           <author>AW</author>
           <desc>
-            This switch defines if the selections in the applications (text or cells) are visualized using 
-            inverse (XOR) when set to false (the old selection method, also used when in HighContrast mode) 
+            This switch defines if the selections in the applications (text or cells) are visualized using
+            inverse (XOR) when set to false (the old selection method, also used when in HighContrast mode)
             or a transparent overlay selection using the system's selection color.
           </desc>
           <label>This switch defines if for text/cell selections the old inverse or the new transparent selection is to be used.</label>
@@ -6524,7 +6542,7 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
 				<desc>Contains settings for smart tags.</desc>
 			</info>
             <group oor:name="Writer">
-				<info>
+        <info>
     				<author>FME</author>
 					<desc>Contains Writer specific settings for smart tags.</desc>
 				</info>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs b/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
index 41ceb993f87e..b510709bb575 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
@@ -81,6 +81,19 @@
                 <desc>TODO</desc>
             </info>
         </set>
+        <group oor:name="SessionShutdown">
+            <info>
+				<author>MAV</author>
+                <desc>The session shutdown related information.</desc>
+            </info>
+            <prop oor:name="DocumentStoreUIEnabled" oor:type="xs:boolean">
+                <info>
+                    <author>MAV</author>
+                    <desc>Determines if the office is allowed to show request to store modified documents on session shutdown.</desc>
+                </info>
+                <value>false</value>
+            </prop>
+        </group>
         <group oor:name="RecoveryInfo">
             <info>
                 <desc>TODO</desc>