sw/source/core/frmedt/feshview.cxx | 2 +- sw/source/core/unocore/unodraw.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit db8fdf20fbbb22e0510f0500140bbf7a3b2642f7 Author: Vasily Melenchuk <vasily.melenc...@cib.de> AuthorDate: Mon Jan 13 10:29:28 2020 +0100 Commit: Thorsten Behrens <thorsten.behr...@cib.de> CommitDate: Wed Jan 22 10:34:01 2020 +0100 tdf#129382: sw: assign names to shape object styles Empty style names for drawing object will cause problems with udo/redo which right now refers style names instead of style pointers. Change-Id: If2266f1db04c624dbfdd716b5599d5f6cbb5371e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86520 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de> diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 93f82fb4cbde..d56a4a0a72d4 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -2080,7 +2080,7 @@ bool SwFEShell::ImpEndCreate() text::PositionLayoutDir::PositionInLayoutDirOfAnchor ); // #i44344#, #i44681# - positioning attributes already set pFormat->PosAttrSet(); - pFormat->SetName(GetUniqueShapeName()); + pFormat->SetName(rSdrObj.GetName()); SwDrawContact *pContact = new SwDrawContact( pFormat, &rSdrObj ); // #i35635# diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 492faee1582e..3b911846e66c 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -711,7 +711,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape) if (pFormat) { if (pFormat->GetName().isEmpty()) - pFormat->SetName(pDoc->GetUniqueFrameName(), false); + 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