diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-10-21 23:21:37 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-10-22 09:30:23 +0300 |
| commit | 9ecac3874d179b1d7aa6b45337001b1def06a9dd (patch) | |
| tree | 120fc40fda1055a0f504e60c553b5734030d2741 /cui | |
| parent | d0be09322d127e7d517851db38c764d57fbab2dc (diff) | |
Replace DISABLE_SCRIPTING with HAVE_FEATURE_SCRIPTING
Feature test macros that govern conditional compilation should be
defined in config_*.h include files, not on the compilation command
line.
Change-Id: I40575a4762fd2564f10927b6f38a112dd9f9a3d7
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/Library_cui.mk | 2 | ||||
| -rw-r--r-- | cui/source/options/treeopt.cxx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 60808ef729a2..b821f2a6a45b 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -137,7 +137,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/options/optaboutconfig \ cui/source/options/optaccessibility \ cui/source/options/optasian \ - $(if $(DISABLE_SCRIPTING),, \ + $(call gb_Helper_optional,SCRIPTING, \ cui/source/options/optbasic) \ cui/source/options/optchart \ cui/source/options/optcolor \ diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 52fa7ed7388a..4647feecc576 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include "cuires.hrc" #include "helpid.hrc" @@ -320,7 +322,7 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, vcl::Window* pParent, const Sf case RID_SVXPAGE_OPTIONS_JAVA: fnCreate = &SvxJavaOptionsPage::Create ; break; case RID_SVXPAGE_ONLINEUPDATE: fnCreate = &SvxOnlineUpdateTabPage::Create; break; case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate = &SvxDefaultColorOptPage::Create; break; -#ifndef DISABLE_SCRIPTING +#if HAVE_FEATURE_SCRIPTING case RID_SVXPAGE_BASICIDE_OPTIONS: fnCreate = &SvxBasicIDEOptionsPage::Create; break; #endif } |