sfx2/source/appl/app.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
New commits: commit 723480428abdcb620d92f3f1fb807db4c18abb8b Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Wed Mar 20 20:20:41 2019 +0200 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Fri Sep 20 12:34:54 2019 +0200 tdf#124168: We do need the BasicDLL thing also in the iOS app For instance, simply inserting a table of contents needs stuff from it. But do keep use of the StarBASIC::* API inside #if HAVE_FEATURE_SCRIPTING. Change-Id: I348ce79899f468e104af336501706f88a6afa287 (cherry picked from commit 1d5249e334d302991783997668093d2eec3e4af7) Reviewed-on: https://gerrit.libreoffice.org/79187 Reviewed-by: Tor Lillqvist <t...@collabora.com> Tested-by: Tor Lillqvist <t...@collabora.com> diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 6ff4e5c5cea6..b9636269172f 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -99,9 +99,7 @@ using namespace ::com::sun::star; static SfxApplication* g_pSfxApplication = nullptr; -#if HAVE_FEATURE_SCRIPTING static BasicDLL* pBasic = nullptr; -#endif #if HAVE_FEATURE_DESKTOP static SfxHelp* pSfxHelp = nullptr; @@ -198,10 +196,12 @@ SfxApplication::SfxApplication() pSfxHelp = new SfxHelp; #endif -#if HAVE_FEATURE_SCRIPTING pBasic = new BasicDLL; + +#if HAVE_FEATURE_SCRIPTING StarBASIC::SetGlobalErrorHdl( LINK( this, SfxApplication, GlobalBasicErrorHdl_Impl ) ); #endif + SAL_INFO( "sfx.appl", "} initialize DDE" ); } @@ -226,9 +226,7 @@ SfxApplication::~SfxApplication() if ( !pImpl->bDowning ) Deinitialize(); -#if HAVE_FEATURE_SCRIPTING delete pBasic; -#endif g_pSfxApplication = nullptr; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits