diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-02-06 18:31:14 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-02 15:42:56 +0200 |
| commit | ce231a9f2c8119215ea1a56515f7e1d0243c9b40 (patch) | |
| tree | 234321a245c5b4b3e488fa950b883faccaac6e2f /svx | |
| parent | f1470c8a58b6954c95c473b1072840415d52ccc9 (diff) | |
also change the font combo tooltip to say font is not available (fate#308255)
(cherry picked from commit 17d86df23e7be3ab0a161f69ff0f703728e0e135)
Conflicts:
svx/source/tbxctrls/tbcontrl.src
Change-Id: I68e31498aa4916e11e04c57171e32cf9b3204108
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svx/dialogs.hrc | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.src | 10 |
3 files changed, 14 insertions, 0 deletions
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index 714106525ffa..bb5a13da0cb0 100644 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -279,6 +279,8 @@ #define RID_SVXSTR_EXTRAS_CHARBACKGROUND (RID_SVX_START + 196) #define RID_SVXSTR_CLEARFORM (RID_SVX_START + 197) #define RID_SVXSTR_MORE (RID_SVX_START + 198) +#define RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE (RID_SVX_START + 199) +#define RID_SVXSTR_CHARFONTNAME (RID_SVX_START + 200) // Strings for insert/overwrite mode #define RID_SVXSTR_INSERT_HELPTEXT (RID_SVX_START + 210) diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index e066a14e4350..0e1a55d393ef 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -830,6 +830,7 @@ void SvxFontNameBox_Impl::CheckAndMarkUnknownFont( const XubString& fontname ) { font.SetItalic( ITALIC_NONE ); SetControlFont( font ); + SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_CHARFONTNAME )); } } else @@ -838,6 +839,7 @@ void SvxFontNameBox_Impl::CheckAndMarkUnknownFont( const XubString& fontname ) { font.SetItalic( ITALIC_NORMAL ); SetControlFont( font ); + SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE )); } } } diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src index 678fec5203a7..7c19bd7972a2 100644 --- a/svx/source/tbxctrls/tbcontrl.src +++ b/svx/source/tbxctrls/tbcontrl.src @@ -154,3 +154,13 @@ String RID_SVXSTR_TEXTCOLOR }; // ********************************************************************** EOF +// This is duplicated in GenericCommands.xcu in officecfg. +String RID_SVXSTR_CHARFONTNAME +{ + Text [ en-US ] = "Font Name"; +}; + +String RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE +{ + Text [ en-US ] = "Font Name. The current font is not available and will be substituted."; +}; |