diff options
| -rw-r--r-- | linguistic/source/misc2.cxx | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu | 7 | ||||
| -rwxr-xr-x[-rw-r--r--] | officecfg/registry/schema/org/openoffice/Office/Math.xcs | 14 |
3 files changed, 20 insertions, 6 deletions
diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index 40d7a3be93..0b308ea6c9 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.cxx @@ -249,7 +249,10 @@ String GetWritableDictionaryURL( const String &rDicName ) aURLObj.Append( rDicName, INetURLObject::ENCODE_ALL ); DBG_ASSERT(!aURLObj.HasError(), "lng : invalid URL"); - return aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); + // NO_DECODE preserves the escape sequences that might be included in aDirName + // depending on the characters used in the path string. (Needed when comparing + // the dictionary URL with GetDictionaryWriteablePath in DicList::createDictionary.) + return aURLObj.GetMainURL( INetURLObject::NO_DECODE ); } diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu index 4ed9be5a3d..07a717f314 100644..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/Math.xcs b/officecfg/registry/schema/org/openoffice/Office/Math.xcs index 31f6e00a23..13a566dc67 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> |