[Libreoffice-commits] core.git: 13 commits - i18npool/inc i18npool/source i18npool/util
Eike Rathke
erack at redhat.com
Thu Sep 5 05:57:52 PDT 2013
i18npool/inc/localedata.hxx | 13
i18npool/source/breakiterator/breakiteratorImpl.cxx | 632 +++----
i18npool/source/breakiterator/breakiterator_cjk.cxx | 124 -
i18npool/source/breakiterator/breakiterator_unicode.cxx | 284 +--
i18npool/source/breakiterator/xdictionary.cxx | 164 -
i18npool/source/calendar/calendarImpl.cxx | 6
i18npool/source/calendar/calendar_gregorian.cxx | 830 ++++-----
i18npool/source/characterclassification/characterclassificationImpl.cxx | 146 -
i18npool/source/collator/collatorImpl.cxx | 67
i18npool/source/collator/collator_unicode.cxx | 2
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 150 -
i18npool/source/indexentry/indexentrysupplier.cxx | 177 -
i18npool/source/indexentry/indexentrysupplier_common.cxx | 2
i18npool/source/indexentry/indexentrysupplier_default.cxx | 10
i18npool/source/inputchecker/inputsequencechecker.cxx | 104 -
i18npool/source/localedata/localedata.cxx | 206 +-
i18npool/source/nativenumber/nativenumbersupplier.cxx | 888 +++++-----
i18npool/source/registerservices/registerservices.cxx | 4
i18npool/source/textconversion/textconversionImpl.cxx | 26
i18npool/source/transliteration/hiraganaToKatakana.cxx | 18
i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx | 20
i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx | 20
i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx | 10
i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx | 10
i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx | 30
i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx | 12
i18npool/source/transliteration/ignoreSpace_ja_JP.cxx | 10
i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx | 38
i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx | 10
i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx | 12
i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx | 10
i18npool/source/transliteration/transliteration_Ignore.cxx | 98 -
i18npool/source/transliteration/transliteration_Numeric.cxx | 122 -
i18npool/source/transliteration/transliteration_body.cxx | 24
i18npool/source/transliteration/transliteration_commonclass.cxx | 94 -
i18npool/util/i18npool.component | 2
36 files changed, 2194 insertions(+), 2181 deletions(-)
New commits:
commit 660fe83b4357c9fa070739b9c4da9d9002c9bd51
Author: Eike Rathke <erack at redhat.com>
Date: Thu Sep 5 14:56:08 2013 +0200
use sensible indentation
that always annoyed me
Change-Id: I0c439ddb00d78590b465cd47db6e60d1939bd9f7
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index 595c921..4235027 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -39,10 +39,10 @@ BreakIteratorImpl::BreakIteratorImpl()
BreakIteratorImpl::~BreakIteratorImpl()
{
- // Clear lookuptable
- for (size_t l = 0; l < lookupTable.size(); l++)
- delete lookupTable[l];
- lookupTable.clear();
+ // Clear lookuptable
+ for (size_t l = 0; l < lookupTable.size(); l++)
+ delete lookupTable[l];
+ lookupTable.clear();
}
#define LBI getLocaleSpecificBreakIterator(rLocale)
@@ -51,75 +51,75 @@ sal_Int32 SAL_CALL BreakIteratorImpl::nextCharacters( const OUString& Text, sal_
const Locale &rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone )
throw(RuntimeException)
{
- if (nCount < 0) throw RuntimeException();
+ if (nCount < 0) throw RuntimeException();
- return LBI->nextCharacters( Text, nStartPos, rLocale, nCharacterIteratorMode, nCount, nDone);
+ return LBI->nextCharacters( Text, nStartPos, rLocale, nCharacterIteratorMode, nCount, nDone);
}
sal_Int32 SAL_CALL BreakIteratorImpl::previousCharacters( const OUString& Text, sal_Int32 nStartPos,
const Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone )
throw(RuntimeException)
{
- if (nCount < 0) throw RuntimeException();
+ if (nCount < 0) throw RuntimeException();
- return LBI->previousCharacters( Text, nStartPos, rLocale, nCharacterIteratorMode, nCount, nDone);
+ return LBI->previousCharacters( Text, nStartPos, rLocale, nCharacterIteratorMode, nCount, nDone);
}
#define isZWSP(c) (ch == 0x200B)
static sal_Int32 skipSpace(const OUString& Text, sal_Int32 nPos, sal_Int32 len, sal_Int16 rWordType, sal_Bool bDirection)
{
- sal_uInt32 ch=0;
- sal_Int32 pos=nPos;
- switch (rWordType) {
- case WordType::ANYWORD_IGNOREWHITESPACES:
- if (bDirection)
- while (nPos < len && (u_isWhitespace(ch = Text.iterateCodePoints(&pos, 1)) || isZWSP(ch))) nPos=pos;
- else
- while (nPos > 0 && (u_isWhitespace(ch = Text.iterateCodePoints(&pos, -1)) || isZWSP(ch))) nPos=pos;
+ sal_uInt32 ch=0;
+ sal_Int32 pos=nPos;
+ switch (rWordType) {
+ case WordType::ANYWORD_IGNOREWHITESPACES:
+ if (bDirection)
+ while (nPos < len && (u_isWhitespace(ch = Text.iterateCodePoints(&pos, 1)) || isZWSP(ch))) nPos=pos;
+ else
+ while (nPos > 0 && (u_isWhitespace(ch = Text.iterateCodePoints(&pos, -1)) || isZWSP(ch))) nPos=pos;
break;
- case WordType::DICTIONARY_WORD:
- if (bDirection)
- while (nPos < len && (u_isWhitespace(ch = Text.iterateCodePoints(&pos, 1)) || isZWSP(ch) ||
+ case WordType::DICTIONARY_WORD:
+ if (bDirection)
+ while (nPos < len && (u_isWhitespace(ch = Text.iterateCodePoints(&pos, 1)) || isZWSP(ch) ||
! (ch == 0x002E || u_isalnum(ch)))) nPos=pos;
- else
- while (nPos > 0 && (u_isWhitespace(ch = Text.iterateCodePoints(&pos, -1)) || isZWSP(ch) ||
+ else
+ while (nPos > 0 && (u_isWhitespace(ch = Text.iterateCodePoints(&pos, -1)) || isZWSP(ch) ||
! (ch == 0x002E || u_isalnum(ch)))) nPos=pos;
break;
- case WordType::WORD_COUNT:
- if (bDirection)
- while (nPos < len && (u_isUWhiteSpace(ch = Text.iterateCodePoints(&pos, 1)) || isZWSP(ch))) nPos=pos;
- else
- while (nPos > 0 && (u_isUWhiteSpace(ch = Text.iterateCodePoints(&pos, -1)) || isZWSP(ch))) nPos=pos;
+ case WordType::WORD_COUNT:
+ if (bDirection)
+ while (nPos < len && (u_isUWhiteSpace(ch = Text.iterateCodePoints(&pos, 1)) || isZWSP(ch))) nPos=pos;
+ else
+ while (nPos > 0 && (u_isUWhiteSpace(ch = Text.iterateCodePoints(&pos, -1)) || isZWSP(ch))) nPos=pos;
break;
- }
- return nPos;
+ }
+ return nPos;
}
Boundary SAL_CALL BreakIteratorImpl::nextWord( const OUString& Text, sal_Int32 nStartPos,
const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException)
{
- sal_Int32 len = Text.getLength();
- if( nStartPos < 0 || len == 0 )
- result.endPos = result.startPos = 0;
- else if (nStartPos >= len)
- result.endPos = result.startPos = len;
- else {
- result = LBI->nextWord(Text, nStartPos, rLocale, rWordType);
-
- nStartPos = skipSpace(Text, result.startPos, len, rWordType, sal_True);
-
- if ( nStartPos != result.startPos) {
- if( nStartPos >= len )
- result.startPos = result.endPos = len;
- else {
- result = LBI->getWordBoundary(Text, nStartPos, rLocale, rWordType, sal_True);
- // i88041: avoid startPos goes back to nStartPos when switching between Latin and CJK scripts
- if (result.startPos < nStartPos) result.startPos = nStartPos;
- }
+ sal_Int32 len = Text.getLength();
+ if( nStartPos < 0 || len == 0 )
+ result.endPos = result.startPos = 0;
+ else if (nStartPos >= len)
+ result.endPos = result.startPos = len;
+ else {
+ result = LBI->nextWord(Text, nStartPos, rLocale, rWordType);
+
+ nStartPos = skipSpace(Text, result.startPos, len, rWordType, sal_True);
+
+ if ( nStartPos != result.startPos) {
+ if( nStartPos >= len )
+ result.startPos = result.endPos = len;
+ else {
+ result = LBI->getWordBoundary(Text, nStartPos, rLocale, rWordType, sal_True);
+ // i88041: avoid startPos goes back to nStartPos when switching between Latin and CJK scripts
+ if (result.startPos < nStartPos) result.startPos = nStartPos;
}
}
- return result;
+ }
+ return result;
}
static inline sal_Bool SAL_CALL isCJK( const Locale& rLocale ) {
@@ -129,124 +129,124 @@ static inline sal_Bool SAL_CALL isCJK( const Locale& rLocale ) {
Boundary SAL_CALL BreakIteratorImpl::previousWord( const OUString& Text, sal_Int32 nStartPos,
const Locale& rLocale, sal_Int16 rWordType) throw(RuntimeException)
{
- sal_Int32 len = Text.getLength();
- if( nStartPos <= 0 || len == 0 ) {
- result.endPos = result.startPos = 0;
- return result;
- } else if (nStartPos > len) {
- result.endPos = result.startPos = len;
- return result;
- }
+ sal_Int32 len = Text.getLength();
+ if( nStartPos <= 0 || len == 0 ) {
+ result.endPos = result.startPos = 0;
+ return result;
+ } else if (nStartPos > len) {
+ result.endPos = result.startPos = len;
+ return result;
+ }
- sal_Int32 nPos = skipSpace(Text, nStartPos, len, rWordType, sal_False);
+ sal_Int32 nPos = skipSpace(Text, nStartPos, len, rWordType, sal_False);
- // if some spaces are skiped, and the script type is Asian with no CJK rLocale, we have to return
- // (nStartPos, -1) for caller to send correct rLocale for loading correct dictionary.
- result.startPos = nPos;
- if (nPos != nStartPos && nPos > 0 && !isCJK(rLocale) && getScriptClass(Text.iterateCodePoints(&nPos, -1)) == ScriptType::ASIAN) {
- result.endPos = -1;
- return result;
- }
+ // if some spaces are skiped, and the script type is Asian with no CJK rLocale, we have to return
+ // (nStartPos, -1) for caller to send correct rLocale for loading correct dictionary.
+ result.startPos = nPos;
+ if (nPos != nStartPos && nPos > 0 && !isCJK(rLocale) && getScriptClass(Text.iterateCodePoints(&nPos, -1)) == ScriptType::ASIAN) {
+ result.endPos = -1;
+ return result;
+ }
- return LBI->previousWord(Text, result.startPos, rLocale, rWordType);
+ return LBI->previousWord(Text, result.startPos, rLocale, rWordType);
}
Boundary SAL_CALL BreakIteratorImpl::getWordBoundary( const OUString& Text, sal_Int32 nPos, const Locale& rLocale,
sal_Int16 rWordType, sal_Bool bDirection ) throw(RuntimeException)
{
- sal_Int32 len = Text.getLength();
- if( nPos < 0 || len == 0 )
+ sal_Int32 len = Text.getLength();
+ if( nPos < 0 || len == 0 )
+ result.endPos = result.startPos = 0;
+ else if (nPos > len)
+ result.endPos = result.startPos = len;
+ else {
+ sal_Int32 next, prev;
+ next = skipSpace(Text, nPos, len, rWordType, sal_True);
+ prev = skipSpace(Text, nPos, len, rWordType, sal_False);
+ if (prev == 0 && next == len) {
+ result.endPos = result.startPos = nPos;
+ } else if (prev == 0 && ! bDirection) {
result.endPos = result.startPos = 0;
- else if (nPos > len)
+ } else if (next == len && bDirection) {
result.endPos = result.startPos = len;
- else {
- sal_Int32 next, prev;
- next = skipSpace(Text, nPos, len, rWordType, sal_True);
- prev = skipSpace(Text, nPos, len, rWordType, sal_False);
- if (prev == 0 && next == len) {
- result.endPos = result.startPos = nPos;
- } else if (prev == 0 && ! bDirection) {
- result.endPos = result.startPos = 0;
- } else if (next == len && bDirection) {
- result.endPos = result.startPos = len;
- } else {
- if (next != prev) {
- if (next == nPos && next != len)
- bDirection = sal_True;
- else if (prev == nPos && prev != 0)
- bDirection = sal_False;
- else
- nPos = bDirection ? next : prev;
- }
- result = LBI->getWordBoundary(Text, nPos, rLocale, rWordType, bDirection);
+ } else {
+ if (next != prev) {
+ if (next == nPos && next != len)
+ bDirection = sal_True;
+ else if (prev == nPos && prev != 0)
+ bDirection = sal_False;
+ else
+ nPos = bDirection ? next : prev;
}
+ result = LBI->getWordBoundary(Text, nPos, rLocale, rWordType, bDirection);
}
- return result;
+ }
+ return result;
}
sal_Bool SAL_CALL BreakIteratorImpl::isBeginWord( const OUString& Text, sal_Int32 nPos,
const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException)
{
- sal_Int32 len = Text.getLength();
+ sal_Int32 len = Text.getLength();
- if (nPos < 0 || nPos >= len) return sal_False;
+ if (nPos < 0 || nPos >= len) return sal_False;
- sal_Int32 tmp = skipSpace(Text, nPos, len, rWordType, sal_True);
+ sal_Int32 tmp = skipSpace(Text, nPos, len, rWordType, sal_True);
- if (tmp != nPos) return sal_False;
+ if (tmp != nPos) return sal_False;
- result = getWordBoundary(Text, nPos, rLocale, rWordType, sal_True);
+ result = getWordBoundary(Text, nPos, rLocale, rWordType, sal_True);
- return result.startPos == nPos;
+ return result.startPos == nPos;
}
sal_Bool SAL_CALL BreakIteratorImpl::isEndWord( const OUString& Text, sal_Int32 nPos,
const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException)
{
- sal_Int32 len = Text.getLength();
+ sal_Int32 len = Text.getLength();
- if (nPos <= 0 || nPos > len) return sal_False;
+ if (nPos <= 0 || nPos > len) return sal_False;
- sal_Int32 tmp = skipSpace(Text, nPos, len, rWordType, sal_False);
+ sal_Int32 tmp = skipSpace(Text, nPos, len, rWordType, sal_False);
- if (tmp != nPos) return sal_False;
+ if (tmp != nPos) return sal_False;
- result = getWordBoundary(Text, nPos, rLocale, rWordType, sal_False);
+ result = getWordBoundary(Text, nPos, rLocale, rWordType, sal_False);
- return result.endPos == nPos;
+ return result.endPos == nPos;
}
sal_Int32 SAL_CALL BreakIteratorImpl::beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
const Locale &rLocale ) throw(RuntimeException)
{
- if (nStartPos < 0 || nStartPos > Text.getLength())
- return -1;
- if (Text.isEmpty()) return 0;
- return LBI->beginOfSentence(Text, nStartPos, rLocale);
+ if (nStartPos < 0 || nStartPos > Text.getLength())
+ return -1;
+ if (Text.isEmpty()) return 0;
+ return LBI->beginOfSentence(Text, nStartPos, rLocale);
}
sal_Int32 SAL_CALL BreakIteratorImpl::endOfSentence( const OUString& Text, sal_Int32 nStartPos,
const Locale &rLocale ) throw(RuntimeException)
{
- if (nStartPos < 0 || nStartPos > Text.getLength())
- return -1;
- if (Text.isEmpty()) return 0;
- return LBI->endOfSentence(Text, nStartPos, rLocale);
+ if (nStartPos < 0 || nStartPos > Text.getLength())
+ return -1;
+ if (Text.isEmpty()) return 0;
+ return LBI->endOfSentence(Text, nStartPos, rLocale);
}
LineBreakResults SAL_CALL BreakIteratorImpl::getLineBreak( const OUString& Text, sal_Int32 nStartPos,
const Locale& rLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions,
const LineBreakUserOptions& bOptions ) throw(RuntimeException)
{
- return LBI->getLineBreak(Text, nStartPos, rLocale, nMinBreakPos, hOptions, bOptions);
+ return LBI->getLineBreak(Text, nStartPos, rLocale, nMinBreakPos, hOptions, bOptions);
}
sal_Int16 SAL_CALL BreakIteratorImpl::getScriptType( const OUString& Text, sal_Int32 nPos )
throw(RuntimeException)
{
- return (nPos < 0 || nPos >= Text.getLength()) ? ScriptType::WEAK :
- getScriptClass(Text.iterateCodePoints(&nPos, 0));
+ return (nPos < 0 || nPos >= Text.getLength()) ? ScriptType::WEAK :
+ getScriptClass(Text.iterateCodePoints(&nPos, 0));
}
@@ -280,122 +280,122 @@ static sal_Int32 SAL_CALL iterateCodePoints(const OUString& Text, sal_Int32 &nSt
sal_Int32 SAL_CALL BreakIteratorImpl::beginOfScript( const OUString& Text,
sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(RuntimeException)
{
- if (nStartPos < 0 || nStartPos >= Text.getLength())
- return -1;
+ if (nStartPos < 0 || nStartPos >= Text.getLength())
+ return -1;
- if(ScriptType != getScriptClass(Text.iterateCodePoints(&nStartPos, 0)))
- return -1;
+ if(ScriptType != getScriptClass(Text.iterateCodePoints(&nStartPos, 0)))
+ return -1;
+ if (nStartPos == 0) return 0;
+ sal_uInt32 ch=0;
+ while (iterateCodePoints(Text, nStartPos, -1, ch) >= 0 && ScriptType == getScriptClass(ch)) {
if (nStartPos == 0) return 0;
- sal_uInt32 ch=0;
- while (iterateCodePoints(Text, nStartPos, -1, ch) >= 0 && ScriptType == getScriptClass(ch)) {
- if (nStartPos == 0) return 0;
- }
+ }
- return iterateCodePoints(Text, nStartPos, 1, ch);
+ return iterateCodePoints(Text, nStartPos, 1, ch);
}
sal_Int32 SAL_CALL BreakIteratorImpl::endOfScript( const OUString& Text,
sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(RuntimeException)
{
- if (nStartPos < 0 || nStartPos >= Text.getLength())
- return -1;
+ if (nStartPos < 0 || nStartPos >= Text.getLength())
+ return -1;
- if(ScriptType != getScriptClass(Text.iterateCodePoints(&nStartPos, 0)))
- return -1;
+ if(ScriptType != getScriptClass(Text.iterateCodePoints(&nStartPos, 0)))
+ return -1;
- sal_Int32 strLen = Text.getLength();
- sal_uInt32 ch=0;
- while(iterateCodePoints(Text, nStartPos, 1, ch) < strLen ) {
- sal_Int16 currentCharScriptType = getScriptClass(ch);
- if(ScriptType != currentCharScriptType && currentCharScriptType != ScriptType::WEAK)
- break;
- }
- return nStartPos;
+ sal_Int32 strLen = Text.getLength();
+ sal_uInt32 ch=0;
+ while(iterateCodePoints(Text, nStartPos, 1, ch) < strLen ) {
+ sal_Int16 currentCharScriptType = getScriptClass(ch);
+ if(ScriptType != currentCharScriptType && currentCharScriptType != ScriptType::WEAK)
+ break;
+ }
+ return nStartPos;
}
sal_Int32 SAL_CALL BreakIteratorImpl::previousScript( const OUString& Text,
sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(RuntimeException)
{
- if (nStartPos < 0)
- return -1;
- if (nStartPos > Text.getLength())
- nStartPos = Text.getLength();
+ if (nStartPos < 0)
+ return -1;
+ if (nStartPos > Text.getLength())
+ nStartPos = Text.getLength();
- sal_Int16 numberOfChange = (ScriptType == getScriptClass(Text.iterateCodePoints(&nStartPos, 0))) ? 3 : 2;
+ sal_Int16 numberOfChange = (ScriptType == getScriptClass(Text.iterateCodePoints(&nStartPos, 0))) ? 3 : 2;
- sal_uInt32 ch=0;
- while (numberOfChange > 0 && iterateCodePoints(Text, nStartPos, -1, ch) >= 0) {
- if ((((numberOfChange % 2) == 0) ^ (ScriptType != getScriptClass(ch))))
+ sal_uInt32 ch=0;
+ while (numberOfChange > 0 && iterateCodePoints(Text, nStartPos, -1, ch) >= 0) {
+ if ((((numberOfChange % 2) == 0) ^ (ScriptType != getScriptClass(ch))))
+ numberOfChange--;
+ else if (nStartPos == 0) {
+ if (numberOfChange > 0)
numberOfChange--;
- else if (nStartPos == 0) {
- if (numberOfChange > 0)
- numberOfChange--;
- if (nStartPos > 0)
- Text.iterateCodePoints(&nStartPos, -1);
- else
- return -1;
- }
+ if (nStartPos > 0)
+ Text.iterateCodePoints(&nStartPos, -1);
+ else
+ return -1;
}
- return numberOfChange == 0 ? iterateCodePoints(Text, nStartPos, 1, ch) : -1;
+ }
+ return numberOfChange == 0 ? iterateCodePoints(Text, nStartPos, 1, ch) : -1;
}
sal_Int32 SAL_CALL BreakIteratorImpl::nextScript( const OUString& Text, sal_Int32 nStartPos,
sal_Int16 ScriptType ) throw(RuntimeException)
{
- if (nStartPos < 0)
- nStartPos = 0;
- sal_Int32 strLen = Text.getLength();
- if (nStartPos > strLen)
- return -1;
+ if (nStartPos < 0)
+ nStartPos = 0;
+ sal_Int32 strLen = Text.getLength();
+ if (nStartPos > strLen)
+ return -1;
- sal_Int16 numberOfChange = (ScriptType == getScriptClass(Text.iterateCodePoints(&nStartPos, 0))) ? 2 : 1;
+ sal_Int16 numberOfChange = (ScriptType == getScriptClass(Text.iterateCodePoints(&nStartPos, 0))) ? 2 : 1;
- sal_uInt32 ch=0;
- while (numberOfChange > 0 && iterateCodePoints(Text, nStartPos, 1, ch) < strLen) {
- sal_Int16 currentCharScriptType = getScriptClass(ch);
- if ((numberOfChange == 1) ? (ScriptType == currentCharScriptType) :
- (ScriptType != currentCharScriptType && currentCharScriptType != ScriptType::WEAK))
- numberOfChange--;
- }
- return numberOfChange == 0 ? nStartPos : -1;
+ sal_uInt32 ch=0;
+ while (numberOfChange > 0 && iterateCodePoints(Text, nStartPos, 1, ch) < strLen) {
+ sal_Int16 currentCharScriptType = getScriptClass(ch);
+ if ((numberOfChange == 1) ? (ScriptType == currentCharScriptType) :
+ (ScriptType != currentCharScriptType && currentCharScriptType != ScriptType::WEAK))
+ numberOfChange--;
+ }
+ return numberOfChange == 0 ? nStartPos : -1;
}
sal_Int32 SAL_CALL BreakIteratorImpl::beginOfCharBlock( const OUString& Text, sal_Int32 nStartPos,
const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException)
{
- if (CharType == CharType::ANY_CHAR) return 0;
- if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1;
- if (CharType != (sal_Int16)u_charType( Text.iterateCodePoints(&nStartPos, 0))) return -1;
+ if (CharType == CharType::ANY_CHAR) return 0;
+ if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1;
+ if (CharType != (sal_Int16)u_charType( Text.iterateCodePoints(&nStartPos, 0))) return -1;
- sal_Int32 nPos=nStartPos;
- while(nStartPos > 0 && CharType == (sal_Int16)u_charType(Text.iterateCodePoints(&nPos, -1))) { nStartPos=nPos; }
- return nStartPos; // begin of char block is inclusive
+ sal_Int32 nPos=nStartPos;
+ while(nStartPos > 0 && CharType == (sal_Int16)u_charType(Text.iterateCodePoints(&nPos, -1))) { nStartPos=nPos; }
+ return nStartPos; // begin of char block is inclusive
}
sal_Int32 SAL_CALL BreakIteratorImpl::endOfCharBlock( const OUString& Text, sal_Int32 nStartPos,
const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException)
{
- sal_Int32 strLen = Text.getLength();
+ sal_Int32 strLen = Text.getLength();
- if (CharType == CharType::ANY_CHAR) return strLen; // end of char block is exclusive
- if (nStartPos < 0 || nStartPos >= strLen) return -1;
- if (CharType != (sal_Int16)u_charType(Text.iterateCodePoints(&nStartPos, 0))) return -1;
+ if (CharType == CharType::ANY_CHAR) return strLen; // end of char block is exclusive
+ if (nStartPos < 0 || nStartPos >= strLen) return -1;
+ if (CharType != (sal_Int16)u_charType(Text.iterateCodePoints(&nStartPos, 0))) return -1;
- sal_uInt32 ch=0;
- while(iterateCodePoints(Text, nStartPos, 1, ch) < strLen && CharType == (sal_Int16)u_charType(ch)) {}
- return nStartPos; // end of char block is exclusive
+ sal_uInt32 ch=0;
+ while(iterateCodePoints(Text, nStartPos, 1, ch) < strLen && CharType == (sal_Int16)u_charType(ch)) {}
+ return nStartPos; // end of char block is exclusive
}
sal_Int32 SAL_CALL BreakIteratorImpl::nextCharBlock( const OUString& Text, sal_Int32 nStartPos,
const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException)
{
- if (CharType == CharType::ANY_CHAR) return -1;
- if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1;
+ if (CharType == CharType::ANY_CHAR) return -1;
+ if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1;
- sal_Int16 numberOfChange = (CharType == (sal_Int16)u_charType(Text.iterateCodePoints(&nStartPos, 0))) ? 2 : 1;
- sal_Int32 strLen = Text.getLength();
+ sal_Int16 numberOfChange = (CharType == (sal_Int16)u_charType(Text.iterateCodePoints(&nStartPos, 0))) ? 2 : 1;
+ sal_Int32 strLen = Text.getLength();
sal_uInt32 ch=0;
while (numberOfChange > 0 && iterateCodePoints(Text, nStartPos, 1, ch) < strLen) {
@@ -408,21 +408,21 @@ sal_Int32 SAL_CALL BreakIteratorImpl::nextCharBlock( const OUString& Text, sal_I
sal_Int32 SAL_CALL BreakIteratorImpl::previousCharBlock( const OUString& Text, sal_Int32 nStartPos,
const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException)
{
- if(CharType == CharType::ANY_CHAR) return -1;
- if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1;
+ if(CharType == CharType::ANY_CHAR) return -1;
+ if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1;
- sal_Int16 numberOfChange = (CharType == (sal_Int16)u_charType(Text.iterateCodePoints(&nStartPos, 0))) ? 3 : 2;
+ sal_Int16 numberOfChange = (CharType == (sal_Int16)u_charType(Text.iterateCodePoints(&nStartPos, 0))) ? 3 : 2;
- sal_uInt32 ch=0;
- while (numberOfChange > 0 && iterateCodePoints(Text, nStartPos, -1, ch) >= 0) {
- if (((numberOfChange % 2) == 0) ^ (CharType != (sal_Int16)u_charType(ch)))
- numberOfChange--;
- if (nStartPos == 0 && numberOfChange > 0) {
- numberOfChange--;
- if (numberOfChange == 0) return nStartPos;
- }
+ sal_uInt32 ch=0;
+ while (numberOfChange > 0 && iterateCodePoints(Text, nStartPos, -1, ch) >= 0) {
+ if (((numberOfChange % 2) == 0) ^ (CharType != (sal_Int16)u_charType(ch)))
+ numberOfChange--;
+ if (nStartPos == 0 && numberOfChange > 0) {
+ numberOfChange--;
+ if (numberOfChange == 0) return nStartPos;
}
- return numberOfChange == 0 ? iterateCodePoints(Text, nStartPos, 1, ch) : -1;
+ }
+ return numberOfChange == 0 ? iterateCodePoints(Text, nStartPos, 1, ch) : -1;
}
@@ -430,88 +430,88 @@ sal_Int32 SAL_CALL BreakIteratorImpl::previousCharBlock( const OUString& Text, s
sal_Int16 SAL_CALL BreakIteratorImpl::getWordType( const OUString& /*Text*/,
sal_Int32 /*nPos*/, const Locale& /*rLocale*/ ) throw(RuntimeException)
{
- return 0;
+ return 0;
}
namespace
{
- sal_Int16 getScriptClassByUAX24Script(sal_uInt32 currentChar)
- {
- int32_t script = u_getIntPropertyValue(currentChar, UCHAR_SCRIPT);
- return unicode::getScriptClassFromUScriptCode(static_cast<UScriptCode>(script));
- }
+sal_Int16 getScriptClassByUAX24Script(sal_uInt32 currentChar)
+{
+ int32_t script = u_getIntPropertyValue(currentChar, UCHAR_SCRIPT);
+ return unicode::getScriptClassFromUScriptCode(static_cast<UScriptCode>(script));
+}
- struct UBlock2Script
- {
- UBlockCode from;
- UBlockCode to;
- sal_Int16 script;
- };
+struct UBlock2Script
+{
+ UBlockCode from;
+ UBlockCode to;
+ sal_Int16 script;
+};
- static const UBlock2Script scriptList[] =
- {
- {UBLOCK_NO_BLOCK, UBLOCK_NO_BLOCK, ScriptType::WEAK},
- {UBLOCK_BASIC_LATIN, UBLOCK_ARMENIAN, ScriptType::LATIN},
- {UBLOCK_HEBREW, UBLOCK_MYANMAR, ScriptType::COMPLEX},
- {UBLOCK_GEORGIAN, UBLOCK_GEORGIAN, ScriptType::LATIN},
- {UBLOCK_HANGUL_JAMO, UBLOCK_HANGUL_JAMO, ScriptType::ASIAN},
- {UBLOCK_ETHIOPIC, UBLOCK_ETHIOPIC, ScriptType::COMPLEX},
- {UBLOCK_CHEROKEE, UBLOCK_RUNIC, ScriptType::LATIN},
- {UBLOCK_KHMER, UBLOCK_MONGOLIAN, ScriptType::COMPLEX},
- {UBLOCK_LATIN_EXTENDED_ADDITIONAL, UBLOCK_GREEK_EXTENDED, ScriptType::LATIN},
- {UBLOCK_NUMBER_FORMS, UBLOCK_NUMBER_FORMS, ScriptType::WEAK},
- {UBLOCK_CJK_RADICALS_SUPPLEMENT, UBLOCK_HANGUL_SYLLABLES, ScriptType::ASIAN},
- {UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS, UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS, ScriptType::ASIAN},
- {UBLOCK_ARABIC_PRESENTATION_FORMS_A, UBLOCK_ARABIC_PRESENTATION_FORMS_A, ScriptType::COMPLEX},
- {UBLOCK_CJK_COMPATIBILITY_FORMS, UBLOCK_CJK_COMPATIBILITY_FORMS, ScriptType::ASIAN},
- {UBLOCK_ARABIC_PRESENTATION_FORMS_B, UBLOCK_ARABIC_PRESENTATION_FORMS_B, ScriptType::COMPLEX},
- {UBLOCK_HALFWIDTH_AND_FULLWIDTH_FORMS, UBLOCK_HALFWIDTH_AND_FULLWIDTH_FORMS, ScriptType::ASIAN},
- {UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B, UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT, ScriptType::ASIAN},
- {UBLOCK_CJK_STROKES, UBLOCK_CJK_STROKES, ScriptType::ASIAN},
- {UBLOCK_LATIN_EXTENDED_C, UBLOCK_LATIN_EXTENDED_D, ScriptType::LATIN}
- };
-
- #define scriptListCount SAL_N_ELEMENTS(scriptList)
-
- //always sets rScriptType
- //
- //returns true for characters historically explicitly assigned to
- //latin/weak/asian
- //
- //returns false for characters that historically implicitly assigned to
- //weak as unknown
- bool getCompatibilityScriptClassByBlock(sal_uInt32 currentChar, sal_Int16 &rScriptType)
+static const UBlock2Script scriptList[] =
+{
+ {UBLOCK_NO_BLOCK, UBLOCK_NO_BLOCK, ScriptType::WEAK},
+ {UBLOCK_BASIC_LATIN, UBLOCK_ARMENIAN, ScriptType::LATIN},
+ {UBLOCK_HEBREW, UBLOCK_MYANMAR, ScriptType::COMPLEX},
+ {UBLOCK_GEORGIAN, UBLOCK_GEORGIAN, ScriptType::LATIN},
+ {UBLOCK_HANGUL_JAMO, UBLOCK_HANGUL_JAMO, ScriptType::ASIAN},
+ {UBLOCK_ETHIOPIC, UBLOCK_ETHIOPIC, ScriptType::COMPLEX},
+ {UBLOCK_CHEROKEE, UBLOCK_RUNIC, ScriptType::LATIN},
+ {UBLOCK_KHMER, UBLOCK_MONGOLIAN, ScriptType::COMPLEX},
+ {UBLOCK_LATIN_EXTENDED_ADDITIONAL, UBLOCK_GREEK_EXTENDED, ScriptType::LATIN},
+ {UBLOCK_NUMBER_FORMS, UBLOCK_NUMBER_FORMS, ScriptType::WEAK},
+ {UBLOCK_CJK_RADICALS_SUPPLEMENT, UBLOCK_HANGUL_SYLLABLES, ScriptType::ASIAN},
+ {UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS, UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS, ScriptType::ASIAN},
+ {UBLOCK_ARABIC_PRESENTATION_FORMS_A, UBLOCK_ARABIC_PRESENTATION_FORMS_A, ScriptType::COMPLEX},
+ {UBLOCK_CJK_COMPATIBILITY_FORMS, UBLOCK_CJK_COMPATIBILITY_FORMS, ScriptType::ASIAN},
+ {UBLOCK_ARABIC_PRESENTATION_FORMS_B, UBLOCK_ARABIC_PRESENTATION_FORMS_B, ScriptType::COMPLEX},
+ {UBLOCK_HALFWIDTH_AND_FULLWIDTH_FORMS, UBLOCK_HALFWIDTH_AND_FULLWIDTH_FORMS, ScriptType::ASIAN},
+ {UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B, UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT, ScriptType::ASIAN},
+ {UBLOCK_CJK_STROKES, UBLOCK_CJK_STROKES, ScriptType::ASIAN},
+ {UBLOCK_LATIN_EXTENDED_C, UBLOCK_LATIN_EXTENDED_D, ScriptType::LATIN}
+};
+
+#define scriptListCount SAL_N_ELEMENTS(scriptList)
+
+//always sets rScriptType
+//
+//returns true for characters historically explicitly assigned to
+//latin/weak/asian
+//
+//returns false for characters that historically implicitly assigned to
+//weak as unknown
+bool getCompatibilityScriptClassByBlock(sal_uInt32 currentChar, sal_Int16 &rScriptType)
+{
+ bool bKnown = true;
+ //handle specific characters always as weak:
+ // 0x01 - this breaks a word
+ // 0x02 - this can be inside a word
+ // 0x20 & 0xA0 - Bug 102975, declare western space and non-break space as WEAK char.
+ if( 0x01 == currentChar || 0x02 == currentChar || 0x20 == currentChar || 0xA0 == currentChar)
+ rScriptType = ScriptType::WEAK;
+ // workaround for Coptic
+ else if ( 0x2C80 <= currentChar && 0x2CE3 >= currentChar)
+ rScriptType = ScriptType::LATIN;
+ else
{
- bool bKnown = true;
- //handle specific characters always as weak:
- // 0x01 - this breaks a word
- // 0x02 - this can be inside a word
- // 0x20 & 0xA0 - Bug 102975, declare western space and non-break space as WEAK char.
- if( 0x01 == currentChar || 0x02 == currentChar || 0x20 == currentChar || 0xA0 == currentChar)
- rScriptType = ScriptType::WEAK;
- // workaround for Coptic
- else if ( 0x2C80 <= currentChar && 0x2CE3 >= currentChar)
- rScriptType = ScriptType::LATIN;
+ UBlockCode block=ublock_getCode(currentChar);
+ size_t i = 0;
+ while (i < scriptListCount)
+ {
+ if (block <= scriptList[i].to)
+ break;
+ ++i;
+ }
+ if (i < scriptListCount && block >= scriptList[i].from)
+ rScriptType = scriptList[i].script;
else
{
- UBlockCode block=ublock_getCode(currentChar);
- size_t i = 0;
- while (i < scriptListCount)
- {
- if (block <= scriptList[i].to)
- break;
- ++i;
- }
- if (i < scriptListCount && block >= scriptList[i].from)
- rScriptType = scriptList[i].script;
- else
- {
- rScriptType = ScriptType::WEAK;
- bKnown = false;
- }
+ rScriptType = ScriptType::WEAK;
+ bKnown = false;
}
- return bKnown;
}
+ return bKnown;
+}
}
sal_Int16 BreakIteratorImpl::getScriptClass(sal_uInt32 currentChar)
@@ -536,73 +536,73 @@ static inline sal_Bool operator == (const Locale& l1, const Locale& l2) {
sal_Bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUString& aLocaleName) throw( RuntimeException )
{
- // to share service between same Language but different Country code, like zh_CN and zh_TW
- for (size_t l = 0; l < lookupTable.size(); l++) {
- lookupTableItem *listItem = lookupTable[l];
- if (aLocaleName == listItem->aLocale.Language) {
- xBI = listItem->xBI;
- return sal_True;
- }
+ // to share service between same Language but different Country code, like zh_CN and zh_TW
+ for (size_t l = 0; l < lookupTable.size(); l++) {
+ lookupTableItem *listItem = lookupTable[l];
+ if (aLocaleName == listItem->aLocale.Language) {
+ xBI = listItem->xBI;
+ return sal_True;
}
+ }
- Reference < uno::XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
+ Reference < uno::XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
OUString("com.sun.star.i18n.BreakIterator_") + aLocaleName, m_xContext);
- if ( xI.is() ) {
- xBI.set(xI, UNO_QUERY);
- if (xBI.is()) {
- lookupTable.push_back(new lookupTableItem(Locale(aLocaleName, aLocaleName, aLocaleName), xBI));
- return sal_True;
- }
+ if ( xI.is() ) {
+ xBI.set(xI, UNO_QUERY);
+ if (xBI.is()) {
+ lookupTable.push_back(new lookupTableItem(Locale(aLocaleName, aLocaleName, aLocaleName), xBI));
+ return sal_True;
}
- return sal_False;
+ }
+ return sal_False;
}
Reference < XBreakIterator > SAL_CALL
BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) throw (RuntimeException)
{
- if (xBI.is() && rLocale == aLocale)
- return xBI;
- else if (m_xContext.is()) {
- aLocale = rLocale;
-
- for (size_t i = 0; i < lookupTable.size(); i++) {
- lookupTableItem *listItem = lookupTable[i];
- if (rLocale == listItem->aLocale)
- return xBI = listItem->xBI;
- }
+ if (xBI.is() && rLocale == aLocale)
+ return xBI;
+ else if (m_xContext.is()) {
+ aLocale = rLocale;
+
+ for (size_t i = 0; i < lookupTable.size(); i++) {
+ lookupTableItem *listItem = lookupTable[i];
+ if (rLocale == listItem->aLocale)
+ return xBI = listItem->xBI;
+ }
- sal_Unicode under = (sal_Unicode)'_';
+ sal_Unicode under = (sal_Unicode)'_';
- sal_Int32 l = rLocale.Language.getLength();
- sal_Int32 c = rLocale.Country.getLength();
- sal_Int32 v = rLocale.Variant.getLength();
- OUStringBuffer aBuf(l+c+v+3);
+ sal_Int32 l = rLocale.Language.getLength();
+ sal_Int32 c = rLocale.Country.getLength();
+ sal_Int32 v = rLocale.Variant.getLength();
+ OUStringBuffer aBuf(l+c+v+3);
- if ((l > 0 && c > 0 && v > 0 &&
+ if ((l > 0 && c > 0 && v > 0 &&
// load service with name <base>_<lang>_<country>_<varian>
createLocaleSpecificBreakIterator(aBuf.append(rLocale.Language).append(under).append(
- rLocale.Country).append(under).append(rLocale.Variant).makeStringAndClear())) ||
+ rLocale.Country).append(under).append(rLocale.Variant).makeStringAndClear())) ||
(l > 0 && c > 0 &&
- // load service with name <base>_<lang>_<country>
- createLocaleSpecificBreakIterator(aBuf.append(rLocale.Language).append(under).append(
- rLocale.Country).makeStringAndClear())) ||
+ // load service with name <base>_<lang>_<country>
+ createLocaleSpecificBreakIterator(aBuf.append(rLocale.Language).append(under).append(
+ rLocale.Country).makeStringAndClear())) ||
(l > 0 && c > 0 && rLocale.Language.compareToAscii("zh") == 0 &&
- (rLocale.Country.compareToAscii("HK") == 0 ||
- rLocale.Country.compareToAscii("MO") == 0) &&
- // if the country code is HK or MO, one more step to try TW.
- createLocaleSpecificBreakIterator(aBuf.append(rLocale.Language).append(under).appendAscii(
- "TW").makeStringAndClear())) ||
+ (rLocale.Country.compareToAscii("HK") == 0 ||
+ rLocale.Country.compareToAscii("MO") == 0) &&
+ // if the country code is HK or MO, one more step to try TW.
+ createLocaleSpecificBreakIterator(aBuf.append(rLocale.Language).append(under).appendAscii(
+ "TW").makeStringAndClear())) ||
(l > 0 &&
- // load service with name <base>_<lang>
- createLocaleSpecificBreakIterator(rLocale.Language)) ||
- // load default service with name <base>_Unicode
- createLocaleSpecificBreakIterator(OUString("Unicode"))) {
- lookupTable.push_back( new lookupTableItem(aLocale, xBI) );
- return xBI;
- }
+ // load service with name <base>_<lang>
+ createLocaleSpecificBreakIterator(rLocale.Language)) ||
+ // load default service with name <base>_Unicode
+ createLocaleSpecificBreakIterator(OUString("Unicode"))) {
+ lookupTable.push_back( new lookupTableItem(aLocale, xBI) );
+ return xBI;
}
- throw RuntimeException();
+ }
+ throw RuntimeException();
}
const sal_Char cBreakIterator[] = "com.sun.star.i18n.BreakIterator";
@@ -610,21 +610,21 @@ const sal_Char cBreakIterator[] = "com.sun.star.i18n.BreakIterator";
OUString SAL_CALL
BreakIteratorImpl::getImplementationName(void) throw( RuntimeException )
{
- return OUString::createFromAscii(cBreakIterator);
+ return OUString::createFromAscii(cBreakIterator);
}
sal_Bool SAL_CALL
BreakIteratorImpl::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return !rServiceName.compareToAscii(cBreakIterator);
+ return !rServiceName.compareToAscii(cBreakIterator);
}
Sequence< OUString > SAL_CALL
BreakIteratorImpl::getSupportedServiceNames(void) throw( RuntimeException )
{
- Sequence< OUString > aRet(1);
- aRet[0] = OUString::createFromAscii(cBreakIterator);
- return aRet;
+ Sequence< OUString > aRet(1);
+ aRet[0] = OUString::createFromAscii(cBreakIterator);
+ return aRet;
}
} } } }
diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx b/i18npool/source/breakiterator/breakiterator_cjk.cxx
index 28f2631..9ff6a40 100644
--- a/i18npool/source/breakiterator/breakiterator_cjk.cxx
+++ b/i18npool/source/breakiterator/breakiterator_cjk.cxx
@@ -37,41 +37,41 @@ BreakIterator_CJK::BreakIterator_CJK() :
dict( NULL ),
hangingCharacters()
{
- cBreakIterator = "com.sun.star.i18n.BreakIterator_CJK";
+ cBreakIterator = "com.sun.star.i18n.BreakIterator_CJK";
}
Boundary SAL_CALL
BreakIterator_CJK::previousWord(const OUString& text, sal_Int32 anyPos,
const lang::Locale& nLocale, sal_Int16 wordType) throw(RuntimeException)
{
- if (dict) {
- result = dict->previousWord(text, anyPos, wordType);
- // #109813# for non-CJK, single character word, fallback to ICU breakiterator.
- if (result.endPos - result.startPos != 1 ||
- getScriptType(text, result.startPos) == ScriptType::ASIAN)
- return result;
- result = BreakIterator_Unicode::getWordBoundary(text, result.startPos, nLocale, wordType, true);
- if (result.endPos < anyPos)
- return result;
- }
- return BreakIterator_Unicode::previousWord(text, anyPos, nLocale, wordType);
+ if (dict) {
+ result = dict->previousWord(text, anyPos, wordType);
+ // #109813# for non-CJK, single character word, fallback to ICU breakiterator.
+ if (result.endPos - result.startPos != 1 ||
+ getScriptType(text, result.startPos) == ScriptType::ASIAN)
+ return result;
+ result = BreakIterator_Unicode::getWordBoundary(text, result.startPos, nLocale, wordType, true);
+ if (result.endPos < anyPos)
+ return result;
+ }
+ return BreakIterator_Unicode::previousWord(text, anyPos, nLocale, wordType);
}
Boundary SAL_CALL
BreakIterator_CJK::nextWord(const OUString& text, sal_Int32 anyPos,
const lang::Locale& nLocale, sal_Int16 wordType) throw(RuntimeException)
{
- if (dict) {
- result = dict->nextWord(text, anyPos, wordType);
- // #109813# for non-CJK, single character word, fallback to ICU breakiterator.
- if (result.endPos - result.startPos != 1 ||
- getScriptType(text, result.startPos) == ScriptType::ASIAN)
- return result;
- result = BreakIterator_Unicode::getWordBoundary(text, result.startPos, nLocale, wordType, true);
- if (result.startPos > anyPos)
- return result;
- }
- return BreakIterator_Unicode::nextWord(text, anyPos, nLocale, wordType);
+ if (dict) {
+ result = dict->nextWord(text, anyPos, wordType);
+ // #109813# for non-CJK, single character word, fallback to ICU breakiterator.
+ if (result.endPos - result.startPos != 1 ||
+ getScriptType(text, result.startPos) == ScriptType::ASIAN)
+ return result;
+ result = BreakIterator_Unicode::getWordBoundary(text, result.startPos, nLocale, wordType, true);
+ if (result.startPos > anyPos)
+ return result;
+ }
+ return BreakIterator_Unicode::nextWord(text, anyPos, nLocale, wordType);
}
Boundary SAL_CALL
@@ -79,14 +79,14 @@ BreakIterator_CJK::getWordBoundary( const OUString& text, sal_Int32 anyPos,
const lang::Locale& nLocale, sal_Int16 wordType, sal_Bool bDirection )
throw(RuntimeException)
{
- if (dict) {
- result = dict->getWordBoundary(text, anyPos, wordType, bDirection);
- // #109813# for non-CJK, single character word, fallback to ICU breakiterator.
- if (result.endPos - result.startPos != 1 ||
- getScriptType(text, result.startPos) == ScriptType::ASIAN)
- return result;
- }
- return BreakIterator_Unicode::getWordBoundary(text, anyPos, nLocale, wordType, bDirection);
+ if (dict) {
+ result = dict->getWordBoundary(text, anyPos, wordType, bDirection);
+ // #109813# for non-CJK, single character word, fallback to ICU breakiterator.
+ if (result.endPos - result.startPos != 1 ||
+ getScriptType(text, result.startPos) == ScriptType::ASIAN)
+ return result;
+ }
+ return BreakIterator_Unicode::getWordBoundary(text, anyPos, nLocale, wordType, bDirection);
}
LineBreakResults SAL_CALL BreakIterator_CJK::getLineBreak(
@@ -95,22 +95,22 @@ LineBreakResults SAL_CALL BreakIterator_CJK::getLineBreak(
const LineBreakHyphenationOptions& /*hOptions*/,
const LineBreakUserOptions& bOptions ) throw(RuntimeException)
{
- LineBreakResults lbr;
-
- if (bOptions.allowPunctuationOutsideMargin &&
- hangingCharacters.indexOf(Text[nStartPos]) != -1 &&
- (Text.iterateCodePoints( &nStartPos, 1), nStartPos == Text.getLength())) {
- ; // do nothing
- } else if (bOptions.applyForbiddenRules && 0 < nStartPos && nStartPos < Text.getLength()) {
- while (nStartPos > 0 &&
- (bOptions.forbiddenBeginCharacters.indexOf(Text[nStartPos]) != -1 ||
- bOptions.forbiddenEndCharacters.indexOf(Text[nStartPos-1]) != -1))
- Text.iterateCodePoints( &nStartPos, -1);
- }
-
- lbr.breakIndex = nStartPos;
- lbr.breakType = BreakType::WORDBOUNDARY;
- return lbr;
+ LineBreakResults lbr;
+
+ if (bOptions.allowPunctuationOutsideMargin &&
+ hangingCharacters.indexOf(Text[nStartPos]) != -1 &&
+ (Text.iterateCodePoints( &nStartPos, 1), nStartPos == Text.getLength())) {
+ ; // do nothing
+ } else if (bOptions.applyForbiddenRules && 0 < nStartPos && nStartPos < Text.getLength()) {
+ while (nStartPos > 0 &&
+ (bOptions.forbiddenBeginCharacters.indexOf(Text[nStartPos]) != -1 ||
+ bOptions.forbiddenEndCharacters.indexOf(Text[nStartPos-1]) != -1))
+ Text.iterateCodePoints( &nStartPos, -1);
+ }
+
+ lbr.breakIndex = nStartPos;
+ lbr.breakType = BreakType::WORDBOUNDARY;
+ return lbr;
}
#define LOCALE(language, country) lang::Locale(OUString::createFromAscii(language), OUString::createFromAscii(country), OUString())
@@ -119,14 +119,14 @@ LineBreakResults SAL_CALL BreakIterator_CJK::getLineBreak(
// ----------------------------------------------------;
BreakIterator_zh::BreakIterator_zh()
{
- dict = new xdictionary("zh");
- hangingCharacters = LocaleDataImpl().getHangingCharacters(LOCALE("zh", "CN"));
- cBreakIterator = "com.sun.star.i18n.BreakIterator_zh";
+ dict = new xdictionary("zh");
+ hangingCharacters = LocaleDataImpl().getHangingCharacters(LOCALE("zh", "CN"));
+ cBreakIterator = "com.sun.star.i18n.BreakIterator_zh";
}
BreakIterator_zh::~BreakIterator_zh()
{
- delete dict;
+ delete dict;
}
// ----------------------------------------------------
@@ -134,14 +134,14 @@ BreakIterator_zh::~BreakIterator_zh()
// ----------------------------------------------------;
BreakIterator_zh_TW::BreakIterator_zh_TW()
{
- dict = new xdictionary("zh");
- hangingCharacters = LocaleDataImpl().getHangingCharacters(LOCALE("zh", "TW"));
- cBreakIterator = "com.sun.star.i18n.BreakIterator_zh_TW";
+ dict = new xdictionary("zh");
+ hangingCharacters = LocaleDataImpl().getHangingCharacters(LOCALE("zh", "TW"));
+ cBreakIterator = "com.sun.star.i18n.BreakIterator_zh_TW";
}
BreakIterator_zh_TW::~BreakIterator_zh_TW()
{
- delete dict;
+ delete dict;
}
// ----------------------------------------------------
@@ -149,15 +149,15 @@ BreakIterator_zh_TW::~BreakIterator_zh_TW()
// ----------------------------------------------------;
BreakIterator_ja::BreakIterator_ja()
{
- dict = new xdictionary("ja");
- dict->setJapaneseWordBreak();
- hangingCharacters = LocaleDataImpl().getHangingCharacters(LOCALE("ja", "JP"));
- cBreakIterator = "com.sun.star.i18n.BreakIterator_ja";
+ dict = new xdictionary("ja");
+ dict->setJapaneseWordBreak();
+ hangingCharacters = LocaleDataImpl().getHangingCharacters(LOCALE("ja", "JP"));
+ cBreakIterator = "com.sun.star.i18n.BreakIterator_ja";
}
BreakIterator_ja::~BreakIterator_ja()
{
- delete dict;
+ delete dict;
}
// ----------------------------------------------------
@@ -165,8 +165,8 @@ BreakIterator_ja::~BreakIterator_ja()
// ----------------------------------------------------;
BreakIterator_ko::BreakIterator_ko()
{
- hangingCharacters = LocaleDataImpl().getHangingCharacters(LOCALE("ko", "KR"));
- cBreakIterator = "com.sun.star.i18n.BreakIterator_ko";
+ hangingCharacters = LocaleDataImpl().getHangingCharacters(LOCALE("ko", "KR"));
+ cBreakIterator = "com.sun.star.i18n.BreakIterator_ko";
}
BreakIterator_ko::~BreakIterator_ko()
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 63ebe53..0e64343 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -205,18 +205,18 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text,
sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone )
throw(uno::RuntimeException)
{
- if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) { // for CELL mode
- loadICUBreakIterator(rLocale, LOAD_CHARACTER_BREAKITERATOR, 0, "char", Text);
- for (nDone = 0; nDone < nCount; nDone++) {
- nStartPos = character.aBreakIterator->following(nStartPos);
- if (nStartPos == BreakIterator::DONE)
- return Text.getLength();
- }
- } else { // for CHARACTER mode
- for (nDone = 0; nDone < nCount && nStartPos < Text.getLength(); nDone++)
- Text.iterateCodePoints(&nStartPos, 1);
+ if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) { // for CELL mode
+ loadICUBreakIterator(rLocale, LOAD_CHARACTER_BREAKITERATOR, 0, "char", Text);
+ for (nDone = 0; nDone < nCount; nDone++) {
+ nStartPos = character.aBreakIterator->following(nStartPos);
+ if (nStartPos == BreakIterator::DONE)
+ return Text.getLength();
}
- return nStartPos;
+ } else { // for CHARACTER mode
+ for (nDone = 0; nDone < nCount && nStartPos < Text.getLength(); nDone++)
+ Text.iterateCodePoints(&nStartPos, 1);
+ }
+ return nStartPos;
}
sal_Int32 SAL_CALL BreakIterator_Unicode::previousCharacters( const OUString& Text,
@@ -224,131 +224,131 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::previousCharacters( const OUString& Te
sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone )
throw(uno::RuntimeException)
{
- if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) { // for CELL mode
- loadICUBreakIterator(rLocale, LOAD_CHARACTER_BREAKITERATOR, 0, "char", Text);
- for (nDone = 0; nDone < nCount; nDone++) {
- nStartPos = character.aBreakIterator->preceding(nStartPos);
- if (nStartPos == BreakIterator::DONE)
- return 0;
- }
- } else { // for BS to delete one char and CHARACTER mode.
- for (nDone = 0; nDone < nCount && nStartPos > 0; nDone++)
- Text.iterateCodePoints(&nStartPos, -1);
+ if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) { // for CELL mode
+ loadICUBreakIterator(rLocale, LOAD_CHARACTER_BREAKITERATOR, 0, "char", Text);
+ for (nDone = 0; nDone < nCount; nDone++) {
+ nStartPos = character.aBreakIterator->preceding(nStartPos);
+ if (nStartPos == BreakIterator::DONE)
+ return 0;
}
- return nStartPos;
+ } else { // for BS to delete one char and CHARACTER mode.
+ for (nDone = 0; nDone < nCount && nStartPos > 0; nDone++)
+ Text.iterateCodePoints(&nStartPos, -1);
+ }
+ return nStartPos;
}
Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int32 nStartPos,
const lang::Locale& rLocale, sal_Int16 rWordType ) throw(uno::RuntimeException)
{
- loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
+ loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
- result.startPos = icuBI->aBreakIterator->following(nStartPos);
- if( result.startPos >= Text.getLength() || result.startPos == BreakIterator::DONE )
- result.endPos = result.startPos;
- else {
- if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
+ result.startPos = icuBI->aBreakIterator->following(nStartPos);
+ if( result.startPos >= Text.getLength() || result.startPos == BreakIterator::DONE )
+ result.endPos = result.startPos;
+ else {
+ if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
rWordType == WordType::DICTIONARY_WORD ) &&
- u_isWhitespace(Text.iterateCodePoints(&result.startPos, 0)) )
- result.startPos = icuBI->aBreakIterator->following(result.startPos);
+ u_isWhitespace(Text.iterateCodePoints(&result.startPos, 0)) )
+ result.startPos = icuBI->aBreakIterator->following(result.startPos);
- result.endPos = icuBI->aBreakIterator->following(result.startPos);
- if(result.endPos == BreakIterator::DONE)
- result.endPos = result.startPos;
- }
- return result;
+ result.endPos = icuBI->aBreakIterator->following(result.startPos);
+ if(result.endPos == BreakIterator::DONE)
+ result.endPos = result.startPos;
+ }
+ return result;
}
Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_Int32 nStartPos,
const lang::Locale& rLocale, sal_Int16 rWordType) throw(uno::RuntimeException)
{
- loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
+ loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
- result.startPos = icuBI->aBreakIterator->preceding(nStartPos);
- if( result.startPos < 0 || result.startPos == BreakIterator::DONE)
- result.endPos = result.startPos;
- else {
- if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
+ result.startPos = icuBI->aBreakIterator->preceding(nStartPos);
+ if( result.startPos < 0 || result.startPos == BreakIterator::DONE)
+ result.endPos = result.startPos;
+ else {
+ if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
rWordType == WordType::DICTIONARY_WORD) &&
- u_isWhitespace(Text.iterateCodePoints(&result.startPos, 0)) )
- result.startPos = icuBI->aBreakIterator->preceding(result.startPos);
+ u_isWhitespace(Text.iterateCodePoints(&result.startPos, 0)) )
+ result.startPos = icuBI->aBreakIterator->preceding(result.startPos);
- result.endPos = icuBI->aBreakIterator->following(result.startPos);
- if(result.endPos == BreakIterator::DONE)
- result.endPos = result.startPos;
- }
- return result;
+ result.endPos = icuBI->aBreakIterator->following(result.startPos);
+ if(result.endPos == BreakIterator::DONE)
+ result.endPos = result.startPos;
+ }
+ return result;
}
Boundary SAL_CALL BreakIterator_Unicode::getWordBoundary( const OUString& Text, sal_Int32 nPos, const lang::Locale& rLocale,
sal_Int16 rWordType, sal_Bool bDirection ) throw(uno::RuntimeException)
{
- loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
- sal_Int32 len = Text.getLength();
-
- if(icuBI->aBreakIterator->isBoundary(nPos)) {
- result.startPos = result.endPos = nPos;
- if((bDirection || nPos == 0) && nPos < len) //forward
- result.endPos = icuBI->aBreakIterator->following(nPos);
- else
- result.startPos = icuBI->aBreakIterator->preceding(nPos);
+ loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
+ sal_Int32 len = Text.getLength();
+
+ if(icuBI->aBreakIterator->isBoundary(nPos)) {
+ result.startPos = result.endPos = nPos;
+ if((bDirection || nPos == 0) && nPos < len) //forward
+ result.endPos = icuBI->aBreakIterator->following(nPos);
+ else
+ result.startPos = icuBI->aBreakIterator->preceding(nPos);
+ } else {
+ if(nPos <= 0) {
+ result.startPos = 0;
+ result.endPos = len ? icuBI->aBreakIterator->following((sal_Int32)0) : 0;
+ } else if(nPos >= len) {
+ result.startPos = icuBI->aBreakIterator->preceding(len);
+ result.endPos = len;
} else {
- if(nPos <= 0) {
- result.startPos = 0;
- result.endPos = len ? icuBI->aBreakIterator->following((sal_Int32)0) : 0;
- } else if(nPos >= len) {
- result.startPos = icuBI->aBreakIterator->preceding(len);
- result.endPos = len;
- } else {
- result.startPos = icuBI->aBreakIterator->preceding(nPos);
- result.endPos = icuBI->aBreakIterator->following(nPos);
- }
+ result.startPos = icuBI->aBreakIterator->preceding(nPos);
+ result.endPos = icuBI->aBreakIterator->following(nPos);
}
- if (result.startPos == BreakIterator::DONE)
- result.startPos = result.endPos;
- else if (result.endPos == BreakIterator::DONE)
- result.endPos = result.startPos;
+ }
+ if (result.startPos == BreakIterator::DONE)
+ result.startPos = result.endPos;
+ else if (result.endPos == BreakIterator::DONE)
+ result.endPos = result.startPos;
- return result;
+ return result;
}
sal_Int32 SAL_CALL BreakIterator_Unicode::beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
const lang::Locale &rLocale ) throw(uno::RuntimeException)
{
- loadICUBreakIterator(rLocale, LOAD_SENTENCE_BREAKITERATOR, 0, "sent", Text);
+ loadICUBreakIterator(rLocale, LOAD_SENTENCE_BREAKITERATOR, 0, "sent", Text);
- sal_Int32 len = Text.getLength();
- if (len > 0 && nStartPos == len)
- Text.iterateCodePoints(&nStartPos, -1); // issue #i27703# treat end position as part of last sentence
- if (!sentence.aBreakIterator->isBoundary(nStartPos))
- nStartPos = sentence.aBreakIterator->preceding(nStartPos);
+ sal_Int32 len = Text.getLength();
+ if (len > 0 && nStartPos == len)
+ Text.iterateCodePoints(&nStartPos, -1); // issue #i27703# treat end position as part of last sentence
+ if (!sentence.aBreakIterator->isBoundary(nStartPos))
+ nStartPos = sentence.aBreakIterator->preceding(nStartPos);
- // skip preceding space.
- sal_uInt32 ch = Text.iterateCodePoints(&nStartPos, 1);
- while (nStartPos < len && u_isWhitespace(ch)) ch = Text.iterateCodePoints(&nStartPos, 1);
- Text.iterateCodePoints(&nStartPos, -1);
+ // skip preceding space.
+ sal_uInt32 ch = Text.iterateCodePoints(&nStartPos, 1);
+ while (nStartPos < len && u_isWhitespace(ch)) ch = Text.iterateCodePoints(&nStartPos, 1);
+ Text.iterateCodePoints(&nStartPos, -1);
- return nStartPos;
+ return nStartPos;
}
sal_Int32 SAL_CALL BreakIterator_Unicode::endOfSentence( const OUString& Text, sal_Int32 nStartPos,
const lang::Locale &rLocale ) throw(uno::RuntimeException)
{
- loadICUBreakIterator(rLocale, LOAD_SENTENCE_BREAKITERATOR, 0, "sent", Text);
+ loadICUBreakIterator(rLocale, LOAD_SENTENCE_BREAKITERATOR, 0, "sent", Text);
- sal_Int32 len = Text.getLength();
- if (len > 0 && nStartPos == len)
- Text.iterateCodePoints(&nStartPos, -1); // issue #i27703# treat end position as part of last sentence
- nStartPos = sentence.aBreakIterator->following(nStartPos);
+ sal_Int32 len = Text.getLength();
+ if (len > 0 && nStartPos == len)
+ Text.iterateCodePoints(&nStartPos, -1); // issue #i27703# treat end position as part of last sentence
+ nStartPos = sentence.aBreakIterator->following(nStartPos);
- sal_Int32 nPos=nStartPos;
- while (nPos > 0 && u_isWhitespace(Text.iterateCodePoints(&nPos, -1))) nStartPos=nPos;
+ sal_Int32 nPos=nStartPos;
+ while (nPos > 0 && u_isWhitespace(Text.iterateCodePoints(&nPos, -1))) nStartPos=nPos;
- return nStartPos;
+ return nStartPos;
}
LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak(
@@ -357,63 +357,63 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak(
const LineBreakHyphenationOptions& hOptions,
const LineBreakUserOptions& /*rOptions*/ ) throw(uno::RuntimeException)
{
- LineBreakResults lbr;
+ LineBreakResults lbr;
- if (nStartPos >= Text.getLength()) {
- lbr.breakIndex = Text.getLength();
- lbr.breakType = BreakType::WORDBOUNDARY;
- return lbr;
- }
+ if (nStartPos >= Text.getLength()) {
+ lbr.breakIndex = Text.getLength();
+ lbr.breakType = BreakType::WORDBOUNDARY;
+ return lbr;
+ }
- loadICUBreakIterator(rLocale, LOAD_LINE_BREAKITERATOR, 0, lineRule, Text);
-
- sal_Bool GlueSpace=sal_True;
- while (GlueSpace) {
- if (line.aBreakIterator->preceding(nStartPos + 1) == nStartPos) { //Line boundary break
- lbr.breakIndex = nStartPos;
- lbr.breakType = BreakType::WORDBOUNDARY;
- } else if (hOptions.rHyphenator.is()) { //Hyphenation break
- Boundary wBoundary = getWordBoundary( Text, nStartPos, rLocale,
- WordType::DICTIONARY_WORD, false);
- uno::Reference< linguistic2::XHyphenatedWord > aHyphenatedWord;
- aHyphenatedWord = hOptions.rHyphenator->hyphenate(Text.copy(wBoundary.startPos,
- wBoundary.endPos - wBoundary.startPos), rLocale,
+ loadICUBreakIterator(rLocale, LOAD_LINE_BREAKITERATOR, 0, lineRule, Text);
+
+ sal_Bool GlueSpace=sal_True;
+ while (GlueSpace) {
+ if (line.aBreakIterator->preceding(nStartPos + 1) == nStartPos) { //Line boundary break
+ lbr.breakIndex = nStartPos;
+ lbr.breakType = BreakType::WORDBOUNDARY;
+ } else if (hOptions.rHyphenator.is()) { //Hyphenation break
+ Boundary wBoundary = getWordBoundary( Text, nStartPos, rLocale,
+ WordType::DICTIONARY_WORD, false);
+ uno::Reference< linguistic2::XHyphenatedWord > aHyphenatedWord;
+ aHyphenatedWord = hOptions.rHyphenator->hyphenate(Text.copy(wBoundary.startPos,
+ wBoundary.endPos - wBoundary.startPos), rLocale,
(sal_Int16) (hOptions.hyphenIndex - wBoundary.startPos), hOptions.aHyphenationOptions);
- if (aHyphenatedWord.is()) {
- lbr.rHyphenatedWord = aHyphenatedWord;
- if(wBoundary.startPos + aHyphenatedWord->getHyphenationPos() + 1 < nMinBreakPos )
- lbr.breakIndex = -1;
- else
- lbr.breakIndex = wBoundary.startPos; //aHyphenatedWord->getHyphenationPos();
- lbr.breakType = BreakType::HYPHENATION;
- } else {
- lbr.breakIndex = line.aBreakIterator->preceding(nStartPos);
- lbr.breakType = BreakType::WORDBOUNDARY;;
- }
- } else { //word boundary break
+ if (aHyphenatedWord.is()) {
+ lbr.rHyphenatedWord = aHyphenatedWord;
+ if(wBoundary.startPos + aHyphenatedWord->getHyphenationPos() + 1 < nMinBreakPos )
+ lbr.breakIndex = -1;
+ else
+ lbr.breakIndex = wBoundary.startPos; //aHyphenatedWord->getHyphenationPos();
+ lbr.breakType = BreakType::HYPHENATION;
+ } else {
lbr.breakIndex = line.aBreakIterator->preceding(nStartPos);
- lbr.breakType = BreakType::WORDBOUNDARY;
+ lbr.breakType = BreakType::WORDBOUNDARY;;
}
+ } else { //word boundary break
+ lbr.breakIndex = line.aBreakIterator->preceding(nStartPos);
+ lbr.breakType = BreakType::WORDBOUNDARY;
+ }
#define WJ 0x2060 // Word Joiner
- GlueSpace=sal_False;
- if (lbr.breakType == BreakType::WORDBOUNDARY) {
- nStartPos = lbr.breakIndex;
+ GlueSpace=sal_False;
+ if (lbr.breakType == BreakType::WORDBOUNDARY) {
+ nStartPos = lbr.breakIndex;
+ if (Text[nStartPos--] == WJ)
+ GlueSpace=sal_True;
+ while (nStartPos >= 0 &&
+ (u_isWhitespace(Text.iterateCodePoints(&nStartPos, 0)) || Text[nStartPos] == WJ)) {
if (Text[nStartPos--] == WJ)
GlueSpace=sal_True;
- while (nStartPos >= 0 &&
- (u_isWhitespace(Text.iterateCodePoints(&nStartPos, 0)) || Text[nStartPos] == WJ)) {
- if (Text[nStartPos--] == WJ)
- GlueSpace=sal_True;
- }
- if (GlueSpace && nStartPos < 0) {
- lbr.breakIndex = 0;
- break;
- }
+ }
+ if (GlueSpace && nStartPos < 0) {
+ lbr.breakIndex = 0;
+ break;
}
}
+ }
- return lbr;
+ return lbr;
}
@@ -421,21 +421,21 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak(
OUString SAL_CALL
BreakIterator_Unicode::getImplementationName(void) throw( uno::RuntimeException )
{
- return OUString::createFromAscii(cBreakIterator);
+ return OUString::createFromAscii(cBreakIterator);
}
sal_Bool SAL_CALL
BreakIterator_Unicode::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
- return !rServiceName.compareToAscii(cBreakIterator);
+ return !rServiceName.compareToAscii(cBreakIterator);
}
uno::Sequence< OUString > SAL_CALL
BreakIterator_Unicode::getSupportedServiceNames(void) throw( uno::RuntimeException )
{
- uno::Sequence< OUString > aRet(1);
- aRet[0] = OUString::createFromAscii(cBreakIterator);
- return aRet;
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = OUString::createFromAscii(cBreakIterator);
+ return aRet;
}
} } } }
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index cf22d6c..1200535 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -83,61 +83,62 @@ xdictionary::xdictionary(const sal_Char *lang) :
OUStringBuffer aBuf( strlen(lang) + 7 + 4 ); // mostly "*.dll" (with * == dict_zh)
#endif
aBuf.appendAscii( "dict_" ).appendAscii( lang ).appendAscii( SAL_DLLEXTENSION );
- hModule = osl_loadModuleRelative( &thisModule, aBuf.makeStringAndClear().pData, SAL_LOADMODULE_DEFAULT );
- if( hModule ) {
- sal_IntPtr (*func)();
- func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString("getExistMark").pData );
- existMark = (sal_uInt8*) (*func)();
- func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString("getIndex1").pData );
- index1 = (sal_Int16*) (*func)();
- func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString("getIndex2").pData );
- index2 = (sal_Int32*) (*func)();
- func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString("getLenArray").pData );
- lenArray = (sal_Int32*) (*func)();
- func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString("getDataArea").pData );
- dataArea = (sal_Unicode*) (*func)();
- }
- else
- {
- existMark = NULL;
- index1 = NULL;
- index2 = NULL;
- lenArray = NULL;
- dataArea = NULL;
- }
+ hModule = osl_loadModuleRelative( &thisModule, aBuf.makeStringAndClear().pData, SAL_LOADMODULE_DEFAULT );
+ if( hModule ) {
+ sal_IntPtr (*func)();
+ func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString("getExistMark").pData );
+ existMark = (sal_uInt8*) (*func)();
+ func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString("getIndex1").pData );
+ index1 = (sal_Int16*) (*func)();
+ func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString("getIndex2").pData );
+ index2 = (sal_Int32*) (*func)();
+ func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString("getLenArray").pData );
+ lenArray = (sal_Int32*) (*func)();
+ func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString("getDataArea").pData );
+ dataArea = (sal_Unicode*) (*func)();
+ }
+ else
+ {
+ existMark = NULL;
+ index1 = NULL;
+ index2 = NULL;
+ lenArray = NULL;
+ dataArea = NULL;
+ }
#else
- if( strcmp( lang, "ja" ) == 0 ) {
- existMark = getExistMark_ja();
- index1 = getIndex1_ja();
- index2 = getIndex2_ja();
- lenArray = getLenArray_ja();
- dataArea = getDataArea_ja();
- }
- else if( strcmp( lang, "zh" ) == 0 ) {
- existMark = getExistMark_zh();
- index1 = getIndex1_zh();
- index2 = getIndex2_zh();
- lenArray = getLenArray_zh();
- dataArea = getDataArea_zh();
- }
- else
- {
- existMark = NULL;
- index1 = NULL;
- index2 = NULL;
- lenArray = NULL;
- dataArea = NULL;
- }
+ if( strcmp( lang, "ja" ) == 0 ) {
+ existMark = getExistMark_ja();
+ index1 = getIndex1_ja();
+ index2 = getIndex2_ja();
+ lenArray = getLenArray_ja();
+ dataArea = getDataArea_ja();
+ }
+ else if( strcmp( lang, "zh" ) == 0 ) {
+ existMark = getExistMark_zh();
+ index1 = getIndex1_zh();
+ index2 = getIndex2_zh();
+ lenArray = getLenArray_zh();
+ dataArea = getDataArea_zh();
+ }
+ else
+ {
+ existMark = NULL;
+ index1 = NULL;
+ index2 = NULL;
+ lenArray = NULL;
+ dataArea = NULL;
+ }
#endif
- for (sal_Int32 i = 0; i < CACHE_MAX; i++)
- cache[i].size = 0;
+ for (sal_Int32 i = 0; i < CACHE_MAX; i++)
+ cache[i].size = 0;
- japaneseWordBreak = sal_False;
+ japaneseWordBreak = sal_False;
}
-xdictionary::~xdictionary() {
+xdictionary::~xdictionary()
+{
#ifndef DISABLE_DYNLOADING
osl_unloadModule(hModule);
#endif
@@ -151,46 +152,48 @@ xdictionary::~xdictionary() {
void xdictionary::setJapaneseWordBreak()
{
- japaneseWordBreak = sal_True;
+ japaneseWordBreak = sal_True;
}
-sal_Bool xdictionary::exists(const sal_uInt32 c) {
- // 0x1FFF is the hardcoded limit in gendict for existMarks
- sal_Bool exist = (existMark && ((c>>3) < 0x1FFF)) ? sal::static_int_cast<sal_Bool>((existMark[c>>3] & (1<<(c&0x07))) != 0) : sal_False;
- if (!exist && japaneseWordBreak)
- return BreakIteratorImpl::getScriptClass(c) == ScriptType::ASIAN;
- else
- return exist;
+sal_Bool xdictionary::exists(const sal_uInt32 c)
+{
+ // 0x1FFF is the hardcoded limit in gendict for existMarks
+ sal_Bool exist = (existMark && ((c>>3) < 0x1FFF)) ? sal::static_int_cast<sal_Bool>((existMark[c>>3] & (1<<(c&0x07))) != 0) : sal_False;
+ if (!exist && japaneseWordBreak)
+ return BreakIteratorImpl::getScriptClass(c) == ScriptType::ASIAN;
+ else
+ return exist;
}
-sal_Int32 xdictionary::getLongestMatch(const sal_Unicode* str, sal_Int32 sLen) {
+sal_Int32 xdictionary::getLongestMatch(const sal_Unicode* str, sal_Int32 sLen)
+{
- if ( !index1 ) return 0;
+ if ( !index1 ) return 0;
- sal_Int16 idx = index1[str[0] >> 8];
+ sal_Int16 idx = index1[str[0] >> 8];
- if (idx == 0xFF) return 0;
+ if (idx == 0xFF) return 0;
- idx = (idx<<8) | (str[0]&0xff);
+ idx = (idx<<8) | (str[0]&0xff);
- sal_uInt32 begin = index2[idx], end = index2[idx+1];
+ sal_uInt32 begin = index2[idx], end = index2[idx+1];
- if (begin == 0) return 0;
+ if (begin == 0) return 0;
- str++; sLen--; // first character is not stored in the dictionary
- for (sal_uInt32 i = end; i > begin; i--) {
- sal_Int32 len = lenArray[i] - lenArray[i - 1];
- if (sLen >= len) {
- const sal_Unicode *dstr = dataArea + lenArray[i-1];
- sal_Int32 pos = 0;
+ str++; sLen--; // first character is not stored in the dictionary
+ for (sal_uInt32 i = end; i > begin; i--) {
+ sal_Int32 len = lenArray[i] - lenArray[i - 1];
+ if (sLen >= len) {
+ const sal_Unicode *dstr = dataArea + lenArray[i-1];
+ sal_Int32 pos = 0;
- while (pos < len && dstr[pos] == str[pos]) { pos++; }
+ while (pos < len && dstr[pos] == str[pos]) { pos++; }
- if (pos == len)
- return len + 1;
- }
+ if (pos == len)
+ return len + 1;
}
- return 0;
+ }
+ return 0;
}
@@ -210,14 +213,15 @@ WordBreakCache::WordBreakCache() :
* Compare two unicode string,
*/
-sal_Bool WordBreakCache::equals(const sal_Unicode* str, Boundary& boundary) {
- // Different length, different string.
- if (length != boundary.endPos - boundary.startPos) return sal_False;
+sal_Bool WordBreakCache::equals(const sal_Unicode* str, Boundary& boundary)
+{
+ // Different length, different string.
+ if (length != boundary.endPos - boundary.startPos) return sal_False;
- for (sal_Int32 i = 0; i < length; i++)
- if (contents[i] != str[i + boundary.startPos]) return sal_False;
+ for (sal_Int32 i = 0; i < length; i++)
+ if (contents[i] != str[i + boundary.startPos]) return sal_False;
- return sal_True;
+ return sal_True;
}
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index dddeea7..ecb912f 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -137,66 +137,66 @@ Calendar_gregorian::Calendar_gregorian(const Era *_earArray)
void SAL_CALL
Calendar_gregorian::init(const Era *_eraArray)
{
- cCalendar = "com.sun.star.i18n.Calendar_gregorian";
-
- // #i102356# With icu::Calendar::createInstance(UErrorCode) in a Thai
- // th_TH system locale we accidentally used a Buddhist calendar. Though
- // the ICU documentation says that should be the case only for
- // th_TH_TRADITIONAL (and ja_JP_TRADITIONAL Gengou), a plain th_TH
- // already triggers that behavior, ja_JP does not. Strange enough,
- // passing a th_TH locale to the calendar creation doesn't trigger
- // this.
- // See also http://userguide.icu-project.org/datetime/calendar
-
- // Whatever ICU offers as the default calendar for a locale, ensure we
- // have a Gregorian calendar as requested.
-
- /* XXX: with the current implementation the aLocale member variable is
- * not set prior to loading a calendar from locale data. This
- * creates an empty (root) locale for ICU, but at least the correct
- * calendar is used. The language part must not be NULL (respectively
- * not all, language and country and variant), otherwise the current
- * default locale would be used again and the calendar keyword ignored.
- * */
- icu::Locale aIcuLocale( "", NULL, NULL, "calendar=gregorian");
+ cCalendar = "com.sun.star.i18n.Calendar_gregorian";
+
+ // #i102356# With icu::Calendar::createInstance(UErrorCode) in a Thai
+ // th_TH system locale we accidentally used a Buddhist calendar. Though
+ // the ICU documentation says that should be the case only for
+ // th_TH_TRADITIONAL (and ja_JP_TRADITIONAL Gengou), a plain th_TH
+ // already triggers that behavior, ja_JP does not. Strange enough,
+ // passing a th_TH locale to the calendar creation doesn't trigger
+ // this.
+ // See also http://userguide.icu-project.org/datetime/calendar
+
+ // Whatever ICU offers as the default calendar for a locale, ensure we
+ // have a Gregorian calendar as requested.
+
+ /* XXX: with the current implementation the aLocale member variable is
+ * not set prior to loading a calendar from locale data. This
+ * creates an empty (root) locale for ICU, but at least the correct
+ * calendar is used. The language part must not be NULL (respectively
+ * not all, language and country and variant), otherwise the current
+ * default locale would be used again and the calendar keyword ignored.
+ * */
+ icu::Locale aIcuLocale( "", NULL, NULL, "calendar=gregorian");
- UErrorCode status;
- body = icu::Calendar::createInstance( aIcuLocale, status = U_ZERO_ERROR);
- if (!body || !U_SUCCESS(status)) throw ERROR;
- eraArray=_eraArray;
+ UErrorCode status;
+ body = icu::Calendar::createInstance( aIcuLocale, status = U_ZERO_ERROR);
+ if (!body || !U_SUCCESS(status)) throw ERROR;
+ eraArray=_eraArray;
}
Calendar_gregorian::~Calendar_gregorian()
{
- delete body;
+ delete body;
}
Calendar_hanja::Calendar_hanja()
{
- cCalendar = "com.sun.star.i18n.Calendar_hanja";
+ cCalendar = "com.sun.star.i18n.Calendar_hanja";
}
OUString SAL_CALL
Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) throw(RuntimeException)
{
- if ( displayIndex == CalendarDisplayIndex::AM_PM ) {
- // Am/Pm string for Korean Hanja calendar will refer to Japanese locale
- com::sun::star::lang::Locale jaLocale =
- com::sun::star::lang::Locale(OUString("ja"), OUString(), OUString());
- if (idx == 0) return LocaleDataImpl().getLocaleItem(jaLocale).timeAM;
- else if (idx == 1) return LocaleDataImpl().getLocaleItem(jaLocale).timePM;
- else throw ERROR;
- }
- else
- return Calendar_gregorian::getDisplayName( displayIndex, idx, nameType );
+ if ( displayIndex == CalendarDisplayIndex::AM_PM ) {
+ // Am/Pm string for Korean Hanja calendar will refer to Japanese locale
+ com::sun::star::lang::Locale jaLocale =
+ com::sun::star::lang::Locale(OUString("ja"), OUString(), OUString());
+ if (idx == 0) return LocaleDataImpl().getLocaleItem(jaLocale).timeAM;
+ else if (idx == 1) return LocaleDataImpl().getLocaleItem(jaLocale).timePM;
+ else throw ERROR;
+ }
+ else
+ return Calendar_gregorian::getDisplayName( displayIndex, idx, nameType );
}
void SAL_CALL
Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const com::sun::star::lang::Locale& rLocale ) throw(RuntimeException)
{
- // Since this class could be called by service name 'hanja_yoil', we have to
- // rename uniqueID to get right calendar defined in locale data.
- Calendar_gregorian::loadCalendar(OUString("hanja"), rLocale);
+ // Since this class could be called by service name 'hanja_yoil', we have to
+ // rename uniqueID to get right calendar defined in locale data.
+ Calendar_gregorian::loadCalendar(OUString("hanja"), rLocale);
}
static const Era gengou_eraArray[] = {
@@ -208,7 +208,7 @@ static const Era gengou_eraArray[] = {
};
Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray)
{
- cCalendar = "com.sun.star.i18n.Calendar_gengou";
+ cCalendar = "com.sun.star.i18n.Calendar_gengou";
}
static const Era ROC_eraArray[] = {
@@ -217,7 +217,7 @@ static const Era ROC_eraArray[] = {
};
Calendar_ROC::Calendar_ROC() : Calendar_gregorian(ROC_eraArray)
{
- cCalendar = "com.sun.star.i18n.Calendar_ROC";
+ cCalendar = "com.sun.star.i18n.Calendar_ROC";
}
static const Era buddhist_eraArray[] = {
@@ -226,118 +226,118 @@ static const Era buddhist_eraArray[] = {
};
Calendar_buddhist::Calendar_buddhist() : Calendar_gregorian(buddhist_eraArray)
{
- cCalendar = "com.sun.star.i18n.Calendar_buddhist";
+ cCalendar = "com.sun.star.i18n.Calendar_buddhist";
}
void SAL_CALL
Calendar_gregorian::loadCalendar( const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale ) throw(RuntimeException)
{
- // init. fieldValue[]
- getValue();
+ // init. fieldValue[]
+ getValue();
- aLocale = rLocale;
- Sequence< Calendar2 > xC = LocaleDataImpl().getAllCalendars2(rLocale);
- for (sal_Int32 i = 0; i < xC.getLength(); i++)
+ aLocale = rLocale;
+ Sequence< Calendar2 > xC = LocaleDataImpl().getAllCalendars2(rLocale);
+ for (sal_Int32 i = 0; i < xC.getLength(); i++)
+ {
+ if (uniqueID == xC[i].Name)
{
- if (uniqueID == xC[i].Name)
+ aCalendar = xC[i];
+ // setup minimalDaysInFirstWeek
+ setMinimumNumberOfDaysForFirstWeek(
+ aCalendar.MinimumNumberOfDaysForFirstWeek);
+ // setup first day of week
+ for (sal_Int16 day = sal::static_int_cast<sal_Int16>(
+ aCalendar.Days.getLength()-1); day>=0; day--)
{
- aCalendar = xC[i];
- // setup minimalDaysInFirstWeek
- setMinimumNumberOfDaysForFirstWeek(
- aCalendar.MinimumNumberOfDaysForFirstWeek);
- // setup first day of week
- for (sal_Int16 day = sal::static_int_cast<sal_Int16>(
- aCalendar.Days.getLength()-1); day>=0; day--)
+ if (aCalendar.StartOfWeek == aCalendar.Days[day].ID)
{
- if (aCalendar.StartOfWeek == aCalendar.Days[day].ID)
- {
- setFirstDayOfWeek( day);
- return;
- }
+ setFirstDayOfWeek( day);
+ return;
}
}
}
- // Calendar is not for the locale
- throw ERROR;
+ }
+ // Calendar is not for the locale
+ throw ERROR;
}
com::sun::star::i18n::Calendar2 SAL_CALL
Calendar_gregorian::getLoadedCalendar2() throw(RuntimeException)
{
- return aCalendar;
+ return aCalendar;
}
com::sun::star::i18n::Calendar SAL_CALL
Calendar_gregorian::getLoadedCalendar() throw(RuntimeException)
{
- return LocaleDataImpl::downcastCalendar( aCalendar);
+ return LocaleDataImpl::downcastCalendar( aCalendar);
}
OUString SAL_CALL
Calendar_gregorian::getUniqueID() throw(RuntimeException)
{
- return aCalendar.Name;
+ return aCalendar.Name;
}
void SAL_CALL
Calendar_gregorian::setDateTime( double timeInDays ) throw(RuntimeException)
{
- // ICU handles dates in milliseconds as double values and uses floor()
- // to obtain integer values, which may yield a date decremented by one
- // for odd (historical) timezone values where the computed value due to
- // rounding errors has a fractional part in milliseconds. Ensure we
- // pass a value without fraction here. If not, that may lead to
- // fdo#44286 or fdo#52619 and the like, e.g. when passing
- // -2136315212000.000244 instead of -2136315212000.000000
- double fM = timeInDays * U_MILLIS_PER_DAY;
- double fR = rtl::math::round( fM );
- SAL_INFO_IF( fM != fR, "i18npool",
- "Calendar_gregorian::setDateTime: " << std::fixed << fM << " rounded to " << fR);
- UErrorCode status;
- body->setTime( fR, status = U_ZERO_ERROR);
- if ( !U_SUCCESS(status) ) throw ERROR;
- getValue();
+ // ICU handles dates in milliseconds as double values and uses floor()
+ // to obtain integer values, which may yield a date decremented by one
+ // for odd (historical) timezone values where the computed value due to
+ // rounding errors has a fractional part in milliseconds. Ensure we
+ // pass a value without fraction here. If not, that may lead to
+ // fdo#44286 or fdo#52619 and the like, e.g. when passing
+ // -2136315212000.000244 instead of -2136315212000.000000
+ double fM = timeInDays * U_MILLIS_PER_DAY;
+ double fR = rtl::math::round( fM );
+ SAL_INFO_IF( fM != fR, "i18npool",
+ "Calendar_gregorian::setDateTime: " << std::fixed << fM << " rounded to " << fR);
+ UErrorCode status;
+ body->setTime( fR, status = U_ZERO_ERROR);
+ if ( !U_SUCCESS(status) ) throw ERROR;
+ getValue();
}
double SAL_CALL
Calendar_gregorian::getDateTime() throw(RuntimeException)
{
- if (fieldSet) {
- setValue();
- getValue();
- }
- UErrorCode status;
- double r = body->getTime(status = U_ZERO_ERROR);
- if ( !U_SUCCESS(status) ) throw ERROR;
- return r / U_MILLIS_PER_DAY;
+ if (fieldSet) {
+ setValue();
+ getValue();
+ }
+ UErrorCode status;
+ double r = body->getTime(status = U_ZERO_ERROR);
+ if ( !U_SUCCESS(status) ) throw ERROR;
+ return r / U_MILLIS_PER_DAY;
}
// map field value from gregorian calendar to other calendar, it can be overwritten by derived class.
// By using eraArray, it can take care Japanese and Taiwan ROC calendar.
void Calendar_gregorian::mapFromGregorian() throw(RuntimeException)
{
- if (eraArray) {
- sal_Int16 e, y, m, d;
+ if (eraArray) {
+ sal_Int16 e, y, m, d;
- e = fieldValue[CalendarFieldIndex::ERA];
- y = fieldValue[CalendarFieldIndex::YEAR];
- m = fieldValue[CalendarFieldIndex::MONTH] + 1;
- d = fieldValue[CalendarFieldIndex::DAY_OF_MONTH];
+ e = fieldValue[CalendarFieldIndex::ERA];
+ y = fieldValue[CalendarFieldIndex::YEAR];
+ m = fieldValue[CalendarFieldIndex::MONTH] + 1;
+ d = fieldValue[CalendarFieldIndex::DAY_OF_MONTH];
- // since the year is reversed for first era, it is reversed again here for Era compare.
- if (e == 0)
- y = 1 - y;
+ // since the year is reversed for first era, it is reversed again here for Era compare.
+ if (e == 0)
+ y = 1 - y;
- for (e = 0; eraArray[e].year; e++)
- if ((y != eraArray[e].year) ? y < eraArray[e].year :
+ for (e = 0; eraArray[e].year; e++)
+ if ((y != eraArray[e].year) ? y < eraArray[e].year :
(m != eraArray[e].month) ? m < eraArray[e].month : d < eraArray[e].day)
- break;
+ break;
- fieldValue[CalendarFieldIndex::ERA] = e;
- fieldValue[CalendarFieldIndex::YEAR] =
- sal::static_int_cast<sal_Int16>( (e == 0) ? (eraArray[0].year - y) : (y - eraArray[e-1].year + 1) );
- }
+ fieldValue[CalendarFieldIndex::ERA] = e;
+ fieldValue[CalendarFieldIndex::YEAR] =
+ sal::static_int_cast<sal_Int16>( (e == 0) ? (eraArray[0].year - y) : (y - eraArray[e-1].year + 1) );
+ }
}
#define FIELDS ((1 << CalendarFieldIndex::ERA) | (1 << CalendarFieldIndex::YEAR))
@@ -345,42 +345,42 @@ void Calendar_gregorian::mapFromGregorian() throw(RuntimeException)
// By using eraArray, it can take care Japanese and Taiwan ROC calendar.
void Calendar_gregorian::mapToGregorian() throw(RuntimeException)
{
- if (eraArray && (fieldSet & FIELDS)) {
- sal_Int16 y, e = fieldValue[CalendarFieldIndex::ERA];
- if (e == 0)
- y = sal::static_int_cast<sal_Int16>( eraArray[0].year - fieldValue[CalendarFieldIndex::YEAR] );
- else
- y = sal::static_int_cast<sal_Int16>( eraArray[e-1].year + fieldValue[CalendarFieldIndex::YEAR] - 1 );
-
- fieldSetValue[CalendarFieldIndex::ERA] = y <= 0 ? 0 : 1;
- fieldSetValue[CalendarFieldIndex::YEAR] = (y <= 0 ? 1 - y : y);
- fieldSet |= FIELDS;
- }
+ if (eraArray && (fieldSet & FIELDS)) {
+ sal_Int16 y, e = fieldValue[CalendarFieldIndex::ERA];
+ if (e == 0)
+ y = sal::static_int_cast<sal_Int16>( eraArray[0].year - fieldValue[CalendarFieldIndex::YEAR] );
+ else
+ y = sal::static_int_cast<sal_Int16>( eraArray[e-1].year + fieldValue[CalendarFieldIndex::YEAR] - 1 );
+
+ fieldSetValue[CalendarFieldIndex::ERA] = y <= 0 ? 0 : 1;
+ fieldSetValue[CalendarFieldIndex::YEAR] = (y <= 0 ? 1 - y : y);
+ fieldSet |= FIELDS;
+ }
}
static UCalendarDateFields fieldNameConverter(sal_Int16 fieldIndex) throw(RuntimeException)
{
- UCalendarDateFields f;
-
- switch (fieldIndex) {
- case CalendarFieldIndex::AM_PM: f = UCAL_AM_PM; break;
- case CalendarFieldIndex::DAY_OF_MONTH: f = UCAL_DATE; break;
- case CalendarFieldIndex::DAY_OF_WEEK: f = UCAL_DAY_OF_WEEK; break;
- case CalendarFieldIndex::DAY_OF_YEAR: f = UCAL_DAY_OF_YEAR; break;
- case CalendarFieldIndex::DST_OFFSET: f = UCAL_DST_OFFSET; break;
- case CalendarFieldIndex::ZONE_OFFSET: f = UCAL_ZONE_OFFSET; break;
- case CalendarFieldIndex::HOUR: f = UCAL_HOUR_OF_DAY; break;
- case CalendarFieldIndex::MINUTE: f = UCAL_MINUTE; break;
- case CalendarFieldIndex::SECOND: f = UCAL_SECOND; break;
- case CalendarFieldIndex::MILLISECOND: f = UCAL_MILLISECOND; break;
- case CalendarFieldIndex::WEEK_OF_MONTH: f = UCAL_WEEK_OF_MONTH; break;
- case CalendarFieldIndex::WEEK_OF_YEAR: f = UCAL_WEEK_OF_YEAR; break;
- case CalendarFieldIndex::YEAR: f = UCAL_YEAR; break;
- case CalendarFieldIndex::MONTH: f = UCAL_MONTH; break;
- case CalendarFieldIndex::ERA: f = UCAL_ERA; break;
- default: throw ERROR;
- }
- return f;
+ UCalendarDateFields f;
+
+ switch (fieldIndex) {
+ case CalendarFieldIndex::AM_PM: f = UCAL_AM_PM; break;
+ case CalendarFieldIndex::DAY_OF_MONTH: f = UCAL_DATE; break;
+ case CalendarFieldIndex::DAY_OF_WEEK: f = UCAL_DAY_OF_WEEK; break;
+ case CalendarFieldIndex::DAY_OF_YEAR: f = UCAL_DAY_OF_YEAR; break;
+ case CalendarFieldIndex::DST_OFFSET: f = UCAL_DST_OFFSET; break;
+ case CalendarFieldIndex::ZONE_OFFSET: f = UCAL_ZONE_OFFSET; break;
+ case CalendarFieldIndex::HOUR: f = UCAL_HOUR_OF_DAY; break;
+ case CalendarFieldIndex::MINUTE: f = UCAL_MINUTE; break;
+ case CalendarFieldIndex::SECOND: f = UCAL_SECOND; break;
+ case CalendarFieldIndex::MILLISECOND: f = UCAL_MILLISECOND; break;
+ case CalendarFieldIndex::WEEK_OF_MONTH: f = UCAL_WEEK_OF_MONTH; break;
+ case CalendarFieldIndex::WEEK_OF_YEAR: f = UCAL_WEEK_OF_YEAR; break;
+ case CalendarFieldIndex::YEAR: f = UCAL_YEAR; break;
+ case CalendarFieldIndex::MONTH: f = UCAL_MONTH; break;
+ case CalendarFieldIndex::ERA: f = UCAL_ERA; break;
+ default: throw ERROR;
+ }
+ return f;
}
void SAL_CALL
@@ -491,220 +491,220 @@ static void lcl_setCombinedOffsetFieldValues( sal_Int32 nValue,
void Calendar_gregorian::setValue() throw(RuntimeException)
{
- // Correct DST glitch, see also localtime/gmtime conversion pitfalls at
- // http://www.erack.de/download/timetest.c
- //
- // #i24082# in order to make the DST correction work in all
- // circumstances, the time values have to be always resubmitted,
- // regardless whether specified by the caller or not. It is not
- // sufficient to rely on the ICU internal values previously set, as the
- // following may happen:
- // - Let 2004-03-28T02:00 be the onsetRule.
- // - On 2004-03-29 (calendar initialized with 2004-03-29T00:00 DST) set
- // a date of 2004-03-28 => calendar results in 2004-03-27T23:00 no DST.
- // - Correcting this with simply "2004-03-28 no DST" and no time
- // specified results in 2004-03-29T00:00, the ICU internal 23:00 time
- // being adjusted to 24:00 in this case, switching one day further.
- // => submit 2004-03-28T00:00 no DST.
-
- // This got even weirder since ICU incorporated also historical data,
- // even the timezone may differ for different dates! It is necessary to
- // let ICU choose the corresponding OlsonTimeZone transitions and adapt
- // values.
- // #i86094# gives examples where that went wrong:
- // TZ=Europe/Moscow date <= 1919-07-01
- // zone +2:30:48 (!) instead of +3h, DST +2h instead of +1h
- // TZ=America/St_Johns date <= 1935-03-30
- // zone -3:30:52 (!) instead of -3:30
-
- // Copy fields before calling submitFields() directly or indirectly below.
- memcpy(fieldSetValue, fieldValue, sizeof(fieldSetValue));
- // Possibly setup ERA and YEAR in fieldSetValue.
- mapToGregorian();
-
- DUMP_ICU_CAL_MSG(("%s\n","setValue() before any submission"));
- DUMP_I18N_CAL_MSG(("%s\n","setValue() before any submission"));
-
- bool bNeedZone = !(fieldSet & (1 << CalendarFieldIndex::ZONE_OFFSET));
- bool bNeedDST = !(fieldSet & (1 << CalendarFieldIndex::DST_OFFSET));
- sal_Int32 nZone1, nDST1, nYear, nMonth, nDay, nHour, nMinute, nSecond, nMilliSecond, nZone0, nDST0;
- nZone1 = nDST1 = nZone0 = nDST0 = 0;
- nYear = nMonth = nDay = nHour = nMinute = nSecond = nMilliSecond = -1;
- if ( bNeedZone || bNeedDST )
+ // Correct DST glitch, see also localtime/gmtime conversion pitfalls at
+ // http://www.erack.de/download/timetest.c
+ //
+ // #i24082# in order to make the DST correction work in all
+ // circumstances, the time values have to be always resubmitted,
+ // regardless whether specified by the caller or not. It is not
+ // sufficient to rely on the ICU internal values previously set, as the
+ // following may happen:
+ // - Let 2004-03-28T02:00 be the onsetRule.
+ // - On 2004-03-29 (calendar initialized with 2004-03-29T00:00 DST) set
+ // a date of 2004-03-28 => calendar results in 2004-03-27T23:00 no DST.
+ // - Correcting this with simply "2004-03-28 no DST" and no time
+ // specified results in 2004-03-29T00:00, the ICU internal 23:00 time
+ // being adjusted to 24:00 in this case, switching one day further.
+ // => submit 2004-03-28T00:00 no DST.
+
+ // This got even weirder since ICU incorporated also historical data,
+ // even the timezone may differ for different dates! It is necessary to
+ // let ICU choose the corresponding OlsonTimeZone transitions and adapt
+ // values.
+ // #i86094# gives examples where that went wrong:
+ // TZ=Europe/Moscow date <= 1919-07-01
+ // zone +2:30:48 (!) instead of +3h, DST +2h instead of +1h
+ // TZ=America/St_Johns date <= 1935-03-30
+ // zone -3:30:52 (!) instead of -3:30
+
+ // Copy fields before calling submitFields() directly or indirectly below.
+ memcpy(fieldSetValue, fieldValue, sizeof(fieldSetValue));
+ // Possibly setup ERA and YEAR in fieldSetValue.
+ mapToGregorian();
+
+ DUMP_ICU_CAL_MSG(("%s\n","setValue() before any submission"));
+ DUMP_I18N_CAL_MSG(("%s\n","setValue() before any submission"));
+
+ bool bNeedZone = !(fieldSet & (1 << CalendarFieldIndex::ZONE_OFFSET));
+ bool bNeedDST = !(fieldSet & (1 << CalendarFieldIndex::DST_OFFSET));
+ sal_Int32 nZone1, nDST1, nYear, nMonth, nDay, nHour, nMinute, nSecond, nMilliSecond, nZone0, nDST0;
+ nZone1 = nDST1 = nZone0 = nDST0 = 0;
+ nYear = nMonth = nDay = nHour = nMinute = nSecond = nMilliSecond = -1;
+ if ( bNeedZone || bNeedDST )
+ {
+ UErrorCode status;
+ if ( !(fieldSet & (1 << CalendarFieldIndex::YEAR)) )
{
- UErrorCode status;
- if ( !(fieldSet & (1 << CalendarFieldIndex::YEAR)) )
- {
- nYear = body->get( UCAL_YEAR, status = U_ZERO_ERROR);
- if ( !U_SUCCESS(status) )
- nYear = -1;
- }
- if ( !(fieldSet & (1 << CalendarFieldIndex::MONTH)) )
- {
- nMonth = body->get( UCAL_MONTH, status = U_ZERO_ERROR);
- if ( !U_SUCCESS(status) )
- nMonth = -1;
- }
- if ( !(fieldSet & (1 << CalendarFieldIndex::DAY_OF_MONTH)) )
- {
- nDay = body->get( UCAL_DATE, status = U_ZERO_ERROR);
- if ( !U_SUCCESS(status) )
- nDay = -1;
- }
- if ( !(fieldSet & (1 << CalendarFieldIndex::HOUR)) )
- {
- nHour = body->get( UCAL_HOUR_OF_DAY, status = U_ZERO_ERROR);
- if ( !U_SUCCESS(status) )
- nHour = -1;
- }
- if ( !(fieldSet & (1 << CalendarFieldIndex::MINUTE)) )
- {
- nMinute = body->get( UCAL_MINUTE, status = U_ZERO_ERROR);
- if ( !U_SUCCESS(status) )
- nMinute = -1;
- }
- if ( !(fieldSet & (1 << CalendarFieldIndex::SECOND)) )
- {
- nSecond = body->get( UCAL_SECOND, status = U_ZERO_ERROR);
- if ( !U_SUCCESS(status) )
- nSecond = -1;
- }
- if ( !(fieldSet & (1 << CalendarFieldIndex::MILLISECOND)) )
- {
- nMilliSecond = body->get( UCAL_MILLISECOND, status = U_ZERO_ERROR);
- if ( !U_SUCCESS(status) )
- nMilliSecond = -1;
- }
- if ( !(fieldSet & (1 << CalendarFieldIndex::ZONE_OFFSET)) )
- {
- nZone0 = body->get( UCAL_ZONE_OFFSET, status = U_ZERO_ERROR);
- if ( !U_SUCCESS(status) )
- nZone0 = 0;
- }
- if ( !(fieldSet & (1 << CalendarFieldIndex::DST_OFFSET)) )
- {
- nDST0 = body->get( UCAL_DST_OFFSET, status = U_ZERO_ERROR);
- if ( !U_SUCCESS(status) )
- nDST0 = 0;
- }
-
- // Submit values to obtain a time zone and DST corresponding to the date/time.
- submitValues( nYear, nMonth, nDay, nHour, nMinute, nSecond, nMilliSecond, nZone0, nDST0);
-
- DUMP_ICU_CAL_MSG(("%s\n","setValue() in bNeedZone||bNeedDST after submitValues()"));
- DUMP_I18N_CAL_MSG(("%s\n","setValue() in bNeedZone||bNeedDST after submitValues()"));
- nZone1 = body->get( UCAL_ZONE_OFFSET, status = U_ZERO_ERROR);
+ nYear = body->get( UCAL_YEAR, status = U_ZERO_ERROR);
+ if ( !U_SUCCESS(status) )
+ nYear = -1;
+ }
+ if ( !(fieldSet & (1 << CalendarFieldIndex::MONTH)) )
+ {
+ nMonth = body->get( UCAL_MONTH, status = U_ZERO_ERROR);
+ if ( !U_SUCCESS(status) )
+ nMonth = -1;
+ }
+ if ( !(fieldSet & (1 << CalendarFieldIndex::DAY_OF_MONTH)) )
+ {
+ nDay = body->get( UCAL_DATE, status = U_ZERO_ERROR);
if ( !U_SUCCESS(status) )
- nZone1 = 0;
- nDST1 = body->get( UCAL_DST_OFFSET, status = U_ZERO_ERROR);
+ nDay = -1;
+ }
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list