do HardCodedScriptName before getting Font Capabilities

Change-Id: I3f3f14b3b24abbbdb40f8eb6655d42b12d920999

1 files changed, 9 insertions, 13 deletions

diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index 1472c015b35b..c4a75988c289 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -1247,22 +1247,19 @@ namespace
 
 OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice)
 {
-    vcl::FontCapabilities aFontCapabilities;
-    if (!rDevice.GetFontCapabilities(aFontCapabilities))
-        return OUString();
+    UScriptCode eScript = lcl_getHardCodedScriptNameForFont(rDevice);
+    if (eScript == USCRIPT_INVALID_CODE)
+    {
+        vcl::FontCapabilities aFontCapabilities;
+        if (!rDevice.GetFontCapabilities(aFontCapabilities))
+            return OUString();
 
 #if OSL_DEBUG_LEVEL > 2
-    fprintf(stderr, "font is %s\n",
-        OUStringToOString(rDevice.GetFont().GetName(), RTL_TEXTENCODING_UTF8).getStr());
-    lcl_dump_unicode_coverage(aFontCapabilities.maUnicodeRange);
-    lcl_dump_codepage_coverage(aFontCapabilities.maCodePageRange);
+        lcl_dump_unicode_coverage(aFontCapabilities.maUnicodeRange);
+        lcl_dump_codepage_coverage(aFontCapabilities.maCodePageRange);
 #endif
 
-    aFontCapabilities.maUnicodeRange &= getCommonLatnSubsetMask();
-
-    UScriptCode eScript = lcl_getHardCodedScriptNameForFont (rDevice);
-
-    if (eScript == USCRIPT_INVALID_CODE) {
+        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
@@ -1272,7 +1269,6 @@ OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice)
             return OUString();
 
         eScript = attemptToDisambiguateHan(eScript, rDevice);
-
     }
 
     OUString sSampleText = makeShortRepresentativeTextForScript(eScript);