summaryrefslogtreecommitdiff
path: root/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'i18npool/source/transliteration/fullwidthToHalfwidth.cxx')
-rw-r--r--i18npool/source/transliteration/fullwidthToHalfwidth.cxx23
1 files changed, 12 insertions, 11 deletions
diff --git a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
index cc90fd84e3ec..267ec26a0b60 100644
--- a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
+++ b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
@@ -25,14 +25,15 @@
#include <transliteration_OneToOne.hxx>
using namespace com::sun::star::uno;
+using namespace com::sun::star::i18n;
using namespace com::sun::star::lang;
-namespace com { namespace sun { namespace star { namespace i18n {
+namespace i18npool {
fullwidthToHalfwidth::fullwidthToHalfwidth()
{
func = nullptr;
- table = &widthfolding::getfull2halfTable();
+ table = &i18nutil::widthfolding::getfull2halfTable();
transliterationName = "fullwidthToHalfwidth";
implementationName = "com.sun.star.i18n.Transliteration.FULLWIDTH_HALFWIDTH";
}
@@ -46,7 +47,7 @@ OUString SAL_CALL
fullwidthToHalfwidth::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
{
// Decomposition: GA --> KA + voice-mark
- const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
+ const OUString& newStr = i18nutil::widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
// One to One mapping
useOffset = false;
@@ -58,7 +59,7 @@ fullwidthToHalfwidth::transliterate( const OUString& inStr, sal_Int32 startPos,
sal_Unicode SAL_CALL
fullwidthToHalfwidth::transliterateChar2Char( sal_Unicode inChar)
{
- sal_Unicode newChar = widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar);
+ sal_Unicode newChar = i18nutil::widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar);
if (newChar == 0xFFFF)
throw MultipleCharsOutputException();
return transliteration_OneToOne::transliterateChar2Char(inChar);
@@ -67,7 +68,7 @@ fullwidthToHalfwidth::transliterateChar2Char( sal_Unicode inChar)
fullwidthKatakanaToHalfwidthKatakana::fullwidthKatakanaToHalfwidthKatakana()
{
func = nullptr;
- table = &widthfolding::getfullKana2halfKanaTable();
+ table = &i18nutil::widthfolding::getfullKana2halfKanaTable();
transliterationName = "fullwidthKatakanaToHalfwidthKatakana";
implementationName = "com.sun.star.i18n.Transliteration.FULLWIDTHKATAKANA_HALFWIDTHKATAKANA";
}
@@ -79,7 +80,7 @@ OUString SAL_CALL
fullwidthKatakanaToHalfwidthKatakana::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
{
// Decomposition: GA --> KA + voice-mark
- const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
+ const OUString& newStr = i18nutil::widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
// One to One mapping
useOffset = false;
@@ -91,7 +92,7 @@ fullwidthKatakanaToHalfwidthKatakana::transliterate( const OUString& inStr, sal_
sal_Unicode SAL_CALL
fullwidthKatakanaToHalfwidthKatakana::transliterateChar2Char( sal_Unicode inChar )
{
- sal_Unicode newChar = widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar);
+ sal_Unicode newChar = i18nutil::widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar);
if (newChar == 0xFFFF)
throw MultipleCharsOutputException();
return transliteration_OneToOne::transliterateChar2Char(inChar);
@@ -100,7 +101,7 @@ fullwidthKatakanaToHalfwidthKatakana::transliterateChar2Char( sal_Unicode inChar
fullwidthToHalfwidthLikeASC::fullwidthToHalfwidthLikeASC()
{
func = nullptr;
- table = &widthfolding::getfull2halfTableForASC();
+ table = &i18nutil::widthfolding::getfull2halfTableForASC();
transliterationName = "fullwidthToHalfwidthLikeASC";
implementationName = "com.sun.star.i18n.Transliteration.FULLWIDTH_HALFWIDTH_LIKE_ASC";
}
@@ -112,7 +113,7 @@ OUString SAL_CALL
fullwidthToHalfwidthLikeASC::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
{
// Decomposition: GA --> KA + voice-mark
- const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
+ const OUString& newStr = i18nutil::widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
// One to One mapping
useOffset = false;
@@ -125,12 +126,12 @@ fullwidthToHalfwidthLikeASC::transliterate( const OUString& inStr, sal_Int32 sta
sal_Unicode SAL_CALL
fullwidthToHalfwidthLikeASC::transliterateChar2Char( sal_Unicode inChar )
{
- sal_Unicode newChar = widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar);
+ sal_Unicode newChar = i18nutil::widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar);
if (newChar == 0xFFFF)
throw MultipleCharsOutputException();
return transliteration_OneToOne::transliterateChar2Char(inChar);
}
-} } } }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */