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

Resolves: tdf#106935 restore traditional toolbar labels

Browse Source 
Change-Id: I00cf16e9ce429f9186cc900a07f4d386e33b8f7b
This commit is contained in:
Caolán McNamara
2017-04-04 14:29:00 +01:00
parent 924624b40a
commit f1a53e7a0b
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sfx2/source/dialog/dialog.hrc
View File

@@ -54,7 +54,9 @@
#define STR_CANCEL_RECORDING ( RC_DIALOG_BEGIN + 108 ) #define STR_CANCEL_RECORDING ( RC_DIALOG_BEGIN + 108 )
#define STR_PDF_EXPORT_SEND ( RC_DIALOG_BEGIN + 120 ) #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 SFX_ST_EDIT ( RC_DIALOG_BEGIN + 124 )
#define STR_STYLE_ELEMTLIST ( RC_DIALOG_BEGIN + 125 ) #define STR_STYLE_ELEMTLIST ( RC_DIALOG_BEGIN + 125 )
#define STR_FONT_TABPAGE ( RC_DIALOG_BEGIN + 126 ) #define STR_FONT_TABPAGE ( RC_DIALOG_BEGIN + 126 )

9
sfx2/source/dialog/templdlg.cxx
View File

@@ -2190,18 +2190,15 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(SfxBindings* pB, SfxTemplatePanel
if (xUICommands.is()) if (xUICommands.is())
{ {
uno::Any aCommand = xUICommands->getByName(".uno:StyleApply"); uno::Any aCommand = xUICommands->getByName(".uno:StyleApply");
OUString sLabel = lcl_GetLabel( aCommand ); m_aActionTbR->InsertItem(SID_STYLE_WATERCAN, Image(BitmapEx(SfxResId(RID_SFXBMP_WATERCAN))), SfxResId(STR_STYLE_FILL_FORMAT_MODE).toString());
m_aActionTbR->InsertItem(SID_STYLE_WATERCAN, Image(BitmapEx(SfxResId(RID_SFXBMP_WATERCAN))), sLabel);
m_aActionTbR->SetHelpId(SID_STYLE_WATERCAN, HID_TEMPLDLG_WATERCAN); m_aActionTbR->SetHelpId(SID_STYLE_WATERCAN, HID_TEMPLDLG_WATERCAN);
aCommand = xUICommands->getByName(".uno:StyleNewByExample"); 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))), SfxResId(STR_STYLE_NEW_STYLE_FROM_SELECTION).toString());
m_aActionTbR->InsertItem(SID_STYLE_NEW_BY_EXAMPLE, Image(BitmapEx(SfxResId(RID_SFXBMP_NEW_BY_EXAMPLE))), sLabel);
m_aActionTbR->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE); m_aActionTbR->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE);
aCommand = xUICommands->getByName(".uno:StyleUpdateByExample"); 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))), SfxResId(STR_STYLE_UPDATE_STYLE).toString());
m_aActionTbR->InsertItem(SID_STYLE_UPDATE_BY_EXAMPLE, Image(BitmapEx(SfxResId(RID_SFXBMP_UPDATE_BY_EXAMPLE))), sLabel);
m_aActionTbR->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE); m_aActionTbR->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE);
} }
} }

15
sfx2/source/dialog/templdlg.src
View File

@@ -47,4 +47,19 @@ String STR_STYLE_FILTER_HIERARCHICAL
Text [ en-US ] = "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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */