diff options
| -rw-r--r-- | sw/qa/core/swdoc-test.cxx | 10 | ||||
| -rw-r--r-- | sw/source/core/txtnode/txtedt.cxx | 13 |
2 files changed, 11 insertions, 12 deletions
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx index a3f795a6a43a..f19e9e5bd9a4 100644 --- a/sw/qa/core/swdoc-test.cxx +++ b/sw/qa/core/swdoc-test.cxx @@ -307,6 +307,7 @@ void SwDocTest::testSwScanner() } //See https://issues.apache.org/ooo/show_bug.cgi?id=89042 + //See https://bugs.freedesktop.org/show_bug.cgi?id=53399 { SwDocStat aDocStat; @@ -323,15 +324,20 @@ void SwDocTest::testSwScanner() CPPUNIT_ASSERT_MESSAGE("Should be 3", aDocStat.nWord == 3); const sal_Unicode aShouldBeFive[] = { + // f r e n c h space 0x0046, 0x0072, 0x0065, 0x006E, 0x0063, 0x0068, 0x0020, + // << nbsp s a v o i 0x00AB, 0x00A0, 0x0073, 0x0061, 0x0076, 0x006F, 0x0069, - 0x0072, 0x0020, 0x0063, 0x0061, 0x006C, 0x0063, 0x0075, - 0x006C, 0x0065, 0x0072, 0x00A0, 0x00BB + // r nnbsp c a l c u + 0x0072, 0x202f, 0x0063, 0x0061, 0x006C, 0x0063, 0x0075, + // l e r idspace >> + 0x006C, 0x0065, 0x0072, 0x3000, 0x00BB }; m_pDoc->AppendTxtNode(*aPaM.GetPoint()); m_pDoc->InsertString(aPaM, rtl::OUString(aShouldBeFive, SAL_N_ELEMENTS(aShouldBeFive))); pTxtNode = aPaM.GetNode()->GetTxtNode(); + aDocStat.Reset(); pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeFive)); CPPUNIT_ASSERT_MESSAGE("Should be 5", aDocStat.nWord == 5); } diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 7f350c6f68d7..2cbe32a1c225 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -71,6 +71,7 @@ #include <txtatr.hxx> #include <fmtautofmt.hxx> #include <istyleaccess.hxx> +#include <unicode/uchar.h> #include <unomid.h> @@ -96,14 +97,6 @@ using namespace ::com::sun::star::smarttags; extern const SwTxtNode *pLinguNode; extern SwTxtFrm *pLinguFrm; -bool lcl_IsSkippableWhiteSpace( xub_Unicode cCh ) -{ - return 0x3000 == cCh || - ' ' == cCh || - '\t' == cCh || - 0x0a == cCh; -} - /* * This has basically the same function as SwScriptInfo::MaskHiddenRanges, * only for deleted redlines @@ -731,7 +724,7 @@ sal_Bool SwScanner::NextWord() // skip non-letter characters: while ( nBegin < aText.getLength() ) { - if ( !lcl_IsSkippableWhiteSpace( aText[nBegin] ) ) + if ( !u_isspace( aText[nBegin] ) ) { if ( !pLanguage ) { @@ -1879,7 +1872,7 @@ void SwTxtNode::CountWords( SwDocStat& rStat, //do the count // all counts exclude hidden paras and hidden+redlined within para // definition of space/white chars in SwScanner (and BreakIter!) - // uses both lcl_IsSkippableWhiteSpace and BreakIter getWordBoundary in SwScanner + // uses both u_isspace and BreakIter getWordBoundary in SwScanner sal_uInt32 nTmpWords = 0; // count of all words sal_uInt32 nTmpAsianWords = 0; //count of all Asian codepoints sal_uInt32 nTmpChars = 0; // count of all chars |