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-07 18:31:50 +0100 |
| commit | 90e132ad6c9d5adde29ad14e3a30dd743338f8ed (patch) | |
| tree | 66791448684e2a91cb24058350acd10a7098f6fc /svx | |
| parent | 00914dc9248760d62bea373f1fb4b78eece77dd7 (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 | 12 |
3 files changed, 16 insertions, 0 deletions
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index 0c56983f74b6..bf68808e2494 100644 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -397,6 +397,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 the UndoTbxControls diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 34a78599293b..2eb46cc97ff8 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -672,6 +672,7 @@ void SvxFontNameBox_Impl::CheckAndMarkUnknownFont( const XubString& fontname ) { font.SetItalic( ITALIC_NONE ); SetControlFont( font ); + SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_CHARFONTNAME )); } } else @@ -680,6 +681,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 b75f35cee573..d12a94ef5813 100644 --- a/svx/source/tbxctrls/tbcontrl.src +++ b/svx/source/tbxctrls/tbcontrl.src @@ -163,5 +163,17 @@ String RID_SVXSTR_TEXTCOLOR Text [ en-US ] = "Font color"; }; //-----IAccessibility2 Implementation 2009 + +// 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 |