sw/source/core/doc/docdraw.cxx | 2 ++
sw/source/uibase/utlui/content.cxx | 17 +++++++++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
New commits:
commit 1c3e170d56d3cad1e7729f839fa63f607b62e4e3
Author: Jim Raykowski <rayk...@gmail.com>
AuthorDate: Sun Feb 28 17:10:12 2021 -0900
Commit: Jim Raykowski <rayk...@gmail.com>
CommitDate: Tue Mar 9 02:27:49 2021 +0100
tdf#140661 Give shapes names when ungrouping if they don't already have
Change-Id: I8242a697980e4f661a914998792ae9efdb090915
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111725
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <rayk...@gmail.com>
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index c070519cfbf9..4468e648a8a2 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -329,6 +329,8 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
// #i36010# - set layout direction of the position
pFormat->SetPositionLayoutDir(
text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
+ if (pSubObj->GetName().isEmpty())
+ pSubObj->SetName(pFormat->GetName());
pFormatsAndObjs[i].emplace_back( pFormat, pSubObj );
if( bUndo )
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index ea338a0a00e8..8371dd31c385 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3243,8 +3243,21 @@ void SwContentTree::UpdateTracking()
{
SdrObject* pSelected = pSdrView->GetMarkedObjectByIndex(0);
OUString aName(pSelected->GetName());
- lcl_SelectByContentTypeAndName(this, *m_xTreeView,
-
SwResId(STR_CONTENT_TYPE_DRAWOBJECT), aName);
+ if (!aName.isEmpty())
+ lcl_SelectByContentTypeAndName(this, *m_xTreeView,
+
SwResId(STR_CONTENT_TYPE_DRAWOBJECT), aName);
+ else
+ {
+ // clear treeview selections
+ m_xTreeView->unselect_all();
+ Select();
+ }
+ }
+ else
+ {
+ // clear treeview selections
+ m_xTreeView->unselect_all();
+ Select();
}
return;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
