callcatcher: update unused code

Change-Id: I8563922204d3ec93bf138cbd1aaba620c0215bf7

4 files changed, 3 insertions, 97 deletions

diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 7c56da1df5b1..c3daef0afe64 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -301,93 +301,6 @@ PopupMenu* SfxMenuControl::GetPopup () const
 
 sal_IntPtr Select_Impl( void* pHdl, void* pVoid );
 
-SfxAppMenuControl_Impl::SfxAppMenuControl_Impl(
-    sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings )
-    : SfxMenuControl( nPos, rBindings ), pMenu(0)
-{
-    // Determine the current background color setting for menus
-    const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    m_sIconTheme         = rSettings.DetermineIconTheme();
-    m_bShowMenuImages    = rSettings.GetUseImagesInMenus();
-
-    ::framework::MenuConfiguration aConf( ::comphelper::getProcessComponentContext() );
-    Reference<com::sun::star::frame::XFrame> aXFrame( GetBindings().GetDispatcher_Impl()->GetFrame()->GetFrame().GetFrameInterface() );
-    pMenu = aConf.CreateBookmarkMenu( aXFrame, GetId() == SID_NEWDOCDIRECT ? OUString(BOOKMARK_NEWMENU) : OUString(BOOKMARK_WIZARDMENU) );
-    if( pMenu )
-    {
-        pMenu->SetSelectHdl( Link<>( &(this->GetBindings()), Select_Impl ) );
-        pMenu->SetActivateHdl( LINK(this, SfxAppMenuControl_Impl, Activate) );
-        rMenu.SetPopupMenu( nPos, pMenu );
-    }
-}
-
-SfxAppMenuControl_Impl::~SfxAppMenuControl_Impl()
-{
-    delete pMenu;
-}
-
-IMPL_LINK_TYPED( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu, bool )
-{
-    if ( pActMenu )
-    {
-        const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-        OUString sIconTheme = rSettings.DetermineIconTheme();
-        bool bShowMenuImages = rSettings.GetUseImagesInMenus();
-
-        if (( sIconTheme != m_sIconTheme ) ||
-            ( bShowMenuImages != m_bShowMenuImages ))
-        {
-            m_sIconTheme        = sIconTheme;
-            m_bShowMenuImages   = bShowMenuImages;
-
-            sal_uInt16 nCount = pActMenu->GetItemCount();
-            for ( sal_uInt16 nSVPos = 0; nSVPos < nCount; nSVPos++ )
-            {
-                sal_uInt16 nItemId = pActMenu->GetItemId( nSVPos );
-                if ( pActMenu->GetItemType( nSVPos ) != MenuItemType::SEPARATOR )
-                {
-                    if ( bShowMenuImages )
-                    {
-                        bool        bImageSet = false;
-                        OUString aImageId;
-                        ::framework::MenuAttributes* pMenuAttributes =
-                            reinterpret_cast< ::framework::MenuAttributes*>(pMenu->GetUserValue( nItemId ));
-
-                        if ( pMenuAttributes )
-                            aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
-
-                        if ( aImageId.getLength() > 0 )
-                        {
-                            Reference< ::com::sun::star::frame::XFrame > xFrame;
-                            Image aImage = GetImage( xFrame, aImageId, false );
-                            if ( !!aImage )
-                            {
-                                bImageSet = true;
-                                pActMenu->SetItemImage( nItemId, aImage );
-                            }
-                        }
-
-                        OUString aCmd( pActMenu->GetItemCommand( nItemId ) );
-                        if ( !bImageSet && !aCmd.isEmpty() )
-                        {
-                            Image aImage = SvFileInformationManager::GetImage(
-                                INetURLObject(aCmd), false );
-                            if ( !!aImage )
-                                pActMenu->SetItemImage( nItemId, aImage );
-                        }
-                    }
-                    else
-                        pActMenu->SetItemImage( nItemId, Image() );
-                }
-            }
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
 SfxUnoMenuControl* SfxMenuControl::CreateControl( const OUString& rCmd,
         sal_uInt16 nId, Menu& rMenu, const OUString& sItemText,
         SfxBindings& rBindings, SfxVirtualMenu* pVirt)
@@ -447,17 +360,17 @@ sal_IntPtr Select_Impl( void* /*pHdl*/, void* pVoid )
 
     if ( xDisp.is() )
     {
-        SfxAppMenuControl_Impl::ExecuteInfo* pExecuteInfo = new SfxAppMenuControl_Impl::ExecuteInfo;
+        ExecuteInfo* pExecuteInfo = new ExecuteInfo;
         pExecuteInfo->xDispatch     = xDisp;
         pExecuteInfo->aTargetURL    = aTargetURL;
         pExecuteInfo->aArgs         = Sequence< PropertyValue >();
-        Application::PostUserEvent( LINK( 0, SfxAppMenuControl_Impl, ExecuteHdl_Impl), pExecuteInfo );
+        Application::PostUserEvent( LINK( 0, ExecuteInfo, ExecuteHdl_Impl), pExecuteInfo );
     }
 
     return sal_IntPtr(true);
 }
 
-IMPL_STATIC_LINK_NOINSTANCE( SfxAppMenuControl_Impl, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )
+IMPL_STATIC_LINK_NOINSTANCE( ExecuteInfo, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )
 {
     pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs );
     delete pExecuteInfo;
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 633def05fb43..fe68160173a4 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -302,11 +302,6 @@ void Deck::PrintWindowSubTree (vcl::Window* pRoot, int nIndentation)
         PrintWindowSubTree(pRoot->GetChild(nIndex), nIndentation+1);
 }
 
-void Deck::PrintWindowTree()
-{
-    PrintWindowSubTree(this, 0);
-}
-
 IMPL_LINK(Deck, HandleVerticalScrollBarChange,void*, EMPTYARG)
 {
     const sal_Int32 nYOffset (-mpVerticalScrollBar->GetThumbPos());
diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx
index 9da5a2557762..5db17296aed5 100644
--- a/sfx2/source/sidebar/Deck.hxx
+++ b/sfx2/source/sidebar/Deck.hxx
@@ -67,7 +67,6 @@ public:
     virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE;
     virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE;
 
-    void PrintWindowTree();
     static void PrintWindowSubTree (vcl::Window* pRoot, int nIndentation);
 
     sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; }
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 690d6f913eff..d71718e3db68 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -204,7 +204,6 @@ void SAL_CALL SidebarController::disposing()
     if (mpCurrentDeck)
     {
         mpCurrentDeck.disposeAndClear();
-//        mpCurrentDeck->PrintWindowTree();
     }
 
     mpTabBar.disposeAndClear();