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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 537470442956..e45f2a99c22b 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1723,7 +1723,7 @@ int Desktop::doShutdown() // with the solar mutex unlocked, to avoid deadlock: sal_uLong nAcquireCount = Application::ReleaseSolarMutex(); DeregisterServices(); -#ifndef DISABLE_SCRIPTING +#if HAVE_FEATURE_SCRIPTING StarBASIC::DetachAllDocBasicItems(); #endif Application::AcquireSolarMutex(nAcquireCount); |