impressdefaults1: merge

8 files changed, 211 insertions, 259 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 479827565775..ed1c8d587762 100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5197,7 +5197,12 @@
           <value xml:lang="en-US">Delete All Comments by This Author</value>
         </prop>
       </node>
-      <node oor:name=".uno:DeleteNote" oor:op="replace">
+      <node oor:name=".uno:ReplyComment" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Reply Comment</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DeleteComment" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Delete Comment</value>
         </prop>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
index 7570fda066ca..4ed9be5a3d27 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
@@ -38,7 +38,7 @@
                     <value xml:lang="en-US">~Text Mode</value>
                 </prop>
             </node>
-            <node oor:name=".uno:InsertFormula" oor:op="replace">
+            <node oor:name=".uno:ImportFormula" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">~Import Formula...</value>
                 </prop>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 4fa236666b6b..465c6b37c0cd 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -166,6 +166,16 @@
                     <value xml:lang="en-US">~Protect Records...</value>
                 </prop>
             </node>
+            <node oor:name=".uno:RejectTracedChange" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Reject Change</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:AcceptTracedChange" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Accept Change</value>
+                </prop>
+            </node>
             <node oor:name=".uno:UpdateAllLinks" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">~Links</value>
diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index 575c0aba053b..3c9f0c6af44c 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -60,6 +60,11 @@
             <value>Default</value>
         </prop>
     </node>
+    <node oor:name="WM" oor:op="replace">
+        <prop oor:name="ShouldSwitchWorkspace" oor:op="replace" oor:type="xs:string">
+            <value></value>
+        </prop>
+    </node>
   </node>
   <node oor:name="DefaultFonts">
     <node oor:name="en" oor:op="replace">
@@ -1423,9 +1428,8 @@
       </node>
       <node oor:name="arial" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>liberationsans;albany;albanyamt;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>liberationsans;albany;albanyamt;arimo;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
-        <prop oor:name="SubstFontsMS"><value></value></prop>
         <prop oor:name="SubstFontsPS"><value>Helvetica</value></prop>
         <prop oor:name="SubstFontsHTML"><value>sans-serif</value></prop>
         <prop oor:name="FontWeight"><value>Normal</value></prop>
@@ -1436,24 +1440,9 @@
         <prop oor:name="SubstFonts">
           <value>arialnarrowmt;liberationsansnarrow;helveticanarrow;helmetcondensed;dejavusanscondensed;nimbussanslcondensed;nimbussanscondensed</value>
         </prop>
-        <prop oor:name="SubstFontsMS">
-          <value></value>
-        </prop>
-        <prop oor:name="SubstFontsPS">
-          <value></value>
-        </prop>
-        <prop oor:name="SubstFontsHTML">
-          <value></value>
-        </prop>
-        <prop oor:name="FontWeight">
-          <value>Normal</value>
-        </prop>
-        <prop oor:name="FontWidth">
-          <value>Condensed</value>
-        </prop>
-        <prop oor:name="FontType">
-          <value>Normal,SansSerif</value>
-        </prop>
+        <prop oor:name="FontWeight"><value>Normal</value></prop>
+        <prop oor:name="FontWidth"><value>Condensed</value></prop>
+        <prop oor:name="FontType"><value>Normal,SansSerif</value></prop>
       </node>
       <node oor:name="arialunicode" oor:op="replace">
         <prop oor:name="SubstFonts">
@@ -1478,6 +1467,17 @@
           <value>Normal,SansSerif,Full</value>
         </prop>
       </node>
+      <node oor:name="arimo" oor:op="replace">
+        <prop oor:name="SubstFonts">
+          <value>arial;liberationsans;albany;albanyamt;helvetica;</value>
+        </prop>
+        <prop oor:name="SubstFontsMS"><value>arial</value></prop>
+        <prop oor:name="SubstFontsPS"><value>helvetica</value></prop>
+        <prop oor:name="SubstFontsHTML"><value>sans-serif</value></prop>
+        <prop oor:name="FontWeight"><value>Normal</value></prop>
+        <prop oor:name="FontWidth"><value>Normal</value></prop>
+        <prop oor:name="FontType"><value>Standard,Normal,SansSerif</value></prop>
+      </node>
       <node oor:name="arioso" oor:op="replace">
         <prop oor:name="SubstFonts">
           <value>palacescript;palacescriptmt;arioso;shelley;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;andymt;comicsansms;andy;kidprint;</value>
@@ -2394,7 +2394,7 @@
       </node>
       <node oor:name="courier" oor:op="replace">
     <prop oor:name="SubstFonts">
-          <value>cumberland;cumberlandamt;liberationmono;couriernew;nimbusmonol;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+          <value>cumberland;cumberlandamt;cousine;liberationmono;couriernew;nimbusmonol;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
         </prop>
     <prop oor:name="SubstFontsMS"><value>Courier New</value></prop>
     <prop oor:name="SubstFontsPS"><value></value></prop>
@@ -2405,9 +2405,19 @@
       </node>
       <node oor:name="couriernew" oor:op="replace">
     <prop oor:name="SubstFonts">
-      <value>cumberland;cumberlandamt;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+      <value>cumberland;cumberlandamt;cousine;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+        </prop>
+    <prop oor:name="SubstFontsPS"><value>Courier</value></prop>
+    <prop oor:name="SubstFontsHTML"><value>monospace</value></prop>
+    <prop oor:name="FontWeight"><value>Normal</value></prop>
+    <prop oor:name="FontWidth"><value>Normal</value></prop>
+    <prop oor:name="FontType"><value>Standard,Normal,Fixed,Typewriter</value></prop>
+      </node>
+      <node oor:name="cousine" oor:op="replace">
+    <prop oor:name="SubstFonts">
+      <value>couriernew;cumberland;cumberlandamt;liberationmono;courier</value>
         </prop>
-    <prop oor:name="SubstFontsMS"><value></value></prop>
+    <prop oor:name="SubstFontsMS"><value>Courier New</value></prop>
     <prop oor:name="SubstFontsPS"><value>Courier</value></prop>
     <prop oor:name="SubstFontsHTML"><value>monospace</value></prop>
     <prop oor:name="FontWeight"><value>Normal</value></prop>
@@ -7287,7 +7297,6 @@
         <prop oor:name="SubstFonts">
           <value>thorndale;thorndaleamt;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
         </prop>
-        <prop oor:name="SubstFontsMS"><value></value></prop>
         <prop oor:name="SubstFontsPS"><value>Times</value></prop>
         <prop oor:name="SubstFontsHTML"><value>serif</value></prop>
         <prop oor:name="FontWeight"><value>Normal</value></prop>
@@ -7316,6 +7325,17 @@
         <prop oor:name="FontWidth"><value>Normal</value></prop>
         <prop oor:name="FontType"><value>Normal,Serif</value></prop>
       </node>
+      <node oor:name="timos" oor:op="replace">
+        <prop oor:name="SubstFonts">
+          <value>timesnewroman;thorndale;thorndaleamt;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons</value>
+        </prop>
+        <prop oor:name="SubstFontsMS"><value>Times New Roman</value></prop>
+        <prop oor:name="SubstFontsPS"><value>Times</value></prop>
+        <prop oor:name="SubstFontsHTML"><value>serif</value></prop>
+        <prop oor:name="FontWeight"><value>Normal</value></prop>
+        <prop oor:name="FontWidth"><value>Normal</value></prop>
+        <prop oor:name="FontType"><value>Standard,Normal,Serif</value></prop>
+      </node>
       <node oor:name="tmsrmn" oor:op="replace">
         <prop oor:name="SubstFonts">
           <value>thorndaleamt;thorndale;timesnewroman;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 02e05a932952..9bc07c592f0f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -4368,69 +4368,133 @@
 					<info>
 						<desc>Specifies default settings of graphic export dialogs.</desc>
 					</info>
-					<group oor:name="BMP">
+          <prop oor:name="PixelExportUnit" oor:type="xs:int">
+            <info>
+                <desc>Specifies the unit default that is used in the the graphic export dialog if exporting pixel graphics.</desc>
+            </info>
+            <constraints>
+              <enumeration oor:value="0">
+                <info>
+                  <desc>inches</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="1">
+                <info>
+                  <desc>cm</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="2">
+                <info>
+                  <desc>mm</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="3">
+                <info>
+                  <desc>points</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="4">
+                <info>
+                  <desc>pica</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="5">
+                <info>
+                  <desc>pixels</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="-1">
+                <info>
+                  <desc>default (depends to the metric settings in tools/options)</desc>
+                </info>
+              </enumeration>
+            </constraints>
+            <value>-1</value>
+          </prop>
+          <prop oor:name="PixelExportResolutionUnit" oor:type="xs:int">
+            <info>
+              <desc>Specifies the unit default for the resolution that is used in the the graphic export dialog if exporting pixel graphics.</desc>
+            </info>
+            <constraints>
+              <enumeration oor:value="0">
+                <info>
+                  <desc>pixels/inch</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="1">
+                <info>
+                  <desc>pixels/cm</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="2">
+                <info>
+                  <desc>pixels/meter</desc>
+                </info>
+              </enumeration>
+            </constraints>
+            <value>0</value>
+          </prop>
+          <prop oor:name="PixelExportResolution" oor:type="xs:int">
+            <info>
+              <desc>Specifies the logical width of a graphic. [UNIT=1/100 mm].</desc>
+            </info>
+            <constraints>
+              <minInclusive oor:value="1">
+                <info>
+                  <desc>Represents the lowest value that can be entered in the dialog.</desc>
+                </info>
+              </minInclusive>
+            </constraints>
+            <value>96</value>
+          </prop>
+          <prop oor:name="MaxFilesizeForRealtimePreview" oor:type="xs:int">
+            <info>
+              <desc>Specifies the maximum raw graphic size in bytes up to which the realtime preview is enabled, for fast computers this value may be enlarged</desc>
+            </info>
+            <value>4000000</value>
+          </prop>
+          <prop oor:name="VectorExportUnit" oor:type="xs:int">
+            <info>
+              <desc>Specifies the unit default that is used in the the graphic export dialog if exporting vector graphics.</desc>
+            </info>
+            <constraints>
+              <enumeration oor:value="0">
+                <info>
+                  <desc>inches</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="1">
+                <info>
+                  <desc>cm</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="2">
+                <info>
+                  <desc>mm</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="3">
+                <info>
+                  <desc>points</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="4">
+                <info>
+                  <desc>pica</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="-1">
+                <info>
+                  <desc>default (depends to the metric settings in tools/options)</desc>
+                </info>
+              </enumeration>
+            </constraints>
+            <value>-1</value>
+          </prop>
+          <group oor:name="BMP">
 						<info>
 							<desc>Specifies default settings of the Windows Bitmap export dialog.</desc>
 						</info>
-						<prop oor:name="ExportMode" oor:type="xs:int">
-							<!-- OldPath: BMP-EXPORT-MODE -->
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  BMP-MS Windows - [dialog] BMP Options -->
-							<info>
-								<desc>Specifies usable export modes.</desc>
-								<label>Mode - Original / Resolution / Size</label>
-							</info>
-							<constraints>
-								<enumeration oor:value="0">
-									<info>
-										<desc>Original size</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="1">
-									<info>
-										<desc>Logical size (dpi/pixel ratio)</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="2">
-									<info>
-										<desc>Given size</desc>
-									</info>
-								</enumeration>
-							</constraints>
-							<value>0</value>
-						</prop>
-						<prop oor:name="Resolution" oor:type="xs:int">
-							<!-- OldPath: BMP-EXPORT-RES -->
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  BMP-MS Windows - [dialog] BMP Options -->
-							<info>
-								<desc>Specifies resolution which is to be used if export mode is 1. [UNIT=dpi]</desc>
-								<label>Resolution</label>
-							</info>
-							<constraints>
-								<enumeration oor:value="75">
-									<info>
-										<desc>75</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="150">
-									<info>
-										<desc>150</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="300">
-									<info>
-										<desc>300</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="600">
-									<info>
-										<desc>600</desc>
-									</info>
-								</enumeration>
-							</constraints>
-							<value>75</value>
-						</prop>
 						<prop oor:name="Color" oor:type="xs:int">
 							<!-- OldLocation: fltopt.ini -->
 							<!-- UIHints: File  Export  Filetype  BMP-MS Windows - [dialog] BMP Options -->
@@ -4492,13 +4556,6 @@
 							</info>
 							<value>true</value>
 						</prop>
-						<node-ref oor:name="Size" oor:node-type="LogicalGraphicSize">
-							<info>
-								<desc>Specifies the logical size of a graphic. [UNIT=1/100 mm].</desc>
-							</info>
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  BMP-MS Windows - [dialog] BMP Options -->
-						</node-ref>
 					</group>
 					<group oor:name="EPS">
 						<!-- OldLocation: fltopt.ini -->
@@ -4706,72 +4763,6 @@
 							<value>0</value>
 						</prop>
 					</group>
-					<group oor:name="MET">
-						<info>
-							<desc>Specifies if graphics are exported with the original- or selected size.</desc>
-						</info>
-						<prop oor:name="ExportMode" oor:type="xs:int">
-							<!-- OldPath: MET-EXPORT-MODE -->
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  MET-OS/2 Metafile -->
-							<info>
-								<desc>Specifies if graphics are exported with the original- or selected size.</desc>
-							</info>
-							<constraints>
-								<enumeration oor:value="0">
-									<info>
-										<desc>Original size</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="1">
-									<info>
-										<desc>Given size</desc>
-									</info>
-								</enumeration>
-							</constraints>
-							<value>0</value>
-						</prop>
-						<node-ref oor:name="Size" oor:node-type="LogicalGraphicSize">
-							<info>
-								<desc>Specifies the logical size of a graphic. [UNIT=1/100 mm].</desc>
-							</info>
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  MET-MS Windows - [dialog] MET Options -->
-						</node-ref>
-					</group>
-					<group oor:name="PCT">
-						<info>
-							<desc>Specifies default settings of the PCT - Mac Pict export dialog.</desc>
-						</info>
-						<prop oor:name="ExportMode" oor:type="xs:int">
-							<!-- OldPath: PCT-EXPORT-MODE -->
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  PCT-Mac Pict -->
-							<info>
-								<desc>Specifies if graphics are exported with original- or selected size.</desc>
-							</info>
-							<constraints>
-								<enumeration oor:value="0">
-									<info>
-										<desc>Original size</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="1">
-									<info>
-										<desc>Given size</desc>
-									</info>
-								</enumeration>
-							</constraints>
-							<value>0</value>
-						</prop>
-						<node-ref oor:name="Size" oor:node-type="LogicalGraphicSize">
-							<info>
-								<desc>Specifies the logical size of a graphic. [UNIT=1/100 mm].</desc>
-							</info>
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  PCT-MS Windows - [dialog] PCT Options -->
-						</node-ref>
-					</group>
 					<group oor:name="PBM">
 						<info>
 							<desc>Specifies default settings of the PBM - Portable Bitmap export dialog.</desc>
@@ -4850,105 +4841,6 @@
 							<value>1</value>
 						</prop>
 					</group>
-					<group oor:name="SVM">
-						<info>
-							<desc>Specifies default settings of the SVM - StarView Meta File export dialog.</desc>
-						</info>
-						<prop oor:name="ExportMode" oor:type="xs:int">
-							<!-- OldPath: SVM-EXPORT-MODE -->
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  SVM - StarView Metafile -->
-							<info>
-								<desc>Specifies if graphics should be exported with the original- or selected size.</desc>
-							</info>
-							<constraints>
-								<enumeration oor:value="0">
-									<info>
-										<desc>Original size</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="1">
-									<info>
-										<desc>Given size</desc>
-									</info>
-								</enumeration>
-							</constraints>
-							<value>0</value>
-						</prop>
-						<node-ref oor:name="Size" oor:node-type="LogicalGraphicSize">
-							<info>
-								<desc>Specifies the logical size of a graphic. [UNIT=1/100 mm].</desc>
-							</info>
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  SVM  - StarView Metafile - [dialog] SVM Options -->
-						</node-ref>
-					</group>
-					<group oor:name="WMF">
-						<info>
-							<desc>Specifies default settings of the WMF - Windows Metafile export dialog.</desc>
-						</info>
-						<prop oor:name="ExportMode" oor:type="xs:int">
-							<!-- OldPath: WMF-EXPORT-MODE -->
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  WMF -MS Windows Metafile -->
-							<info>
-								<desc>Specifies if graphics should be exported with the original- or selected size.</desc>
-							</info>
-							<constraints>
-								<enumeration oor:value="0">
-									<info>
-										<desc>Original size</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="1">
-									<info>
-										<desc>Given size</desc>
-									</info>
-								</enumeration>
-							</constraints>
-							<value>0</value>
-						</prop>
-						<node-ref oor:name="Size" oor:node-type="LogicalGraphicSize">
-							<info>
-								<desc>Specifies the logical size of a graphic. [UNIT=1/100 mm].</desc>
-							</info>
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  WMF - MS Windows Metafile - [dialog] WMF Options -->
-						</node-ref>
-					</group>
-					<group oor:name="EMF">
-						<info>
-							<desc>Specifies default settings of the EMF - Enhanced Metafile export dialog.</desc>
-						</info>
-						<prop oor:name="ExportMode" oor:type="xs:int">
-							<!-- OldPath: EMF-EXPORT-MODE -->
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File - Export -->
-							<info>
-								<desc>Specifies if graphics should be exported with the original- or selected size.</desc>
-							</info>
-							<constraints>
-								<enumeration oor:value="0">
-									<info>
-										<desc>Original size</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="1">
-									<info>
-										<desc>Given size</desc>
-									</info>
-								</enumeration>
-							</constraints>
-							<value>0</value>
-						</prop>
-						<node-ref oor:name="Size" oor:node-type="LogicalGraphicSize">
-							<info>
-								<desc>Specifies the logical size of a graphic. [UNIT=1/100 mm].</desc>
-							</info>
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  EMF - Enhanced Metafile - [dialog] EMF Options -->
-						</node-ref>
-					</group>
 					<group oor:name="PNG">
 						<info>
 							<desc>Specifies default settings of the PNG - Portable Network Graphic export dialog.</desc>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 4a3c2c02c396..ea806e58f320 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1512,6 +1512,15 @@
 				<info>
 					<desc>Contains miscellaneous settings.</desc>
 				</info>
+				<prop oor:name="IsAlignMathObjectsToBaseline" oor:type="xs:boolean">
+					<!-- UIHints: none yet -->
+					<info>
+						<author>TL</author>
+						<desc>Automatically align the baseline of Math objects with the baseline of the surrounding text.</desc>
+						<label>Align Math objects</label>
+					</info>
+					<value>true</value>
+				</prop>
 				<prop oor:name="MeasureUnit" oor:type="xs:int">
 					<!-- OldPath: Writer/Layout -->
 					<!-- OldLocation: Soffice.cfg -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
index 8738d9db2112..b92e4684c842 100644
--- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
@@ -418,6 +418,15 @@
 				<info>
 					<desc>Contains miscellaneous settings.</desc>
 				</info>
+                <prop oor:name="IsAlignMathObjectsToBaseline" oor:type="xs:boolean">
+                    <!-- UIHints: none yet -->
+                    <info>
+                        <author>TL</author>
+                        <desc>Automatically align the baseline of Math objects with the baseline of the surrounding text.</desc>
+                        <label>Align Math objects</label>
+                    </info>
+                    <value>true</value>
+                </prop>
 				<prop oor:name="MeasureUnit" oor:type="xs:int">
 					<!-- OldPath: HTML_Editor/Layout/Window -->
 					<!-- OldLocation: Soffice.cfg -->
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
index 76c4bb17782b..62d3fdcce85d 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -395,7 +395,14 @@
 					<author>AS</author>
 					<desc>Contains all of the document factories that were installed during setup.</desc>
 				</info>
-			</set>
+            </set>
+            <prop oor:name="OfficeRestartInProgress" oor:type="xs:boolean">
+                <info>
+                    <author>MAV</author>
+                    <desc>The entry specifies that we are in restart process</desc>
+                </info>
+                <value>false</value>
+            </prop>
 		</group>
 		<group oor:name="L10N">
 			<info>