[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source
Bakos Attila (via logerrit)
logerrit at kemper.freedesktop.org
Fri Oct 16 09:08:48 UTC 2020
sw/source/uibase/shells/drwbassh.cxx | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit d7b67e6fe3e449c8c5b95a57d8cc7b9ca70c7a99
Author: Bakos Attila <bakos.attilakaroly at nisz.hu>
AuthorDate: Mon Jul 20 14:30:39 2020 +0200
Commit: Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Oct 16 11:07:51 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-authored-by: 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/+/102769
Reviewed-by: Michael Stahl <michael.stahl at cib.de>
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index bccbe313bdf9..c707b803736b 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -53,6 +53,7 @@
#include <com/sun/star/text/RelOrientation.hpp>
#include <IDocumentDrawModelAccess.hxx>
#include <fmtfollowtextflow.hxx>
+#include <textboxhelper.hxx>
using namespace ::com::sun::star;
@@ -478,6 +479,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();
}
@@ -489,6 +492,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();
}
More information about the Libreoffice-commits
mailing list