sw/source/core/unocore/unodraw.cxx | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit a70f4724af04c8bf2d366bcaeb6aeffacc95b344
Author: Vasily Melenchuk <vasily.melenc...@cib.de>
AuthorDate: Thu Nov 21 20:12:52 2019 +0300
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Wed Jan 22 20:50:27 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.behr...@cib.de>
(cherry picked from commit c2d689790c332ffd2f0d73de6aae53f26f0fbe53)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87206
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 35d35b635ee0..65ba37f31739 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -709,8 +709,12 @@ void SwXDrawPage::add(const uno::Reference<
drawing::XShape > & xShape)
UnoActionContext aAction(pDoc);
pDoc->getIDocumentContentOperations().InsertDrawObj( *pTemp, *pObj, aSet );
SwFrameFormat* pFormat = ::FindFrameFormat( pObj );
- if(pFormat)
+ if (pFormat)
+ {
+ if (pFormat->GetName().isEmpty())
+ pFormat->SetName(pDoc->GetUniqueFrameName(), false);
pShape->SetFrameFormat(pFormat);
+ }
pShape->m_bDescriptor = false;
pPam.reset();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
