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

[Jeff Huang (via logerrit)]

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

New commits:
commit 925ed355f096c0b005cfddbbe4c78400472de5bc
Author:     Jeff Huang <jeff at mail.ossii.com.tw>
AuthorDate: Mon Apr 12 14:16:02 2021 +0800
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Tue Apr 20 10:42:46 2021 +0200

    tdf#141525 Fix "Line with Arrow/Circle" insertion error.
    
    When you insert "Line with Arrow/Circle" from "Lines and Arrows", it will show
    "Line Starts with Arrow" instead of "Line with Arrow/Circle". This patch can
    fix this issue. (This issue exists at least since 6.3 series.)
    
    Change-Id: I827b9582951fe359d89245970e73d63f7697553f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113963
    Tested-by: Jenkins
    Reviewed-by: Mark Hung <marklh9 at gmail.com>
    (cherry picked from commit 2b498e380a91a536d177376e854cf3a6e2fb0b35)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114179
    Reviewed-by: Po-Yen Huang <jeff at mail.ossii.com.tw>
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    (cherry picked from commit 4ee3d213e8d3c4afdc3714b50def117dfe5c8023)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114275
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 9da71abf8b8c..33134f5858a6 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1005,6 +1005,14 @@ void SwFEShell::SetLineEnds(SfxItemSet& rAttr, SdrObject const & rObj, sal_uInt1
     // and again, for the still missing ends
     switch (nSlotId)
     {
+        case SID_LINE_ARROW_CIRCLE:
+        {
+            // circle end
+            rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
+            rAttr.Put(XLineEndWidthItem(nWidth));
+        }
+        break;
+
         case SID_LINE_CIRCLE_ARROW:
         {
             // circle start