Kaydet (Commit) 7f2e5c9a authored tarafından Noel Grandin's avatar Noel Grandin

m_bShowAllShapes in SdPageObjsTLV is dead

since
  commit c4a91f14
  Date:   Mon Feb 11 17:32:44 2019 +0000
  weld SdInsertPagesObjsDlg

Change-Id: I9644c492d02e930592fd568c15f2f87d12f4f038
Reviewed-on: https://gerrit.libreoffice.org/68386Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
Tested-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 4d502ef3
......@@ -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
......
......@@ -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;
}
......
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment