summaryrefslogtreecommitdiff
path: root/include/sfx2/app.hxx
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2014-06-27 10:29:46 +0200
committerNorbert Thiebaud <nthiebaud@gmail.com>2014-06-27 17:08:04 +0200
commit01a882039ec4d0edf4da7d3e10ffea569a3e4aee (patch)
tree1bca8f566d2b62f3f96d869fd2b2576cf2b10556 /include/sfx2/app.hxx
parentd92aa2f445662aa9ca7d81fef1e667bcae031fc6 (diff)
fdo#69036 do not try to create a sfxApplication when we are tearing-down
This was triggered by connectivity calc driver, which on shutdown was trying to 'dispose()' it's connection which in turn would, if the shutdown of calc was already done try to re-create an sfxApplication instance, just to delete illusory inexistant documents... Change-Id: Ic166367ca399d613743f379ebbfbffb5813701c0
Diffstat (limited to 'include/sfx2/app.hxx')
-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 1c677566ea6c..09286352018d 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -149,6 +149,7 @@ public:
SfxApplication();
virtual ~SfxApplication();
static SfxApplication* GetOrCreate();
+ static SfxApplication* Get() { return pApp;}
// Resource Manager
ResMgr* GetSfxResManager();
@@ -202,7 +203,6 @@ public:
bool IsDowning() const;
void ResetLastDir();
- SAL_DLLPRIVATE static SfxApplication* Get() { return pApp;}
SAL_DLLPRIVATE SfxDispatcher* GetAppDispatcher_Impl();
SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl();