summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-10 13:49:12 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-11 06:15:21 +0000
commit5c84f40ea2e86bf85c0a59201faf1431f16aee40 (patch)
tree43a8b61f71052b4e3202f334fce8c60e52827fed /sfx2
parentfe82f6fc5cbd638972571a33f04e95971507bba9 (diff)
loplugin:constantfunction
update the plugin similarly to commit 3ee3b36ae0c064fb5c81268d8d63444309d1b970 Author: Stephan Bergmann <sbergman@redhat.com> Date: Fri Oct 7 12:05:49 2016 +0200 loplugin:staticmethods: Don't be fooled by decls starting with macros Change-Id: I98ac3216d5acf89a49a26feb089ae2fd34e6e510 Reviewed-on: https://gerrit.libreoffice.org/29665 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/childwin.cxx4
-rw-r--r--sfx2/source/control/dispatch.cxx8
-rw-r--r--sfx2/source/dialog/basedlgs.cxx2
-rw-r--r--sfx2/source/dialog/dockwin.cxx8
-rw-r--r--sfx2/source/dialog/splitwin.cxx2
-rw-r--r--sfx2/source/view/viewfrm.cxx26
6 files changed, 1 insertions, 49 deletions
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 1d1fdb8ed16f..d3ea17ce41ab 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -658,10 +658,6 @@ void SfxChildWindow::Activate_Impl()
pImpl->pWorkWin->SetActiveChild_Impl( pWindow );
}
-void SfxChildWindow::Deactivate_Impl()
-{
-}
-
bool SfxChildWindow::QueryClose()
{
bool bAllow = true;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 34619467da70..11d950e5b02f 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -794,10 +794,6 @@ void SfxDispatcher::DoActivate_Impl(bool bMDI)
}
}
-void SfxDispatcher::DoParentActivate_Impl()
-{
-}
-
/** This method controls the deactivation of a dispatcher.
Since the application dispatcher is always active, either as a sub
@@ -875,10 +871,6 @@ void SfxDispatcher::DoDeactivate_Impl(bool bMDI, SfxViewFrame* pNew)
Flush();
}
-void SfxDispatcher::DoParentDeactivate_Impl()
-{
-}
-
/** This method searches in SfxDispatcher after <SfxShell> , from the Slot Id
nSlot currently being handled. For this, the dispatcher is first flushed.
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index e4011862de40..2fdeef8d8f06 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -333,7 +333,6 @@ bool SfxModelessDialog::Notify( NotifyEvent& rEvt )
else if ( rEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() )
{
pBindings->SetActiveFrame( css::uno::Reference< css::frame::XFrame > () );
- SfxChildWindow::Deactivate_Impl();
}
else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
@@ -421,7 +420,6 @@ bool SfxFloatingWindow::Notify( NotifyEvent& rEvt )
if ( !HasChildPathFocus() )
{
pBindings->SetActiveFrame( nullptr );
- SfxChildWindow::Deactivate_Impl();
}
}
else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT )
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 9365efea38a3..183600a4075d 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1656,20 +1656,12 @@ bool SfxDockingWindow::Notify( NotifyEvent& rEvt )
else if ( rEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() )
{
pBindings->SetActiveFrame( nullptr );
- if (pMgr != nullptr)
- SfxChildWindow::Deactivate_Impl();
}
return DockingWindow::Notify( rEvt );
}
-SplitWindowItemFlags SfxDockingWindow::GetWinBits_Impl()
-{
- return SplitWindowItemFlags::NONE;
-}
-
-
void SfxDockingWindow::SetItemSize_Impl( const Size& rSize )
{
pImpl->aSplitSize = rSize;
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 2e80e3b7fd19..ba2d8713dcce 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -663,7 +663,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
{
SfxDockingWindow* pDockWin = pDock->pWin;
- SplitWindowItemFlags nItemBits = SfxDockingWindow::GetWinBits_Impl();
+ SplitWindowItemFlags nItemBits = SplitWindowItemFlags::NONE;
long nWinSize, nSetSize;
if ( IsHorizontal() )
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 588a4eb0e8a3..54066676804a 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1072,39 +1072,13 @@ bool SfxViewFrame::Close()
void SfxViewFrame::DoActivate( bool bUI )
{
SfxGetpApp();
-
m_pDispatcher->DoActivate_Impl( bUI );
-
- // If this ViewFrame has got a parent and this is not a parent of the
- // old ViewFrames, it gets a ParentActivate.
- if ( bUI )
- {
- SfxViewFrame *pFrame = GetParentViewFrame();
- while ( pFrame )
- {
- SfxDispatcher::DoParentActivate_Impl();
- pFrame = pFrame->GetParentViewFrame();
- }
- }
}
void SfxViewFrame::DoDeactivate(bool bUI, SfxViewFrame* pNewFrame )
{
SfxGetpApp();
m_pDispatcher->DoDeactivate_Impl( bUI, pNewFrame );
-
- // If this ViewFrame has got a parent and this is not a parent of the
- // new ViewFrames, it gets a ParentDeactivate.
- if ( bUI )
- {
- SfxViewFrame *pFrame = GetParentViewFrame();
- while ( pFrame )
- {
- if ( !pNewFrame || !pNewFrame->GetFrame().IsParent( &pFrame->GetFrame() ) )
- SfxDispatcher::DoParentDeactivate_Impl();
- pFrame = pFrame->GetParentViewFrame();
- }
- }
}
void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh )