[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/crsr/findtxt.cxx |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

New commits:
commit df88c042a978c4c14aa1c12fdbb106ec7a1190e9
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Feb 19 17:14:54 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Feb 25 15:35:07 2020 +0100

    tdf#129553 sw_redlinehide: fix replace of paragraph breaks with $
    
    The problem is that in the special selections that replace paragraph
    breaks, the start and end node are actually different, hence have
    different text frames.
    
    (regression from 5e81b966778d82692b4763d892b457186a7f269d)
    
    Practically the end content index is going to be 0 typically which
    doesn't need mapping, but not sure if that's guaranteed anywhere.
    
    Change-Id: I77c95c2f3e55edcc7aca6f4540cae90b3be5d79b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89050
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit 83122add64ecbf0fd3ba30368d5d87bde3dac278)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89428
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index def2a7529d72..d438d2df99f6 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -1095,8 +1095,10 @@ boost::optional<OUString> ReplaceBackReferences(const i18nutil::SearchOptions2&
     if( pPam && pPam->HasMark() &&
         SearchAlgorithms2::REGEXP == rSearchOpt.AlgorithmType2 )
     {
-        const SwContentNode* pTextNode = pPam->GetContentNode();
-        if (!pTextNode || !pTextNode->IsTextNode())
+        SwContentNode const*const pTextNode = pPam->GetContentNode();
+        SwContentNode const*const pMarkTextNode = pPam->GetContentNode(false);
+        if (!pTextNode || !pTextNode->IsTextNode()
+            || !pMarkTextNode || !pMarkTextNode->IsTextNode())
         {
             return xRet;
         }
@@ -1106,7 +1108,7 @@ boost::optional<OUString> ReplaceBackReferences(const i18nutil::SearchOptions2&
         const bool bParaEnd = rSearchOpt.searchString == "$" || rSearchOpt.searchString == "^$" || rSearchOpt.searchString == "$^";
         if (bParaEnd || (pLayout
                 ? sw::FrameContainsNode(*pFrame, pPam->GetMark()->nNode.GetIndex())
-                : pTextNode == pPam->GetContentNode(false)))
+                : pTextNode == pMarkTextNode))
         {
             utl::TextSearch aSText( utl::TextSearch::UpgradeToSearchOptions2( rSearchOpt) );
             OUString rStr = pLayout
@@ -1116,8 +1118,16 @@ boost::optional<OUString> ReplaceBackReferences(const i18nutil::SearchOptions2&
             AmbiguousIndex nEnd;
             if (pLayout)
             {
-                nStart.SetFrameIndex(pFrame->MapModelToViewPos(*pPam->Start()));
-                nEnd.SetFrameIndex(pFrame->MapModelToViewPos(*pPam->End()));
+                SwTextFrame const*const pStartFrame(
+                    bParaEnd && *pPam->GetMark() < *pPam->GetPoint()
+                        ? static_cast<SwTextFrame const*>(pMarkTextNode->getLayoutFrame(pLayout))
+                        : pFrame);
+                SwTextFrame const*const pEndFrame(
+                    bParaEnd && *pPam->GetPoint() <= *pPam->GetMark()
+                        ? static_cast<SwTextFrame const*>(pMarkTextNode->getLayoutFrame(pLayout))
+                        : pFrame);
+                nStart.SetFrameIndex(pStartFrame->MapModelToViewPos(*pPam->Start()));
+                nEnd.SetFrameIndex(pEndFrame->MapModelToViewPos(*pPam->End()));
             }
             else
             {