[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 2 commits - desktop/source solenv/bin
Tomaž Vajngerl (via logerrit)
logerrit at kemper.freedesktop.org
Thu May 13 10:15:09 UTC 2021
desktop/source/lib/init.cxx | 4 ++++
solenv/bin/native-code.py | 41 ++++++++++++++++++++++++++++++++++++++---
2 files changed, 42 insertions(+), 3 deletions(-)
New commits:
commit e12058e880bbce9170f502bcfc5d136ade079490
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon May 10 14:55:49 2021 +0900
Commit: Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Thu May 13 12:14:49 2021 +0200
lok: enable macros by default for Android
This enables macros execution for Android, so the user will be
asked to execute macros (assuming the security level is set to 1,
which is the default) if the document contains any macros to
execute.
Change-Id: I34dbd123c5b4ea7386096fd3a21766da3479be6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115301
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115532
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0c0ca3f9b362..764b10743c11 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2282,9 +2282,13 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis,
}
SvtSecurityOptions().SetMacroSecurityLevel(nMacroSecurityLevel);
+#if defined(ANDROID) && HAVE_FEATURE_ANDROID_LOK
+ sal_Int16 nMacroExecMode = document::MacroExecMode::USE_CONFIG;
+#else
const OUString aEnableMacrosExecution = extractParameter(aOptions, u"EnableMacrosExecution");
sal_Int16 nMacroExecMode = aEnableMacrosExecution == "true" ? document::MacroExecMode::USE_CONFIG :
document::MacroExecMode::NEVER_EXECUTE;
+#endif
aFilterOptions[2].Name = "MacroExecutionMode";
aFilterOptions[2].Value <<= nMacroExecMode;
commit c765fb0c47b80e8c46dbb5b43e2d5e91237bb883
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Fri Apr 30 22:01:24 2021 +0900
Commit: Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Thu May 13 12:14:36 2021 +0200
update native-code.py with services for vba scripts in Calc
Change-Id: I54eb60d3be2717c17daa6b7634ccee3e099cbb7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114932
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115511
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 783d221fc454..3574347bb204 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -26,6 +26,9 @@ core_factory_list = [
]
core_constructor_list = [
+# basic/util/sb.component
+ ("com_sun_star_comp_sfx2_DialogLibraryContainer_get_implementation","#if HAVE_FEATURE_SCRIPTING"),
+ ("com_sun_star_comp_sfx2_ScriptLibraryContainer_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
# UnoControls/util/ctl.component
"stardiv_UnoControls_FrameControl_get_implementation",
"stardiv_UnoControls_ProgressBar_get_implementation",
@@ -271,6 +274,19 @@ core_constructor_list = [
("i18npool_NumToTextUpper_zh_TW_get_implementation", "#if WITH_LOCALE_ALL || WITH_LOCALE_zh"),
# i18nsearch/sourceh/search/i18nsearch.component
"i18npool_TextSearch_get_implementation",
+# io/source/io.component
+ "io_Pump_get_implementation",
+ "io_ODataInputStream_get_implementation",
+ "io_ODataOutputStream_get_implementation",
+ "io_OMarkableInputStream_get_implementation",
+ "io_OMarkableOutputStream_get_implementation",
+ "io_OObjectInputStream_get_implementation",
+ "io_OObjectOutputStream_get_implementation",
+ "io_OPipeImpl_get_implementation",
+ "io_OAcceptor_get_implementation",
+ "io_OConnector_get_implementation",
+ "io_OTextInputStream_get_implementation",
+ "io_OTextOutputStream_get_implementation",
# linguistic/source/lng.component
"linguistic_ConvDicList_get_implementation",
"linguistic_DicList_get_implementation",
@@ -295,6 +311,13 @@ core_constructor_list = [
"com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation",
"com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation",
"com_sun_star_extensions_xml_sax_Writer_get_implementation",
+# scripting/util/scriptframe.component
+ ("scripting_BrowseNodeFactoryImpl_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+ ("scripting_MasterScriptProvider_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+ ("scripting_MasterScriptProviderFactory_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+ ("scripting_ScriptingFrameworkURIHelper_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+# scripting/source/basprov/basprov.component
+ ("scripting_BasicProviderImpl_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
# sfx2/util/sfx.component
"SfxDocumentMetaData_get_implementation",
"com_sun_star_comp_office_FrameLoader_get_implementation",
@@ -406,6 +429,8 @@ core_constructor_list = [
# ucb/source/ucp/ucphier1.component
"ucb_HierarchyContentProvider_get_implementation",
"ucb_HierarchyDataSource_get_implementation",
+# ucb/source/ucp/package/ucppkg1
+ "ucb_package_ContentProvider_get_implementation",
# unotools/util/utl.component
"unotools_ServiceDocument_get_implementation",
"unotools_OTempFileService_get_implementation",
@@ -590,6 +615,16 @@ calc_constructor_list = [
# sc/util/scfilt.component
"com_sun_star_comp_oox_xls_ExcelFilter_get_implementation",
"com_sun_star_comp_oox_xls_FormulaParser_get_implementation",
+# sc/util/vbaobj.component
+ ("Calc_ScVbaApplication_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+ ("ScVbaEventsHelper_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+ ("ScVbaGlobals_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+ ("Calc_ScVbaHyperlink_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+ ("ScVbaTextFrame_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+ ("Calc_ScVbaWindow_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+ ("Calc_ScVbaWorkbook_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+ ("Calc_ScVbaWorksheet_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+ ("Calc_ScVbaRange_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
# scaddins/source/analysis/analysis.component
"scaddins_AnalysisAddIn_get_implementation",
# scaddins/source/datefunc/date.component
@@ -601,6 +636,9 @@ calc_constructor_list = [
# svl/util/svl.component
"com_sun_star_uno_util_numbers_SvNumberFormatsSupplierServiceObject_get_implementation",
"com_sun_star_uno_util_numbers_SvNumberFormatterServiceObject_get_implementation",
+# scripting/source/vbaevents/vbaevents.component
+ ("ooo_vba_VBAToOOEventDesc_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+ ("ooo_vba_EventListener_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
]
draw_factory_list = [
@@ -676,9 +714,6 @@ writer_factory_list = [
]
writer_constructor_list = [
-# basic/util/sb.component
- ("com_sun_star_comp_sfx2_DialogLibraryContainer_get_implementation","#if HAVE_FEATURE_SCRIPTING"),
- ("com_sun_star_comp_sfx2_ScriptLibraryContainer_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
# filter/source/textfilterdetect/textfd.component
"com_sun_star_comp_filters_PlainTextFilterDetect_get_implementation",
# sw/util/sw.component
More information about the Libreoffice-commits
mailing list