sw/source/core/unocore/unodraw.cxx | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 0b0de876bad66c84a8dd0d8d19944109e59cf21a
Author: Vasily Melenchuk <vasily.melenc...@cib.de>
AuthorDate: Tue May 5 15:47:44 2020 +0300
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Mon May 11 10:52:13 2020 +0200
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.behr...@cib.de>
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index a90358d43afb..9181ef940072 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
