summaryrefslogtreecommitdiffstats
path: root/officecfg
diff options
context:
space:
mode:
authorAndre Fischer <andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com>2010-11-05 10:17:51 +0100
committerAndre Fischer <andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com>2010-11-05 10:17:51 +0100
commit312cafc472e4ac74a045baf123476a2457c15185 (patch)
tree6a1e95fbf38b3355c2a243d88b8df2efae4ffe92 /officecfg
parentimpress195: #i91102# Another Matrox G550 DirectX blacklist entry. (diff)
parentCWS-TOOLING: integrate CWS vcl116 (diff)
downloadcore-312cafc472e4ac74a045baf123476a2457c15185.tar.gz
core-312cafc472e4ac74a045baf123476a2457c15185.zip
impress195: merge with DEV300_m92
Diffstat (limited to 'officecfg')
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Math.xcu5
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Paths.xcu3
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu10
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu15
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu2
-rw-r--r--officecfg/registry/data/org/openoffice/Office/makefile.mk2
-rw-r--r--officecfg/registry/data/org/openoffice/VCL.xcu68
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Common.xcs356
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Math.xcs23
-rwxr-xr-xofficecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs2
-rw-r--r--officecfg/registry/schema/org/openoffice/Setup.xcs9
11 files changed, 217 insertions, 278 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Math.xcu b/officecfg/registry/data/org/openoffice/Office/Math.xcu
index 6778873e3386..b65c2422c433 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Math.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Math.xcu
@@ -48,6 +48,8 @@
<value>0</value>
</prop>
</node>
+
+ <!-- only used for symbols with the 'Greek' symbol set name -->
<node oor:name="Id2" oor:op="replace">
<prop oor:name="Name">
<value>OpenSymbol</value>
@@ -65,10 +67,11 @@
<value>0</value>
</prop>
<prop oor:name="Italic">
- <value>2</value>
+ <value>0</value>
</prop>
</node>
</node>
+
<node oor:name="SymbolList">
<node oor:name="alpha" oor:op="replace">
<prop oor:name="Char">
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index 91a26137b24d..37eebe5c2a22 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -169,7 +169,8 @@
<node oor:name="Fingerprint" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths">
- <node oor:name="$(insturl)/share/fingerprint" oor:op="fuse" />
+ <node install:module="internallibtextcatdata" oor:name="$(insturl)/share/fingerprint" oor:op="fuse"/>
+ <node install:module="externallibtextcatdata" oor:name="${SYSTEM_LIBTEXTCAT_DATA}" oor:op="fuse"/>
</node>
</node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 33e5109405d0..5c72d948436f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE oor:component-data SYSTEM "../../../../../component-update.dtd">
<oor:component-data oor:name="CalcCommands" oor:package="org.openoffice.Office.UI" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<node oor:name="UserInterface">
@@ -160,6 +160,14 @@
<value xml:lang="en-US">~Select...</value>
</prop>
</node>
+ <node oor:name=".uno:TableEvents" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Sheet ~Events...</value>
+ </prop>
+ <prop oor:name="ContextLabel" oor:type="xs:string">
+ <value xml:lang="en-US">~Events...</value>
+ </prop>
+ </node>
<node oor:name=".uno:DataPilotFilter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">DataPilot Filter</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index ebed194fcffc..479827565775 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1463,9 +1463,6 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Find Text</value>
</prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
</node>
<node oor:name=".uno:DownSearch" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
@@ -1487,9 +1484,6 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Focus to Findbar</value>
</prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
</node>
<node oor:name=".uno:ExtendedHelp" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
@@ -2139,9 +2133,6 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Sentence case</value>
</prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
</node>
<node oor:name=".uno:ChangeCaseToLower" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
@@ -2163,17 +2154,11 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Capitalize Every Word</value>
</prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
</node>
<node oor:name=".uno:ChangeCaseToToggleCase" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~tOGGLE cASE</value>
</prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
</node>
<node oor:name=".uno:ChangeCaseToHalfWidth" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
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/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk
index e65b03371da3..2af1e8629bd9 100644
--- a/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk
@@ -87,6 +87,8 @@ MODULEFILES= \
Paths-macosx.xcu \
Paths-unxwnt.xcu \
Paths-unixdesktop.xcu \
+ Paths-internallibtextcatdata.xcu \
+ Paths-externallibtextcatdata.xcu \
Writer-cjk.xcu \
Impress-ogltrans.xcu \
Embedding-calc.xcu \
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/Math.xcs b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index caa8726b7c72..31f6e00a230a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -402,7 +402,28 @@
</info>
<value>false</value>
</prop>
- <prop oor:name="ScaleNormalBracket" oor:type="xs:boolean">
+ <prop oor:name="GreekCharStyle" oor:type="xs:short">
+ <!-- UIHints: n/a yet -->
+ <info>
+ <author>TL</author>
+ <desc>Specifies the default layout for symbols from the 'Greek' symbol set.</desc>
+ <label>Greek character style</label>
+ </info>
+ <constraints>
+ <minInclusive oor:value="0">
+ <info>
+ <desc>Specifies the minimum value allowed</desc>
+ </info>
+ </minInclusive>
+ <maxInclusive oor:value="2">
+ <info>
+ <desc>Specifies the maximum value allowed</desc>
+ </info>
+ </maxInclusive>
+ </constraints>
+ <value>0</value>
+ </prop>
+ <prop oor:name="ScaleNormalBracket" oor:type="xs:boolean">
<!-- OldPath: Math/StandardFormat -->
<!-- OldLocation: Soffice.cfg -->
<!-- UIHints: Format - Spacing - Category - Brackets - Scale all brackets -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
index 7b0b221f15a9..7ff91464727d 100755
--- a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
@@ -15,7 +15,7 @@
OpenOffice.org Improvement Program. If this is zero the user will get asked.
</desc>
</info>
- <value>2</value>
+ <value>1</value>
</prop>
<prop oor:name="InvitationAccepted" oor:type="xs:boolean">
<info>
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>