[Libreoffice-commits] .: 3 commits - svtools/source

[Caolán McNamara]

 svtools/source/control/ctrlbox.cxx |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

New commits:
commit bc78cf7caa13319b99a39069329ec22d557b81c5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 9 20:58:56 2011 +0000

    Add Cherokee preview

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index fc60a6a..afac084 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1113,6 +1113,14 @@ namespace
                 sSampleText = rtl::OUString(aEthi, SAL_N_ELEMENTS(aEthi));
                 break;
             }
+            case vcl::UnicodeCoverage::CHEROKEE:
+            {
+                const sal_Unicode aCher[] = {
+                    0x13D7, 0x13AA, 0x13EA, 0x13B6, 0x13D9, 0x13D7
+                };
+                sSampleText = rtl::OUString(aCher, SAL_N_ELEMENTS(aCher));
+                break;
+            }
             case vcl::UnicodeCoverage::KHMER:
             {
                 const sal_Unicode aKhmr[] = {
commit 83c93074d772ff2c24af68674aa6107864e71a3a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 9 20:52:07 2011 +0000

    mask out cjk punctuation

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 0eea55e..fc60a6a 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1539,12 +1539,14 @@ namespace
         aGenericMask.set(vcl::UnicodeCoverage::SPECIALS, false);
         aGenericMask.set(vcl::UnicodeCoverage::NONPLANE_0, false);
         aGenericMask.set(vcl::UnicodeCoverage::PRIVATE_USE_PLANE_15, false);
+        aGenericMask.set(vcl::UnicodeCoverage::CJK_SYMBOLS_AND_PUNCTUATION, false);
 
         boost::dynamic_bitset<sal_uInt32> aMasked = rFontCapabilities.maUnicodeRange & aGenericMask;
 
         if (aMasked.count() == 1)
             return aMasked.find_first();
 
+
         if (aMasked[vcl::UnicodeCoverage::ARABIC])
         {
             aMasked.set(vcl::UnicodeCoverage::ARABIC_PRESENTATION_FORMS_A, false);
commit 75486f56065404258e9875467433986e5807d8d9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 9 20:27:47 2011 +0000

    Cyrillic+Georgian is likely best previewed as Georgian

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 8e0ca85..0eea55e 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1570,6 +1570,13 @@ namespace
         if (aMasked.count() == 1)
             return aMasked.find_first();
 
+        if (aMasked[vcl::UnicodeCoverage::CYRILLIC])
+        {
+            //Probably strongly tuned for Georgian
+            if (aMasked.count() == 2 && aMasked[vcl::UnicodeCoverage::GEORGIAN])
+                return vcl::UnicodeCoverage::GEORGIAN;
+        }
+
         boost::dynamic_bitset<sal_uInt32> aCJKMask(vcl::UnicodeCoverage::MAX_UC_ENUM);
         aCJKMask.set();
         aCJKMask.set(vcl::UnicodeCoverage::CJK_SYMBOLS_AND_PUNCTUATION, false);