diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-23 17:22:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-23 23:16:44 +0000 |
| commit | 3869e10a30a22a8cf47986d4216d9edd8e501c5f (patch) | |
| tree | 34680c613920f2164814f85eafe5e64857a79bd6 /svtools | |
| parent | 7fb2fdff429c84e12f892f1de65598b1f222346e (diff) | |
for mixed script mode use sample latin text
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/sampletext.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index 7c2be7b226f6..8ea02956d90c 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -425,6 +425,9 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) sSampleText = rtl::OUString(aTale, SAL_N_ELEMENTS(aTale)); break; } + case USCRIPT_LATIN: + sSampleText = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Lorem ipsum")); + break; default: break; } @@ -1010,17 +1013,11 @@ namespace return aMask; } - boost::dynamic_bitset<sal_uInt32> getGenericMask() - { - static boost::dynamic_bitset<sal_uInt32> aMask(getWeakMask() & getCommonLatnSubsetMask()); - return aMask; - } - UScriptCode getScript(const vcl::FontCapabilities &rFontCapabilities) { using vcl::UnicodeCoverage::UnicodeCoverageEnum; - boost::dynamic_bitset<sal_uInt32> aMasked = rFontCapabilities.maUnicodeRange & getGenericMask(); + boost::dynamic_bitset<sal_uInt32> aMasked = rFontCapabilities.maUnicodeRange & getWeakMask(); if (aMasked.count() == 1) return otCoverageToScript(static_cast<UnicodeCoverageEnum>(aMasked.find_first())); @@ -1160,7 +1157,7 @@ rtl::OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice) lcl_dump_codepage_coverage(aFontCapabilities.maCodePageRange); #endif - aFontCapabilities.maUnicodeRange &= getGenericMask(); + aFontCapabilities.maUnicodeRange &= getCommonLatnSubsetMask(); //If this font is probably tuned to display a single non-Latin //script and the font name is itself in Latin, then show a small @@ -1551,6 +1548,8 @@ rtl::OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const Font &r sRet = makeRepresentativeTextForScript(USCRIPT_ARABIC); } } + else if (nScriptType == com::sun::star::i18n::ScriptType::LATIN) + sRet = makeRepresentativeTextForScript(USCRIPT_LATIN); } } |