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

6 files changed, 45 insertions, 33 deletions

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 1281111ce1cc..1b9cdd43b2dd 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <com/sun/star/frame/theAutoRecovery.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -664,7 +666,7 @@ void SAL_CALL SlideshowImpl::disposing()
 
     if( maPresSettings.mbFullScreen )
     {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
         // restore StarBASICErrorHdl
         StarBASIC::SetGlobalErrorHdl(maStarBASICGlobalErrorHdl);
         maStarBASICGlobalErrorHdl = Link();
@@ -995,7 +997,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
 
             if( maPresSettings.mbFullScreen )
             {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
                 // disable basic ide error handling
                 maStarBASICGlobalErrorHdl = StarBASIC::GetGlobalErrorHdl();
                 StarBASIC::SetGlobalErrorHdl( Link() );
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index d859637bb0a6..6e01b5244a40 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include "ViewShellImplementation.hxx"
 
 #include "sdpage.hxx"
@@ -141,7 +143,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
             }
             else
             {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
                 StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 #endif
                 rRequest.Ignore ();
@@ -155,7 +157,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
         }
         else
         {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
             rRequest.Ignore ();
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 ();
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 7318d84bad9b..0c257dbdbe46 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include "DrawViewShell.hxx"
 
 #include <sfx2/viewfrm.hxx>
@@ -151,7 +153,7 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
                     sal_Int32 nWhatKind = (sal_Int32)pWhatKind->GetValue ();
                     if (! CHECK_RANGE (PK_STANDARD, nWhatKind, PK_HANDOUT))
                     {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
                         StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 #endif
                         rReq.Ignore ();
@@ -161,7 +163,7 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
                     {
                         if (! CHECK_RANGE (0, nWhatPage, GetDoc()->GetSdPageCount((PageKind)nWhatKind)))
                         {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
                             StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 #endif
                             rReq.Ignore ();
@@ -174,7 +176,7 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
                 }
                 else
                 {
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
                     StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
                     rReq.Ignore ();
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 603814a2182a..4319cdaa2912 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include "DrawViewShell.hxx"
 #include <vcl/wrkwin.hxx>
 #include <svx/xgrad.hxx>
@@ -218,12 +220,12 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                         pAttr->Put (XFillStyleItem ((drawing::FillStyle) pFillStyle->GetValue ()), XATTR_FILLSTYLE);
                         rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 #endif
                     break;
                 }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
             break;
@@ -240,12 +242,12 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                         pAttr->Put (XLineStyleItem ((XLineStyle) pLineStyle->GetValue ()), XATTR_LINESTYLE);
                         rBindings.Invalidate (SID_ATTR_LINE_STYLE);
                     }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 #endif
                     break;
                 }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
             break;
@@ -261,7 +263,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                     rBindings.Invalidate (SID_ATTR_LINE_WIDTH);
                     break;
                 }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
             break;
@@ -285,7 +287,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                     rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     break;
                 }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
             break;
@@ -306,7 +308,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                     rBindings.Invalidate (SID_ATTR_LINE_COLOR);
                     break;
                 }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
             break;
@@ -368,7 +370,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                     rBindings.Invalidate (SID_ATTR_FILL_GRADIENT);
                     break;
                 }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
             break;
@@ -422,7 +424,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                     rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     break;
                 }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
             break;
@@ -467,12 +469,12 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                         rBindings.Invalidate (SID_ATTR_LINE_DASH);
                         rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 #endif
                     break;
                 }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
             break;
@@ -544,12 +546,12 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                         rBindings.Invalidate (SID_ATTR_FILL_GRADIENT);
                         rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 #endif
                     break;
                 }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
             break;
@@ -606,12 +608,12 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                         rBindings.Invalidate (SID_ATTR_FILL_HATCH);
                         rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 #endif
                     break;
                 }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
             break;
@@ -646,7 +648,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
 
                     break;
                 }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
             break;
@@ -681,7 +683,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
 
                     break;
                 }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
             break;
@@ -696,7 +698,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                 {
                     break;
                 }
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
             break;
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index ca6dbb148183..84916c7cae70 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include "ViewShell.hxx"
 #include "GraphicViewShell.hxx"
 #include "GraphicViewShellBase.hxx"
@@ -279,7 +281,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
 
             if(HasCurrentFunction( SID_BEZIER_EDIT ) )
                 GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
             StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 #endif
             rRequest.Ignore ();
@@ -292,7 +294,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
 
         if(HasCurrentFunction(SID_BEZIER_EDIT) )
             GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
-#ifndef DISABLE_SCRIPTING
+#if HAVE_FEATURE_SCRIPTING
         StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
         rRequest.Ignore ();