diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-05-11 00:34:15 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-05-14 14:06:47 +0300 |
| commit | b2bed3ef5ef29b895d362dcc493b3e274eca17eb (patch) | |
| tree | fc40af40916d9f86ff7b9d2e63d0003ce07bdb11 /officecfg | |
| parent | b91fb08fd63207e663dca83abe1305d8025b4b48 (diff) | |
Revert "tdf#96444 Replace chr(20) with '%20' in style uno commands"
This reverts commit 939abe5a79674525ce134637947fe424a7e2332a.
This causes styles to not appear as having keyboard
shortcuts in Tools > Customize... > Keyboard, and style
buttons that were added using tdf#106681 to not have
their keyboard shortcuts in their tooltips.
Given that the original bug is a local problem in
MenuBarManager, I prefer to fix it there, rather than
put workarounds all over the place, including those ugly
"%20".
Change-Id: I797f463df2b37ab69f73f357ab9d120697e0ff33
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 24 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 24 |
2 files changed, 24 insertions, 24 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index fe0c37a2e2ee..78380bda67bd 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -3269,7 +3269,7 @@ <node oor:name="0_MOD1" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">.uno:StyleApply?Style:string=Text%20body&FamilyName:string=ParagraphStyles</value> + <value xml:lang="en-US">.uno:StyleApply?Style:string=Text body&FamilyName:string=ParagraphStyles</value> </prop> </node> <node oor:name="0_SHIFT_MOD1" oor:op="replace"> @@ -3281,31 +3281,31 @@ <node oor:name="1_MOD1" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading%201&FamilyName:string=ParagraphStyles</value> + <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 1&FamilyName:string=ParagraphStyles</value> </prop> </node> <node oor:name="2_MOD1" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading%202&FamilyName:string=ParagraphStyles</value> + <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 2&FamilyName:string=ParagraphStyles</value> </prop> </node> <node oor:name="3_MOD1" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading%203&FamilyName:string=ParagraphStyles</value> + <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 3&FamilyName:string=ParagraphStyles</value> </prop> </node> <node oor:name="4_MOD1" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading%204&FamilyName:string=ParagraphStyles</value> + <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 4&FamilyName:string=ParagraphStyles</value> </prop> </node> <node oor:name="5_MOD1" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading%205&FamilyName:string=ParagraphStyles</value> + <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 5&FamilyName:string=ParagraphStyles</value> </prop> </node> <node oor:name="8_MOD1" oor:op="replace"> @@ -5603,7 +5603,7 @@ <node oor:name="0_MOD1" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">.uno:StyleApply?Style:string=Text%20body&FamilyName:string=ParagraphStyles</value> + <value xml:lang="en-US">.uno:StyleApply?Style:string=Text body&FamilyName:string=ParagraphStyles</value> </prop> </node> <node oor:name="0_SHIFT_MOD1" oor:op="replace"> @@ -5615,31 +5615,31 @@ <node oor:name="1_MOD1" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading%201&FamilyName:string=ParagraphStyles</value> + <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 1&FamilyName:string=ParagraphStyles</value> </prop> </node> <node oor:name="2_MOD1" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading%202&FamilyName:string=ParagraphStyles</value> + <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 2&FamilyName:string=ParagraphStyles</value> </prop> </node> <node oor:name="3_MOD1" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading%203&FamilyName:string=ParagraphStyles</value> + <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 3&FamilyName:string=ParagraphStyles</value> </prop> </node> <node oor:name="4_MOD1" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading%204&FamilyName:string=ParagraphStyles</value> + <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 4&FamilyName:string=ParagraphStyles</value> </prop> </node> <node oor:name="5_MOD1" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading%205&FamilyName:string=ParagraphStyles</value> + <value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 5&FamilyName:string=ParagraphStyles</value> </prop> </node> <node oor:name="8_MOD1" oor:op="replace"> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index db76ef1f043a..a73fe0a505a2 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -2753,7 +2753,7 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:StyleApply?Style:string=Horizontal%20Line&FamilyName:string=ParagraphStyles" oor:op="replace"> + <node oor:name=".uno:StyleApply?Style:string=Horizontal Line&FamilyName:string=ParagraphStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Horizontal ~Line</value> </prop> @@ -2785,7 +2785,7 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:StyleApply?Style:string=Heading%201&FamilyName:string=ParagraphStyles" oor:op="replace"> + <node oor:name=".uno:StyleApply?Style:string=Heading 1&FamilyName:string=ParagraphStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Heading ~1</value> </prop> @@ -2793,7 +2793,7 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:StyleApply?Style:string=Heading%202&FamilyName:string=ParagraphStyles" oor:op="replace"> + <node oor:name=".uno:StyleApply?Style:string=Heading 2&FamilyName:string=ParagraphStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Heading ~2</value> </prop> @@ -2801,7 +2801,7 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:StyleApply?Style:string=Heading%203&FamilyName:string=ParagraphStyles" oor:op="replace"> + <node oor:name=".uno:StyleApply?Style:string=Heading 3&FamilyName:string=ParagraphStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Heading ~3</value> </prop> @@ -2809,7 +2809,7 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:StyleApply?Style:string=Heading%204&FamilyName:string=ParagraphStyles" oor:op="replace"> + <node oor:name=".uno:StyleApply?Style:string=Heading 4&FamilyName:string=ParagraphStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Heading ~4</value> </prop> @@ -2817,7 +2817,7 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:StyleApply?Style:string=Heading%205&FamilyName:string=ParagraphStyles" oor:op="replace"> + <node oor:name=".uno:StyleApply?Style:string=Heading 5&FamilyName:string=ParagraphStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Heading ~5</value> </prop> @@ -2825,7 +2825,7 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:StyleApply?Style:string=Heading%206&FamilyName:string=ParagraphStyles" oor:op="replace"> + <node oor:name=".uno:StyleApply?Style:string=Heading 6&FamilyName:string=ParagraphStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Heading ~6</value> </prop> @@ -2838,17 +2838,17 @@ <value xml:lang="en-US">~Quotations</value> </prop> </node> - <node oor:name=".uno:StyleApply?Style:string=Preformatted%20Text&FamilyName:string=ParagraphStyles" oor:op="replace"> + <node oor:name=".uno:StyleApply?Style:string=Preformatted Text&FamilyName:string=ParagraphStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Pre~formatted Text</value> </prop> </node> - <node oor:name=".uno:StyleApply?Style:string=Text%20body&FamilyName:string=ParagraphStyles" oor:op="replace"> + <node oor:name=".uno:StyleApply?Style:string=Text body&FamilyName:string=ParagraphStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Text Body</value> </prop> </node> - <node oor:name=".uno:StyleApply?Style:string=Default%20Style&FamilyName:string=CharacterStyles" oor:op="replace"> + <node oor:name=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Default ~Character</value> </prop> @@ -2858,7 +2858,7 @@ <value xml:lang="en-US">E~mphasis</value> </prop> </node> - <node oor:name=".uno:StyleApply?Style:string=Strong%20Emphasis&FamilyName:string=CharacterStyles" oor:op="replace"> + <node oor:name=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">~Strong Emphasis</value> </prop> @@ -2868,7 +2868,7 @@ <value xml:lang="en-US">Qu~otation</value> </prop> </node> - <node oor:name=".uno:StyleApply?Style:string=Source%20Text&FamilyName:string=CharacterStyles" oor:op="replace"> + <node oor:name=".uno:StyleApply?Style:string=Source Text&FamilyName:string=CharacterStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Sou~rce Text</value> </prop> |