mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "tdf#96444 Replace chr(20) with '%20' in style uno commands"

Browse Source 
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
This commit is contained in:
Maxim Monastirsky 2017-05-11 00:34:15 +03:00
parent b91fb08fd6
commit b2bed3ef5e
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
View File

@ -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&amp;FamilyName:string=ParagraphStyles</value>
<value xml:lang="en-US">.uno:StyleApply?Style:string=Text body&amp;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&amp;FamilyName:string=ParagraphStyles</value>
<value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 1&amp;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&amp;FamilyName:string=ParagraphStyles</value>
<value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 2&amp;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&amp;FamilyName:string=ParagraphStyles</value>
<value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 3&amp;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&amp;FamilyName:string=ParagraphStyles</value>
<value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 4&amp;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&amp;FamilyName:string=ParagraphStyles</value>
<value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 5&amp;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&amp;FamilyName:string=ParagraphStyles</value>
<value xml:lang="en-US">.uno:StyleApply?Style:string=Text body&amp;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&amp;FamilyName:string=ParagraphStyles</value>
<value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 1&amp;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&amp;FamilyName:string=ParagraphStyles</value>
<value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 2&amp;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&amp;FamilyName:string=ParagraphStyles</value>
<value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 3&amp;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&amp;FamilyName:string=ParagraphStyles</value>
<value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 4&amp;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&amp;FamilyName:string=ParagraphStyles</value>
<value xml:lang="en-US">.uno:StyleApply?Style:string=Heading 5&amp;FamilyName:string=ParagraphStyles</value>
</prop>
</node>
<node oor:name="8_MOD1" oor:op="replace">

24
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
View File

@ -2753,7 +2753,7 @@
<value>1</value>
</prop>
</node>
<node oor:name=".uno:StyleApply?Style:string=Horizontal%20Line&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
<node oor:name=".uno:StyleApply?Style:string=Horizontal Line&amp;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&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
<node oor:name=".uno:StyleApply?Style:string=Heading 1&amp;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&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
<node oor:name=".uno:StyleApply?Style:string=Heading 2&amp;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&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
<node oor:name=".uno:StyleApply?Style:string=Heading 3&amp;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&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
<node oor:name=".uno:StyleApply?Style:string=Heading 4&amp;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&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
<node oor:name=".uno:StyleApply?Style:string=Heading 5&amp;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&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
<node oor:name=".uno:StyleApply?Style:string=Heading 6&amp;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&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
<node oor:name=".uno:StyleApply?Style:string=Preformatted Text&amp;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&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
<node oor:name=".uno:StyleApply?Style:string=Text body&amp;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&amp;FamilyName:string=CharacterStyles" oor:op="replace">
<node oor:name=".uno:StyleApply?Style:string=Default Style&amp;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&amp;FamilyName:string=CharacterStyles" oor:op="replace">
<node oor:name=".uno:StyleApply?Style:string=Strong Emphasis&amp;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&amp;FamilyName:string=CharacterStyles" oor:op="replace">
<node oor:name=".uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Sou~rce Text</value>
</prop>

20
sw/uiconfig/swriter/menubar/menubar.xml
View File

@ -296,7 +296,7 @@
<menu:menuitem menu:id=".uno:InsertRLM"/>
</menu:menupopup>
</menu:menu>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Horizontal%20Line&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Horizontal Line&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuseparator/>
<menu:menu menu:id=".uno:InsertFootnotesMenu">
<menu:menupopup>
@ -565,19 +565,19 @@
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Standard&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Title&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Subtitle&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading%201&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading%202&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading%203&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading%204&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Text%20body&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 3&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 4&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Text body&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotations&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Preformatted%20Text&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Preformatted Text&amp;FamilyName:string=ParagraphStyles"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Default%20Style&amp;FamilyName:string=CharacterStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&amp;FamilyName:string=CharacterStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong%20Emphasis&amp;FamilyName:string=CharacterStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotation&amp;FamilyName:string=CharacterStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Source%20Text&amp;FamilyName:string=CharacterStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:EditStyle"/>
<menu:menuitem menu:id=".uno:StyleUpdateByExample"/>