diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-11-03 09:49:37 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-03 14:48:49 +0000 |
commit | fa430e6b4e6f5d096bdf59db26e5d7393ca2297b (patch) | |
tree | 09f8d5fb17a4d9b090c9994c10c66a840a8003cd /sw/source/core/txtnode | |
parent | 79fcf0b4a86e22e541eecd6e39726fac2016750b (diff) |
Resolves: fdo#68347 fix word count with recorded changes
also see fdo#46757
a) We need to ignore redline-deleted text, but count redline-added text
b) each block of text is denoted by its end position in the model
and where that maps to in the view so a hidden portion
should record its end point not its starting point, and a non-hidden
deleted portion should always record its end point
c) when mapping a model position to the view we take the offset of
the model pos arg from the block end and use that to offset the
mapped block-end view pos to get the final view pos. But for
hidden portions that won't make a whole lot of sense, and
end up offsetting into prior portions, so map all positions within a
hidden portion to the same block-end view pos
add regression tests for these cases
Change-Id: I45c76bba47fd430bc3bccb5f919502660d415d9e
Diffstat (limited to 'sw/source/core/txtnode')
-rw-r--r-- | sw/source/core/txtnode/modeltoviewhelper.cxx | 70 | ||||
-rw-r--r-- | sw/source/core/txtnode/txtedt.cxx | 2 |
2 files changed, 45 insertions, 27 deletions
diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx b/sw/source/core/txtnode/modeltoviewhelper.cxx index ad268cdfccde..43bab21fd677 100644 --- a/sw/source/core/txtnode/modeltoviewhelper.cxx +++ b/sw/source/core/txtnode/modeltoviewhelper.cxx @@ -94,7 +94,7 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, sal_uInt16 eMode) if (eMode & HIDEINVISIBLE) SwScriptInfo::selectHiddenTextProperty(rNode, aHiddenMulti); - if (eMode & HIDEREDLINED) + if (eMode & HIDEDELETIONS) SwScriptInfo::selectRedLineDeleted(rNode, aHiddenMulti); std::vector<block> aBlocks; @@ -203,43 +203,55 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, sal_uInt16 eMode) } } + //store the end of each range in the model and where that end of range + //maps to in the view sal_Int32 nOffset = 0; for (std::vector<block>::iterator i = aBlocks.begin(); i != aBlocks.end(); ++i) { + const sal_Int32 nBlockLen = i->m_nLen; + if (!nBlockLen) + continue; + const sal_Int32 nBlockStart = i->m_nStart; + const sal_Int32 nBlockEnd = nBlockStart + nBlockLen; + if (!i->m_bVisible) { - const sal_Int32 nHiddenStart = i->m_nStart; - const sal_Int32 nHiddenLen = i->m_nLen; + sal_Int32 const modelBlockPos(nBlockEnd); + sal_Int32 const viewBlockPos(nBlockStart + nOffset); + m_aMap.push_back(ConversionMapEntry(modelBlockPos, viewBlockPos, false)); - m_aRetText = m_aRetText.replaceAt( nOffset + nHiddenStart, nHiddenLen, OUString() ); - m_aMap.push_back( ConversionMapEntry( nHiddenStart, nOffset + nHiddenStart ) ); - nOffset -= nHiddenLen; + m_aRetText = m_aRetText.replaceAt(nOffset + nBlockStart, nBlockLen, OUString()); + nOffset -= nBlockLen; } else { for (FieldResultSet::iterator j = i->m_aAttrs.begin(); j != i->m_aAttrs.end(); ++j) { - sal_Int32 const viewPos(nOffset + j->m_nFieldPos); - m_aRetText = m_aRetText.replaceAt(viewPos, 1, j->m_sExpand); - m_aMap.push_back( ConversionMapEntry(j->m_nFieldPos, viewPos) ); + sal_Int32 const modelFieldPos(j->m_nFieldPos); + sal_Int32 const viewFieldPos(j->m_nFieldPos + nOffset); + m_aMap.push_back( ConversionMapEntry(modelFieldPos, viewFieldPos, true) ); + + m_aRetText = m_aRetText.replaceAt(viewFieldPos, 1, j->m_sExpand); + nOffset += j->m_sExpand.getLength() - 1; + switch (j->m_eType) { case FieldResult::FIELD: - m_FieldPositions.push_back(viewPos); + m_FieldPositions.push_back(viewFieldPos); break; case FieldResult::FOOTNOTE: - m_FootnotePositions.push_back(viewPos); + m_FootnotePositions.push_back(viewFieldPos); break; case FieldResult::NONE: /*ignore*/ break; } - nOffset += j->m_sExpand.getLength() - 1; } + + sal_Int32 const modelEndBlock(nBlockEnd); + sal_Int32 const viewFieldPos(nBlockEnd + nOffset); + m_aMap.push_back(ConversionMapEntry(modelEndBlock, viewFieldPos, true)); } } - - if ( !m_aMap.empty() ) - m_aMap.push_back( ConversionMapEntry( rNodeText.getLength()+1, m_aRetText.getLength()+1 ) ); } /** Converts a model position into a view position @@ -248,15 +260,21 @@ sal_Int32 ModelToViewHelper::ConvertToViewPosition( sal_Int32 nModelPos ) const { // Search for entry after nPos: ConversionMap::const_iterator aIter; + for ( aIter = m_aMap.begin(); aIter != m_aMap.end(); ++aIter ) { - if ( (*aIter).first >= nModelPos ) + if (aIter->m_nModelPos >= nModelPos) { - const sal_Int32 nPosModel = (*aIter).first; - const sal_Int32 nPosExpand = (*aIter).second; - - const sal_Int32 nDistToNextModel = nPosModel - nModelPos; - return nPosExpand - nDistToNextModel; + //if it's an invisible portion, map all contained positions + //to the anchor viewpos + if (!aIter->m_bVisible) + return aIter->m_nViewPos; + + //if it's a visible portion, then the view position is the anchor + //viewpos - the offset of the input modelpos from the anchor + //modelpos + const sal_Int32 nOffsetFromEnd = aIter->m_nModelPos - nModelPos; + return aIter->m_nViewPos - nOffsetFromEnd; } } @@ -274,10 +292,10 @@ ModelToViewHelper::ModelPosition ModelToViewHelper::ConvertToModelPosition( sal_ ConversionMap::const_iterator aIter; for ( aIter = m_aMap.begin(); aIter != m_aMap.end(); ++aIter ) { - if ( (*aIter).second > nViewPos ) + if (aIter->m_nViewPos > nViewPos) { - const sal_Int32 nPosModel = (*aIter).first; - const sal_Int32 nPosExpand = (*aIter).second; + const sal_Int32 nPosModel = aIter->m_nModelPos; + const sal_Int32 nPosExpand = aIter->m_nViewPos; // If nViewPos is in front of first field, we are finished. if ( aIter == m_aMap.begin() ) @@ -286,8 +304,8 @@ ModelToViewHelper::ModelPosition ModelToViewHelper::ConvertToModelPosition( sal_ --aIter; // nPrevPosModel is the field position - const sal_Int32 nPrevPosModel = (*aIter).first; - const sal_Int32 nPrevPosExpand = (*aIter).second; + const sal_Int32 nPrevPosModel = aIter->m_nModelPos; + const sal_Int32 nPrevPosExpand = aIter->m_nViewPos; const sal_Int32 nLengthModel = nPosModel - nPrevPosModel; const sal_Int32 nLengthExpand = nPosExpand - nPrevPosExpand; diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index d094b83442cb..2ec09bbaf6b8 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1993,7 +1993,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat, } // ConversionMap to expand fields, remove invisible and redline deleted text for scanner - const ModelToViewHelper aConversionMap(*this, EXPANDFIELDS | EXPANDFOOTNOTE | HIDEINVISIBLE | HIDEREDLINED); + const ModelToViewHelper aConversionMap(*this, EXPANDFIELDS | EXPANDFOOTNOTE | HIDEINVISIBLE | HIDEDELETIONS); OUString aExpandText = aConversionMap.getViewText(); if (aExpandText.isEmpty() && !bCountNumbering) |