diff options
| -rw-r--r-- | compilerplugins/clang/unusedfields.readonly.results | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/sdtreelb.cxx | 28 | ||||
| -rw-r--r-- | sd/source/ui/inc/sdtreelb.hxx | 9 |
3 files changed, 9 insertions, 30 deletions
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results index 65d5c3ffa4ca..0c59f8d1e7cf 100644 --- a/compilerplugins/clang/unusedfields.readonly.results +++ b/compilerplugins/clang/unusedfields.readonly.results @@ -532,8 +532,6 @@ sd/source/core/CustomAnimationCloner.cxx:72 sd::CustomAnimationClonerImpl maCloneNodeVector std::vector<Reference<XAnimationNode> > sd/source/ui/inc/sdtreelb.hxx:309 SdPageObjsTLV m_bLinkableSelected _Bool -sd/source/ui/inc/sdtreelb.hxx:310 - SdPageObjsTLV m_bShowAllShapes _Bool sd/source/ui/sidebar/MasterPageContainer.cxx:152 sd::sidebar::MasterPageContainer::Implementation maLargePreviewBeingCreated class Image sd/source/ui/sidebar/MasterPageContainer.cxx:153 diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 50f571174508..2fa3dc9c4e42 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -1413,7 +1413,6 @@ SdPageObjsTLV::SdPageObjsTLV(std::unique_ptr<weld::TreeView> xTreeView) , m_pMedium(nullptr) , m_pOwnMedium(nullptr) , m_bLinkableSelected(false) - , m_bShowAllShapes(false) { m_xTreeView->connect_expanding(LINK(this, SdPageObjsTLV, RequestingChildrenHdl)); m_xTreeView->connect_changed(LINK(this, SdPageObjsTLV, SelectHdl)); @@ -1431,28 +1430,17 @@ IMPL_LINK_NOARG(SdPageObjsTLV, SelectHdl, weld::TreeView&, void) m_aChangeHdl.Call(*m_xTreeView); } -OUString SdPageObjsTLV::GetObjectName( - const SdrObject* pObject, - const bool bCreate) const +OUString SdPageObjsTLV::GetObjectName(const SdrObject* pObject) { - OUString aRet; + if ( !pObject ) + return OUString(); - if ( pObject ) - { - aRet = pObject->GetName(); + OUString aRet = pObject->GetName(); + if (!aRet.isEmpty()) + return aRet; - if (aRet.isEmpty() && dynamic_cast<const SdrOle2Obj* >(pObject) != nullptr) - aRet = static_cast< const SdrOle2Obj* >( pObject )->GetPersistName(); - } - - if (bCreate - && m_bShowAllShapes - && aRet.isEmpty() - && pObject!=nullptr) - { - aRet = SdResId(STR_NAVIGATOR_SHAPE_BASE_NAME); - aRet = aRet.replaceFirst("%1", OUString::number(pObject->GetOrdNum() + 1)); - } + if (auto pOle = dynamic_cast<const SdrOle2Obj* >(pObject)) + aRet = pOle->GetPersistName(); return aRet; } diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 41f45b1f0729..b954175c5d18 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -301,7 +301,6 @@ private: SfxMedium* m_pMedium; SfxMedium* m_pOwnMedium; bool m_bLinkableSelected; - bool m_bShowAllShapes; OUString m_aDocName; ::sd::DrawDocShellRef m_xBookmarkDocShRef; ///< for the loading of bookmarks Link<weld::TreeView&, void> m_aChangeHdl; @@ -314,14 +313,8 @@ private: @param pObject When this is NULL then an empty string is returned, regardless of the value of bCreate. - @param bCreate - This flag controls for objects without user supplied name - whether a name is created. When a name is created then this - name is not stored in the object. */ - OUString GetObjectName ( - const SdrObject* pObject, - const bool bCreate = true) const; + static OUString GetObjectName (const SdrObject* pObject); void CloseBookmarkDoc(); |