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

[Attila Bakos (NISZ) (via logerrit)]

 sw/source/core/frmedt/fecopy.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 35d74bf25163178b3bebefe08cddc06de56cd641
Author:     Attila Bakos (NISZ) <bakos.attilakaroly at nisz.hu>
AuthorDate: Wed Nov 25 14:06:49 2020 +0100
Commit:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
CommitDate: Tue Mar 2 09:54:07 2021 +0100

    tdf#135044 sw: fix Ctrl + drag textbox copy
    
    Text content was missing in the new textbox
    after Ctrl + drag and drop copying of a text box
    with text content.
    
    Change-Id: Ib93096df0028ee0e02c73804c1518aec4490b57f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106585
    Tested-by: László Németh <nemeth at numbertext.org>
    Reviewed-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit 64819ab91555b5afe360cf25aba6431546c4d905)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111777
    Tested-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
    Reviewed-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>

diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 67027a4c5b9e..4272996d822c 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -404,6 +404,11 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
                             static_cast<SwDrawFrameFormat*>(pFormat)->PosAttrSet();
                         }
                     }
+                    if (SwTextBoxHelper::getOtherTextBoxFormat(pFormat, RES_DRAWFRMFMT))
+                    {
+                        SwTextBoxHelper::syncFlyFrameAttr(*pFormat, pFormat->GetAttrSet());
+                    }
+
                     if( bSelectInsert )
                         pDestDrwView->MarkObj( pNew, pDestPgView );
                 }