diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-07 20:33:43 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-05-30 09:40:36 +0200 |
| commit | f5a6844e683f8d97c60f5cf19aab00d41209cfc3 (patch) | |
| tree | e4ebfe86d810ded6f2f5a9f81866eba3bc3d48a0 /sfx2 | |
| parent | 3ad60c39a266b54a0dd94ac8bd15a88d64c9dd5f (diff) | |
make SfxGetpApp just get and move GetOrCreate to the periphery
Reviewed-on: https://gerrit.libreoffice.org/34957
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(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 <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/module.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/notify/globalevents.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
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<SfxObjectFactory*> 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--; |