Skip to content

C
core
Kaydet (Commit) 9e1d98fe authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

loplugin: defaultparams 

Change-Id: I320eb6149793689c496b14090e8e0243397d01ba
üst 371a535a
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 24 deletions
i18npool/source/breakiterator/breakiteratorImpl.cxx
Dosyayı görüntüle @ 9e1d98fe
...@@ -73,13 +73,13 @@ static sal_Int32 skipSpace(const OUString& Text, sal_Int32 nPos, sal_Int32 len, ...@@ -73,13 +73,13 @@ static sal_Int32 skipSpace(const OUString& Text, sal_Int32 nPos, sal_Int32 len,
switch (rWordType) { switch (rWordType) {
case WordType::ANYWORD_IGNOREWHITESPACES: case WordType::ANYWORD_IGNOREWHITESPACES:
if (bDirection) if (bDirection)
while (nPos < len && (u_isWhitespace(ch = Text.iterateCodePoints(&pos, 1)) || isZWSP(ch))) nPos=pos; while (nPos < len && (u_isWhitespace(ch = Text.iterateCodePoints(&pos)) || isZWSP(ch))) nPos=pos;
else else
while (nPos > 0 && (u_isWhitespace(ch = Text.iterateCodePoints(&pos, -1)) || isZWSP(ch))) nPos=pos; while (nPos > 0 && (u_isWhitespace(ch = Text.iterateCodePoints(&pos, -1)) || isZWSP(ch))) nPos=pos;
break; break;
case WordType::DICTIONARY_WORD: case WordType::DICTIONARY_WORD:
if (bDirection) if (bDirection)
while (nPos < len && (u_isWhitespace(ch = Text.iterateCodePoints(&pos, 1)) || isZWSP(ch) || while (nPos < len && (u_isWhitespace(ch = Text.iterateCodePoints(&pos)) || isZWSP(ch) ||
! (ch == 0x002E || u_isalnum(ch)))) nPos=pos; ! (ch == 0x002E || u_isalnum(ch)))) nPos=pos;
else else
while (nPos > 0 && (u_isWhitespace(ch = Text.iterateCodePoints(&pos, -1)) || isZWSP(ch) || while (nPos > 0 && (u_isWhitespace(ch = Text.iterateCodePoints(&pos, -1)) || isZWSP(ch) ||
...@@ -87,7 +87,7 @@ static sal_Int32 skipSpace(const OUString& Text, sal_Int32 nPos, sal_Int32 len, ...@@ -87,7 +87,7 @@ static sal_Int32 skipSpace(const OUString& Text, sal_Int32 nPos, sal_Int32 len,
break; break;
case WordType::WORD_COUNT: case WordType::WORD_COUNT:
if (bDirection) if (bDirection)
while (nPos < len && (u_isUWhiteSpace(ch = Text.iterateCodePoints(&pos, 1)) || isZWSP(ch))) nPos=pos; while (nPos < len && (u_isUWhiteSpace(ch = Text.iterateCodePoints(&pos)) || isZWSP(ch))) nPos=pos;
else else
while (nPos > 0 && (u_isUWhiteSpace(ch = Text.iterateCodePoints(&pos, -1)) || isZWSP(ch))) nPos=pos; while (nPos > 0 && (u_isUWhiteSpace(ch = Text.iterateCodePoints(&pos, -1)) || isZWSP(ch))) nPos=pos;
break; break;
......
i18npool/source/breakiterator/breakiterator_cjk.cxx
Dosyayı görüntüle @ 9e1d98fe
...@@ -96,7 +96,7 @@ LineBreakResults SAL_CALL BreakIterator_CJK::getLineBreak( ...@@ -96,7 +96,7 @@ LineBreakResults SAL_CALL BreakIterator_CJK::getLineBreak(
if (bOptions.allowPunctuationOutsideMargin && if (bOptions.allowPunctuationOutsideMargin &&
hangingCharacters.indexOf(Text[nStartPos]) != -1 && hangingCharacters.indexOf(Text[nStartPos]) != -1 &&
(Text.iterateCodePoints( &nStartPos, 1), nStartPos == Text.getLength())) { (Text.iterateCodePoints( &nStartPos ), nStartPos == Text.getLength())) {
; // do nothing ; // do nothing
} else if (bOptions.applyForbiddenRules && 0 < nStartPos && nStartPos < Text.getLength()) { } else if (bOptions.applyForbiddenRules && 0 < nStartPos && nStartPos < Text.getLength()) {
while (nStartPos > 0 && while (nStartPos > 0 &&
......
i18npool/source/breakiterator/breakiterator_unicode.cxx
Dosyayı görüntüle @ 9e1d98fe
...@@ -217,7 +217,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text, ...@@ -217,7 +217,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text,
} }
} else { // for CHARACTER mode } else { // for CHARACTER mode
for (nDone = 0; nDone < nCount && nStartPos < Text.getLength(); nDone++) for (nDone = 0; nDone < nCount && nStartPos < Text.getLength(); nDone++)
Text.iterateCodePoints(&nStartPos, 1); Text.iterateCodePoints(&nStartPos);
} }
return nStartPos; return nStartPos;
} }
...@@ -331,8 +331,8 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::beginOfSentence( const OUString& Text, ...@@ -331,8 +331,8 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::beginOfSentence( const OUString& Text,
nStartPos = sentence.aBreakIterator->preceding(nStartPos); nStartPos = sentence.aBreakIterator->preceding(nStartPos);
// skip preceding space. // skip preceding space.
sal_uInt32 ch = Text.iterateCodePoints(&nStartPos, 1); sal_uInt32 ch = Text.iterateCodePoints(&nStartPos);
while (nStartPos < len && u_isWhitespace(ch)) ch = Text.iterateCodePoints(&nStartPos, 1); while (nStartPos < len && u_isWhitespace(ch)) ch = Text.iterateCodePoints(&nStartPos);
Text.iterateCodePoints(&nStartPos, -1); Text.iterateCodePoints(&nStartPos, -1);
return nStartPos; return nStartPos;
......
i18npool/source/breakiterator/xdictionary.cxx
Dosyayı görüntüle @ 9e1d98fe
...@@ -283,7 +283,7 @@ bool xdictionary::seekSegment(const OUString &rText, sal_Int32 pos, ...@@ -283,7 +283,7 @@ bool xdictionary::seekSegment(const OUString &rText, sal_Int32 pos,
segBoundary.startPos = segmentCachedBoundary.startPos; segBoundary.startPos = segmentCachedBoundary.startPos;
segBoundary.endPos = segmentCachedBoundary.endPos; segBoundary.endPos = segmentCachedBoundary.endPos;
indexUtf16 = segmentCachedBoundary.startPos; indexUtf16 = segmentCachedBoundary.startPos;
rText.iterateCodePoints(&indexUtf16, 1); rText.iterateCodePoints(&indexUtf16);
return segmentCachedBoundary.endPos > indexUtf16; return segmentCachedBoundary.endPos > indexUtf16;
} }
} }
...@@ -303,7 +303,7 @@ bool xdictionary::seekSegment(const OUString &rText, sal_Int32 pos, ...@@ -303,7 +303,7 @@ bool xdictionary::seekSegment(const OUString &rText, sal_Int32 pos,
indexUtf16 = pos; indexUtf16 = pos;
while (indexUtf16 < rText.getLength()) while (indexUtf16 < rText.getLength())
{ {
sal_uInt32 ch = rText.iterateCodePoints(&indexUtf16, 1); sal_uInt32 ch = rText.iterateCodePoints(&indexUtf16);
if (u_isWhitespace(ch) || exists(ch)) if (u_isWhitespace(ch) || exists(ch))
segBoundary.endPos = indexUtf16; segBoundary.endPos = indexUtf16;
else else
...@@ -315,7 +315,7 @@ bool xdictionary::seekSegment(const OUString &rText, sal_Int32 pos, ...@@ -315,7 +315,7 @@ bool xdictionary::seekSegment(const OUString &rText, sal_Int32 pos,
segmentCachedBoundary.endPos = segBoundary.endPos; segmentCachedBoundary.endPos = segBoundary.endPos;
indexUtf16 = segBoundary.startPos; indexUtf16 = segBoundary.startPos;
rText.iterateCodePoints(&indexUtf16, 1); rText.iterateCodePoints(&indexUtf16);
return segBoundary.endPos > indexUtf16; return segBoundary.endPos > indexUtf16;
} }
...@@ -419,8 +419,8 @@ Boundary xdictionary::nextWord(const OUString& rText, sal_Int32 anyPos, sal_Int1 ...@@ -419,8 +419,8 @@ Boundary xdictionary::nextWord(const OUString& rText, sal_Int32 anyPos, sal_Int1
const sal_Int32 nLen = rText.getLength(); const sal_Int32 nLen = rText.getLength();
if (anyPos < nLen) { if (anyPos < nLen) {
// looknig for the first non-whitespace character from anyPos // looknig for the first non-whitespace character from anyPos
sal_uInt32 ch = rText.iterateCodePoints(&anyPos, 1); sal_uInt32 ch = rText.iterateCodePoints(&anyPos);
while (u_isWhitespace(ch) && (anyPos < nLen)) ch=rText.iterateCodePoints(&anyPos, 1); while (u_isWhitespace(ch) && (anyPos < nLen)) ch=rText.iterateCodePoints(&anyPos);
if (anyPos > 0) if (anyPos > 0)
rText.iterateCodePoints(&anyPos, -1); rText.iterateCodePoints(&anyPos, -1);
} }
...@@ -445,7 +445,7 @@ Boundary xdictionary::getWordBoundary(const OUString& rText, sal_Int32 anyPos, s ...@@ -445,7 +445,7 @@ Boundary xdictionary::getWordBoundary(const OUString& rText, sal_Int32 anyPos, s
if (!bDirection && startPos > 0 && startPos == (anyPos - boundary.startPos)) if (!bDirection && startPos > 0 && startPos == (anyPos - boundary.startPos))
{ {
sal_Int32 indexUtf16 = anyPos-1; sal_Int32 indexUtf16 = anyPos-1;
sal_uInt32 ch = rText.iterateCodePoints(&indexUtf16, 1); sal_uInt32 ch = rText.iterateCodePoints(&indexUtf16);
if (u_isWhitespace(ch)) if (u_isWhitespace(ch))
i--; i--;
} }
...@@ -456,7 +456,7 @@ Boundary xdictionary::getWordBoundary(const OUString& rText, sal_Int32 anyPos, s ...@@ -456,7 +456,7 @@ Boundary xdictionary::getWordBoundary(const OUString& rText, sal_Int32 anyPos, s
} else { } else {
boundary.startPos = anyPos; boundary.startPos = anyPos;
if (anyPos < len) rText.iterateCodePoints(&anyPos, 1); if (anyPos < len) rText.iterateCodePoints(&anyPos);
boundary.endPos = anyPos < len ? anyPos : len; boundary.endPos = anyPos < len ? anyPos : len;
} }
if (wordType == WordType::WORD_COUNT) { if (wordType == WordType::WORD_COUNT) {
...@@ -464,7 +464,7 @@ Boundary xdictionary::getWordBoundary(const OUString& rText, sal_Int32 anyPos, s ...@@ -464,7 +464,7 @@ Boundary xdictionary::getWordBoundary(const OUString& rText, sal_Int32 anyPos, s
while (boundary.endPos < len) while (boundary.endPos < len)
{ {
sal_Int32 indexUtf16 = boundary.endPos; sal_Int32 indexUtf16 = boundary.endPos;
if (u_ispunct(rText.iterateCodePoints(&indexUtf16, 1))) if (u_ispunct(rText.iterateCodePoints(&indexUtf16)))
boundary.endPos = indexUtf16; boundary.endPos = indexUtf16;
else else
break; break;
......
i18npool/source/indexentry/indexentrysupplier_asian.cxx
Dosyayı görüntüle @ 9e1d98fe
...@@ -182,7 +182,7 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry, ...@@ -182,7 +182,7 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry,
sal_Int16 max_index; sal_Int16 max_index;
sal_uInt16** idx=func(&max_index); sal_uInt16** idx=func(&max_index);
for (sal_Int32 i=0,j=0; i < rIndexEntry.getLength(); i=j) { for (sal_Int32 i=0,j=0; i < rIndexEntry.getLength(); i=j) {
sal_uInt32 ch = rIndexEntry.iterateCodePoints(&j, 1); sal_uInt32 ch = rIndexEntry.iterateCodePoints(&j);
if (((sal_Int16)(ch>>8)) <= max_index) { if (((sal_Int16)(ch>>8)) <= max_index) {
sal_uInt16 address = idx[0][ch>>8]; sal_uInt16 address = idx[0][ch>>8];
if (address != 0xFFFF) { if (address != 0xFFFF) {
......
io/source/acceptor/acc_pipe.cxx
Dosyayı görüntüle @ 9e1d98fe
...@@ -75,8 +75,7 @@ namespace io_acceptor ...@@ -75,8 +75,7 @@ namespace io_acceptor
m_sDescription += ",uniqueValue="; m_sDescription += ",uniqueValue=";
m_sDescription += OUString::number( m_sDescription += OUString::number(
sal::static_int_cast<sal_Int64 >( sal::static_int_cast<sal_Int64 >(
reinterpret_cast< sal_IntPtr >(&m_pipe)), reinterpret_cast< sal_IntPtr >(&m_pipe)) );
10 );
} }
PipeConnection::~PipeConnection() PipeConnection::~PipeConnection()
......
io/source/acceptor/acc_socket.cxx
Dosyayı görüntüle @ 9e1d98fe
...@@ -166,8 +166,7 @@ namespace io_acceptor { ...@@ -166,8 +166,7 @@ namespace io_acceptor {
m_sDescription += ",uniqueValue=" ; m_sDescription += ",uniqueValue=" ;
m_sDescription += OUString::number( m_sDescription += OUString::number(
sal::static_int_cast< sal_Int64 >( sal::static_int_cast< sal_Int64 >(
reinterpret_cast< sal_IntPtr >(&m_socket)), reinterpret_cast< sal_IntPtr >(&m_socket)) );
10 );
} }
SocketConnection::~SocketConnection() SocketConnection::~SocketConnection()
......
io/source/connector/ctr_pipe.cxx
Dosyayı görüntüle @ 9e1d98fe
...@@ -36,8 +36,7 @@ namespace stoc_connector { ...@@ -36,8 +36,7 @@ namespace stoc_connector {
m_sDescription += ",uniqueValue="; m_sDescription += ",uniqueValue=";
m_sDescription += OUString::number( m_sDescription += OUString::number(
sal::static_int_cast< sal_Int64 >( sal::static_int_cast< sal_Int64 >(
reinterpret_cast< sal_IntPtr >(&m_pipe)), reinterpret_cast< sal_IntPtr >(&m_pipe)) );
10 );
} }
PipeConnection::~PipeConnection() PipeConnection::~PipeConnection()
......
io/source/connector/ctr_socket.cxx
Dosyayı görüntüle @ 9e1d98fe
...@@ -87,8 +87,7 @@ namespace stoc_connector { ...@@ -87,8 +87,7 @@ namespace stoc_connector {
m_sDescription += ",uniqueValue="; m_sDescription += ",uniqueValue=";
m_sDescription += OUString::number( m_sDescription += OUString::number(
sal::static_int_cast< sal_Int64 >( sal::static_int_cast< sal_Int64 >(
reinterpret_cast< sal_IntPtr >(&m_socket)), reinterpret_cast< sal_IntPtr >(&m_socket)) );
10 );
} }
SocketConnection::~SocketConnection() SocketConnection::~SocketConnection()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment