[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sfx2/source

[Caolán McNamara]

 sfx2/source/dialog/dialog.hrc   |    3 +++
 sfx2/source/dialog/templdlg.cxx |    9 +++------
 sfx2/source/dialog/templdlg.src |   15 +++++++++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)

New commits:
commit 8e0220ce0d9e20577694b56011cfe34d1bc35fc5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 4 14:29:00 2017 +0100

    Resolves: tdf#106935 restore traditional toolbar labels
    
    (cherry picked from commit f1a53e7a0b388e0a5303fe68dfbb4c60f4c7a0ff)
    
    Change-Id: I00cf16e9ce429f9186cc900a07f4d386e33b8f7b
    Reviewed-on: https://gerrit.libreoffice.org/36083
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index 800f71750b18..5d4f2538c471 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -62,6 +62,9 @@
 #define STR_STYLE_ELEMTLIST             ( RC_DIALOG_BEGIN + 125 )
 #define STR_FONT_TABPAGE                ( RC_DIALOG_BEGIN + 126 )
 #define STR_PREVIEW_CHECKBOX            ( RC_DIALOG_BEGIN + 127 )
+#define STR_STYLE_FILL_FORMAT_MODE      ( RC_DIALOG_BEGIN + 128 )
+#define STR_STYLE_NEW_STYLE_FROM_SELECTION ( RC_DIALOG_BEGIN + 129 )
+#define STR_STYLE_UPDATE_STYLE          ( RC_DIALOG_BEGIN + 130 )
 
 #endif
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 7ffe615edaea..994e3ccb1a3f 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2196,18 +2196,15 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(SfxBindings* pB, SfxTemplatePanel
         if (xUICommands.is())
         {
             uno::Any aCommand = xUICommands->getByName(".uno:StyleApply");
-            OUString sLabel = lcl_GetLabel( aCommand );
-            m_aActionTbR->InsertItem( SID_STYLE_WATERCAN, sLabel );
+            m_aActionTbR->InsertItem( SID_STYLE_WATERCAN, SfxResId(STR_STYLE_FILL_FORMAT_MODE).toString() );
             m_aActionTbR->SetHelpId(SID_STYLE_WATERCAN, HID_TEMPLDLG_WATERCAN);
 
             aCommand = xUICommands->getByName(".uno:StyleNewByExample");
-            sLabel = lcl_GetLabel( aCommand );
-            m_aActionTbR->InsertItem( SID_STYLE_NEW_BY_EXAMPLE, sLabel );
+            m_aActionTbR->InsertItem( SID_STYLE_NEW_BY_EXAMPLE, SfxResId(STR_STYLE_NEW_STYLE_FROM_SELECTION).toString() );
             m_aActionTbR->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE);
 
             aCommand = xUICommands->getByName(".uno:StyleUpdateByExample");
-            sLabel = lcl_GetLabel( aCommand );
-            m_aActionTbR->InsertItem( SID_STYLE_UPDATE_BY_EXAMPLE, sLabel );
+            m_aActionTbR->InsertItem( SID_STYLE_UPDATE_BY_EXAMPLE, SfxResId(STR_STYLE_UPDATE_STYLE).toString() );
             m_aActionTbR->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE);
         }
     }
diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src
index 0381acfbb7c8..f0c1e50cdfd6 100644
--- a/sfx2/source/dialog/templdlg.src
+++ b/sfx2/source/dialog/templdlg.src
@@ -44,4 +44,19 @@ String STR_STYLE_FILTER_HIERARCHICAL
     Text [ en-US ] = "Hierarchical" ;
 };
 
+String STR_STYLE_FILL_FORMAT_MODE
+{
+    Text [ en-US ] = "Fill Format Mode" ;
+};
+
+String STR_STYLE_NEW_STYLE_FROM_SELECTION
+{
+    Text [ en-US ] = "New Style from Selection" ;
+};
+
+String STR_STYLE_UPDATE_STYLE
+{
+    Text [ en-US ] = "Update Style" ;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */