merge from master

8 files changed, 65 insertions, 109 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 5c735744104b..2616566225b9 100755..100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -1698,7 +1698,7 @@
       <value xml:lang="es">.uno:Bold</value>
      </prop>
     </node>
-    <node oor:name="N_MOD1_MOD2" oor:op="replace">
+    <node oor:name="C_MOD1_MOD2" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:InsertAnnotation</value>
      </prop>
@@ -1893,7 +1893,7 @@
     </node>
    </node>
    <node oor:name="com.sun.star.presentation.PresentationDocument" oor:op="replace">
-     <node oor:name="N_MOD1_MOD2" oor:op="replace">
+     <node oor:name="C_MOD1_MOD2" oor:op="replace">
        <prop oor:name="Command">
          <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
          <value xml:lang="en-US">.uno:InsertAnnotation</value>
@@ -2739,7 +2739,7 @@
       <value xml:lang="es">.uno:Bold</value>
      </prop>
     </node>
-    <node oor:name="N_MOD1_MOD2" oor:op="replace">
+    <node oor:name="C_MOD1_MOD2" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:InsertAnnotation</value>
      </prop>
@@ -3374,7 +3374,7 @@
       <value xml:lang="es">.uno:Bold</value>
      </prop>
     </node>
-    <node oor:name="N_MOD1_MOD2" oor:op="replace">
+    <node oor:name="C_MOD1_MOD2" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:InsertAnnotation</value>
      </prop>
@@ -3979,7 +3979,7 @@
       <value xml:lang="es">.uno:Bold</value>
      </prop>
     </node>
-    <node oor:name="N_MOD1_MOD2" oor:op="replace">
+    <node oor:name="C_MOD1_MOD2" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:InsertAnnotation</value>
      </prop>
@@ -4589,7 +4589,7 @@
       <value xml:lang="es">.uno:Bold</value>
      </prop>
     </node>
-    <node oor:name="N_MOD1_MOD2" oor:op="replace">
+    <node oor:name="C_MOD1_MOD2" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:InsertAnnotation</value>
      </prop>
@@ -5204,7 +5204,7 @@
       <value xml:lang="es">.uno:Bold</value>
      </prop>
     </node>
-    <node oor:name="N_MOD1_MOD2" oor:op="replace">
+    <node oor:name="C_MOD1_MOD2" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:InsertAnnotation</value>
      </prop>
@@ -5567,7 +5567,7 @@
     </node>
    </node>
    <node oor:name="com.sun.star.drawing.DrawingDocument" oor:op="replace">
-     <node oor:name="N_MOD1_MOD2" oor:op="replace">
+     <node oor:name="C_MOD1_MOD2" oor:op="replace">
        <prop oor:name="Command">
          <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
          <value xml:lang="en-US">.uno:InsertAnnotation</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 46611715f998..7b83b162338e 100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3412,7 +3412,7 @@
             </node>
             <node oor:name=".uno:BmpMask" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Eyedropper</value>
+                    <value xml:lang="en-US">Color ~Replacer</value>
                 </prop>
             </node>
             <node oor:name=".uno:GoLeftBlock" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
index 4ed9be5a3d27..07a717f31442 100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
@@ -42,9 +42,6 @@
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">~Import Formula...</value>
                 </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
             </node>
             <node oor:name=".uno:FitInWindow" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
@@ -111,7 +108,7 @@
             </node>
             <node oor:name=".uno:View100" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">1</value>
+                    <value xml:lang="en-US">Zoom 100%</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
@@ -119,7 +116,7 @@
             </node>
             <node oor:name=".uno:View200" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">2</value>
+                    <value xml:lang="en-US">Zoom 200%</value>
                 </prop>
             </node>
             <node oor:name=".uno:ZoomIn" oor:op="replace">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 9bc07c592f0f..ae171230dd13 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2600,39 +2600,6 @@
 				</constraints>
 				<value>100</value>
 			</prop>
-			<prop oor:name="LookAndFeel" oor:type="xs:short">
-				<!-- OldPath: General/View -->
-				<!-- OldLocation: soffice.cfg -->
-				<!-- UIHints: Tools  Options - General  View  [Section] Display -->
-				<info>
-					<author>PB</author>
-					<desc>Determines the look and feel of the application.</desc>
-					<label>Look &amp; Feel</label>
-				</info>
-				<constraints>
-					<enumeration oor:value="0">
-						<info>
-							<desc>Standard</desc>
-						</info>
-					</enumeration>
-					<enumeration oor:value="1">
-						<info>
-							<desc>Macintosh</desc>
-						</info>
-					</enumeration>
-					<enumeration oor:value="2">
-						<info>
-							<desc>X Window</desc>
-						</info>
-					</enumeration>
-					<enumeration oor:value="3">
-						<info>
-							<desc>OS/2</desc>
-						</info>
-					</enumeration>
-				</constraints>
-				<value>0</value>
-			</prop>
 			<group oor:name="NewDocumentHandling">
 				<info>
 					<author>CD</author>
@@ -2714,17 +2681,6 @@
 					</info>
 					<value>true</value>
 				</prop>
-				<prop oor:name="ColoredTab" oor:type="xs:boolean">
-					<!-- OldPath: General/View -->
-					<!-- OldLocation: soffice.cfg -->
-					<!-- UIHints: Tools  Options - General  View  [Section] Options -->
-					<info>
-						<author>PB</author>
-						<desc>Specifies TabDialogs with colored tab control (True)</desc>
-						<label>Colored tab controls</label>
-					</info>
-					<value>false</value>
-				</prop>
 				<prop oor:name="MousePositioning" oor:type="xs:short">
 					<!-- OldPath: General/View -->
 					<!-- OldLocation: soffice.cfg -->
@@ -2780,17 +2736,6 @@
 					</constraints>
 					<value>1</value>
 				</prop>
-				<prop oor:name="SingleLineTab" oor:type="xs:boolean">
-					<!-- OldPath: General/View -->
-					<!-- OldLocation: soffice.cfg -->
-					<!-- UIHints: Tools  Options - General  View  [Section] Options -->
-					<info>
-						<author>PB</author>
-						<desc>Specifies TabDialogs with single line tab control (True).</desc>
-						<label>Single line tab controls</label>
-					</info>
-					<value>false</value>
-				</prop>
 			</group>
 			<group oor:name="Localisation">
 				<info>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index e133b7a5a957..6dd518250d4a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -282,7 +282,7 @@
 					<desc>Indicates whether moving while holding the Control key makes a copy of the moved object.</desc>
 					<label>Copy while moving</label>
 				</info>
-				<value>false</value>
+				<value>true</value>
 			</prop>
 			<prop oor:name="ObjectMoveable" oor:type="xs:boolean">
 				<!-- OldPath: Draw/Other -->
@@ -410,7 +410,7 @@
 						<desc>Indicates whether a simple click on a text object changes it to edit mode.</desc>
 						<label>Allow quick editing</label>
 					</info>
-					<value>false</value>
+					<value>true</value>
 				</prop>
 				<prop oor:name="Selectable" oor:type="xs:boolean">
 					<!-- OldPath: Draw/Other/Text_Objects -->
@@ -824,7 +824,7 @@
 						<desc>Specifies the number of points between two grid points on the X axis.</desc>
 						<label>X Axis Subdivision</label>
 					</info>
-					<value>1</value>
+					<value>9</value>
 				</prop>
 				<prop oor:name="YAxis" oor:type="xs:double">
 					<!-- OldPath: Draw/Grid/Subdivision -->
@@ -836,7 +836,7 @@
 						<desc>Specifies the number of points between two grid points on the Y axis.</desc>
 						<label>Y Axis Subdivision</label>
 					</info>
-					<value>1</value>
+					<value>9</value>
 				</prop>
 			</group>
 			<group oor:name="SnapGrid">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 8317e3e0082d..871c5c2c1494 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -331,7 +331,7 @@
           <desc>Indicates whether moving while holding the Control key makes a copy of the moved object.</desc>
           <label>Copy while moving</label>
         </info>
-        <value>false</value>
+        <value>true</value>
       </prop>
       <prop oor:name="ObjectMoveable" oor:type="xs:boolean">
         <!-- OldPath: Impress/Other -->
@@ -371,7 +371,7 @@
           <desc>Indicates whether a double-click on an object activates the rotation mode.</desc>
           <label>Rotation Mode after clicking object</label>
         </info>
-        <value>false</value>
+        <value>true</value>
       </prop>
       <prop oor:name="Preview" oor:type="xs:double">
         <!-- OldPath: Impress/Other -->
@@ -426,7 +426,7 @@
           <desc>Indicates whether to show big (true) or small (false) handles.</desc>
           <label>Big Handles</label>
         </info>
-        <value>false</value>
+        <value>true</value>
       </prop>
       <prop oor:name="ModifyWithAttributes" oor:type="xs:boolean">
         <!-- OldPath: Impress/Other -->
@@ -537,6 +537,29 @@
         </info>
         <value>0</value>
       </prop>
+      <prop oor:name="PenColor" oor:type="xs:int">
+        <!-- OldPath: -->
+        <!-- OldLocation: -->
+        <!-- UIHints: slide show context menu -->
+        <info>
+          <author>CL</author>
+          <desc>Color of the pen during slideshow.</desc>
+          <label>Pen Color</label>
+        </info>
+        <value>16711680</value>
+      </prop>
+      <prop oor:name="PenWidth" oor:type="xs:double">
+        <!-- OldPath: -->
+        <!-- OldLocation: -->
+        <!-- UIHints: slide show context menu -->
+        <info>
+          <author>CL</author>
+          <desc>Width of the pen during slideshow.</desc>
+          <label>Pen Width</label>
+        </info>
+        <value>150</value>
+      </prop>
+
       <group oor:name="TextObject">
         <info>
           <desc>Contains text editing related configuration items.</desc>
@@ -679,7 +702,7 @@
             <desc>Indicates whether to snap at snap lines.</desc>
             <label>Snap lines</label>
           </info>
-          <value>false</value>
+          <value>true</value>
         </prop>
         <prop oor:name="PageMargin" oor:type="xs:boolean">
           <!-- OldPath: Impress/Snap/Objects -->
@@ -699,7 +722,7 @@
             <desc>Indicates whether to justify the outline of an object to that of an adjacent object.</desc>
             <label>Object frame</label>
           </info>
-          <value>false</value>
+          <value>true</value>
         </prop>
         <prop oor:name="ObjectPoint" oor:type="xs:boolean">
           <!-- OldPath: Impress/Snap/Objects -->
@@ -871,14 +894,14 @@
               <desc>Defines the horizontal distance between adjacent grid points in 1/100 mm, used when the metric system is active.</desc>
               <label/>
             </info>
-            <value>1000</value>
+            <value>2000</value>
           </prop>
           <prop oor:name="NonMetric" oor:type="xs:int">
             <info>
               <desc>Defines the horizontal distance between adjacent grid points in 1/100 mm, used when the non-metric system is active.</desc>
               <label/>
             </info>
-            <value>1270</value>
+            <value>2540</value>
           </prop>
         </group>
         <group oor:name="YAxis">
@@ -895,14 +918,14 @@
               <desc>Defines the vertical distance between adjacent grid points in 1/100 mm, used when the metric system is active.</desc>
               <label/>
             </info>
-            <value>1000</value>
+            <value>2000</value>
           </prop>
           <prop oor:name="NonMetric" oor:type="xs:int">
             <info>
               <desc>Defines the vertical distance between adjacent grid points in 1/100 mm, used when the non-metric system is active.</desc>
               <label/>
             </info>
-            <value>1270</value>
+            <value>2540</value>
           </prop>
         </group>
       </group>
@@ -919,7 +942,7 @@
             <desc>Specifies the number of points between two adjacent grid points on the X axis.</desc>
             <label>X Axis Subdivision</label>
           </info>
-          <value>1</value>
+          <value>9</value>
         </prop>
         <prop oor:name="YAxis" oor:type="xs:double">
           <!-- OldPath: Impress/Grid/Subdivision -->
@@ -930,7 +953,7 @@
             <desc>Specifies the number of intervals between two adjacent grid points on the Y axis</desc>
             <label>Y Axis Subdivision</label>
           </info>
-          <value>1</value>
+          <value>9</value>
         </prop>
       </group>
       <group oor:name="SnapGrid">
@@ -961,7 +984,7 @@
               <desc>Defines the horizontal distance between adjacent points of the snap grid in 1/100 mm, used when the metric system is selected.</desc>
               <label/>
             </info>
-            <value>1000</value>
+            <value>100</value>
           </prop>
           <prop oor:name="NonMetric" oor:type="xs:int">
             <info>
@@ -985,7 +1008,7 @@
               <desc>Defines the vertical distance between adjacent points of the snap grid in 1/100 mm, used when the metric system is selected.</desc>
               <label/>
             </info>
-            <value>1000</value>
+            <value>100</value>
           </prop>
           <prop oor:name="NonMetric" oor:type="xs:int">
             <info>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index 31f6e00a230a..13a566dc6746 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -316,6 +316,20 @@
 				<value>100</value>
 			</prop>
 		</group>
+        <group oor:name="LoadSave">
+            <info>
+                <desc>Contains settings related to load and save operations.</desc>
+            </info>
+            <prop oor:name="IsSaveOnlyUsedSymbols" oor:type="xs:boolean">
+                <!-- UIHints: - Tools/Options - OpenOffice Maths - Settings -->
+                <info>
+                    <author>TL</author>
+                    <desc>When set only symbols used in the current formula will be saved. Otherwise all user defined symbols will be saved in each formula.</desc>
+                    <label>Save only used symbols.</label>
+                </info>
+                <value>true</value>
+            </prop>
+        </group>
 		<group oor:name="Misc">
 			<info>
 				<desc>Contains miscellaneous settings.</desc>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs b/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
index b77cb00f8cac..90acb2a110bf 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
@@ -48,28 +48,5 @@
 				<desc>Lists the registered Scripting Framework runtimes.</desc>
 			</info>
 		</set>
-		<group oor:name="ScriptDisplaySettings">
-			<info>
-				<desc> Specifies display settings for assignment dialogs </desc>
-			</info>
-			<prop oor:name="ShowBasic" oor:type="xs:boolean">
-				<info>
-					<desc>Show Basic scripts in assignment dialogs</desc>
-				</info>
-				<value>false</value>
-			</prop>
-			<prop oor:name="ShowSF" oor:type="xs:boolean">
-				<info>
-					<desc>Show Scripting Framework scripts in assignment dialogs</desc>
-				</info>
-				<value>true</value>
-			</prop>
-			<prop oor:name="UseNewToolsConfigure" oor:type="xs:boolean">
-				<info>
-					<desc>Use New Tools Configure dialog</desc>
-				</info>
-				<value>true</value>
-			</prop>
-		</group>
 	</component>
 </oor:component-schema>