diff options
| author | TheRock Builder <libo@therock> | 2021-12-03 16:39:43 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-04 05:01:23 +0100 |
| commit | 35cc52f77804eda54d4e466da1b2afbdc1555ef3 (patch) | |
| tree | 1fa38b137ad6a9b4efe24bfd7fe1e52e1385d9c8 /basic | |
| parent | 33f3470474dd79a3a0eae1f6cb369e6400b58b6a (diff) | |
Fix --disable-(avmedia|scripting)
So it's not a good idea to change the patch without testing it
again. I'm still hoping for a better usable MediaItem then the
previous dummy. The ODF stores a preview image and it should
allow to export the media.
The scripting fix feels like a workaround. somehow the final
class specifier triggers something that makes the linker fail
with missing destructors for all std::unique_ptr objects
derivated from SbxFactory. Implementing these as virtual
overrides didn't help, neither as {} or = default. So this
removes them in the !"#if HAVE_FEATURE_SCRIPTING" case.
Change-Id: I9f6751f44e0247ed31c27be0ee816239795e9372
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126330
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/inc/sbintern.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx index 0f1b4d3114b5..fe897ab6bcd6 100644 --- a/basic/source/inc/sbintern.hxx +++ b/basic/source/inc/sbintern.hxx @@ -104,6 +104,7 @@ struct SbiGlobals { static SbiGlobals* pGlobals; SbiInstance* pInst; // all active runtime instances +#if HAVE_FEATURE_SCRIPTING std::unique_ptr<SbiFactory> pSbFac; // StarBASIC-Factory std::unique_ptr<SbUnoFactory> pUnoFac; // Factory for Uno-Structs at DIM AS NEW std::unique_ptr<SbTypeFactory> @@ -114,6 +115,8 @@ struct SbiGlobals pOLEFac; // Factory for OLE types std::unique_ptr<SbFormFactory> pFormFac; // Factory for user forms + std::unique_ptr<BasicManager> pAppBasMgr; +#endif SbModule* pMod; // currently active module SbModule* pCompMod; // currently compiled module short nInst; // number of BASICs @@ -128,9 +131,6 @@ struct SbiGlobals OUString aErrMsg; // buffer for GetErrorText() std::unique_ptr<::utl::TransliterationWrapper> pTransliterationWrapper; // For StrComp bool bBlockCompilerError; -#if HAVE_FEATURE_SCRIPTING - std::unique_ptr<BasicManager> pAppBasMgr; -#endif StarBASIC* pMSOMacroRuntimLib; // Lib containing MSO Macro Runtime API entry symbols SbiGlobals(); |