diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-24 14:12:18 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-06-22 14:25:51 +0200 |
| commit | 14069d84174ca7a4e60db4d75912903e9679b643 (patch) | |
| tree | adf1a9138c9a1cb942e885d59f1d392a8f9eeb3b /sfx2 | |
| parent | 75c42c1f3ba6d40d518a4da400a84015d30240c0 (diff) | |
configure: Improve help-options handling
This patch includes:
* A README.help.md as a general documentation for the different
help types, the LO code and help-related build options.
* Adds --disable-xmlhelp for removing the xmlhelp support from the
build. Disable for iOS, Android and Emscripten. This was partly
included in HAVE_FEATURE_DESKTOP before.
* Rename WITH_HELP define to WITH_HELPPACKS, which reflects the
actual usage AFAIK.
* Depend --with-omindex on --with-help=online and don't override
the --with-help setting. Error out on conflicting options.
* Depend --with-helppack-integration on build help variants, which
actually result in help packs.
Kind of reverts commit 2c38ea6d16b910294220cefaf8ae6a0683e6405a
("Building without --with-help is not supposed to disable help
functionality").
Change-Id: Ie4cb73905b3ed94e991d9f1bd75cfbd6de9da385
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116222
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'sfx2')
| -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 89bc3fdc50ea..e410902ccdb7 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -67,7 +67,7 @@ using namespace ::com::sun::star; static SfxApplication* g_pSfxApplication = nullptr; -#if HAVE_FEATURE_DESKTOP +#if HAVE_FEATURE_XMLHELP static SfxHelp* pSfxHelp = nullptr; #endif @@ -127,7 +127,7 @@ SfxApplication* SfxApplication::GetOrCreate() ::framework::SetStatusBarControllerCreator( SfxStatusBarControllerFactory ); ::framework::SetDockingWindowCreator( SfxDockingWindowFactory ); ::framework::SetIsDockingWindowVisible( IsDockingWindowVisible ); -#if HAVE_FEATURE_DESKTOP +#if HAVE_FEATURE_XMLHELP Application::SetHelp( pSfxHelp ); if (!utl::ConfigManager::IsFuzzing() && SvtHelpOptions().IsHelpTips()) Help::EnableQuickHelp(); @@ -167,7 +167,7 @@ SfxApplication::SfxApplication() (void)bOk; #endif -#if HAVE_FEATURE_DESKTOP +#if HAVE_FEATURE_XMLHELP pSfxHelp = new SfxHelp; #endif @@ -187,7 +187,7 @@ SfxApplication::~SfxApplication() for (auto &module : pImpl->aModules) // Clear modules module.reset(); -#if HAVE_FEATURE_DESKTOP +#if HAVE_FEATURE_XMLHELP delete pSfxHelp; Application::SetHelp(); #endif |