Put some help-related code behind #if HAVE_FEATURE_HELP
Change-Id: I586921111d06030f3bc6d2cac2cea97a44f28a71
This commit is contained in:
@@ -17,6 +17,8 @@
|
|||||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <config_features.h>
|
||||||
|
|
||||||
#if defined UNX
|
#if defined UNX
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#else // UNX
|
#else // UNX
|
||||||
@@ -127,7 +129,10 @@ SfxApplication* SfxApplication::pApp = NULL;
|
|||||||
#ifndef DISABLE_SCRIPTING
|
#ifndef DISABLE_SCRIPTING
|
||||||
static BasicDLL* pBasic = NULL;
|
static BasicDLL* pBasic = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if HAVE_FEATURE_HELP
|
||||||
static SfxHelp* pSfxHelp = NULL;
|
static SfxHelp* pSfxHelp = NULL;
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
@@ -162,7 +167,7 @@ SfxApplication* SfxApplication::GetOrCreate()
|
|||||||
::framework::SetDockingWindowCreator( SfxDockingWindowFactory );
|
::framework::SetDockingWindowCreator( SfxDockingWindowFactory );
|
||||||
::framework::SetIsDockingWindowVisible( IsDockingWindowVisible );
|
::framework::SetIsDockingWindowVisible( IsDockingWindowVisible );
|
||||||
::framework::SetActivateToolPanel( &SfxViewFrame::ActivateToolPanel );
|
::framework::SetActivateToolPanel( &SfxViewFrame::ActivateToolPanel );
|
||||||
|
#if HAVE_FEATURE_HELP
|
||||||
Application::SetHelp( pSfxHelp );
|
Application::SetHelp( pSfxHelp );
|
||||||
if ( SvtHelpOptions().IsHelpTips() )
|
if ( SvtHelpOptions().IsHelpTips() )
|
||||||
Help::EnableQuickHelp();
|
Help::EnableQuickHelp();
|
||||||
@@ -172,6 +177,7 @@ SfxApplication* SfxApplication::GetOrCreate()
|
|||||||
Help::EnableBalloonHelp();
|
Help::EnableBalloonHelp();
|
||||||
else
|
else
|
||||||
Help::DisableBalloonHelp();
|
Help::DisableBalloonHelp();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
return pApp;
|
return pApp;
|
||||||
}
|
}
|
||||||
@@ -206,7 +212,9 @@ SfxApplication::SfxApplication()
|
|||||||
(void)bOk;
|
(void)bOk;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if HAVE_FEATURE_HELP
|
||||||
pSfxHelp = new SfxHelp;
|
pSfxHelp = new SfxHelp;
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef DISABLE_SCRIPTING
|
#ifndef DISABLE_SCRIPTING
|
||||||
pBasic = new BasicDLL;
|
pBasic = new BasicDLL;
|
||||||
@@ -223,11 +231,14 @@ SfxApplication::~SfxApplication()
|
|||||||
|
|
||||||
SfxModule::DestroyModules_Impl();
|
SfxModule::DestroyModules_Impl();
|
||||||
|
|
||||||
|
#if HAVE_FEATURE_HELP
|
||||||
delete pSfxHelp;
|
delete pSfxHelp;
|
||||||
Application::SetHelp( NULL );
|
Application::SetHelp( NULL );
|
||||||
|
#endif
|
||||||
|
|
||||||
// delete global options
|
// delete global options
|
||||||
SvtViewOptions::ReleaseOptions();
|
SvtViewOptions::ReleaseOptions();
|
||||||
|
|
||||||
#ifndef DISABLE_SCRIPTING
|
#ifndef DISABLE_SCRIPTING
|
||||||
delete pBasic;
|
delete pBasic;
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user