diff options
| author | Tor Lillqvist <tml@collabora.com> | 2019-03-20 20:20:41 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2019-03-20 20:24:45 +0200 |
| commit | 40264372657160b69b9639eff4fe0263af8f9033 (patch) | |
| tree | 79f9ab1beda249e6782991f090728fae6d47a48b | |
| parent | 3681e8d8e6270912090b22445e67899bc2207e39 (diff) | |
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
| -rw-r--r-- | sfx2/source/appl/app.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 9388d962655e..e0d50dc44b71 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -100,9 +100,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; @@ -199,10 +197,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" ); } @@ -227,9 +227,7 @@ SfxApplication::~SfxApplication() if ( !pImpl->bDowning ) Deinitialize(); -#if HAVE_FEATURE_SCRIPTING delete pBasic; -#endif g_pSfxApplication = nullptr; } |