commit 141d4427d2d2db6a16133fcf7571798233a99cb0
author Tamas Bunth <tamas.bunth@collabora.co.uk> Tue Sep 19 16:53:16 2017 +0200
committer Tamás Bunth <btomi96@gmail.com> Fri Sep 29 14:37:02 2017 +0200
tree 1bf46c6f1a7bcfc1f5c37e4422943f3630bce3eb
parent f6990d3f61b37e15d0320ef60d2d66535fadddc0

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 <btomi96@gmail.com>
Tested-by: Tamás Bunth <btomi96@gmail.com>

sw/source/core/tox/ToxTextGenerator.cxx

diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx
index 4eaaf8c3..c748bdb 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;
}