sw/source/core/doc/DocumentLayoutManager.cxx | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit 42770e9c231bec7cec383b4c0d6979b0d7a329ee
Author: Vasily Melenchuk <vasily.melenc...@cib.de>
AuthorDate: Thu Aug 20 12:06:03 2020 +0300
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Thu Aug 27 13:01:02 2020 +0200
tdf#133490: set name for pasted frame format
In some copy/paste operations resulting frame format name can
be empty. This can lead to problems with udo/redo which relies
on format names.
Change-Id: I3cb542321d37cc00e2dee83d0f667164d83ead78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101042
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit a6c2a87612a10d55fc59fa01e44d67d95505834f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101366
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx
b/sw/source/core/doc/DocumentLayoutManager.cxx
index 57f8af08920b..8d5cc79dc648 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -41,6 +41,7 @@
#include <pam.hxx>
#include <frameformats.hxx>
#include <com/sun/star/embed/EmbedStates.hpp>
+#include <svx/svdobj.hxx>
using namespace ::com::sun::star;
@@ -484,6 +485,14 @@ SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat(
pDestTextBox->SetOtherTextBoxFormat(pDest);
}
+ if (pDest->GetName().isEmpty())
+ {
+ // Format name should have unique name. Let's use object name as a
fallback
+ SdrObject *pObj = pDest->FindSdrObject();
+ if (pObj)
+ pDest->SetName(pObj->GetName());
+ }
+
return pDest;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
