diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-23 17:24:38 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-23 23:16:44 +0000 |
| commit | 0dbc4fa3efdea90ba23e17e12c2bfe15d763acbf (patch) | |
| tree | 857875b2edaee72abb836c8235c4bb87e6e6a18b /svx | |
| parent | 2dba28faae2266e72c05d8f3d55bfbc3e5771adb (diff) | |
add string::strip, can replace EraseLeadingAndTrailingChars
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/fntctrl.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 73f60c49c7d8..a40474d72ea9 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -682,7 +682,15 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) if ( !pImpl->bSelection || pImpl->bUseFontNameAsText ) { using namespace com::sun::star::i18n::ScriptType; - pImpl->aText = rFont.GetName(); + + //If we're showing multiple sample texts, then they're all + //sample texts. If only showing Latin, continue to use + //the fontname as the preview + if ((pImpl->m_bCJKEnabled) || (pImpl->m_bCTLEnabled)) + pImpl->aText = makeRepresentativeTextForFont(LATIN, rFont); + else + pImpl->aText = rFont.GetName(); + if (pImpl->m_bCJKEnabled) { if (pImpl->aText.Len()) |