[Libreoffice-commits] core.git: include/sfx2 sfx2/source unusedcode.easy

[Caolán McNamara]

 include/sfx2/mnuitem.hxx     |    2 +-
 sfx2/source/menu/mnuitem.cxx |    5 ++++-
 unusedcode.easy              |    1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 888e154dba0d0de2539e44029f022dbf963a6029
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 20 10:13:40 2015 +0100

    drop unused -SfxAppMenuControl_Impl::RegisterControl
    
    Change-Id: I2f9d151449d5f58cd553f28b98c2aabfbb204dd6

diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx
index 0ddfe02..065b6c9 100644
--- a/include/sfx2/mnuitem.hxx
+++ b/include/sfx2/mnuitem.hxx
@@ -130,7 +130,7 @@ protected:
     DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
 
 public:
-    SFX_DECL_MENU_CONTROL();
+    static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings );
     SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings );
     virtual ~SfxAppMenuControl_Impl();
 
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index ea660ab..cb7fd05 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -301,7 +301,10 @@ PopupMenu* SfxMenuControl::GetPopup () const
 
 sal_IntPtr Select_Impl( void* pHdl, void* pVoid );
 
-SFX_IMPL_MENU_CONTROL( SfxAppMenuControl_Impl, SfxStringItem );
+SfxMenuControl* SfxAppMenuControl_Impl::CreateImpl(sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings)
+{
+    return new SfxAppMenuControl_Impl(nId, rMenu, rBindings);
+}
 
 SfxAppMenuControl_Impl::SfxAppMenuControl_Impl(
     sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings )
diff --git a/unusedcode.easy b/unusedcode.easy
index 5914c9c..2d475ea 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -33,7 +33,6 @@ ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
 ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
 SdrUndoObjList::SetOrdNum(unsigned int)
 SecurityEnvironment_NssImpl::getCertificate(rtl::OUString const&, rtl::OUString const&)
-SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
 StylePool::getCount() const
 StyleSettings::SetAlternatingRowColor(Color const&)
 StyleSettings::SetCursorSize(long)