i18npool/inc/transliteration_Ignore.hxx | 14 +++++++-------
i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx | 2 +-
i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx | 2 +-
i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx | 2 +-
i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit d9645bf8a1c1c95aeeb9a90b89387d82795f56dd
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Sep 11 12:53:25 2014 +0200
Prevent erroneous pick up of unrelated css::i18n::Maping
...from include/i18nutil/casefolding.hxx
Change-Id: I892a83b8e40dadcffc1b59eaa18bee2b782131f1
diff --git a/i18npool/inc/transliteration_Ignore.hxx
b/i18npool/inc/transliteration_Ignore.hxx
index da3ed51..b610bf6 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -24,13 +24,6 @@
typedef sal_Unicode (*TransFunc)(const sal_Unicode);
-typedef struct {
- sal_Unicode previousChar;
- sal_Unicode currentChar;
- sal_Unicode replaceChar;
- bool two2one;
-} Mapping;
-
namespace com { namespace sun { namespace star { namespace i18n {
class transliteration_Ignore : public transliteration_commonclass
@@ -68,6 +61,13 @@ public:
transliterateRange( const OUString& str1, const OUString& str2,
XTransliteration& t1, XTransliteration& t2 )
throw(com::sun::star::uno::RuntimeException);
+ struct Mapping {
+ sal_Unicode previousChar;
+ sal_Unicode currentChar;
+ sal_Unicode replaceChar;
+ bool two2one;
+ };
+
protected:
TransFunc func;
oneToOneMapping *table;
diff --git a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
index 39cd4c2..1285447 100644
--- a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
@@ -23,7 +23,7 @@ using namespace com::sun::star::uno;
namespace com { namespace sun { namespace star { namespace i18n {
-static const Mapping BaFa[] = {
+static const transliteration_Ignore::Mapping BaFa[] = {
{ 0x30F4, 0x30A1, 0x30D0, true },
{ 0x3094, 0x3041, 0x3070, true },
{ 0x30D5, 0x30A1, 0x30CF, true },
diff --git a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
index ae3c0c1..43e5bd0 100644
--- a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
@@ -24,7 +24,7 @@ using namespace com::sun::star::lang;
namespace com { namespace sun { namespace star { namespace i18n {
-static const Mapping HyuByu[] = {
+static const transliteration_Ignore::Mapping HyuByu[] = {
{ 0x30D5, 0x30E5, 0x30D2, false },
{ 0x3075, 0x3085, 0x3072, false },
{ 0x30F4, 0x30E5, 0x30D3, false },
diff --git a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
index 21c8853..fcc32a2 100644
--- a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
@@ -24,7 +24,7 @@ using namespace com::sun::star::lang;
namespace com { namespace sun { namespace star { namespace i18n {
-static const Mapping SeZe[] = {
+static const transliteration_Ignore::Mapping SeZe[] = {
// SI + E --> SE
{ 0x30B7, 0x30A7, 0x30BB, true },
// SI + E --> SE
diff --git a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
index 732257b..6bdf54a 100644
--- a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
@@ -24,7 +24,7 @@ using namespace com::sun::star::lang;
namespace com { namespace sun { namespace star { namespace i18n {
-static const Mapping TiJi[] = {
+static const transliteration_Ignore::Mapping TiJi[] = {
// TU + I --> TI
{ 0x30C4, 0x30A3, 0x30C1, true },
// TE + I --> TI
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
