summaryrefslogtreecommitdiff
path: root/include/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-03-07 20:33:43 +0000
committerAndras Timar <andras.timar@collabora.com>2017-05-30 09:40:36 +0200
commitf5a6844e683f8d97c60f5cf19aab00d41209cfc3 (patch)
treee4ebfe86d810ded6f2f5a9f81866eba3bc3d48a0 /include/sfx2
parent3ad60c39a266b54a0dd94ac8bd15a88d64c9dd5f (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 'include/sfx2')
-rw-r--r--include/sfx2/app.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 74d29003aa9e..6b5a1af72aac 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -248,7 +248,7 @@ public:
inline SfxApplication* SfxGetpApp()
{
- return SfxApplication::GetOrCreate();
+ return SfxApplication::Get();
}
#endif