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 /sd/source/ui/view/drviews2.cxx | |
| 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 'sd/source/ui/view/drviews2.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index f1a9454614ca..d172e9e5a8d5 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include <avmedia/mediaplayer.hxx> #include <basic/sberrors.hxx> @@ -510,7 +512,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) rReq.Ignore (); break; } -#ifndef DISABLE_SCRIPTING +#if HAVE_FEATURE_SCRIPTING StarBASIC::FatalError (SbERR_WRONG_ARGS); #endif rReq.Ignore (); @@ -538,7 +540,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) rReq.Ignore (); break; } -#ifndef DISABLE_SCRIPTING +#if HAVE_FEATURE_SCRIPTING StarBASIC::FatalError (SbERR_WRONG_ARGS); #endif rReq.Ignore (); @@ -587,13 +589,13 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) rBindings.Invalidate( SID_ZOOM_OUT ); rBindings.Invalidate( SID_ATTR_ZOOMSLIDER ); } -#ifndef DISABLE_SCRIPTING +#if HAVE_FEATURE_SCRIPTING else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE); #endif rReq.Ignore (); break; } -#ifndef DISABLE_SCRIPTING +#if HAVE_FEATURE_SCRIPTING StarBASIC::FatalError (SbERR_WRONG_ARGS); #endif rReq.Ignore (); @@ -1484,7 +1486,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } else if (pArgs->Count () != 4) { -#ifndef DISABLE_SCRIPTING +#if HAVE_FEATURE_SCRIPTING StarBASIC::FatalError (SbERR_WRONG_ARGS); #endif Cancel(); @@ -1666,7 +1668,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } else { -#ifndef DISABLE_SCRIPTING +#if HAVE_FEATURE_SCRIPTING StarBASIC::FatalError (SbERR_WRONG_ARGS); #endif Cancel (); |