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>
This commit is contained in:
committed by
Jan-Marek Glogowski
parent
33f3470474
commit
35cc52f778
@@ -16,8 +16,13 @@ $(eval $(call gb_Library_set_include,avmedia,\
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_use_libraries,avmedia,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
sal \
|
||||
svl \
|
||||
ucbhelper \
|
||||
vcl \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_use_sdk_api,avmedia,))
|
||||
@@ -44,16 +49,11 @@ $(eval $(call gb_Library_use_externals,avmedia,\
|
||||
$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
|
||||
|
||||
$(eval $(call gb_Library_use_libraries,avmedia,\
|
||||
comphelper \
|
||||
ucbhelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
i18nlangtag \
|
||||
sfx \
|
||||
svt \
|
||||
tl \
|
||||
utl \
|
||||
vcl \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_exception_objects,avmedia,\
|
||||
|
@@ -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();
|
||||
|
Reference in New Issue
Block a user