tdf#129375: Avoid crash when inserting bibliography entry on iOS

I don't really know how the bibliography functionality works and how
it is connected to database stuff. Until now Library_bib for
instance was excluded for iOS because it was seen to be part of the
"DBCONNECTIVITY" feature. Change that now. Also, build the dba and
dbahsql libraries also in the non-DBCONNECTIVITY case. This at least
avoids the crash and avoids new warnings about missing constructors or
factories.

Change-Id: I8a8c62a895fcd43e7fa725a4707ac5ad428a64b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86043
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86045
Tested-by: Jenkins
This commit is contained in:
Tor Lillqvist 2019-12-31 13:35:11 +02:00
parent 04ef45a6dd
commit 6eb5cffa1c
6 changed files with 27 additions and 15 deletions

View file

@ -340,11 +340,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
configmgr \ configmgr \
ctl \ ctl \
cui \ cui \
dba \
dbahsql \
$(call gb_Helper_optional,DBCONNECTIVITY, \ $(call gb_Helper_optional,DBCONNECTIVITY, \
dba \
dbase \ dbase \
dbaxml \ dbaxml) \
dbahsql) \
dbtools \ dbtools \
deploymentmisc \ deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
@ -1100,7 +1100,7 @@ $(eval $(call gb_Helper_register_mos,\
chart \ chart \
cnr \ cnr \
cui \ cui \
$(call gb_Helper_optional,DBCONNECTIVITY,dba) \ dba \
dkt \ dkt \
editeng \ editeng \
flt \ flt \

View file

@ -44,7 +44,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
cppuhelper \ cppuhelper \
cpputools \ cpputools \
cui \ cui \
$(call gb_Helper_optional,DBCONNECTIVITY,dbaccess) \ dbaccess \
desktop \ desktop \
$(call gb_Helper_optional,DICTIONARIES,dictionaries) \ $(call gb_Helper_optional,DICTIONARIES,dictionaries) \
dtrans \ dtrans \

View file

@ -9,15 +9,22 @@
$(eval $(call gb_Module_Module,dbaccess)) $(eval $(call gb_Module_Module,dbaccess))
$(eval $(call gb_Module_add_targets,dbaccess,\
Library_dba \
Library_dbahsql \
))
$(eval $(call gb_Module_add_l10n_targets,dbaccess,\
AllLangMoTarget_dba \
))
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,dbaccess,\ $(eval $(call gb_Module_add_targets,dbaccess,\
$(if $(filter WNT,$(OS)),Executable_odbcconfig) \ $(if $(filter WNT,$(OS)),Executable_odbcconfig) \
Library_dba \
Library_dbaxml \ Library_dbaxml \
Library_dbu \ Library_dbu \
Library_sdbt \ Library_sdbt \
Library_dbahsql \
UIConfig_dbaccess \ UIConfig_dbaccess \
UIConfig_dbapp \ UIConfig_dbapp \
UIConfig_dbbrowser \ UIConfig_dbbrowser \
@ -27,10 +34,6 @@ $(eval $(call gb_Module_add_targets,dbaccess,\
UIConfig_dbtdata \ UIConfig_dbtdata \
)) ))
$(eval $(call gb_Module_add_l10n_targets,dbaccess,\
AllLangMoTarget_dba \
))
ifneq ($(OS),iOS) ifneq ($(OS),iOS)
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
$(eval $(call gb_Module_add_check_targets,dbaccess,\ $(eval $(call gb_Module_add_check_targets,dbaccess,\

View file

@ -33,9 +33,12 @@ $(eval $(call gb_Module_add_targets,extensions,\
)) ))
endif endif
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,extensions,\ $(eval $(call gb_Module_add_targets,extensions,\
Library_bib \ Library_bib \
))
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,extensions,\
Library_dbp \ Library_dbp \
Library_pcr \ Library_pcr \
UIConfig_sbibliography \ UIConfig_sbibliography \

View file

@ -229,10 +229,14 @@ $(eval $(call gb_Rdb_add_components,services,\
) \ ) \
)) ))
$(eval $(call gb_Rdb_add_components,services,\
extensions/source/bibliography/bib \
dbaccess/util/dba \
))
ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Rdb_add_components,services,\ $(eval $(call gb_Rdb_add_components,services,\
extensions/source/bibliography/bib \
extensions/source/dbpilots/dbp \ extensions/source/dbpilots/dbp \
extensions/source/propctrlr/pcr \ extensions/source/propctrlr/pcr \
connectivity/source/cpool/dbpool2 \ connectivity/source/cpool/dbpool2 \
@ -263,7 +267,6 @@ $(eval $(call gb_Rdb_add_components,services,\
connectivity/source/manager/sdbc2 \ connectivity/source/manager/sdbc2 \
connectivity/source/drivers/writer/writer \ connectivity/source/drivers/writer/writer \
dbaccess/source/filter/xml/dbaxml \ dbaccess/source/filter/xml/dbaxml \
dbaccess/util/dba \
dbaccess/util/dbu \ dbaccess/util/dbu \
dbaccess/util/sdbt \ dbaccess/util/sdbt \
forms/util/frm \ forms/util/frm \

View file

@ -66,6 +66,8 @@ core_factory_list = [
("libcuilo.a", "cui_component_getFactory"), ("libcuilo.a", "cui_component_getFactory"),
("libproxyfaclo.a", "proxyfac_component_getFactory"), ("libproxyfaclo.a", "proxyfac_component_getFactory"),
("libguesslanglo.a", "guesslang_component_getFactory"), ("libguesslanglo.a", "guesslang_component_getFactory"),
("libbiblo.a", "bib_component_getFactory"),
("libdbalo.a", "dba_component_getFactory"),
] ]
core_constructor_list = [ core_constructor_list = [
@ -133,7 +135,7 @@ core_constructor_list = [
"com_sun_star_comp_SequenceOutputStreamService", "com_sun_star_comp_SequenceOutputStreamService",
"com_sun_star_comp_util_OfficeInstallationDirectories", "com_sun_star_comp_util_OfficeInstallationDirectories",
# dbaccess/util/dba.component # dbaccess/util/dba.component
("com_sun_star_comp_dba_ORowSet_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"), "com_sun_star_comp_dba_ORowSet_get_implementation",
# forms/util/frm.component # forms/util/frm.component
("com_sun_star_comp_forms_FormOperations_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"), ("com_sun_star_comp_forms_FormOperations_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
("com_sun_star_comp_forms_ODatabaseForm_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"), ("com_sun_star_comp_forms_ODatabaseForm_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
@ -271,6 +273,7 @@ core_constructor_list = [
"stardiv_Toolkit_VCLXToolkit_get_implementation", "stardiv_Toolkit_VCLXToolkit_get_implementation",
# uui/util/uui.component # uui/util/uui.component
"com_sun_star_comp_uui_UUIInteractionHandler_get_implementation", "com_sun_star_comp_uui_UUIInteractionHandler_get_implementation",
"com_sun_star_comp_uui_UUIInteractionRequestStringResolver_get_implementation",
# xmloff/util/xo.component # xmloff/util/xo.component
"XMLMetaExportComponent_get_implementation", "XMLMetaExportComponent_get_implementation",
"XMLMetaImportComponent_get_implementation", "XMLMetaImportComponent_get_implementation",