diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-01-03 00:41:56 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-01-03 16:43:03 +0100 |
| commit | f2945255df273404ee2457dcf761cb8f334b732b (patch) | |
| tree | 46f1a87f3f97a5176214d55fc0bad92c119e73d9 /sw/source | |
| parent | 5969eec0e998804eba77338b17de90737e2acb43 (diff) | |
cp#2013101510000026: doc import of comments affecting more text nodes
Change-Id: I3932d82cb4cd640b19957b93cc7e59711af1b564
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 49 |
1 files changed, 44 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 1eba247c59e3..5c4a3b09acbb 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -2162,11 +2162,50 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes) WW8_CP nStart = GetAnnotationStart(nAtnIndex); WW8_CP nEnd = GetAnnotationEnd(nAtnIndex); sal_Int32 nLen = nEnd - nStart; - // Don't support ranges affecting multiple SwTxtNode for now. - if (nLen && pPaM->GetPoint()->nContent.GetIndex() >= nLen) - { - pPaM->SetMark(); - pPaM->GetPoint()->nContent -= nLen; + if( nLen ) + { + if (pPaM->GetPoint()->nContent.GetIndex() >= nLen) + { + pPaM->SetMark(); + pPaM->GetPoint()->nContent -= nLen; + } + else if (pPaM->GetPoint()->nNode.GetNode().IsTxtNode() ) + { + pPaM->SetMark(); + nLen -= pPaM->GetPoint()->nContent.GetIndex(); + + SwTxtNode* pTxtNode = 0; + // Find first text node which affected by the comment + while( pPaM->GetPoint()->nNode >= 0 ) + { + SwNode* pNode = 0; + // Find previous text node + do + { + pPaM->GetPoint()->nNode--; + nLen--; // End line character + pNode = &pPaM->GetPoint()->nNode.GetNode(); + } + while( !pNode->IsTxtNode() && pPaM->GetPoint()->nNode >= 0 ); + + // Subtrackt previous text node's length + if( pNode && pNode->IsTxtNode() ) + { + pTxtNode = pNode->GetTxtNode(); + if( nLen < pTxtNode->Len() ) + break; + else + nLen -= pTxtNode->Len(); + } + } + + // Set postion of the text range's first character + if( pTxtNode ) + { + pTxtNode->MakeStartIndex(&pPaM->GetPoint()->nContent); + pPaM->GetPoint()->nContent += pTxtNode->Len() - nLen; + } + } } } } |