diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-03-07 14:26:45 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-07 14:26:46 +0000 |
commit | c97a37de3c63000ff7e58469e4beff8307167ca0 (patch) | |
tree | 3288c6add85d005953690b6567eca7703b7529af | |
parent | 260bfa5e4913c4ecb5720f3ef5163333374de744 (diff) |
shouldn't need these SfxGetpApp as it will already exist
SfxGetpApp will get or create SfxApplication
in normal use we start SfxApplication via SfxGlobalEvents_Impl ctor
theGlobalEventBroadcaster right from the start in Desktop::Main
Change-Id: I5fec2dfb79c8bc322266048603252a9aa93a883f
-rw-r--r-- | sfx2/source/appl/workwin.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm.cxx | 2 |
4 files changed, 0 insertions, 9 deletions
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 59d453919bf0..4ea26b0957ca 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -1162,9 +1162,6 @@ void SfxWorkWindow::UpdateObjectBars_Impl2() p->Lock(); } - // you realize what is needed often (saves Code and execution time) - SfxGetpApp(); - Reference< css::beans::XPropertySet > xPropSet( GetFrameInterface(), UNO_QUERY ); Reference< css::frame::XLayoutManager > xLayoutManager; diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index b8b25ed58c66..37a1726b5abf 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1223,7 +1223,6 @@ void SfxDispatcher::Update_Impl( bool bForce ) if ( !xImp->pFrame ) return; - SfxGetpApp(); // -Wall is this required??? SfxDispatcher *pDisp = this; bool bUpdate = bForce; while ( pDisp && pDisp->xImp->pFrame ) @@ -1329,7 +1328,6 @@ void SfxDispatcher::Update_Impl( bool bForce ) void SfxDispatcher::Update_Impl_( bool bUIActive, bool bIsMDIApp, bool bIsIPOwner, SfxWorkWindow *pTaskWin ) { - SfxGetpApp(); SfxWorkWindow *pWorkWin = xImp->pFrame->GetFrame().GetWorkWindow_Impl(); bool bIsActive = false; SfxDispatcher *pActDispat = pWorkWin->GetBindings().GetDispatcher_Impl(); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index d0a50f048d68..cf11ada4d9b6 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -1044,7 +1044,6 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) sal_uInt16 nId = pTabCtrl->GetCurPageId(); DBG_ASSERT( m_pImpl->aData.size(), "no Pages registered" ); - SfxGetpApp(); // Tab Page schon da? VclPtr<SfxTabPage> pTabPage = dynamic_cast<SfxTabPage*> (pTabCtrl->GetTabPage( nId )); @@ -1142,7 +1141,6 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) { sal_uInt16 nId = pTabCtrl->GetCurPageId(); - SfxGetpApp(); SfxTabPage *pPage = dynamic_cast<SfxTabPage*> (pTabCtrl->GetTabPage( nId )); DBG_ASSERT( pPage, "no active Page" ); if (!pPage) diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 12fc132a8542..98190220e362 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1074,13 +1074,11 @@ bool SfxViewFrame::Close() void SfxViewFrame::DoActivate( bool bUI ) { - SfxGetpApp(); m_pDispatcher->DoActivate_Impl( bUI ); } void SfxViewFrame::DoDeactivate(bool bUI, SfxViewFrame* pNewFrame ) { - SfxGetpApp(); m_pDispatcher->DoDeactivate_Impl( bUI, pNewFrame ); } |