[Libreoffice-commits] core.git: include/sfx2 officecfg/registry sfx2/source

[Libreoffice Gerrit user]

 include/sfx2/strings.hrc                                             |    1 +
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |    4 ++--
 sfx2/source/dialog/templdlg.cxx                                      |    5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 6acf4af3c90cca4edbad4fceb9c07bf90805a224
Author:     Roman Kuznetsov <antilibreoffice at gmail.com>
AuthorDate: Sun Jan 27 18:37:50 2019 +0100
Commit:     Heiko Tietze <tietze.heiko at gmail.com>
CommitDate: Mon Feb 4 11:40:22 2019 +0100

    tdf#74446 Changed item names in Styles dropdown menu on Sidebar
    
    Change-Id: I16ff0d5ff896d896cd2e261ea86a8df8d9b45f3b
    Reviewed-on: https://gerrit.libreoffice.org/66974
    Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>
    Tested-by: Heiko Tietze <tietze.heiko at gmail.com>

diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index a77dbc86d77d..329c5c8c39db 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -219,6 +219,7 @@
 #define STR_STYLE_FILTER_HIERARCHICAL           NC_("STR_STYLE_FILTER_HIERARCHICAL", "Hierarchical")
 #define STR_STYLE_FILL_FORMAT_MODE              NC_("STR_STYLE_FILL_FORMAT_MODE", "Fill Format Mode")
 #define STR_STYLE_NEW_STYLE_FROM_SELECTION      NC_("STR_STYLE_NEW_STYLE_FROM_SELECTION", "New Style from Selection")
+#define STR_STYLE_NEW_STYLE_ACTION              NC_("STR_STYLE_NEW_STYLE_ACTION", "Styles actions")
 #define STR_STYLE_UPDATE_STYLE                  NC_("STR_STYLE_UPDATE_STYLE", "Update Style")
 
 #define STR_MACRO_LOSS                          NC_("STR_MACRO_LOSS", "Do you really want to cancel the recording? Any steps recorded up to this point will be lost.")
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 500704cd2808..ad3fab4ba91f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2992,7 +2992,7 @@
       </node>
       <node oor:name=".uno:StyleNewByExample" oor:op="replace">
         <prop oor:name="ContextLabel" oor:type="xs:string">
-          <value xml:lang="en-US">~New Style...</value>
+          <value xml:lang="en-US">~New Style from Selection</value>
         </prop>
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">New</value>
@@ -3019,7 +3019,7 @@
       </node>
       <node oor:name=".uno:StyleUpdateByExample" oor:op="replace">
         <prop oor:name="ContextLabel" oor:type="xs:string">
-          <value xml:lang="en-US">~Update Style</value>
+          <value xml:lang="en-US">~Update Selected Style</value>
         </prop>
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Update</value>
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 8131c34a9df8..a749ff062842 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2144,6 +2144,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(SfxBindings* pB, SfxTemplatePanel
     m_aActionTbR->SetHelpId(SID_STYLE_WATERCAN, HID_TEMPLDLG_WATERCAN);
 
     m_aActionTbR->InsertItem(SID_STYLE_NEW_BY_EXAMPLE, Image(StockImage::Yes, RID_SFXBMP_NEW_BY_EXAMPLE), SfxResId(STR_STYLE_NEW_STYLE_FROM_SELECTION));
+    //renamed to SID_STYLE_NEW_BY_EXAMPLE in SfxTemplateDialog_Impl::ReplaceUpdateButtonByMenu()
     m_aActionTbR->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE);
 
     m_aActionTbR->InsertItem(SID_STYLE_UPDATE_BY_EXAMPLE, Image(StockImage::Yes, RID_SFXBMP_UPDATE_BY_EXAMPLE), SfxResId(STR_STYLE_UPDATE_STYLE));
@@ -2195,6 +2196,8 @@ void SfxTemplateDialog_Impl::ReplaceUpdateButtonByMenu()
     m_aActionTbR->HideItem(SID_STYLE_UPDATE_BY_EXAMPLE);
     m_aActionTbR->SetItemBits( SID_STYLE_NEW_BY_EXAMPLE,
             ToolBoxItemBits::DROPDOWNONLY|m_aActionTbR->GetItemBits( SID_STYLE_NEW_BY_EXAMPLE ));
+    //rename menu in case of Writer
+    m_aActionTbR->SetItemText(SID_STYLE_NEW_BY_EXAMPLE, SfxResId(STR_STYLE_NEW_STYLE_ACTION));
 }
 
 void SfxTemplateDialog_Impl::ClearFamilyList()
@@ -2386,6 +2389,8 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox, void )
         pMenu->InsertItem( SID_STYLE_UPDATE_BY_EXAMPLE, sLabel );
         pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE);
 
+        pMenu->InsertSeparator();
+
         sLabel = vcl::CommandInfoProvider::GetPopupLabelForCommand(".uno:LoadStyles", sTextDoc);
         pMenu->InsertItem( SID_TEMPLATE_LOAD, sLabel );
         pMenu->SetHelpId(SID_TEMPLATE_LOAD, ".uno:LoadStyles");