[Libreoffice-commits] core.git: desktop/source

Tor Lillqvist tml at collabora.com
Fri May 30 13:29:09 PDT 2014


 desktop/source/app/app.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2949cb7b2380291be16831f5239368e90bdc6380
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri May 30 23:28:22 2014 +0300

    No StarBASIC if DISABLE_SCRIPTING
    
    Change-Id: Ie72c883c4d55ad247f582dcd89420f13814c28a3

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b6c4e8c..065fb40 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1767,7 +1767,9 @@ int Desktop::doShutdown()
     // with the solar mutex unlocked, to avoid deadlock:
     sal_uLong nAcquireCount = Application::ReleaseSolarMutex();
     DeregisterServices();
+#ifndef DISABLE_SCRIPTING
     StarBASIC::DetachAllDocBasicItems();
+#endif
     Application::AcquireSolarMutex(nAcquireCount);
     // be sure that path/language options gets destroyed before
     // UCB is deinitialized


More information about the Libreoffice-commits mailing list