[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - 2 commits - sw/source

[Vasily Melenchuk (via logerrit)]

 sw/source/core/frmedt/feshview.cxx |    2 +-
 sw/source/core/unocore/unodraw.cxx |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 271629be26f2e443923c34e2f18d100e616fd772
Author:     Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Mon Jan 13 10:29:28 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Jan 24 11:12:19 2020 +0100

    tdf#129382: sw: assign names to shape object styles
    
    Empty style names for drawing object will cause problems with
    udo/redo which right now refers style names instead of style
    pointers.
    
    Change-Id: If2266f1db04c624dbfdd716b5599d5f6cbb5371e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86520
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit db8fdf20fbbb22e0510f0500140bbf7a3b2642f7)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87214
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Signed-off-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87305
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 598ed442b727..b08e94c5bf8d 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -2089,7 +2089,7 @@ bool SwFEShell::ImpEndCreate()
             text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
         // #i44344#, #i44681# - positioning attributes already set
         pFormat->PosAttrSet();
-        pFormat->SetName(GetUniqueShapeName());
+        pFormat->SetName(rSdrObj.GetName());
 
         SwDrawContact *pContact = new SwDrawContact( pFormat, &rSdrObj );
         // #i35635#
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 4f6f0df53530..77c89b485d95 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -721,7 +721,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
     if(pFormat)
     {
         if (pFormat->GetName().isEmpty())
-            pFormat->SetName(pDoc->GetUniqueFrameName(), false);
+            pFormat->SetName(pSvxShape->GetSdrObject()->GetName(), false);
         pFormat->Add(pShape);
     }
     pShape->m_bDescriptor = false;
commit fd0cade5e0fc29436572799aa48f3aca789e1734
Author:     Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Thu Nov 21 20:12:52 2019 +0300
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Jan 24 11:12:11 2020 +0100

    tdf#128782: sw: assign name to draw object
    
    SwXDrawPage is inserting frame styles without name. This is confusing
    undo/redo code which is operating styles by names.
    
    Change-Id: Ibcda01fbd3ec88e9cdbde446c3f18c7ad6b0cbc8
    Reviewed-on: https://gerrit.libreoffice.org/83415
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit c2d689790c332ffd2f0d73de6aae53f26f0fbe53)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87206
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Signed-off-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87304
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index b6536f0397e1..4f6f0df53530 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -719,7 +719,11 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
     pDoc->getIDocumentContentOperations().InsertDrawObj( *pTemp, *pObj, aSet );
     SwFrameFormat* pFormat = ::FindFrameFormat( pObj );
     if(pFormat)
+    {
+        if (pFormat->GetName().isEmpty())
+            pFormat->SetName(pDoc->GetUniqueFrameName(), false);
         pFormat->Add(pShape);
+    }
     pShape->m_bDescriptor = false;
 
     pPam.reset();