diff options
Diffstat (limited to 'sfx2/source/appl/app.cxx')
-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 b954e9f5e7a9..7e660132988e 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(); @@ -352,6 +352,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" ); @@ -365,6 +367,9 @@ SfxApplication::~SfxApplication() SfxModule::DestroyModules_Impl(); + delete pSfxHelp; + Application::SetHelp( NULL ); + // delete global options SvtViewOptions::ReleaseOptions(); delete pBasic; |