[Libreoffice-commits] core.git: sfx2/source

[Caolán McNamara]

 sfx2/source/appl/workwin.cxx     |    3 ---
 sfx2/source/control/dispatch.cxx |    2 --
 sfx2/source/dialog/tabdlg.cxx    |    2 --
 sfx2/source/view/viewfrm.cxx     |    2 --
 4 files changed, 9 deletions(-)

New commits:
commit c97a37de3c63000ff7e58469e4beff8307167ca0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 7 14:26:45 2017 +0000

    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

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 59d4539..4ea26b0 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 b8b25ed..37a1726 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 d0a50f0..cf11ada 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 12fc132..9819022 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 );
 }