[Libreoffice-commits] core.git: sw/source

[Vasily Melenchuk (via logerrit)]

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

New commits:
commit 6e2ed4ea934851f82611c3352b9551046fda89d0
Author:     Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Mon Jan 20 11:55:02 2020 +0300
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Mon Feb 3 14:44:43 2020 +0100

    sw: set unique name for fontwork object and style on insertion
    
    Unique name for fontwork is required to be displayed in Navigator pane,
    unique style name is important for correct undo/redo work.
    
    Change-Id: If633d0fda9bb98558a311dd1dd9324f9d6d04616
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87056
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 8137013ab109..da9be791b33b 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -935,6 +935,8 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj,
     }
     // insert drawing object into the document creating a new <SwDrawFrameFormat> instance
     SwDrawFrameFormat* pFormat = GetDoc()->getIDocumentContentOperations().InsertDrawObj( aPam, rDrawObj, rFlyAttrSet );
+    pFormat->SetName(GetDoc()->GetUniqueShapeName());
+    rDrawObj.SetName(pFormat->GetName());
 
     // move object to visible layer
     SwContact* pContact = static_cast<SwContact*>(rDrawObj.GetUserCall());