[Libreoffice-commits] core.git: 3 commits - framework/inc framework/source officecfg/registry sc/uiconfig sw/uiconfig
Maxim Monastirsky
momonasmon at gmail.com
Sun May 14 11:09:23 UTC 2017
framework/inc/uielement/menubarmanager.hxx | 1
framework/source/uielement/menubarmanager.cxx | 4 -
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 24 ++++----
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 24 ++++----
sc/uiconfig/scalc/ui/notebookbar_groups.ui | 10 +--
sw/uiconfig/swriter/menubar/menubar.xml | 20 +++---
sw/uiconfig/swriter/toolbar/textstylebar.xml | 30 +++++-----
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 10 +--
sw/uiconfig/swriter/ui/notebookbar_groups.ui | 10 +--
9 files changed, 67 insertions(+), 66 deletions(-)
New commits:
commit 180416ba647ded76ef27da074eff9c46583b82d0
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Sun May 14 13:51:42 2017 +0300
Remove more %20 from style commands
And fix a typo found in H5/H6 commands in Writer's
style toolbar.
Change-Id: Ieb8f701d055870040010da66a9a108bbd089bc0a
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groups.ui b/sc/uiconfig/scalc/ui/notebookbar_groups.ui
index 18b15b797b83..71fd26ff02e1 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groups.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groups.ui
@@ -163,7 +163,7 @@
<object class="GtkMenuItem" id="stylemenuacc1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Accent%201&FamilyName:string=CellStyles</property>
+ <property name="action_name">.uno:StyleApply?Style:string=Accent 1&FamilyName:string=CellStyles</property>
<property name="label" translatable="yes">Accent 1</property>
<property name="use_underline">True</property>
</object>
@@ -172,7 +172,7 @@
<object class="GtkMenuItem" id="stylemenuacc2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Accent%202&FamilyName:string=CellStyles</property>
+ <property name="action_name">.uno:StyleApply?Style:string=Accent 2&FamilyName:string=CellStyles</property>
<property name="label" translatable="yes">Accent 2</property>
<property name="use_underline">True</property>
</object>
@@ -181,7 +181,7 @@
<object class="GtkMenuItem" id="stylemenuacc3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Accent%203&FamilyName:string=CellStyles</property>
+ <property name="action_name">.uno:StyleApply?Style:string=Accent 3&FamilyName:string=CellStyles</property>
<property name="label" translatable="yes">Accent 3</property>
<property name="use_underline">True</property>
</object>
@@ -196,7 +196,7 @@
<object class="GtkMenuItem" id="stylemenuhed1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Heading%201&FamilyName:string=CellStyles</property>
+ <property name="action_name">.uno:StyleApply?Style:string=Heading 1&FamilyName:string=CellStyles</property>
<property name="label" translatable="yes">Heading 1</property>
<property name="use_underline">True</property>
</object>
@@ -205,7 +205,7 @@
<object class="GtkMenuItem" id="stylemenuhed2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Heading%202&FamilyName:string=CellStyles</property>
+ <property name="action_name">.uno:StyleApply?Style:string=Heading 2&FamilyName:string=CellStyles</property>
<property name="label" translatable="yes">Heading 2</property>
<property name="use_underline">True</property>
</object>
diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml b/sw/uiconfig/swriter/toolbar/textstylebar.xml
index 802a9d997721..b32feadf8054 100644
--- a/sw/uiconfig/swriter/toolbar/textstylebar.xml
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -34,15 +34,15 @@
<toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Standard&FamilyName:string=ParagraphStyles" toolbar:text="Default" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Title&FamilyName:string=ParagraphStyles" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Subtitle&FamilyName:string=ParagraphStyles" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading%201&FamilyName:string=ParagraphStyles" toolbar:text="H1"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading%202&FamilyName:string=ParagraphStyles" toolbar:text="H2"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading%203&FamilyName:string=ParagraphStyles" toolbar:text="H3"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading%204&FamilyName:string=ParagraphStyles" toolbar:text="H4" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading%203&FamilyName:string=ParagraphStyles" toolbar:text="H5" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading%204&FamilyName:string=ParagraphStyles" toolbar:text="H6" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Text%20body&FamilyName:string=ParagraphStyles" toolbar:text="Text"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading 1&FamilyName:string=ParagraphStyles" toolbar:text="H1"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading 2&FamilyName:string=ParagraphStyles" toolbar:text="H2"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading 3&FamilyName:string=ParagraphStyles" toolbar:text="H3"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading 4&FamilyName:string=ParagraphStyles" toolbar:text="H4" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading 5&FamilyName:string=ParagraphStyles" toolbar:text="H5" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading 6&FamilyName:string=ParagraphStyles" toolbar:text="H6" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Text body&FamilyName:string=ParagraphStyles" toolbar:text="Text"/>
<toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Quotations&FamilyName:string=ParagraphStyles" toolbar:text="Quote"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Preformatted%20Text&FamilyName:string=ParagraphStyles" toolbar:text="Pre"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Preformatted Text&FamilyName:string=ParagraphStyles" toolbar:text="Pre"/>
<toolbar:toolbarseparator/>
<!-- These commands can be enabled when tdf#88512 and tdf#106782 are fixed -->
<toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:text="Character Styles" toolbar:visible="false"/>
@@ -50,12 +50,12 @@
<toolbar:toolbaritem xlink:href=".uno:StyleNewByExample" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:EditStyle" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Default%20Style&FamilyName:string=CharacterStyles" toolbar:text="Default"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles" toolbar:text="Default"/>
<toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Strong%20Emphasis&FamilyName:string=CharacterStyles" toolbar:text="Strong"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles" toolbar:text="Strong"/>
<toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Quotation&FamilyName:string=CharacterStyles" toolbar:text="Quote" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Source%20Text&FamilyName:string=CharacterStyles" toolbar:text="Code"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=User%20Entry&FamilyName:string=CharacterStyles" toolbar:text="User" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Source Text&FamilyName:string=CharacterStyles" toolbar:text="Code"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=User Entry&FamilyName:string=CharacterStyles" toolbar:text="User" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:visible="false"/>
@@ -73,9 +73,9 @@
<!-- These command can be enabled when tdf#107000 is fixed -->
<toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:text="List Styles" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=List%201&FamilyName:string=NumberingStyles" toolbar:text="Bullet"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Numbering%201&FamilyName:string=NumberingStyles" toolbar:text="Number"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Numbering%204&FamilyName:string=NumberingStyles" toolbar:text="Roman"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=List 1&FamilyName:string=NumberingStyles" toolbar:text="Bullet"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Numbering 1&FamilyName:string=NumberingStyles" toolbar:text="Number"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Numbering 4&FamilyName:string=NumberingStyles" toolbar:text="Roman"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:visible="false"/>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index b99b2c73e8cf..b036e1e9fc9b 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -3196,21 +3196,21 @@
<object class="GtkMenuItem" id="heading1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Heading%201&FamilyName:string=ParagraphStyles</property>
+ <property name="action_name">.uno:StyleApply?Style:string=Heading 1&FamilyName:string=ParagraphStyles</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="heading2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Heading%202&FamilyName:string=ParagraphStyles</property>
+ <property name="action_name">.uno:StyleApply?Style:string=Heading 2&FamilyName:string=ParagraphStyles</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="heading3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Heading%203&FamilyName:string=ParagraphStyles</property>
+ <property name="action_name">.uno:StyleApply?Style:string=Heading 3&FamilyName:string=ParagraphStyles</property>
</object>
</child>
<child>
@@ -3223,7 +3223,7 @@
<object class="GtkMenuItem" id="chardefault">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Default%20Style&FamilyName:string=CharacterStyles</property>
+ <property name="action_name">.uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles</property>
</object>
</child>
<child>
@@ -3237,7 +3237,7 @@
<object class="GtkMenuItem" id="bold">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Strong%20Emphasis&FamilyName:string=CharacterStyles</property>
+ <property name="action_name">.uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles</property>
</object>
</child>
<child>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groups.ui b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
index e440f4d7624c..fb41e3de7e96 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
@@ -333,7 +333,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Heading 1</property>
- <property name="action_name">.uno:StyleApply?Style:string=Heading%201&FamilyName:string=ParagraphStyles</property>
+ <property name="action_name">.uno:StyleApply?Style:string=Heading 1&FamilyName:string=ParagraphStyles</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -342,7 +342,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Heading 2</property>
- <property name="action_name">.uno:StyleApply?Style:string=Heading%202&FamilyName:string=ParagraphStyles</property>
+ <property name="action_name">.uno:StyleApply?Style:string=Heading 2&FamilyName:string=ParagraphStyles</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -351,7 +351,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Heading 3</property>
- <property name="action_name">.uno:StyleApply?Style:string=Heading%203&FamilyName:string=ParagraphStyles</property>
+ <property name="action_name">.uno:StyleApply?Style:string=Heading 3&FamilyName:string=ParagraphStyles</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -366,7 +366,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Default Character</property>
- <property name="action_name">.uno:StyleApply?Style:string=Default%20Style&FamilyName:string=CharacterStyles</property>
+ <property name="action_name">.uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -384,7 +384,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Strong Emphasis</property>
- <property name="action_name">.uno:StyleApply?Style:string=Strong%20Emphasis&FamilyName:string=CharacterStyles</property>
+ <property name="action_name">.uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles</property>
<property name="use_underline">True</property>
</object>
</child>
commit b769152dcafe2b12bd820587036cced0ec49ec4f
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Sun May 14 13:25:53 2017 +0300
tdf#96444 Shortcuts are saved with non-parsed URL
MenuBarManager overwrites the item URL with the parsed
version. This causes the keyboard shortcuts of style
commands to no longer be found on subsequent opening of
the menu, because they have spaces, which in the parsed
version were replaced with "%20".
Change-Id: I80b559203742922f70b7cec54b5a5ae57d3ef7dd
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 7c363dc902e1..67f598247964 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -169,6 +169,7 @@ class MenuBarManager:
sal_uInt16 nItemId;
OUString aTargetFrame;
OUString aMenuItemURL;
+ OUString aParsedItemURL;
css::uno::Reference< css::frame::XStatusListener > xSubMenuManager;
css::uno::Reference< css::frame::XDispatch > xMenuItemDispatch;
css::uno::Reference< css::frame::XPopupMenuController > xPopupMenuController;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 2e99be82a8bb..eadf7764af49 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -364,7 +364,7 @@ void SAL_CALL MenuBarManager::statusChanged( const FeatureStateEvent& Event )
for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
{
MenuItemHandler* pMenuItemHandler = *p;
- if ( pMenuItemHandler->aMenuItemURL == aFeatureURL )
+ if ( pMenuItemHandler->aParsedItemURL == aFeatureURL )
{
bool bCheckmark( false );
bool bMenuItemEnabled( m_pVCLMenu->IsItemEnabled( pMenuItemHandler->nItemId ));
@@ -851,7 +851,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu, bool )
if ( xMenuItemDispatch.is() )
{
pMenuItemHandler->xMenuItemDispatch = xMenuItemDispatch;
- pMenuItemHandler->aMenuItemURL = aTargetURL.Complete;
+ pMenuItemHandler->aParsedItemURL = aTargetURL.Complete;
if ( !bPopupMenu )
{
commit b2bed3ef5ef29b895d362dcc493b3e274eca17eb
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Thu May 11 00:34:15 2017 +0300
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
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>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 1287fe68ee6b..b91b0eebaefd 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -296,7 +296,7 @@
<menu:menuitem menu:id=".uno:InsertRLM"/>
</menu:menupopup>
</menu:menu>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Horizontal%20Line&FamilyName:string=ParagraphStyles"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Horizontal Line&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&FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Title&FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Subtitle&FamilyName:string=ParagraphStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading%201&FamilyName:string=ParagraphStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading%202&FamilyName:string=ParagraphStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading%203&FamilyName:string=ParagraphStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading%204&FamilyName:string=ParagraphStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Text%20body&FamilyName:string=ParagraphStyles"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 1&FamilyName:string=ParagraphStyles"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 2&FamilyName:string=ParagraphStyles"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 3&FamilyName:string=ParagraphStyles"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 4&FamilyName:string=ParagraphStyles"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Text body&FamilyName:string=ParagraphStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotations&FamilyName:string=ParagraphStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Preformatted%20Text&FamilyName:string=ParagraphStyles"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Preformatted Text&FamilyName:string=ParagraphStyles"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default%20Style&FamilyName:string=CharacterStyles"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong%20Emphasis&FamilyName:string=CharacterStyles"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotation&FamilyName:string=CharacterStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Source%20Text&FamilyName:string=CharacterStyles"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&FamilyName:string=CharacterStyles"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:EditStyle"/>
<menu:menuitem menu:id=".uno:StyleUpdateByExample"/>
More information about the Libreoffice-commits
mailing list