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:20:41 +0200 |
commit | 1d5249e334d302991783997668093d2eec3e4af7 (patch) | |
tree | 44436078cad63e0360dc3d35a5fdfc274a9c8f32 /sfx2 | |
parent | f6bdfa3754744fafc6bee8a07d706897a487e035 (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
Diffstat (limited to 'sfx2')
-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 597a8bdb8b2a..faea2ed1acb5 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -102,9 +102,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; @@ -201,10 +199,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" ); } @@ -229,9 +229,7 @@ SfxApplication::~SfxApplication() if ( !pImpl->bDowning ) Deinitialize(); -#if HAVE_FEATURE_SCRIPTING delete pBasic; -#endif g_pSfxApplication = nullptr; } |