Sprinkle more DISABLE_SCRIPTING ifdefs

7 files changed, 66 insertions, 24 deletions

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index bc8b3bae51e4..3bc8dc1c8659 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -693,9 +693,11 @@ void SAL_CALL SlideshowImpl::disposing()
 
     if( maPresSettings.mbFullScreen )
     {
+#ifndef DISABLE_SCRIPTING
         // restore StarBASICErrorHdl
         StarBASIC::SetGlobalErrorHdl(maStarBASICGlobalErrorHdl);
         maStarBASICGlobalErrorHdl = Link();
+#endif
     }
     else
     {
@@ -1038,9 +1040,11 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
 
             if( maPresSettings.mbFullScreen )
             {
+#ifndef DISABLE_SCRIPTING
                 // disable basic ide error handling
                 maStarBASICGlobalErrorHdl = StarBASIC::GetGlobalErrorHdl();
                 StarBASIC::SetGlobalErrorHdl( Link() );
+#endif
             }
 
             // call resize handler
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index c83267ef5131..e0e075088320 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -177,7 +177,9 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
             }
             else
             {
+#ifndef DISABLE_SCRIPTING
                 StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
+#endif
                 rRequest.Ignore ();
                 break;
             }
@@ -189,7 +191,9 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
         }
         else
         {
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             rRequest.Ignore ();
             break;
         }
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index ee16ce6c2760..af8239ffcb88 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -492,8 +492,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                     rReq.Ignore ();
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             rReq.Ignore ();
             break;
         }
@@ -519,8 +520,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                     rReq.Ignore ();
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             rReq.Ignore ();
             break;
         }
@@ -567,13 +569,15 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                         rBindings.Invalidate( SID_ZOOM_OUT );
                         rBindings.Invalidate( SID_ATTR_ZOOMSLIDER );
                     }
+#ifndef DISABLE_SCRIPTING
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
-
+#endif
                     rReq.Ignore ();
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             rReq.Ignore ();
             break;
         }
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index eb7d96799c25..f67f60fac66a 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -174,7 +174,9 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
                     sal_Int32 nWhatKind = (sal_Int32)pWhatKind->GetValue ();
                     if (! CHECK_RANGE (PK_STANDARD, nWhatKind, PK_HANDOUT))
                     {
+#ifndef DISABLE_SCRIPTING
                         StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
+#endif
                         rReq.Ignore ();
                         break;
                     }
@@ -182,7 +184,9 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
                     {
                         if (! CHECK_RANGE (0, nWhatPage, GetDoc()->GetSdPageCount((PageKind)nWhatKind)))
                         {
+#ifndef DISABLE_SCRIPTING
                             StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
+#endif
                             rReq.Ignore ();
                             break;
                         }
@@ -193,7 +197,9 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
                 }
                 else
                 {
+#ifndef DISABLE_SCRIPTING
                     StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
                     rReq.Ignore ();
                     break;
                 }
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 107fca660d89..f2741cdf4345 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -273,12 +273,14 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                         pAttr->Put (XFillStyleItem ((XFillStyle) pFillStyle->GetValue ()), XATTR_FILLSTYLE);
                         rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     }
+#ifndef DISABLE_SCRIPTING
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
-
+#endif
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             break;
 
         // linienstil neu bestimmen
@@ -293,12 +295,14 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                         pAttr->Put (XLineStyleItem ((XLineStyle) pLineStyle->GetValue ()), XATTR_LINESTYLE);
                         rBindings.Invalidate (SID_ATTR_LINE_STYLE);
                     }
+#ifndef DISABLE_SCRIPTING
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
-
+#endif
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             break;
 
         // linienbreite setzen
@@ -312,8 +316,9 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                     rBindings.Invalidate (SID_ATTR_LINE_WIDTH);
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             break;
 
         case SID_SETFILLCOLOR :
@@ -335,8 +340,9 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                     rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             break;
 
         case SID_SETLINECOLOR :
@@ -355,8 +361,9 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                     rBindings.Invalidate (SID_ATTR_LINE_COLOR);
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             break;
 
         case SID_SETGRADSTARTCOLOR :
@@ -416,8 +423,9 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                     rBindings.Invalidate (SID_ATTR_FILL_GRADIENT);
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             break;
 
         case SID_SETHATCHCOLOR :
@@ -469,8 +477,9 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                     rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             break;
 
         // einstellungen fuer liniendash
@@ -513,12 +522,14 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                         rBindings.Invalidate (SID_ATTR_LINE_DASH);
                         rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     }
+#ifndef DISABLE_SCRIPTING
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
-
+#endif
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             break;
 
         // einstellungen fuer farbverlauf
@@ -588,12 +599,14 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                         rBindings.Invalidate (SID_ATTR_FILL_GRADIENT);
                         rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     }
+#ifndef DISABLE_SCRIPTING
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
-
+#endif
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             break;
 
         // einstellungen fuer schraffur
@@ -648,12 +661,14 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                         rBindings.Invalidate (SID_ATTR_FILL_HATCH);
                         rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     }
+#ifndef DISABLE_SCRIPTING
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
-
+#endif
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             break;
 
         case SID_SELECTGRADIENT :
@@ -686,8 +701,9 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
 
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             break;
 
         case SID_SELECTHATCH :
@@ -720,8 +736,9 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
 
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             break;
 
         case SID_UNSELECT :
@@ -734,8 +751,9 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                 {
                     break;
                 }
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
             break;
 
 /*        case SID_SETFONTFAMILYNAME :
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 231c6d54cfe0..516e7b83e16a 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -164,7 +164,9 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
             }
             else if (pArgs->Count () != 4)
                  {
+#ifndef DISABLE_SCRIPTING
                      StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
                      Cancel();
                      rReq.Ignore ();
                      break;
@@ -340,7 +342,9 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
             }
             else
             {
+#ifndef DISABLE_SCRIPTING
                 StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
                 Cancel ();
                 rReq.Ignore ();
                 break;
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 674b3443568b..87b88cf73070 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -300,8 +300,9 @@ SdPage* ViewShell::CreateOrDuplicatePage (
 
             if(HasCurrentFunction( SID_BEZIER_EDIT ) )
                 GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
-
+#ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
+#endif
             rRequest.Ignore ();
             return NULL;
         }
@@ -312,8 +313,9 @@ SdPage* ViewShell::CreateOrDuplicatePage (
 
         if(HasCurrentFunction(SID_BEZIER_EDIT) )
             GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
-
+#ifndef DISABLE_SCRIPTING
         StarBASIC::FatalError (SbERR_WRONG_ARGS);
+#endif
         rRequest.Ignore ();
         return NULL;
     }