[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svx/source

Eike Rathke erack at redhat.com
Wed Oct 28 05:57:15 PDT 2015


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

New commits:
commit 4df5049cb5e6cf8c31861d8ab4a4a49e5167efee
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Oct 27 16:43:38 2015 +0100

    prepare to enable build with ICU 56
    
    Accept new UBlockCode enum values.
    Just make it compile, without adding resource strings and blocks.
    Excerpt of 5b7e8efbf4d73e385c8fb3469a23c0b2592bfb57
    
    Change-Id: Ia14e4c1c85f8be3e7bae0eb6f5bec1ae33f1a0bf
    Reviewed-on: https://gerrit.libreoffice.org/19632
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 3d616e9..a65fefc 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1574,6 +1574,32 @@ void SubsetMap::InitList()
                     aAllSubsets.push_back( Subset( 0x118A0, 0x118FF, RID_SUBSETSTR_WARANG_CITI ) );
                     break;
 #endif
+#if U_ICU_VERSION_MAJOR_NUM >= 56
+                    /* FIXME: add RID_... to include/svx/ucsubset.hrc and
+                     * strings to svx/source/dialog/ucsubset.src and Unicode
+                     * block ranges to aAllSubsets, for now this only
+                     * compiles.. */
+                case UBLOCK_AHOM:
+                    break;
+                case UBLOCK_ANATOLIAN_HIEROGLYPHS:
+                    break;
+                case UBLOCK_CHEROKEE_SUPPLEMENT:
+                    break;
+                case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E:
+                    break;
+                case UBLOCK_EARLY_DYNASTIC_CUNEIFORM:
+                    break;
+                case UBLOCK_HATRAN:
+                    break;
+                case UBLOCK_MULTANI:
+                    break;
+                case UBLOCK_OLD_HUNGARIAN:
+                    break;
+                case UBLOCK_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS:
+                    break;
+                case UBLOCK_SUTTON_SIGNWRITING:
+                    break;
+#endif
 
             }
 


More information about the Libreoffice-commits mailing list