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

[Bakos Attila (via logerrit)]

 sw/source/uibase/shells/drwbassh.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 0f8f643ada57b66f4868c13457b610aab35a6a0a
Author:     Bakos Attila <bakos.attilakaroly at nisz.hu>
AuthorDate: Mon Jul 20 14:30:39 2020 +0200
Commit:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
CommitDate: Wed Sep 16 23:16:55 2020 +0200

    tdf#124430 Writer Editing: Fix textbox aligning
    
    Before, when align function was used the textboxes
    (shape+frame) went apart, now the textframe follows
    the shape.
    
    Co-dev: Attila Bánhegyi (NISZ)
    Change-Id: I4d69a2f7f4e5ef50d17bb0871c501d6e0026d0e2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99048
    Reviewed-by: Attila Bakos <bakos.attilakaroly at nisz.hu>
    Reviewed-by: László Németh <nemeth at numbertext.org>
    Tested-by: Jenkins
    Tested-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit 06fd06597796d9e92117602245f3968c93707708)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102768
    Tested-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
    Reviewed-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>

diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 12d87bab691b..ba966feefccc 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -62,6 +62,7 @@
 #include <IDocumentDrawModelAccess.hxx>
 #include <memory>
 #include <fmtfollowtextflow.hxx>
+#include <textboxhelper.hxx>
 
 using namespace ::com::sun::star;
 
@@ -487,6 +488,8 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq)
                         SwFormatHoriOrient aHOrient(pFrameFormat->GetFormatAttr(RES_HORI_ORIENT));
                         aHOrient.SetHoriOrient( nHorizOrient );
                         pFrameFormat->SetFormatAttr(aHOrient);
+                        if (auto pTxFrm = SwTextBoxHelper::getOtherTextBoxFormat(pFrameFormat, RES_DRAWFRMFMT))
+                            pTxFrm->SetFormatAttr(aHOrient);
                         pSh->EndAction();
                     }
 
@@ -498,6 +501,8 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq)
                         SwFormatVertOrient aVOrient(pFrameFormat->GetFormatAttr(RES_VERT_ORIENT));
                         aVOrient.SetVertOrient( nVertOrient );
                         pFrameFormat->SetFormatAttr(aVOrient);
+                        if (auto pTxFrm = SwTextBoxHelper::getOtherTextBoxFormat(pFrameFormat, RES_DRAWFRMFMT))
+                            pTxFrm->SetFormatAttr(aVOrient);
                         pSh->EndAction();
                     }