summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--i18npool/source/breakiterator/breakiteratorImpl.cxx6
-rw-r--r--i18npool/source/breakiterator/breakiterator_cjk.cxx2
-rw-r--r--i18npool/source/breakiterator/breakiterator_unicode.cxx6
-rw-r--r--i18npool/source/breakiterator/xdictionary.cxx16
-rw-r--r--i18npool/source/indexentry/indexentrysupplier_asian.cxx2
-rw-r--r--io/source/acceptor/acc_pipe.cxx3
-rw-r--r--io/source/acceptor/acc_socket.cxx3
-rw-r--r--io/source/connector/ctr_pipe.cxx3
-rw-r--r--io/source/connector/ctr_socket.cxx3
9 files changed, 20 insertions, 24 deletions
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index e07c2ba06733..afae133c6b88 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -73,13 +73,13 @@ static sal_Int32 skipSpace(const OUString& Text, sal_Int32 nPos, sal_Int32 len,
switch (rWordType) {
case WordType::ANYWORD_IGNOREWHITESPACES:
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
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) ||
+ while (nPos < len && (u_isWhitespace(ch = Text.iterateCodePoints(&pos)) || isZWSP(ch) ||
! (ch == 0x002E || u_isalnum(ch)))) nPos=pos;
else
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,
break;
case WordType::WORD_COUNT:
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
while (nPos > 0 && (u_isUWhiteSpace(ch = Text.iterateCodePoints(&pos, -1)) || isZWSP(ch))) nPos=pos;
break;
diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx b/i18npool/source/breakiterator/breakiterator_cjk.cxx
index 487f06f5b1a7..8983053fd3cd 100644
--- a/i18npool/source/breakiterator/breakiterator_cjk.cxx
+++ b/i18npool/source/breakiterator/breakiterator_cjk.cxx
@@ -96,7 +96,7 @@ LineBreakResults SAL_CALL BreakIterator_CJK::getLineBreak(
if (bOptions.allowPunctuationOutsideMargin &&
hangingCharacters.indexOf(Text[nStartPos]) != -1 &&
- (Text.iterateCodePoints( &nStartPos, 1), nStartPos == Text.getLength())) {
+ (Text.iterateCodePoints( &nStartPos ), nStartPos == Text.getLength())) {
; // do nothing
} else if (bOptions.applyForbiddenRules && 0 < nStartPos && nStartPos < Text.getLength()) {
while (nStartPos > 0 &&
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 126114c2c195..262f06ac04ac 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -217,7 +217,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text,
}
} else { // for CHARACTER mode
for (nDone = 0; nDone < nCount && nStartPos < Text.getLength(); nDone++)
- Text.iterateCodePoints(&nStartPos, 1);
+ Text.iterateCodePoints(&nStartPos);
}
return nStartPos;
}
@@ -331,8 +331,8 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::beginOfSentence( const OUString& Text,
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);
+ sal_uInt32 ch = Text.iterateCodePoints(&nStartPos);
+ while (nStartPos < len && u_isWhitespace(ch)) ch = Text.iterateCodePoints(&nStartPos);
Text.iterateCodePoints(&nStartPos, -1);
return nStartPos;
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index 142ec98e7364..322239c8a9fa 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -283,7 +283,7 @@ bool xdictionary::seekSegment(const OUString &rText, sal_Int32 pos,
segBoundary.startPos = segmentCachedBoundary.startPos;
segBoundary.endPos = segmentCachedBoundary.endPos;
indexUtf16 = segmentCachedBoundary.startPos;
- rText.iterateCodePoints(&indexUtf16, 1);
+ rText.iterateCodePoints(&indexUtf16);
return segmentCachedBoundary.endPos > indexUtf16;
}
}
@@ -303,7 +303,7 @@ bool xdictionary::seekSegment(const OUString &rText, sal_Int32 pos,
indexUtf16 = pos;
while (indexUtf16 < rText.getLength())
{
- sal_uInt32 ch = rText.iterateCodePoints(&indexUtf16, 1);
+ sal_uInt32 ch = rText.iterateCodePoints(&indexUtf16);
if (u_isWhitespace(ch) || exists(ch))
segBoundary.endPos = indexUtf16;
else
@@ -315,7 +315,7 @@ bool xdictionary::seekSegment(const OUString &rText, sal_Int32 pos,
segmentCachedBoundary.endPos = segBoundary.endPos;
indexUtf16 = segBoundary.startPos;
- rText.iterateCodePoints(&indexUtf16, 1);
+ rText.iterateCodePoints(&indexUtf16);
return segBoundary.endPos > indexUtf16;
}
@@ -419,8 +419,8 @@ Boundary xdictionary::nextWord(const OUString& rText, sal_Int32 anyPos, sal_Int1
const sal_Int32 nLen = rText.getLength();
if (anyPos < nLen) {
// looknig for the first non-whitespace character from anyPos
- sal_uInt32 ch = rText.iterateCodePoints(&anyPos, 1);
- while (u_isWhitespace(ch) && (anyPos < nLen)) ch=rText.iterateCodePoints(&anyPos, 1);
+ sal_uInt32 ch = rText.iterateCodePoints(&anyPos);
+ while (u_isWhitespace(ch) && (anyPos < nLen)) ch=rText.iterateCodePoints(&anyPos);
if (anyPos > 0)
rText.iterateCodePoints(&anyPos, -1);
}
@@ -445,7 +445,7 @@ Boundary xdictionary::getWordBoundary(const OUString& rText, sal_Int32 anyPos, s
if (!bDirection && startPos > 0 && startPos == (anyPos - boundary.startPos))
{
sal_Int32 indexUtf16 = anyPos-1;
- sal_uInt32 ch = rText.iterateCodePoints(&indexUtf16, 1);
+ sal_uInt32 ch = rText.iterateCodePoints(&indexUtf16);
if (u_isWhitespace(ch))
i--;
}
@@ -456,7 +456,7 @@ Boundary xdictionary::getWordBoundary(const OUString& rText, sal_Int32 anyPos, s
} else {
boundary.startPos = anyPos;
- if (anyPos < len) rText.iterateCodePoints(&anyPos, 1);
+ if (anyPos < len) rText.iterateCodePoints(&anyPos);
boundary.endPos = anyPos < len ? anyPos : len;
}
if (wordType == WordType::WORD_COUNT) {
@@ -464,7 +464,7 @@ Boundary xdictionary::getWordBoundary(const OUString& rText, sal_Int32 anyPos, s
while (boundary.endPos < len)
{
sal_Int32 indexUtf16 = boundary.endPos;
- if (u_ispunct(rText.iterateCodePoints(&indexUtf16, 1)))
+ if (u_ispunct(rText.iterateCodePoints(&indexUtf16)))
boundary.endPos = indexUtf16;
else
break;
diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
index a41e8cb56a08..4216e408aa59 100644
--- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
@@ -182,7 +182,7 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry,
sal_Int16 max_index;
sal_uInt16** idx=func(&max_index);
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) {
sal_uInt16 address = idx[0][ch>>8];
if (address != 0xFFFF) {
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index 28a7cd285925..1265d0e8b498 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -75,8 +75,7 @@ namespace io_acceptor
m_sDescription += ",uniqueValue=";
m_sDescription += OUString::number(
sal::static_int_cast<sal_Int64 >(
- reinterpret_cast< sal_IntPtr >(&m_pipe)),
- 10 );
+ reinterpret_cast< sal_IntPtr >(&m_pipe)) );
}
PipeConnection::~PipeConnection()
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx
index 5e374622bd35..aaecf3cc72d6 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -166,8 +166,7 @@ namespace io_acceptor {
m_sDescription += ",uniqueValue=" ;
m_sDescription += OUString::number(
sal::static_int_cast< sal_Int64 >(
- reinterpret_cast< sal_IntPtr >(&m_socket)),
- 10 );
+ reinterpret_cast< sal_IntPtr >(&m_socket)) );
}
SocketConnection::~SocketConnection()
diff --git a/io/source/connector/ctr_pipe.cxx b/io/source/connector/ctr_pipe.cxx
index 0829b0f63e49..f9b19ea79695 100644
--- a/io/source/connector/ctr_pipe.cxx
+++ b/io/source/connector/ctr_pipe.cxx
@@ -36,8 +36,7 @@ namespace stoc_connector {
m_sDescription += ",uniqueValue=";
m_sDescription += OUString::number(
sal::static_int_cast< sal_Int64 >(
- reinterpret_cast< sal_IntPtr >(&m_pipe)),
- 10 );
+ reinterpret_cast< sal_IntPtr >(&m_pipe)) );
}
PipeConnection::~PipeConnection()
diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx
index 76dcb317be8c..c23c8969b026 100644
--- a/io/source/connector/ctr_socket.cxx
+++ b/io/source/connector/ctr_socket.cxx
@@ -87,8 +87,7 @@ namespace stoc_connector {
m_sDescription += ",uniqueValue=";
m_sDescription += OUString::number(
sal::static_int_cast< sal_Int64 >(
- reinterpret_cast< sal_IntPtr >(&m_socket)),
- 10 );
+ reinterpret_cast< sal_IntPtr >(&m_socket)) );
}
SocketConnection::~SocketConnection()
generated by cgit (git 2.34.1) at 2025-01-08 16:51:24 +0000