summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-02-10 14:08:40 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-02-10 14:08:40 +0000
commit5aee848d35795e827eb0c909dc44fd08201244b2 (patch)
tree1ef8f39cf580c44d60b2b7eaf5401a6f60d42202 /svtools
parent50bd906a0f7f1cc97ae813aeb448484851bae269 (diff)
add sample Hangul text for hang script-tag
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/control/ctrlbox.cxx19
1 files changed, 16 insertions, 3 deletions
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 3b268af91dd8..fa3911f0a4c1 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -965,6 +965,13 @@ namespace
};
sSampleText = rtl::OUString(aHani, SAL_N_ELEMENTS(aHani));
}
+ else if (nScript == MKTAG("hang"))
+ {
+ const sal_Unicode aHang[] = {
+ 0xD55C, 0xAE00
+ };
+ sSampleText = rtl::OUString(aHang, SAL_N_ELEMENTS(aHang));
+ }
else if (nScript == MKTAG("hebr"))
{
const sal_Unicode aHebr[] = {
@@ -1095,17 +1102,22 @@ namespace
return aTmp[0];
aTmp.erase(std::remove(aTmp.begin(), aTmp.end(), MKTAG("deva")), aTmp.end());
-
//Probably strongly tuned for a single Indic script
if (aTmp.size() == 1)
return aTmp[0];
+ aTmp.erase(std::remove(aTmp.begin(), aTmp.end(), MKTAG("jamo")), aTmp.end());
+ //Probably strongly tuned for a single CJK script (Korean)
+ if (aTmp.size() == 1)
+ return aTmp[0];
+
if (aTmp.size() == 2)
{
const sal_uInt32 nHaniKaniTag = MKTAG("hani") | MKTAG("kana");
if ((aTmp[0] | aTmp[1]) == nHaniKaniTag)
return nHaniKaniTag;
}
+
return 0;
}
@@ -1332,14 +1344,15 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt )
{
MKTAG("arab"), MKTAG("hebr"),
+ (MKTAG("hani")|MKTAG("kana")), MKTAG("hani"), MKTAG("kana"),
+ MKTAG("hang"),
+
MKTAG("beng"), MKTAG("gujr"), MKTAG("guru"), MKTAG("knda"),
MKTAG("mlym"), MKTAG("mymr"), MKTAG("orya"), MKTAG("taml"),
MKTAG("telu"), MKTAG("sinh"),
MKTAG("tibt"), MKTAG("thai"), MKTAG("khmr"), MKTAG("ethi"),
- (MKTAG("hani")|MKTAG("kana")), MKTAG("hani"), MKTAG("kana"),
-
MKTAG("deva"),
MKTAG("grek"), MKTAG("cyrl")