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

also change the font combo tooltip to say font is not available

Browse Source 
Change-Id: I68e31498aa4916e11e04c57171e32cf9b3204108
This commit is contained in:
Luboš Luňák
2013-02-06 18:31:14 +01:00
parent 445ad88361
commit 17d86df23e
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
svx/inc/svx/dialogs.hrc
View File

@@ -277,6 +277,8 @@
#define RID_SVXSTR_EXTRAS_CHARBACKGROUND (RID_SVX_START + 196) #define RID_SVXSTR_EXTRAS_CHARBACKGROUND (RID_SVX_START + 196)
#define RID_SVXSTR_CLEARFORM (RID_SVX_START + 197) #define RID_SVXSTR_CLEARFORM (RID_SVX_START + 197)
#define RID_SVXSTR_MORE (RID_SVX_START + 198) #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 // Strings for insert/overwrite mode
#define RID_SVXSTR_INSERT_HELPTEXT (RID_SVX_START + 210) #define RID_SVXSTR_INSERT_HELPTEXT (RID_SVX_START + 210)

2
svx/source/tbxctrls/tbcontrl.cxx
View File

@@ -809,6 +809,7 @@ void SvxFontNameBox_Impl::CheckAndMarkUnknownFont( const OUString& fontname )
{ {
font.SetItalic( ITALIC_NONE ); font.SetItalic( ITALIC_NONE );
SetControlFont( font ); SetControlFont( font );
SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_CHARFONTNAME ));
} }
} }
else else
@@ -817,6 +818,7 @@ void SvxFontNameBox_Impl::CheckAndMarkUnknownFont( const OUString& fontname )
{ {
font.SetItalic( ITALIC_NORMAL ); font.SetItalic( ITALIC_NORMAL );
SetControlFont( font ); SetControlFont( font );
SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE ));
} }
} }
} }

12
svx/source/tbxctrls/tbcontrl.src
View File

@@ -152,5 +152,17 @@ String RID_SVXSTR_TEXTCOLOR
{ {
Text [ en-US ] = "Font color"; 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 // ********************************************************************** EOF