diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-04 14:29:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-04 14:29:00 +0100 |
| commit | f1a53e7a0b388e0a5303fe68dfbb4c60f4c7a0ff (patch) | |
| tree | 251cbc4b08e7447e29232e1632d70a3377ebab58 | |
| parent | 924624b40a97d6925f66374259c2c21707805fcd (diff) | |
Resolves: tdf#106935 restore traditional toolbar labels
Change-Id: I00cf16e9ce429f9186cc900a07f4d386e33b8f7b
| -rw-r--r-- | sfx2/source/dialog/dialog.hrc | 4 | ||||
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 9 | ||||
| -rw-r--r-- | sfx2/source/dialog/templdlg.src | 15 |
3 files changed, 21 insertions, 7 deletions
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc index e78b075bfae1..4c93cbfdedf1 100644 --- a/sfx2/source/dialog/dialog.hrc +++ b/sfx2/source/dialog/dialog.hrc @@ -54,7 +54,9 @@ #define STR_CANCEL_RECORDING ( RC_DIALOG_BEGIN + 108 ) #define STR_PDF_EXPORT_SEND ( RC_DIALOG_BEGIN + 120 ) -//free +#define STR_STYLE_FILL_FORMAT_MODE ( RC_DIALOG_BEGIN + 121 ) +#define STR_STYLE_NEW_STYLE_FROM_SELECTION ( RC_DIALOG_BEGIN + 122 ) +#define STR_STYLE_UPDATE_STYLE ( RC_DIALOG_BEGIN + 123 ) #define SFX_ST_EDIT ( RC_DIALOG_BEGIN + 124 ) #define STR_STYLE_ELEMTLIST ( RC_DIALOG_BEGIN + 125 ) #define STR_FONT_TABPAGE ( RC_DIALOG_BEGIN + 126 ) diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 2407880c3430..a99ac5523908 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2190,18 +2190,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, Image(BitmapEx(SfxResId(RID_SFXBMP_WATERCAN))), sLabel); + m_aActionTbR->InsertItem(SID_STYLE_WATERCAN, Image(BitmapEx(SfxResId(RID_SFXBMP_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, Image(BitmapEx(SfxResId(RID_SFXBMP_NEW_BY_EXAMPLE))), sLabel); + m_aActionTbR->InsertItem(SID_STYLE_NEW_BY_EXAMPLE, Image(BitmapEx(SfxResId(RID_SFXBMP_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, Image(BitmapEx(SfxResId(RID_SFXBMP_UPDATE_BY_EXAMPLE))), sLabel); + m_aActionTbR->InsertItem(SID_STYLE_UPDATE_BY_EXAMPLE, Image(BitmapEx(SfxResId(RID_SFXBMP_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 ee0e92df8d1e..5eb3c9db886d 100644 --- a/sfx2/source/dialog/templdlg.src +++ b/sfx2/source/dialog/templdlg.src @@ -47,4 +47,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: */ |