[Libreoffice-commits] core.git: svx/source

[Mark Wielaard]

 svx/source/dialog/charmap.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 30c3032920be91741ab089966f7e458ce08d09a4
Author: Mark Wielaard <mark at klomp.org>
Date:   Fri May 31 00:10:58 2013 +0200

    Make charmap.cxx compile with icu >= 4.4.
    
    configure.ac claims ICU >= 4.2 is supported. Make it so.
    
    Change-Id: Ia08bb492f41dcb88bc84550edb51ce5e89fe1103
    Reviewed-on: https://gerrit.libreoffice.org/4112
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 23494a8..bc6c83e 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1302,6 +1302,7 @@ void SubsetMap::InitList()
                 case UBLOCK_DOMINO_TILES:
                     aAllSubsets.push_back( Subset( 0x1F030, 0x1F09F, RID_SUBSETSTR_DOMINO_TILES ) );
                     break;
+#if U_ICU_VERSION_MAJOR_NUM >= 44
                 case UBLOCK_SAMARITAN:
                     aAllSubsets.push_back( Subset( 0x0800, 0x083F, RID_SUBSETSTR_SAMARITAN ) );
                     break;
@@ -1380,6 +1381,8 @@ void SubsetMap::InitList()
                 case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C:
                     aAllSubsets.push_back( Subset( 0x2A700, 0x2B73F, RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C ) );
                     break;
+#endif
+#if U_ICU_VERSION_MAJOR_NUM >= 46
                 case UBLOCK_MANDAIC:
                     aAllSubsets.push_back( Subset( 0x0840, 0x085F, RID_SUBSETSTR_MANDAIC ) );
                     break;
@@ -1416,6 +1419,7 @@ void SubsetMap::InitList()
                 case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D:
                     aAllSubsets.push_back( Subset( 0x2B740, 0x2B81F, RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D ) );
                     break;
+#endif
 #if U_ICU_VERSION_MAJOR_NUM >= 49
                 case UBLOCK_ARABIC_EXTENDED_A:
                     aAllSubsets.push_back( Subset( 0x08A0, 0x08FF, RID_SUBSETSTR_ARABIC_EXTENDED_A ) );