diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-04-19 16:15:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-05-20 15:23:06 +0100 |
| commit | ca1b647fc86d1c32c5c195f9ff0e3ede48da4802 (patch) | |
| tree | fba1e114dd680cbb52ba5a13fdb35c2627c228ae /sfx2 | |
| parent | 37b8567fc76b78b1844461926175ba6919b8c7bd (diff) | |
SfxHelp leaks, make sure it goes away at the right time
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/app.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 4d4e9c6bd0..afaccc4a5f 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -153,6 +153,7 @@ using namespace ::com::sun::star; // Static member SfxApplication* SfxApplication::pApp = NULL; static BasicDLL* pBasic = NULL; +static SfxHelp* pSfxHelp = NULL; class SfxPropertyHandler : public PropertyHandler { @@ -305,7 +306,6 @@ SfxApplication* SfxApplication::GetOrCreate() ::framework::SetIsDockingWindowVisible( IsDockingWindowVisible ); ::framework::SetActivateToolPanel( &SfxViewFrame::ActivateToolPanel ); - SfxHelp* pSfxHelp = new SfxHelp; Application::SetHelp( pSfxHelp ); if ( SvtHelpOptions().IsHelpTips() ) Help::EnableQuickHelp(); @@ -351,6 +351,8 @@ SfxApplication::SfxApplication() #endif #endif + pSfxHelp = new SfxHelp; + pBasic = new BasicDLL; StarBASIC::SetGlobalErrorHdl( LINK( this, SfxApplication, GlobalBasicErrorHdl_Impl ) ); RTL_LOGFILE_CONTEXT_TRACE( aLog, "} initialize DDE" ); @@ -364,6 +366,9 @@ SfxApplication::~SfxApplication() SfxModule::DestroyModules_Impl(); + delete pSfxHelp; + Application::SetHelp( NULL ); + // delete global options SvtViewOptions::ReleaseOptions(); delete pBasic; |