diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-27 20:33:10 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-28 00:17:36 +0200 |
| commit | 0cd2accbd4cb044bf67b75e5271aa7f39628349c (patch) | |
| tree | 8bf4fffce755f03d22b085150d128ffa4c9527ee /sfx2/source/appl | |
| parent | a1f2f8636dd3b4b75bb24833bb42734a5f7c6c37 (diff) | |
Put some help-related code behind #if HAVE_FEATURE_HELP
Change-Id: I586921111d06030f3bc6d2cac2cea97a44f28a71
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/app.cxx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 2e0018eed17e..2f904002a5be 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #if defined UNX #include <limits.h> #else // UNX @@ -127,7 +129,10 @@ SfxApplication* SfxApplication::pApp = NULL; #ifndef DISABLE_SCRIPTING static BasicDLL* pBasic = NULL; #endif + +#if HAVE_FEATURE_HELP static SfxHelp* pSfxHelp = NULL; +#endif namespace { @@ -162,7 +167,7 @@ SfxApplication* SfxApplication::GetOrCreate() ::framework::SetDockingWindowCreator( SfxDockingWindowFactory ); ::framework::SetIsDockingWindowVisible( IsDockingWindowVisible ); ::framework::SetActivateToolPanel( &SfxViewFrame::ActivateToolPanel ); - +#if HAVE_FEATURE_HELP Application::SetHelp( pSfxHelp ); if ( SvtHelpOptions().IsHelpTips() ) Help::EnableQuickHelp(); @@ -172,6 +177,7 @@ SfxApplication* SfxApplication::GetOrCreate() Help::EnableBalloonHelp(); else Help::DisableBalloonHelp(); +#endif } return pApp; } @@ -206,7 +212,9 @@ SfxApplication::SfxApplication() (void)bOk; #endif +#if HAVE_FEATURE_HELP pSfxHelp = new SfxHelp; +#endif #ifndef DISABLE_SCRIPTING pBasic = new BasicDLL; @@ -223,11 +231,14 @@ SfxApplication::~SfxApplication() SfxModule::DestroyModules_Impl(); +#if HAVE_FEATURE_HELP delete pSfxHelp; Application::SetHelp( NULL ); +#endif // delete global options SvtViewOptions::ReleaseOptions(); + #ifndef DISABLE_SCRIPTING delete pBasic; #endif |