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 /sc/source/ui/docshell/docsh4.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 'sc/source/ui/docshell/docsh4.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index a8f7883c51cc..a3dce4dbccec 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -157,14 +157,14 @@ void ScDocShell::Execute( SfxRequest& rReq ) } else // geschuetzte Zelle { -#ifndef DISABLE_SCRIPTING +#if HAVE_FEATURE_SCRIPTING SbxBase::SetError( SbxERR_BAD_PARAMETER ); //! welchen Fehler ? #endif break; } } } -#ifndef DISABLE_SCRIPTING +#if HAVE_FEATURE_SCRIPTING SbxBase::SetError( SbxERR_NO_OBJECT ); #endif } @@ -1095,7 +1095,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) ScTabViewShell* pSh = GetBestViewShell(); if ( pSh ) pSh->Execute( rReq ); -#ifndef DISABLE_SCRIPTING +#if HAVE_FEATURE_SCRIPTING else SbxBase::SetError( SbxERR_NO_ACTIVE_OBJECT ); #endif |