[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/doc/docdesc.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit ae3fb60f749066aa69dd1c32d2d963562a93eabb
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Aug 4 12:26:23 2020 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Aug 5 15:10:50 2020 +0200

    tdf#135144 sw: copy bookmarks in SwDoc::CopyMasterHeader()
    
    ... and SwDoc::CopyMasterFooter(); this is the same as commit
    9f7ee38acec0cb614e37aecc5ea9c5f1c63b61b6 but for 2 other functions that
    do the same thing.
    
    Change-Id: Id7ed449a004ee3c9452d4603bf8632e2720651ed
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100077
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit af38654b4b8388f0a0236601742b7ab3d1590ae8)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100058
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 036185e88d7d..51dc930f06d9 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -293,7 +293,9 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFormatHeader &rHe
                 GetNodes().Copy_( aRange, aTmp, false );
                 aTmp = *pSttNd;
                 GetDocumentContentOperationsManager().CopyFlyInFlyImpl(aRange, nullptr, aTmp);
-
+                SwPaM const source(aRange.aStart, aRange.aEnd);
+                SwPosition dest(aTmp);
+                sw::CopyBookmarks(source, dest);
                 pFormat->SetFormatAttr( SwFormatContent( pSttNd ) );
                 rDescFrameFormat.SetFormatAttr( SwFormatHeader( pFormat ) );
             }
@@ -365,7 +367,9 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFormatFooter &rFo
                 GetNodes().Copy_( aRange, aTmp, false );
                 aTmp = *pSttNd;
                 GetDocumentContentOperationsManager().CopyFlyInFlyImpl(aRange, nullptr, aTmp);
-
+                SwPaM const source(aRange.aStart, aRange.aEnd);
+                SwPosition dest(aTmp);
+                sw::CopyBookmarks(source, dest);
                 pFormat->SetFormatAttr( SwFormatContent( pSttNd ) );
                 rDescFrameFormat.SetFormatAttr( SwFormatFooter( pFormat ) );
             }