loplugin:constantfunction: sfx2

Change-Id: I7b4c18b1f9644048f506fc1b1d1fb8c8c590ea7f

51 files changed, 18 insertions, 427 deletions

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 56bea9be35ed..3977dea8f0c4 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -121,8 +121,6 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
     DECL_DLLPRIVATE_LINK(       GlobalBasicErrorHdl_Impl, StarBASIC* );
 
     static SfxApplication*      Create();
-    void                        Init();
-    void                        Exit();
     void                        SettingsChange( sal_uInt16, const AppSettings & );
     void                        Quit();
     void                        Deinitialize();
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 8137027a9055..a74b236a3f63 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -143,7 +143,6 @@ public:
     FloatingWindow*     GetFloatingWindow() const;
 
     virtual void        Resizing( Size& rSize );
-    bool                Close();
     static void         RegisterChildWindowContext(SfxModule*, sal_uInt16, SfxChildWinContextFactory*);
 };
 
diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx
index 63648c7fea1a..aa38dc0e54b9 100644
--- a/include/sfx2/ctrlitem.hxx
+++ b/include/sfx2/ctrlitem.hxx
@@ -72,7 +72,6 @@ public:
 
     virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                       const SfxPoolItem* pState );
-    void                DeleteFloatingWindow();
 
     SfxMapUnit          GetCoreMetric() const;
 
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 9f2354cf0cdd..57f256707658 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -103,7 +103,6 @@ public:
     void                SetMinOutputSizePixel( const Size& rSize );
     Size                GetMinOutputSizePixel() const;
     virtual bool        Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
-    void                FadeIn( bool );
     DECL_LINK(TimerHdl, void *);
 
     SAL_DLLPRIVATE void Initialize_Impl();
diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx
index 0d01210c8e9c..0bbec0875479 100644
--- a/include/sfx2/doctempl.hxx
+++ b/include/sfx2/doctempl.hxx
@@ -56,7 +56,6 @@ public:
                         ~SfxDocumentTemplates();
 
     bool                IsConstructed() { return pImp != NULL; }
-    void                Construct();
 
     const SfxDocumentTemplates &operator=(const SfxDocumentTemplates &);
 
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 44ad2db0c78b..fcd6c46c748b 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -150,16 +150,15 @@ public:
     SAL_DLLPRIVATE SfxFrame* GetContainingDocFrame_Impl( SfxFrame* pSelf );
     void                UpdateDescriptor( SfxObjectShell *pDoc );
     void                Resize();
-    bool                HasComponent() const;
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >
-                            GetComponent() const;
+                        GetComponent() const;
     void                ReleaseComponent();
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
-                            GetFrameInterface() const;
+                        GetFrameInterface() const;
     void                Appear();
     void                AppearWithUpdate();
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
-                            GetController() const;
+                        GetController() const;
 
     bool                IsInPlace() const;
 
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index b3646bcdbb94..4c30e4f2cac4 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -67,7 +67,7 @@ public:
 
 private:
     /// SfxInterface initializer.
-    static void InitInterface_Impl();
+    static void InitInterface_Impl() {}
 
 public:
 
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 1eda88cbf7ad..c1361ce9241a 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -403,12 +403,10 @@ public:
 
     static sal_uInt32           HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDoc );
 
-    void                        ViewAssigned();
     virtual bool                PrepareClose(bool bUI = true);
     virtual bool                IsInformationLost();
     virtual sal_uInt16          GetHiddenInformationState( sal_uInt16 nStates );
     sal_Int16                   QueryHiddenInformation( HiddenWarningFact eFact, vcl::Window* pParent );
-    bool                        HasSecurityOptOpenReadOnly() const;
     bool                        IsSecurityOptOpenReadOnly() const;
     void                        SetSecurityOptOpenReadOnly( bool bOpenReadOnly = true );
 
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index a691b6a44e3d..7679eec6e527 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -378,31 +378,6 @@ public:
     virtual void                Deactivate(bool bMDI);
 
     /**
-        A parent of the <SfxDispatcher> on which the SfxShell is located, has
-        become active, or the SfxShell instance was pushed on a <SfxDispatcher>,
-        which parent is active.
-
-        The base implementation is empty and does not need to be called.
-
-        [Cross-reference]
-
-        SfxShell::Activate()
-        */
-    void                        ParentActivate();
-
-    /**
-        The active parent of the <SfxDispatcher> on which the SfxShell is located,
-        has been disabled.
-
-        The base implementation is empty and does not need to be called.
-
-        [Cross-reference]
-
-        SfxShell::Deactivate()
-        */
-    void                        ParentDeactivate();
-
-    /**
         This method returns a pointer to the <SfxDispatcher>, when the SfxShell
         is currently <UI-active> or a NULL-pointer if it is not UI-active.
 
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index f5e146c64dc8..835fcff98b46 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -98,7 +98,6 @@ protected:
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     virtual void    Click();
-    void            DoubleClick();
     virtual void    Command( const CommandEvent& rCEvt );
     virtual bool    MouseButtonDown( const MouseEvent & );
     virtual bool    MouseMove( const MouseEvent & );
@@ -114,8 +113,6 @@ public:
     sal_uInt16      GetSlotId() const { return nSlotId; }
     sal_uInt16      GetId() const { return nId; }
     StatusBar&      GetStatusBar() const { return *pBar; }
-    void            CaptureMouse();
-    void            ReleaseMouse();
 
     static SfxStatusBarControl* CreateControl( sal_uInt16 nSlotID, sal_uInt16 nId, StatusBar *pBar, SfxModule* );
     static void RegisterStatusBarControl(SfxModule*, SfxStbCtrlFactory*);
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 42cea7201da8..d751e6307862 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -175,8 +175,6 @@ public:
     virtual ErrCode             DoVerb(long nVerb);
 
     void                        OutplaceActivated( bool bActive, SfxInPlaceClient* pClient );
-    void                        InplaceActivating( SfxInPlaceClient* pClient );
-    void                        InplaceDeactivated( SfxInPlaceClient* pClient );
     virtual void                UIActivating( SfxInPlaceClient* pClient );
     virtual void                UIDeactivated( SfxInPlaceClient* pClient );
 
@@ -190,7 +188,6 @@ public:
      * has been set.  By the time this is called the document has been fully
      * imported.
      */
-    void                        Initialize();
     virtual bool                PrepareClose( bool bUI = true );
     virtual OUString            GetSelectionText( bool bCompleteWords = false );
     virtual bool                HasSelection( bool bText = true ) const;
@@ -205,8 +202,6 @@ public:
     virtual const SfxShell*     GetFormShell() const { return 0; };
 
     // Focus, KeyInput, Cursor
-    void                        GotFocus() const;
-    inline void                 LostFocus() const;
     virtual void                ShowCursor( bool bOn = true );
     virtual bool                KeyInput( const KeyEvent &rKeyEvent );
     bool                        Escape();
@@ -310,27 +305,6 @@ public:
 
 
 
-inline void SfxViewShell::LostFocus() const
-
-/*  [Description]
-
-    This method has to be  called by the application developer, if the edit
-    window has lost the focus. The SFx has for example the ability to turn off
-    the accelerator, so that the cursor keys, the Delete button, etc. work in
-    certain Floating-Windows, even though they are redefined by the
-    Accelerator.
-
-    [Note]
-
-    <StarView> unfortunately does not provide the possibility to define
-    such events 'from the side'.
-*/
-
-{
-}
-
-
-
 inline SfxViewFrame* SfxViewShell::GetViewFrame() const
 
 /*  [Description]
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 13ce217a0163..3bbe8b8f6503 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4720,7 +4720,6 @@ void ScGridWindow::ShowCursor()
 void ScGridWindow::GetFocus()
 {
     ScTabViewShell* pViewShell = pViewData->GetViewShell();
-    pViewShell->GotFocus();
     pViewShell->SetFormShellAtTop( false );     // focus in GridWindow -> FormShell no longer on top
 
     if (pViewShell->HasAccessibilityObjects())
@@ -4742,7 +4741,6 @@ void ScGridWindow::GetFocus()
 void ScGridWindow::LoseFocus()
 {
     ScTabViewShell* pViewShell = pViewData->GetViewShell();
-    pViewShell->LostFocus();
 
     if (pViewShell->HasAccessibilityObjects())
         pViewShell->BroadcastAccessibility(ScAccGridWinFocusLostHint(eWhich, GetAccessible()));
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index 9f6705295432..494cd21d9d64 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -104,7 +104,6 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt )
         if( !pDoc )
             return;
 
-        CaptureMouse();
         SdTemplatePopup_Impl aPop;
         {
             const sal_uInt16 nMasterCount = pDoc->GetMasterSdPageCount(PK_STANDARD);
@@ -128,8 +127,6 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt )
                 pViewFrame->GetBindings().Invalidate(SID_STATUS_LAYOUT);
             }
         }
-
-        ReleaseMouse();
     }
 }
 
diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index e8847462ef03..79a6981088c8 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -51,15 +51,9 @@ public:
     BitSet operator^( sal_uInt16 nBit ) const;
     BitSet& operator^=( const BitSet& rSet );
     BitSet& operator^=( sal_uInt16 nBit );
-    bool IsRealSubSet( const BitSet& rSet ) const;
-    bool IsSubSet( const BitSet& rSet ) const;
-    bool IsRealSuperSet( const BitSet& rSet ) const;
     bool Contains( sal_uInt16 nBit ) const;
-    bool IsSuperSet( const BitSet& rSet ) const;
     bool operator==( const BitSet& rSet ) const;
-    bool operator==( sal_uInt16 nBit ) const;
     bool operator!=( const BitSet& rSet ) const;
-    bool operator!=( sal_uInt16 nBit ) const;
 
 };
 
@@ -144,48 +138,12 @@ inline BitSet& BitSet::operator^=( sal_uInt16 )
 }
 #endif
 
-// determines if the other bitset is a real superset
-inline bool BitSet::IsRealSubSet( const BitSet& ) const
-{
-    return false;
-}
-
-// determines if the other bitset is a superset or equal
-inline bool BitSet::IsSubSet( const BitSet& ) const
-{
-    return false;
-}
-
-// determines if the other bitset is a real subset
-inline bool BitSet::IsRealSuperSet( const BitSet& ) const
-{
-    return false;
-}
-
-// determines if the other bitset is a subset or equal
-inline bool BitSet::IsSuperSet( const BitSet& ) const
-{
-    return false;
-}
-
-// determines if the bit is the only one in the bitset
-inline bool BitSet::operator==( sal_uInt16 ) const
-{
-    return false;
-}
-
 // determines if the bitsets aren't equal
 inline bool BitSet::operator!=( const BitSet& rSet ) const
 {
     return !( *this == rSet );
 }
 
-// determines if the bitset doesn't contain only this bit
-inline bool BitSet::operator!=( sal_uInt16 nBit ) const
-{
-    return !( *this == nBit );
-}
-
 class IndexBitSet : BitSet
 {
 public:
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 270ef7aa28a7..28a709f707cd 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -258,7 +258,6 @@ bool SfxApplication::Initialize_Impl()
 
     // Subklasse initialisieren
     pAppData_Impl->bDowning = false;
-    Init();
 
     // get CHAOS item pool...
     pAppData_Impl->pPool = NoChaos::GetItemPool();
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 9f97c007a489..8bbd1974e971 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -46,52 +46,6 @@
 TYPEINIT2(SfxApplication,SfxShell,SfxBroadcaster);
 
 
-void SfxApplication::Init
-(
-)
-
-/*  [Description]
-
-    This virtual method is called from SFx through Application::Main(),
-    before Execute() is called and:
-    - the Intro is already displayed,
-    - the Applications window exists, but it is still hidden,
-    - the Bindings already exist (Controller can be registered),
-    - the Init and Config-Manager already exists,
-    - the Standard-Controller already exists,
-    - the SFx-Shells have alredy registered their Interfaces.
-
-    [Cross-reference]
-
-    <SfxApplication::Exit()>
-    <SfxApplication::OpenClients()>
-*/
-{
-}
-
-
-
-void SfxApplication::Exit()
-
-/*  [Description]
-
-    This virtual method is called from SFx through Application::Main(),
-    after Execute() has finished and
-    - the configuration (SfxConfigManager) was already saved,
-    - the window positions etc. in the SfxIniManager were written,
-    - the Application window still exists, but is hidden
-    - all Documents and their Views already are closed.
-    - Dispatcher, Bindings etc. already destroyed.
-
-    [Cross-reference]
-    <SfxApplication::Init(int,char*[])>
-*/
-
-{
-}
-
-
-
 SfxFilterMatcher& SfxApplication::GetFilterMatcher()
 {
     if( !pAppData_Impl->pMatcher )
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 5983cfc3fc4a..e49675d7f4a9 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -90,9 +90,6 @@ void SfxApplication::Deinitialize()
     pAppData_Impl->bDowning = true;
     pAppData_Impl->pAppDispat->DoDeactivate_Impl( true, NULL );
 
-    // call derived application-exit
-    Exit();
-
     // Release Controller and others
     // then the remaining components should also disappear ( Beamer! )
 
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 90f5e428aa77..6e19bb762b83 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -543,11 +543,6 @@ void SfxChildWindowContext::Resizing( Size& )
 {
 }
 
-bool SfxChildWindowContext::Close()
-{
-    return true;
-}
-
 void SfxChildWindow::SetFactory_Impl( SfxChildWinFactory *pF )
 {
     pImp->pFact = pF;
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index c58c2d8128f3..7ea881fa76a8 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -136,10 +136,6 @@ TYPEINIT1(SfxModule, SfxShell);
 
 SFX_IMPL_SUPERCLASS_INTERFACE(SfxModule, SfxShell)
 
-void SfxModule::InitInterface_Impl()
-{
-}
-
 ResMgr* SfxModule::GetResMgr()
 {
     return pResMgr;
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 9b22f4e7857e..b002aabcefb6 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -300,9 +300,6 @@ void SfxBindings::DeleteControllers_Impl()
         SfxStateCache *pCache = (*pImp->pCaches)[nCache];
         sal_uInt16 nSlotId = pCache->GetId();
 
-        // Delete SfxPopupWindow
-        pCache->DeleteFloatingWindows();
-
         // Re-align, because the cache may have been reduced
         sal_uInt16 nNewCount = pImp->pCaches->size();
         if ( nNewCount < nCount )
@@ -385,8 +382,6 @@ void SfxBindings::HidePopupCtrls_Impl( bool bHide )
         pImp->ePopupAction = SFX_POPUP_SHOW;
     }
 
-    for(SfxStateCacheArr_Impl::const_iterator it = pImp->pCaches->begin(); it != pImp->pCaches->end(); ++it)
-        (*it)->DeleteFloatingWindows();
     pImp->ePopupAction = SFX_POPUP_DELETE;
 }
 
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index c602e443b457..c1fa1624daa5 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -260,12 +260,6 @@ void SfxControllerItem::StateChanged
 
 
 
-void SfxControllerItem::DeleteFloatingWindow()
-{
-}
-
-
-
 void SfxStatusForwarder::StateChanged
 (
     sal_uInt16          nSID,    // <SID> of the triggering slot
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 16cca9d30ea2..bf6e77f738f7 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -692,8 +692,6 @@ void SfxDispatcher::DoActivate_Impl(bool bMDI, SfxViewFrame* /* pOld */)
 
 void SfxDispatcher::DoParentActivate_Impl()
 {
-    for ( int i = int(xImp->aStack.size()) - 1; i >= 0; --i )
-        (*(xImp->aStack.rbegin() + i ))->ParentActivate();
 }
 
 /** This method controls the deactivation of a dispatcher.
@@ -775,8 +773,6 @@ void SfxDispatcher::DoDeactivate_Impl(bool bMDI, SfxViewFrame* pNew)
 
 void SfxDispatcher::DoParentDeactivate_Impl()
 {
-    for ( int i = int(xImp->aStack.size()) - 1; i >= 0; --i )
-        (*(xImp->aStack.rbegin() + i))->ParentDeactivate();
 }
 
 /** This method searches in SfxDispatcher after <SfxShell> , from the Slot Id
@@ -1658,22 +1654,7 @@ bool SfxDispatcher::_TryIntercept_Impl
     sal_uInt16 nLevels = xImp->aStack.size();
     while ( pParent && pParent->xImp->pFrame )
     {
-        if ( pParent->xImp->pFrame->GetFrame().HasComponent() )
-        {
-            // Components may be intercepted
-            if ( pParent->_TryIntercept_Impl( nSlot, rServer, true ) )
-            {
-                // The own shells are added to the Shell Level
-                rServer.SetShellLevel( rServer.GetShellLevel() + nLevels );
-                return true;
-            }
-            else
-                // No further Interception
-                break;
-        }
-        else
-            nLevels = nLevels + pParent->xImp->aStack.size();
-
+        nLevels = nLevels + pParent->xImp->aStack.size();
         pParent = pParent->xImp->pParent;
     }
 
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 3d28d8045396..b055444c1808 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -395,18 +395,6 @@ void SfxShell::Deactivate
     BroadcastContextForActivation(false);
 }
 
-void SfxShell::ParentActivate
-(
-)
-{
-}
-
-void SfxShell::ParentDeactivate
-(
-)
-{
-}
-
 bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
 {
     // Get Slot status
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 9a679e66853a..553cf4a1b645 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -478,19 +478,6 @@ void SfxStateCache::SetCachedState( bool bAlways )
 
 
 
-// Destroy FloatingWindows in all Controls with this Id
-
-void SfxStateCache::DeleteFloatingWindows()
-{
-
-    SfxControllerItem *pNextCtrl=0;
-    for ( SfxControllerItem *pCtrl=pController; pCtrl; pCtrl=pNextCtrl )
-    {
-        pNextCtrl = pCtrl->GetItemLink();
-        pCtrl->DeleteFloatingWindow();
-    }
-}
-
 ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >  SfxStateCache::GetDispatch() const
 {
     if ( pDispatch )
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 45bd65e95774..d355efacaba5 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -241,16 +241,6 @@ void SfxUnoControllerItem::GetNewDispatch()
         // parent may intercept
         xDisp = TryGetDispatch( pParent );
 
-    // only components may intercept
-    if ( !xDisp.is() && pFrame->HasComponent() )
-    {
-        // no interception
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame = pFrame->GetFrameInterface();
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >  xProv( xFrame, ::com::sun::star::uno::UNO_QUERY );
-        if ( xProv.is() )
-            xDisp = xProv->queryDispatch( aCommand, OUString(), 0 );
-    }
-
     return xDisp;
 }
 
@@ -611,7 +601,6 @@ class UsageInfo {
 public:
     UsageInfo()
     {
-        load();
     }
 
     ~UsageInfo()
@@ -622,9 +611,6 @@ public:
     /// Increment command's use.
     void increment(const OUString &rCommand);
 
-    /// Load the usage data from the previous session.
-    void load();
-
     /// Save the usage data for the next session.
     void save();
 };
@@ -639,11 +625,6 @@ void UsageInfo::increment(const OUString &rCommand)
         maUsage[rCommand] = 1;
 }
 
-void UsageInfo::load()
-{
-    // TODO - do the real loading here
-}
-
 void UsageInfo::save()
 {
     if (!officecfg::Office::Common::Misc::CollectUsageInformation::get())
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 5e21f99bdce8..bc0a3bf83774 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1900,10 +1900,6 @@ void SfxDockingWindow::AutoShow_Impl( bool bShow )
     }
 }
 
-void SfxDockingWindow::FadeIn( bool /*bFadeIn*/ )
-{
-}
-
 void SfxDockingWindow::StateChanged( StateChangedType nStateChange )
 {
     if ( nStateChange == StateChangedType::INITSHOW )
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index eb3c76e97ba9..bee29462f5ee 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -77,12 +77,8 @@ void SfxNavigator::Resizing( Size &rSize )
 
 bool SfxNavigator::Close()
 {
-    SfxChildWindowContext *pCon = GetChildWindow_Impl()->GetContext_Impl();
-    DBG_ASSERT( pCon, "No Context!" );
-    if ( !pCon || pCon->Close() )
-        return SfxDockingWindow::Close();
-    else
-        return false;
+    DBG_ASSERT( GetChildWindow_Impl()->GetContext_Impl(), "No Context!" );
+    return SfxDockingWindow::Close();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index af2c2a419818..b3fcb3dd50ca 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -226,8 +226,7 @@ bool SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & )
 
         // open read-only?
         const bool bDoOpenReadonly = m_pOpenReadonlyCB->IsChecked();
-        if (pCurDocShell->HasSecurityOptOpenReadOnly() &&
-            bDoOpenReadonly != pCurDocShell->IsSecurityOptOpenReadOnly())
+        if (bDoOpenReadonly != pCurDocShell->IsSecurityOptOpenReadOnly())
         {
             pCurDocShell->SetSecurityOptOpenReadOnly( bDoOpenReadonly );
             bModified = true;
@@ -269,7 +268,7 @@ void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & )
         }
 
         bool bIsReadonly = pCurDocShell->IsReadOnly();
-        if (pCurDocShell->HasSecurityOptOpenReadOnly() && !bIsHTMLDoc)
+        if (!bIsHTMLDoc)
         {
             m_pOpenReadonlyCB->Check( pCurDocShell->IsSecurityOptOpenReadOnly() );
             m_pOpenReadonlyCB->Enable( !bIsReadonly );
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index ca6f7be22812..9270710ae285 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -156,7 +156,6 @@ void SfxEmptySplitWin_Impl::FadeIn()
     if (!bAutoHide )
         bAutoHide = IsFadeNoButtonMode();
     pOwner->SetFadeIn_Impl( true );
-    pOwner->Show_Impl();
     if ( bAutoHide )
     {
         // Set Timer to close; the caller has to ensure themselves that the
@@ -1225,7 +1224,6 @@ void SfxSplitWindow::FadeOut_Impl()
     }
 
     SetFadeIn_Impl( false );
-    Show_Impl();
 }
 
 void SfxSplitWindow::FadeOut()
@@ -1237,18 +1235,6 @@ void SfxSplitWindow::FadeOut()
 void SfxSplitWindow::FadeIn()
 {
     SetFadeIn_Impl( true );
-    Show_Impl();
-}
-
-void SfxSplitWindow::Show_Impl()
-{
-    sal_uInt16 nCount = pDockArr->size();
-    for ( sal_uInt16 n=0; n<nCount; n++ )
-    {
-        const SfxDock_Impl& rDock = (*pDockArr)[n];
-        if ( rDock.pWin )
-            rDock.pWin->FadeIn( pEmptyWin->bFadeIn );
-    }
 }
 
 bool SfxSplitWindow::ActivateNextChild_Impl( bool bForward )
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 70f8c977880d..7d0bea97a369 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1941,7 +1941,6 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
             for (; it != itEnd; ++it)
             {
                 const OUString aTemplName(pTreeBox ? pTreeBox->GetEntryText(*it) : aFmtLb.GetEntryText(*it));
-                PrepareDeleteAction();
                 bDontUpdate = true; // To prevent the Treelistbox to shut down while deleting
                 Execute_Impl( SID_STYLE_DELETE, aTemplName,
                               OUString(), (sal_uInt16)GetFamilyItem_Impl()->GetFamily() );
@@ -2154,12 +2153,6 @@ void SfxCommonTemplateDialog_Impl::EnableExample_Impl(sal_uInt16 nId, bool bEnab
     EnableItem(nId, bEnable);
 }
 
-void SfxCommonTemplateDialog_Impl::PrepareDeleteAction()
-{
-}
-
-
-
 PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void )
 {
     if ( bBindingUpdate )
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 0af4abec2be4..d8f6cf22156f 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -1240,15 +1240,6 @@ SfxDocumentTemplates::SfxDocumentTemplates()
 
 
 
-void SfxDocumentTemplates::Construct()
-
-//  Delayed build-up of administrative data
-
-{
-}
-
-
-
 SfxDocumentTemplates::~SfxDocumentTemplates()
 
 /*  [Description]
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 084bb1093c5e..e8ca9ef9209b 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -175,17 +175,6 @@ void* GraphicHelper::getWinMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta, co
 
 
 // static
-bool GraphicHelper::supportsMetaFileHandle_Impl()
-{
-#ifdef WNT
-    return true;
-#else
-    return false;
-#endif
-}
-
-
-// static
 bool GraphicHelper::getThumbnailFormatFromGDI_Impl(GDIMetaFile* pMetaFile, const uno::Reference<io::XStream>& xStream)
 {
     bool bResult = false;
diff --git a/sfx2/source/doc/graphhelp.hxx b/sfx2/source/doc/graphhelp.hxx
index c0c3ed1c7747..30201edcbbac 100644
--- a/sfx2/source/doc/graphhelp.hxx
+++ b/sfx2/source/doc/graphhelp.hxx
@@ -38,7 +38,14 @@ public:
 
     static void* getWinMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta, const Size& aMetaSize );
 
-    static bool supportsMetaFileHandle_Impl();
+    static bool supportsMetaFileHandle_Impl()
+    {
+#ifdef WNT
+    return true;
+#else
+    return false;
+#endif
+    }
 
     static bool getThumbnailFormatFromGDI_Impl(
             GDIMetaFile* pMetaFile,
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 933fd3047a91..f3bd0d362f6e 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -407,7 +407,6 @@ void SfxObjectShell::UpdateFromTemplate_Impl(  )
         // the templates of all parts in the master document but it is NOT
         // an error if the template filename points not to a valid file
         SfxDocumentTemplates aTempl;
-        aTempl.Construct();
         if (!aTemplURL.isEmpty())
         {
             try {
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 55f73c05d01e..987cf9a4f3fd 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -3027,11 +3027,6 @@ sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, vcl::
     return nRet;
 }
 
-bool SfxObjectShell::HasSecurityOptOpenReadOnly() const
-{
-    return true;
-}
-
 bool SfxObjectShell::IsSecurityOptOpenReadOnly() const
 {
     return IsLoadReadonly();
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 8c08addfa2dd..4b7d6dd6a47b 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -421,17 +421,6 @@ bool SfxObjectShell::Stamp_GetPrintCancelState() const
 
 
 
-void SfxObjectShell::ViewAssigned()
-
-/*  [Description]
-
-    This method is called when a view is assigned.
-*/
-
-{
-}
-
-
 // closes the Object and all its views
 
 bool SfxObjectShell::Close()
diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx
index 9e7efb2f1e39..1a332e8e5e58 100644
--- a/sfx2/source/inc/splitwin.hxx
+++ b/sfx2/source/inc/splitwin.hxx
@@ -123,7 +123,6 @@ public:
     virtual void        AutoHide() SAL_OVERRIDE;
     virtual void        FadeOut() SAL_OVERRIDE;
     virtual void        FadeIn() SAL_OVERRIDE;
-    void                Show_Impl();
     void                Pin_Impl( bool bPinned );
     bool                ActivateNextChild_Impl( bool bForward = true );
     void                SetActiveWindow_Impl( SfxDockingWindow* pWin );
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index f2fb797edf15..3b8acbce85f6 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -97,7 +97,6 @@ public:
 
     void                    SetState( SfxItemState, const SfxPoolItem*, bool bMaybeDirty=false );
     void                    SetCachedState(bool bAlways = false);
-    void                    DeleteFloatingWindows();
     void                    Invalidate( bool bWithSlot );
     void                    SetVisibleState( bool bShow=true );
 
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 828955ec9f48..df406d29e2c1 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -280,8 +280,6 @@ public:
     OUString            GetSelectedEntry() const;
     SfxObjectShell*     GetObjectShell() const { return pCurObjShell; }
 
-    void                PrepareDeleteAction();  // disable buttons, change button text, etc. when del is going to happen
-
     inline bool         CanEdit( void ) const   { return bCanEdit; }
     inline bool         CanDel( void ) const    { return bCanDel; }
     inline bool         CanNew( void ) const    { return bCanNew; }
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index a69e3c3db5c2..ee16671f3944 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -415,8 +415,6 @@ throw ( uno::RuntimeException, std::exception )
 void SAL_CALL SfxStatusBarControl::doubleClick( const awt::Point& )
 throw ( uno::RuntimeException, std::exception )
 {
-    SolarMutexGuard aGuard;
-    DoubleClick();
 }
 
 
@@ -512,7 +510,6 @@ bool SfxStatusBarControl::MouseMove( const MouseEvent & )
 }
 
 
-
 bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
 
 /*  [Description]
@@ -570,21 +567,6 @@ void SfxStatusBarControl::Click()
 
 
 
-void SfxStatusBarControl::DoubleClick()
-
-/*  [Description]
-
-    This virtual method is called when the user double-clicks on the
-    field in the status row that belongs to this control.
-
-    The default implementation is empty.
-*/
-
-{
-}
-
-
-
 void SfxStatusBarControl::Paint
 (
     const UserDrawEvent& /* Reference to an UserDrawEvent */
@@ -605,18 +587,6 @@ void SfxStatusBarControl::Paint
 
 
 
-void SfxStatusBarControl::CaptureMouse()
-{
-}
-
-
-
-void SfxStatusBarControl::ReleaseMouse()
-{
-}
-
-
-
 SfxStatusBarControl* SfxStatusBarControl::CreateControl
 (
     sal_uInt16     nSlotID,
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 7d6fe2de6daa..4b3696887b3e 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -695,11 +695,6 @@ SfxFrame* SfxFrameIterator::NextSibling_Impl( SfxFrame& rPrev )
     return pRet;
 }
 
-bool SfxFrame::HasComponent() const
-{
-    return false;
-}
-
 ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SfxFrame::GetController() const
 {
     if ( pImp->pCurrentViewFrame && pImp->pCurrentViewFrame->GetViewShell() )
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 6d6f70346a61..05cce6e5c097 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -346,8 +346,6 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingInplace()
 {
     if ( !m_pClient || !m_pClient->GetViewShell() )
         throw uno::RuntimeException();
-
-    m_pClient->GetViewShell()->InplaceActivating( m_pClient );
 }
 
 
@@ -370,8 +368,6 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedInplace()
 {
     if ( !m_pClient || !m_pClient->GetViewShell() )
         throw uno::RuntimeException();
-
-    m_pClient->GetViewShell()->InplaceDeactivated( m_pClient );
 }
 
 
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 1d27f842eda2..9f160d7615e9 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -1528,8 +1528,6 @@ void SAL_CALL SfxBaseController::removeTitleChangeListener(const Reference< fram
 
 void SfxBaseController::initialize( const css::uno::Sequence< css::uno::Any >& /*aArguments*/ ) throw (css::uno::RuntimeException, std::exception)
 {
-    if (m_pData->m_pViewShell)
-        m_pData->m_pViewShell->Initialize();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 24ad62e384a2..0501ed65cb34 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -328,9 +328,6 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
     {
         case SID_EDITDOC:
         {
-            if ( GetFrame().HasComponent() )
-                break;
-
             // Due to Double occupancy in toolboxes (with or without Ctrl),
             // it is also possible that the slot is enabled, but Ctrl-click
             // despite this is not!
@@ -857,14 +854,6 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
     SfxWhichIter aIter( rSet );
     for ( sal_uInt16 nWhich = aIter.FirstWhich(); nWhich; nWhich = aIter.NextWhich() )
     {
-        if ( GetFrame().HasComponent() )
-        {
-            // If the component is not self-dispatched, then
-            // it makes no sense!
-            rSet.DisableItem( nWhich );
-            continue;
-        }
-
         switch ( nWhich )
         {
             case SID_EDITDOC:
@@ -1441,7 +1430,6 @@ void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh )
         pDispatcher->Push( *pObjSh );
         pDispatcher->Flush();
         StartListening( *pObjSh );
-        pObjSh->ViewAssigned();
         Notify( *pObjSh, SfxSimpleHint(SFX_HINT_TITLECHANGED) );
         Notify( *pObjSh, SfxSimpleHint(SFX_HINT_DOCCHANGED) );
         pDispatcher->SetReadOnly_Impl( pObjSh->IsReadOnly() );
@@ -1756,8 +1744,7 @@ void SfxViewFrame::Show()
 
     // Display Frame-window, but only if the ViewFrame has no window of its
     // own or if it does not contain a Component
-    if ( &GetWindow() == &GetFrame().GetWindow() || !GetFrame().HasComponent() )
-        GetWindow().Show();
+    GetWindow().Show();
     GetFrame().GetWindow().Show();
 }
 
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index c16d285bf4bf..2d4ec9b4aec6 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -923,21 +923,6 @@ void SfxViewShell::OutplaceActivated( bool bActive, SfxInPlaceClient* /*pClient*
 
 
 
-void SfxViewShell::InplaceActivating( SfxInPlaceClient* /*pClient*/ )
-{
-    // TODO/LATER: painting of the bitmap can be stopped, it is required if CLIPCHILDREN problem #i25788# is not solved,
-    // but may be the bug will not affect the real office vcl windows, then it is not required
-}
-
-
-
-void SfxViewShell::InplaceDeactivated( SfxInPlaceClient* /*pClient*/ )
-{
-    // TODO/LATER: paint the replacement image in normal way if the painting was stopped
-}
-
-
-
 void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ )
 {
     uno::Reference < frame::XFrame > xOwnFrame( pFrame->GetFrame().GetFrameInterface() );
@@ -1316,11 +1301,6 @@ SfxViewShell::~SfxViewShell()
     DELETEZ( pImp );
 }
 
-void SfxViewShell::Initialize()
-{
-    // override by the application.
-}
-
 bool SfxViewShell::PrepareClose
 (
     bool bUI     // TRUE: Allow Dialog and so on, FALSE: silent-mode
@@ -1699,24 +1679,6 @@ void SfxViewShell::ShowCursor( bool /*bOn*/ )
 
 
 
-void SfxViewShell::GotFocus() const
-
-/*  [Description]
-
-    This Method has to be called by the programmer, when the
-    Edit window has received the focus. This gives for example the SFx
-    the power to turn on the accelerator.
-
-    [Note]
-
-    <StarView> does sadly enough not provide the possibillity to attach
-    such "side-way" events.
-*/
-
-{
-}
-
-
 void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP )
 {
 
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 14715a27451c..b4c795b13811 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -108,7 +108,6 @@ void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState,
 
 bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt )
 {
-    CaptureMouse();
     SelectionTypePopup aPop( mnState );
     StatusBar& rStatusbar = GetStatusBar();
 
@@ -131,7 +130,6 @@ bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt )
             execute( aArgs );
         }
     }
-    ReleaseMouse();
 
     return true;
 }
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 63210fee20b4..4ab723225359 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -144,7 +144,6 @@ void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt )
 {
     if ( COMMAND_CONTEXTMENU & rCEvt.GetCommand() && 0 != nValueSet )
     {
-        CaptureMouse();
         ZoomPopup_Impl aPop( nZoom, nValueSet );
         StatusBar& rStatusbar = GetStatusBar();
 
@@ -170,7 +169,6 @@ void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt )
 
             execute( aArgs );
         }
-        ReleaseMouse();
     }
     else
         SfxStatusBarControl::Command( rCEvt );
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index d6631e7225a4..407b4e73f92c 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -605,7 +605,6 @@ OUString SwTemplNameFieldType::Expand(sal_uLong nFmt) const
             {
                 // for getting region names!
                 SfxDocumentTemplates aFac;
-                aFac.Construct();
                 OUString sTmp;
                 OUString sRegion;
                 aFac.GetLogicNames( xDocProps->getTemplateURL(), sRegion, sTmp );
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 89bf2736fd2b..7805f54dbbc4 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5122,7 +5122,6 @@ void SwEditWin::LoseFocus()
     Window::LoseFocus();
     if( m_pQuickHlpData->m_bIsDisplayed )
         m_pQuickHlpData->Stop( m_rView.GetWrtShell() );
-    m_rView.LostFocus();
 }
 
 void SwEditWin::Command( const CommandEvent& rCEvt )
diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx
index 6a78ef5a0b45..bffd651de112 100644
--- a/sw/source/uibase/utlui/bookctrl.cxx
+++ b/sw/source/uibase/utlui/bookctrl.cxx
@@ -101,7 +101,6 @@ void SwBookmarkControl::Command( const CommandEvent& rCEvt )
     if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU &&
             !GetStatusBar().GetItemText( GetId() ).isEmpty() )
     {
-        CaptureMouse();
         BookmarkPopup_Impl aPop;
         SwWrtShell* pWrtShell = ::GetActiveWrtShell();
         if( pWrtShell && pWrtShell->getIDocumentMarkAccess()->getAllMarksCount() > 0 )
@@ -131,7 +130,6 @@ void SwBookmarkControl::Command( const CommandEvent& rCEvt )
                                         &aBookmark, 0L );
             }
         }
-        ReleaseMouse();
     }
 }
 
diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx
index ab06c0dbd3c8..7c7f960e11d5 100644
--- a/sw/source/uibase/utlui/tmplctrl.cxx
+++ b/sw/source/uibase/utlui/tmplctrl.cxx
@@ -93,7 +93,6 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt )
     if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU &&
             !GetStatusBar().GetItemText( GetId() ).isEmpty() )
     {
-        CaptureMouse();
         SwTemplatePopup_Impl aPop;
         {
             SwView* pView = ::GetActiveView();
@@ -131,7 +130,6 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt )
                 }
             }
         }
-        ReleaseMouse();
     }
 }