commit 2e8eee25cfbcfb2a46494d9b2ef81e65831201ed
author Michael Meeks <michael.meeks@collabora.com> Thu Apr 23 13:57:27 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Thu Apr 23 13:57:27 2015 +0100
tree 8e05c5ebded6edf7ba9fbdbe86c3e2848069c0cc
parent bd4388e4f92d77d34e63858f1d818379e9b077de

Kill unused LazyDeletor<Menu>.

Change-Id: Ibd1d27767b5679a3375d43851363de8c207a43ff

vcl/source/helper/lazydelete.cxx

diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx
index 45ea7e0..2594ad4 100644
--- a/vcl/source/helper/lazydelete.cxx
+++ b/vcl/source/helper/lazydelete.cxx
@@ -32,9 +32,8 @@ LazyDeletorBase::~LazyDeletorBase()
{
}

// instantiate instance pointers for LazyDeletor<Window,Menu>
// instantiate instance pointer for LazyDeletor<Window>
template<> LazyDeletor<vcl::Window>* LazyDeletor<vcl::Window>::s_pOneInstance = NULL;
template<> LazyDeletor<Menu>* LazyDeletor<Menu>::s_pOneInstance = NULL;

// a list for all LazyeDeletor<T> singletons
static std::vector< LazyDeletorBase* > lcl_aDeletors;
@@ -60,16 +59,6 @@ template<> bool LazyDeletor<vcl::Window>::is_less( vcl::Window* left, vcl::Windo
    return left != right && right->IsChild( left, true );
}

#ifndef LINUX
// specialized is_less function for Menu
template<> bool LazyDeletor<Menu>::is_less( Menu* left, Menu* right )
{
    while( left && left != right )
        left = left->ImplGetStartedFrom();
    return left != NULL;
}
#endif

DeleteOnDeinitBase::~DeleteOnDeinitBase()
{
    ImplSVData* pSVData = ImplGetSVData();

vcl/source/window/menu.cxx

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 40a2545..3de9d8d 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -133,9 +133,6 @@ Menu::Menu()

Menu::~Menu()
{

    vcl::LazyDeletor<Menu>::Undelete( this );

    ImplCallEventListeners( VCLEVENT_OBJECT_DYING, ITEMPOS_INVALID );

    // at the window free the reference to the accessible component