partial revert of unused code removal, and add LINUX guards

sfx2/inc/sfx2/mnuitem.hxx

@@ -56,6 +56,7 @@ public:
                             SfxMenuControl( sal_uInt16, SfxBindings&);
 
     static SfxMenuControl*  CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings );
+    static void             RegisterControl( sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL );
 
                             ~SfxMenuControl();
 

sfx2/source/menu/mnuitem.cxx

@@ -246,6 +246,14 @@ SfxMenuControl* SfxMenuControl::CreateImpl( sal_uInt16 /*nId*/, Menu& /*rMenu*/,
     return new SfxMenuControl( sal_True );
 }
 
+#ifndef LINUX
+void SfxMenuControl::RegisterControl( sal_uInt16 nSlotId, SfxModule *pMod )
+{
+    RegisterMenuControl( pMod, new SfxMenuCtrlFactory(
+                SfxMenuControl::CreateImpl, TYPE(SfxStringItem), nSlotId ) );
+}
+#endif
+
 //--------------------------------------------------------------------
 void SfxMenuControl::RegisterMenuControl(SfxModule* pMod, SfxMenuCtrlFactory* pFact)
 {

vcl/source/helper/lazydelete.cxx

@@ -70,6 +70,16 @@ template<> bool LazyDeletor<Window>::is_less( Window* left, Window* right )
     return (left != right && right->IsChild( left, sal_True )) ? true : false;
 }
 
+#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();