diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-12-11 10:37:23 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-02-12 16:07:45 +0000 |
| commit | df52800121871f1fd1d8d48a149c15f5618476d9 (patch) | |
| tree | fe09f7785c16b186982b52c48336b8b0203e619d /sw | |
| parent | 9698ecfe0adc556f2f7894f47f95a1d2c843fe7e (diff) | |
prefer my own cjk char-as-word counting
Change-Id: I120acd40b83cad074869b404d4e74b5ec69d493d
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/txtnode/txtedt.cxx | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 578579c070f8..e0cc703c095e 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1898,9 +1898,6 @@ void SwTxtNode::CountWords( SwDocStat& rStat, // map start and end points onto the ConversionMap const sal_uInt32 nExpandBegin = aConversionMap.ConvertToViewPosition( nStt ); const sal_uInt32 nExpandEnd = aConversionMap.ConvertToViewPosition( nEnd ); -#ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE - aExpandText = aExpandText.copy( nExpandBegin, nExpandEnd - nExpandBegin ); -#endif if (aExpandText.isEmpty() && !bCountNumbering) { @@ -1922,49 +1919,9 @@ void SwTxtNode::CountWords( SwDocStat& rStat, { if (pBreakIt->GetBreakIter().is()) { -#ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE - // FIXME: check if in fact this is a (sadly) duplicated fix. - - // split into different script languages - sal_Int32 nScriptBegin = 0; - while ( nScriptBegin < aExpandText.getLength() ) - { - const sal_Int16 nCurrScript = pBreakIt->GetBreakIter()->getScriptType( aExpandText, nScriptBegin ); - const sal_Int32 nScriptEnd = pBreakIt->GetBreakIter()->endOfScript( aExpandText, nScriptBegin, nCurrScript ); - rtl::OUString aScriptText = aExpandText.copy( nScriptBegin, nScriptEnd - nScriptBegin ); - - // Asian languages count words as characters - if ( nCurrScript == ::com::sun::star::i18n::ScriptType::ASIAN ) - { - // substract white spaces - sal_Int32 nSpaceCount = 0; - sal_Int32 nSpacePos = 0; - - // substract normal white spaces - nSpacePos = -1; - while ( ( nSpacePos = aScriptText.indexOf( ' ', nSpacePos + 1 ) ) != -1 ) - { - nSpaceCount++; - } - // substract Asian full-width white spaces - nSpacePos = -1; - while ( ( nSpacePos = aScriptText.indexOf( 12288, nSpacePos + 1 ) ) != -1 ) - { - nSpaceCount++; - } - nTmpWords += nScriptEnd - nScriptBegin - nSpaceCount; - } - else - { -#endif - // zero is NULL for pLanguage -----------v last param = true for clipping SwScanner aScanner( *this, aExpandText, 0, aConversionMap, i18n::WordType::WORD_COUNT, -#ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE - (xub_StrLen)0, (xub_StrLen)aScriptText.getLength() ); -#else nExpandBegin, nExpandEnd, true ); -#endif // used to filter out scanner returning almost empty strings (len=1; unichar=0x0001) const rtl::OUString aBreakWord( CH_TXTATR_BREAKWORD ); @@ -1982,12 +1939,6 @@ void SwTxtNode::CountWords( SwDocStat& rStat, } } -#ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE -nScriptBegin = nScriptEnd; -} -} -#endif - nTmpCharsExcludingSpaces += aScanner.getOverriddenDashCount(); } |