commit 0b0de876bad66c84a8dd0d8d19944109e59cf21a
author Vasily Melenchuk <vasily.melenchuk@cib.de> Tue May 05 15:47:44 2020 +0300
committer Thorsten Behrens <Thorsten.Behrens@CIB.de> Mon May 11 10:52:13 2020 +0200
tree 47fd990baf8cdea19e44a604d824ac819a9ce422
parent ea414f8f255d75e3be71c0d65731ff3f42f589ed

sw: set unique name for shape format even if shape name is empty

Change-Id: I26cc8ec7ec831286c7afa8e17b94e6c0a270cf20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93479
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

sw/source/core/unocore/unodraw.cxx

diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index a90358d..9181ef9 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -712,7 +712,16 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
    if (pFormat)
    {
        if (pFormat->GetName().isEmpty())
            pFormat->SetName(pSvxShape->GetSdrObject()->GetName(), false);
        {
            if (pSvxShape->GetSdrObject()->GetName().isEmpty())
            {
                pFormat->SetName(pDoc->GetUniqueShapeName(), false);
            }
            else
            {
                pFormat->SetName(pSvxShape->GetSdrObject()->GetName(), false);
            }
        }
        pShape->SetFrameFormat(pFormat);
    }
    pShape->m_bDescriptor = false;