diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-28 11:46:27 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-28 11:48:14 +0200 |
| commit | 2c38ea6d16b910294220cefaf8ae6a0683e6405a (patch) | |
| tree | 0c541b169af5ad81c5ab70b05cbe02ca18178be1 /sfx2/source/appl/app.cxx | |
| parent | 51f50a0dee2867b0f9e3f869e5fbe14923fcef3a (diff) | |
Building without --with-help is not supposed to disable help functionality
Drop HAVE_FEATURE_HELP. Just check HAVE_FEATURE_DESKTOP instead in the few
places in the code where HAVE_FEATURE_HELP had been introduced so far. It's
only for the non-desktop platforms that leaving out the traditional help
functionality is intended anyway.
Change-Id: I2d05869267f509a8e64cf402eed8ebef0020cada
Diffstat (limited to 'sfx2/source/appl/app.cxx')
| -rw-r--r-- | sfx2/source/appl/app.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 2f904002a5be..49ee2b1699c6 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -130,7 +130,7 @@ SfxApplication* SfxApplication::pApp = NULL; static BasicDLL* pBasic = NULL; #endif -#if HAVE_FEATURE_HELP +#if HAVE_FEATURE_DESKTOP static SfxHelp* pSfxHelp = NULL; #endif @@ -167,7 +167,7 @@ SfxApplication* SfxApplication::GetOrCreate() ::framework::SetDockingWindowCreator( SfxDockingWindowFactory ); ::framework::SetIsDockingWindowVisible( IsDockingWindowVisible ); ::framework::SetActivateToolPanel( &SfxViewFrame::ActivateToolPanel ); -#if HAVE_FEATURE_HELP +#if HAVE_FEATURE_DESKTOP Application::SetHelp( pSfxHelp ); if ( SvtHelpOptions().IsHelpTips() ) Help::EnableQuickHelp(); @@ -212,7 +212,7 @@ SfxApplication::SfxApplication() (void)bOk; #endif -#if HAVE_FEATURE_HELP +#if HAVE_FEATURE_DESKTOP pSfxHelp = new SfxHelp; #endif @@ -231,7 +231,7 @@ SfxApplication::~SfxApplication() SfxModule::DestroyModules_Impl(); -#if HAVE_FEATURE_HELP +#if HAVE_FEATURE_DESKTOP delete pSfxHelp; Application::SetHelp( NULL ); #endif |