[Libreoffice-commits] core.git: i18npool/source
Tor Lillqvist
tml at collabora.com
Wed Apr 23 00:23:50 PDT 2014
i18npool/source/transliteration/chartonum.cxx | 1
i18npool/source/transliteration/data/numberchar.h | 87 ----------------------
i18npool/source/transliteration/texttonum.cxx | 3
3 files changed, 91 deletions(-)
New commits:
commit d02c53bcd0a77404a9402fa496bb3cadcb4c7d1e
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 23 10:18:52 2014 +0300
Remove unneeded header
Change-Id: I8d652f866a43a10da8561ad4659c8ae1c068ba41
diff --git a/i18npool/source/transliteration/chartonum.cxx b/i18npool/source/transliteration/chartonum.cxx
index 00f2e73..f719d82 100644
--- a/i18npool/source/transliteration/chartonum.cxx
+++ b/i18npool/source/transliteration/chartonum.cxx
@@ -20,7 +20,6 @@
#include <rtl/ustrbuf.hxx>
#include <chartonum.hxx>
-#include <data/numberchar.h>
using namespace com::sun::star::uno;
diff --git a/i18npool/source/transliteration/data/numberchar.h b/i18npool/source/transliteration/data/numberchar.h
deleted file mode 100644
index 75dbfa1..0000000
--- a/i18npool/source/transliteration/data/numberchar.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_I18NPOOL_SOURCE_TRANSLITERATION_DATA_NUMBERCHAR_H
-#define INCLUDED_I18NPOOL_SOURCE_TRANSLITERATION_DATA_NUMBERCHAR_H
-
-#include <sal/types.h>
-
-namespace com { namespace sun { namespace star { namespace i18n {
-
-static const sal_Int16 NumberChar_HalfWidth = 0;
-static const sal_Int16 NumberChar_FullWidth = 1;
-static const sal_Int16 NumberChar_Lower_zh = 2;
-static const sal_Int16 NumberChar_Upper_zh = 3;
-static const sal_Int16 NumberChar_Upper_zh_TW = 4;
-static const sal_Int16 NumberChar_Modern_ja = 5;
-static const sal_Int16 NumberChar_Traditional_ja= 6;
-static const sal_Int16 NumberChar_Lower_ko = 7;
-static const sal_Int16 NumberChar_Upper_ko = 8;
-static const sal_Int16 NumberChar_Hangul_ko = 9;
-static const sal_Int16 NumberChar_Indic_ar = 10;
-static const sal_Int16 NumberChar_EastIndic_ar = 11;
-static const sal_Int16 NumberChar_Indic_hi = 12;
-static const sal_Int16 NumberChar_th = 13;
-static const sal_Int16 NumberChar_Count = 14;
-
-static const sal_Unicode NumberChar[][10] = {
-// 0 1 2 3 4 5 6 7 8 9
- { 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039 }, // Half Width (Ascii)
- { 0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17, 0xFF18, 0xFF19 }, // Full Width
- { 0x3007, 0x4E00, 0x4E8c, 0x4E09, 0x56DB, 0x4E94, 0x516D, 0x4E03, 0x516B, 0x4E5D }, // Chinese Lower
- { 0x96F6, 0x58F9, 0x8D30, 0x53C1, 0x8086, 0x4F0D, 0x9646, 0x67D2, 0x634C, 0x7396 }, // S. Chinese Upper
- { 0x96F6, 0x58F9, 0x8CB3, 0x53C3, 0x8086, 0x4F0D, 0x9678, 0x67D2, 0x634C, 0x7396 }, // T. Chinese Upper
- { 0x3007, 0x4E00, 0x4E8C, 0x4E09, 0x56DB, 0x4E94, 0x516D, 0x4E03, 0x516B, 0x4E5D }, // Japanese Modern
- { 0x96F6, 0x58F1, 0x5F10, 0x53C2, 0x56DB, 0x4F0D, 0x516D, 0x4E03, 0x516B, 0x4E5D }, // Japanese Trad.
- { 0x3007, 0x4E00, 0x4E8C, 0x4E09, 0x56DB, 0x4E94, 0x516D, 0x4E03, 0x516B, 0x4E5D }, // Korean Lower
- { 0xF9B2, 0x58F9, 0x8CB3, 0x53C3, 0x56DB, 0x4E94, 0x516D, 0x4E03, 0x516B, 0x4E5D }, // Korean Upper
- { 0xC601, 0xC77C, 0xC774, 0xC0BC, 0xC0AC, 0xC624, 0xC721, 0xCE60, 0xD314, 0xAD6C }, // Korean Hangul
- { 0x0660, 0x0661, 0x0662, 0x0663, 0x0664, 0x0665, 0x0666, 0x0667, 0x0668, 0x0669 }, // Arabic Indic
- { 0x06F0, 0x06F1, 0x06F2, 0x06F3, 0x06F4, 0x06F5, 0x06F6, 0x06F7, 0x06F8, 0x06F9 }, // Est. Arabic Indic
- { 0x0966, 0x0967, 0x0968, 0x0969, 0x096A, 0x096B, 0x096C, 0x096D, 0x096E, 0x096F }, // Indic
- { 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, 0x0E58, 0x0E59 } // Thai
-};
-
-#define NUMBER_ZERO NumberChar[NumberChar_HalfWidth][0] // 0x0030
-#define NUMBER_ONE NumberChar[NumberChar_HalfWidth][1] // 0x0031
-#define NUMBER_NINE NumberChar[NumberChar_HalfWidth][9] // 0x0039
-#define NUMBER_DECIMAL DecimalChar[0]
-#define NUMBER_MINUS MinusChar[0]
-#define isNumber(n) ( NUMBER_ZERO <= n && n <= NUMBER_NINE )
-#define isDecimal(n) ( n == NUMBER_DECIMAL )
-#define isMinus(n) ( n == NUMBER_MINUS )
-
-const sal_Int16 Multiplier_Lower_zh = 0;
-const sal_Int16 Multiplier_Upper_zh = 1;
-const sal_Int16 Multiplier_Lower_zh_TW = 2;
-const sal_Int16 Multiplier_Upper_zh_TW = 3;
-const sal_Int16 Multiplier_Hangul_ko = 4;
-const sal_Int16 Multiplier_Modern_ja = 5;
-const sal_Int16 Multiplier_Traditional_ja = 6;
-const sal_Int16 Multiplier_Count = 7;
-
-const sal_Int16 ExponentCount_CJK = 6;
-
-const sal_Int16 ExponentCount_short_CJK = 2;
-
-} } } }
-
-#endif // INCLUDED_I18NPOOL_SOURCE_TRANSLITERATION_DATA_NUMBERCHAR_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/texttonum.cxx b/i18npool/source/transliteration/texttonum.cxx
index 25301dd..188b374 100644
--- a/i18npool/source/transliteration/texttonum.cxx
+++ b/i18npool/source/transliteration/texttonum.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <data/numberchar.h>
-#include <rtl/ustrbuf.hxx>
-
#include <texttonum.hxx>
using namespace com::sun::star::uno;
More information about the Libreoffice-commits
mailing list