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-02-06 18:37:38 +0100 |
| commit | 17d86df23e7be3ab0a161f69ff0f703728e0e135 (patch) | |
| tree | bf769758ffbd4e66bfefa7554725d1022efda996 /svx | |
| parent | 445ad883611e4343e19174bfa1259f0477d3e788 (diff) | |
also change the font combo tooltip to say font is not available
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 | 12 |
3 files changed, 16 insertions, 0 deletions
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index 2ab14c7f41e6..8fe6bb5fcc18 100644 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -277,6 +277,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 2f2812cb1da1..d827854bdb5d 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -809,6 +809,7 @@ void SvxFontNameBox_Impl::CheckAndMarkUnknownFont( const OUString& fontname ) { font.SetItalic( ITALIC_NONE ); SetControlFont( font ); + SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_CHARFONTNAME )); } } else @@ -817,6 +818,7 @@ void SvxFontNameBox_Impl::CheckAndMarkUnknownFont( const OUString& 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..a438a2ad489a 100644 --- a/svx/source/tbxctrls/tbcontrl.src +++ b/svx/source/tbxctrls/tbcontrl.src @@ -152,5 +152,17 @@ String RID_SVXSTR_TEXTCOLOR { Text [ en-US ] = "Font color"; }; + +// 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."; +}; + // ********************************************************************** EOF |