dv22: merge with DEV300_m91

3 files changed, 133 insertions, 234 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
index 7570fda066..4ed9be5a3d 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/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 02e05a9329..9bc07c592f 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/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
index 76c4bb1778..62d3fdcce8 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>