From f5a6844e683f8d97c60f5cf19aab00d41209cfc3 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 7 Mar 2017 20:33:43 +0000 Subject: make SfxGetpApp just get and move GetOrCreate to the periphery MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://gerrit.libreoffice.org/34957 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry-picked from commit 3d213b3dc5130bdbacbd64be00867eecad6373e8) Conflicts: svx/source/gengal/gengal.cxx Change-Id: If3b22635e46dbccf0fad101f51bb653cbbcd3a32 Reviewed-on: https://gerrit.libreoffice.org/38166 Reviewed-by: László Németh Tested-by: László Németh Reviewed-by: Andras Timar Tested-by: Andras Timar --- sfx2/source/appl/module.cxx | 2 +- sfx2/source/notify/globalevents.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 72d447b6ec26..830f7eb7696a 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -115,7 +115,7 @@ SfxModule::SfxModule( ResMgr* pMgrP, std::initializer_list pF void SfxModule::Construct_Impl() { - SfxApplication *pApp = SfxGetpApp(); + SfxApplication *pApp = SfxApplication::GetOrCreate(); pImpl = new SfxModule_Impl; pImpl->pSlotPool = new SfxSlotPool(&pApp->GetAppSlotPool_Impl()); diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx index 9cecd83e5740..69e23ceea6f3 100644 --- a/sfx2/source/notify/globalevents.cxx +++ b/sfx2/source/notify/globalevents.cxx @@ -164,7 +164,7 @@ SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const uno::Reference < uno::XCompone , pImp (nullptr ) { m_refCount++; - SfxGetpApp(); + SfxApplication::GetOrCreate(); pImp = new GlobalEventConfig(); m_xEvents = pImp; m_refCount--; -- cgit