strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Building without --with-help is not supposed to disable help functionality

Browse source 
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
This commit is contained in:
Tor Lillqvist 2013-03-28 11:46:27 +02:00
parent 51f50a0dee
commit 2c38ea6d16
4 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
config_host/config_features.h.in
View file

@ -17,6 +17,10 @@
* the LibreOffice code does not need to handle such things itself. * the LibreOffice code does not need to handle such things itself.
* *
* Non-DESKTOP implies no traditional inter-app drag and drop concept. * Non-DESKTOP implies no traditional inter-app drag and drop concept.
*
* Non-DESKTOP implies no traditional help mechanism, and to some
* extent (as noticed, and as possible without making the code too
* ugly) the related code is ifdeffed out.
*/ */
#define HAVE_FEATURE_DESKTOP 0 #define HAVE_FEATURE_DESKTOP 0
@ -30,14 +34,6 @@
#define HAVE_FEATURE_EXTENSIONS 0 #define HAVE_FEATURE_EXTENSIONS 0
/* HELP - Whether we have the "normal" desktop-style help mechanism
*
* Can be turned on/off also for desktop environments with
* --with-help, so thus a separate feature.
*/
#define HAVE_FEATURE_HELP 0
/* MULTIUSER_ENVIRONMENT - Wheter running on a "normal" multi-user /* MULTIUSER_ENVIRONMENT - Wheter running on a "normal" multi-user
* desktop (or server) OS * desktop (or server) OS
* *

1
configure.ac
View file

@ -4386,7 +4386,6 @@ AC_MSG_CHECKING([whether to build help])
if test "$with_help" = "yes" -a $_os != iOS -a $_os != Android; then if test "$with_help" = "yes" -a $_os != iOS -a $_os != Android; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
BUILD_TYPE="$BUILD_TYPE HELP" BUILD_TYPE="$BUILD_TYPE HELP"
AC_DEFINE(HAVE_FEATURE_HELP)
SCPDEFS="$SCPDEFS -DWITH_HELP" SCPDEFS="$SCPDEFS -DWITH_HELP"
GIT_NEEDED_SUBMODULES="helpcontent2 $GIT_NEEDED_SUBMODULES" GIT_NEEDED_SUBMODULES="helpcontent2 $GIT_NEEDED_SUBMODULES"
else else

4
desktop/source/deployment/registry/help/dp_help.cxx
View file

@ -32,7 +32,7 @@
#include "uno/current_context.hxx" #include "uno/current_context.hxx"
#include "unotools/pathoptions.hxx" #include "unotools/pathoptions.hxx"
#if HAVE_FEATURE_HELP #if HAVE_FEATURE_DESKTOP
#include <helpcompiler/compilehelp.hxx> #include <helpcompiler/compilehelp.hxx>
#include <helpcompiler/HelpIndexer.hxx> #include <helpcompiler/HelpIndexer.hxx>
#endif #endif
@ -387,7 +387,7 @@ void BackendImpl::implProcessHelp(
data.dataUrl = xPackage->getURL(); data.dataUrl = xPackage->getURL();
if (!package->extensionContainsCompiledHelp()) if (!package->extensionContainsCompiledHelp())
{ {
#if HAVE_FEATURE_HELP #if HAVE_FEATURE_DESKTOP
const OUString sHelpFolder = createFolder(OUString(), xCmdEnv); const OUString sHelpFolder = createFolder(OUString(), xCmdEnv);
data.dataUrl = sHelpFolder; data.dataUrl = sHelpFolder;

8
sfx2/source/appl/app.cxx
View file

@ -130,7 +130,7 @@ SfxApplication* SfxApplication::pApp = NULL;
static BasicDLL* pBasic = NULL; static BasicDLL* pBasic = NULL;
#endif #endif
#if HAVE_FEATURE_HELP #if HAVE_FEATURE_DESKTOP
static SfxHelp* pSfxHelp = NULL; static SfxHelp* pSfxHelp = NULL;
#endif #endif
@ -167,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 #if HAVE_FEATURE_DESKTOP
Application::SetHelp( pSfxHelp ); Application::SetHelp( pSfxHelp );
if ( SvtHelpOptions().IsHelpTips() ) if ( SvtHelpOptions().IsHelpTips() )
Help::EnableQuickHelp(); Help::EnableQuickHelp();
@ -212,7 +212,7 @@ SfxApplication::SfxApplication()
(void)bOk; (void)bOk;
#endif #endif
#if HAVE_FEATURE_HELP #if HAVE_FEATURE_DESKTOP
pSfxHelp = new SfxHelp; pSfxHelp = new SfxHelp;
#endif #endif
@ -231,7 +231,7 @@ SfxApplication::~SfxApplication()
SfxModule::DestroyModules_Impl(); SfxModule::DestroyModules_Impl();
#if HAVE_FEATURE_HELP #if HAVE_FEATURE_DESKTOP
delete pSfxHelp; delete pSfxHelp;
Application::SetHelp( NULL ); Application::SetHelp( NULL );
#endif #endif