#i107172#: remove unused code

6 files changed, 5 insertions, 54 deletions

diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index f8e3f9c7163a..599102464c79 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.hxx
@@ -40,7 +40,6 @@
 
 class ImageList;
 
-class SfxAcceleratorManager;
 class SfxBindings;
 class SfxObjectFactory;
 class ModalDialog;
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index cc525f4acd7d..880494057714 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -96,7 +96,6 @@ class Bitmap;
 class INetURLObject;
 class IndexBitSet;
 class SfxTopFrame;
-class SfxAcceleratorManager;
 class JobSetup;
 class Size;
 class Point;
@@ -798,7 +797,6 @@ public:
 
     // configuration items
     SAL_DLLPRIVATE SfxEventConfigItem_Impl* GetEventConfig_Impl( sal_Bool bForce=sal_False );
-    SAL_DLLPRIVATE SfxAcceleratorManager* GetAccMgr_Impl();
     SAL_DLLPRIVATE SfxToolBoxConfig* GetToolBoxConfig_Impl();
     SAL_DLLPRIVATE sal_uInt16 ImplGetSignatureState( sal_Bool bScriptingContent = FALSE );
 
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 6883f0976566..5273f1b27779 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -961,11 +961,8 @@ BOOL SfxObjectShell::Remove
         String aName(pMySheet->GetName());
         String aEmpty;
         SfxStyleFamily  eFamily = pMySheet->GetFamily();
-        if (pMySheet)
-        {
-            pMyPool->Remove(pMySheet);
-            bRet = TRUE;
-        }
+        pMyPool->Remove(pMySheet);
+        bRet = TRUE;
 
         SfxStyleSheetBase* pTestSheet = pMyPool->First();
         while (pTestSheet)
@@ -986,20 +983,10 @@ BOOL SfxObjectShell::Remove
 
             pTestSheet = pMyPool->Next();
         }
-        if(bRet)
-            SetModified( TRUE );
-    }
-/*
-    else if (nIdx1 == CONTENT_CONFIG)
-    {
-        if (GetConfigManager()->RemoveItem(nIdx2))
-        {
-            SetModified(TRUE);
-            bRet = TRUE;
-            SFX_APP()->GetDispatcher_Impl()->Update_Impl(TRUE);
-        }
+
+        SetModified( TRUE );
     }
-*/
+
     return bRet;
 }
 
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 91c0f605e453..bfcf8d9c20b8 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -190,7 +190,6 @@ TYPEINIT1(SfxObjectShell, SfxShell);
 //--------------------------------------------------------------------
 SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell )
 :mpObjectContainer(0)
-    ,pAccMgr(0)
     ,pCfgMgr( 0)
     ,pBasicManager( new SfxBasicManagerHolder )
     ,rDocShell( _rDocShell )
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index fed465c69986..bb35941d989e 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -59,13 +59,11 @@ struct MarkData_Impl
 
 class SfxFrame;
 class SfxToolBoxConfig;
-class SfxAcceleratorManager;
 class SfxBasicManagerHolder;
 
 struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
 {
     ::comphelper::EmbeddedObjectContainer* mpObjectContainer;
-    SfxAcceleratorManager*  pAccMgr;
     SfxConfigManager*   pCfgMgr;
     SfxBasicManagerHolder*
                         pBasicManager;
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 87f35805d1e7..b94b61e80326 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -1256,36 +1256,6 @@ String SfxVirtualMenu::GetItemHelpText( USHORT nSlotId ) const
 }
 
 //--------------------------------------------------------------------
-/*
-void SfxVirtualMenu::InvalidateKeyCodes()
-{
-    DBG_ASSERT( pSVMenu, "invalidating key of incomplete menu" );
-
-    SfxApplication* pSfxApp = SFX_APP();
-    SfxViewFrame *pViewFrame = pBindings->GetDispatcher()->GetFrame();
-    SfxAcceleratorManager* pAccMgr = pViewFrame->GetViewShell()->GetAccMgr_Impl();
-    SfxAcceleratorManager* pAppAccel = pSfxApp->GetAppAccel_Impl();
-    if ( !pAccMgr )
-        pAccMgr = pAppAccel;
-
-    for ( USHORT nPos = 0; nPos < pSVMenu->GetItemCount(); ++nPos )
-    {
-        USHORT nId = pSVMenu->GetItemId(nPos);
-        SfxVirtualMenu *pPopup = GetPopupMenu(nId);
-//        if ( pPopup )
-//            pPopup->InvalidateKeyCodes();
-//        else if ( nId )
-        if ( nId && !pSVMenu->GetPopupMenu( nId ) )
-        {
-            KeyCode aCode = pAccMgr->GetKeyCode( nId );
-            if ( !aCode.GetCode() && pAccMgr != pAppAccel )
-                aCode = pAppAccel->GetKeyCode( nId );
-            pSVMenu->SetAccelKey( nId, aCode );
-        }
-    }
-} */
-
-//--------------------------------------------------------------------
 
 // set the checkmark of the specified item