sw/source/core/tox/ToxTextGenerator.cxx | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
New commits: commit 141d4427d2d2db6a16133fcf7571798233a99cb0 Author: Tamas Bunth <[email protected]> Date: Tue Sep 19 16:53:16 2017 +0200 tdf#99689 allow Subscript in Illustration Index... ... and Index of Tables. Change-Id: I5a677f431d1a2e3836bcacdd382708b0ce397faf Reviewed-on: https://gerrit.libreoffice.org/42481 Reviewed-by: Tamás Bunth <[email protected]> Tested-by: Tamás Bunth <[email protected]> diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx index 4eaaf8c3730c..c748bdb42041 100644 --- a/sw/source/core/tox/ToxTextGenerator.cxx +++ b/sw/source/core/tox/ToxTextGenerator.cxx @@ -200,9 +200,8 @@ ToxTextGenerator::GenerateText(SwDoc* pDoc, const std::vector<SwTOXSortTabBase*> { // for TOC numbering rText += GetNumStringOfFirstNode( rBase, true, MAXLEVEL ); - SwIndex aIdx( pTOXNd, rText.getLength() ); - ToxWhitespaceStripper stripper(rBase.GetText().sText); - pTOXNd->InsertText(stripper.GetStrippedString(), aIdx); + HandledTextToken htt = HandleTextToken(rBase, pDoc->GetAttrPool() ); + ApplyHandledTextToken(htt, *pTOXNd); } break; @@ -316,8 +315,14 @@ ToxTextGenerator::HandleTextToken(const SwTOXSortTabBase& source, SwAttrPool& po clone->SetStyleHandle(attributesToClone); result.autoFormats.push_back(clone); - result.startPositions.push_back(stripper.GetPositionInStrippedString(hint->GetStart())); - result.endPositions.push_back(stripper.GetPositionInStrippedString(*hint->GetAnyEnd())); + + ModelToViewHelper aConversionMap( *pSrc, ExpandMode::ExpandFields ); + result.startPositions.push_back( + stripper.GetPositionInStrippedString(aConversionMap.ConvertToViewPosition( + hint->GetStart() ))); + result.endPositions.push_back( + stripper.GetPositionInStrippedString(aConversionMap.ConvertToViewPosition( + *hint->GetAnyEnd() ))); } return result; }
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
