diff options
64 files changed, 304 insertions, 62 deletions
diff --git a/sc/CppunitTest_sc_addin_functions_test.mk b/sc/CppunitTest_sc_addin_functions_test.mk index b1aa766679be..24cbcaf22d1c 100644 --- a/sc/CppunitTest_sc_addin_functions_test.mk +++ b/sc/CppunitTest_sc_addin_functions_test.mk @@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_addin_functions_test,\ $(eval $(call gb_CppunitTest_use_api,sc_addin_functions_test,\ offapi \ udkapi \ + oovbaapi \ )) $(eval $(call gb_CppunitTest_use_ure,sc_addin_functions_test)) diff --git a/sc/CppunitTest_sc_anchor_test.mk b/sc/CppunitTest_sc_anchor_test.mk index 2f9719e48fd6..9005c69ce446 100644 --- a/sc/CppunitTest_sc_anchor_test.mk +++ b/sc/CppunitTest_sc_anchor_test.mk @@ -59,7 +59,11 @@ $(eval $(call gb_CppunitTest_set_include,sc_anchor_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sc_anchor_test)) +$(eval $(call gb_CppunitTest_use_api,sc_anchor_test,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sc_anchor_test)) $(eval $(call gb_CppunitTest_use_vcl,sc_anchor_test)) diff --git a/sc/CppunitTest_sc_array_functions_test.mk b/sc/CppunitTest_sc_array_functions_test.mk index c94b75a7b203..79a4453e3c76 100644 --- a/sc/CppunitTest_sc_array_functions_test.mk +++ b/sc/CppunitTest_sc_array_functions_test.mk @@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_array_functions_test,\ $(eval $(call gb_CppunitTest_use_api,sc_array_functions_test,\ offapi \ udkapi \ + oovbaapi \ )) $(eval $(call gb_CppunitTest_use_ure,sc_array_functions_test)) diff --git a/sc/CppunitTest_sc_bugfix_test.mk b/sc/CppunitTest_sc_bugfix_test.mk index d14a9e1154da..18e06b81a94a 100644 --- a/sc/CppunitTest_sc_bugfix_test.mk +++ b/sc/CppunitTest_sc_bugfix_test.mk @@ -61,7 +61,11 @@ $(eval $(call gb_CppunitTest_set_include,sc_bugfix_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sc_bugfix_test)) +$(eval $(call gb_CppunitTest_use_api,sc_bugfix_test,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sc_bugfix_test)) $(eval $(call gb_CppunitTest_use_vcl,sc_bugfix_test)) diff --git a/sc/CppunitTest_sc_cond_format_merge.mk b/sc/CppunitTest_sc_cond_format_merge.mk index bfb7dc2bba3f..c09d48f022fe 100644 --- a/sc/CppunitTest_sc_cond_format_merge.mk +++ b/sc/CppunitTest_sc_cond_format_merge.mk @@ -59,7 +59,11 @@ $(eval $(call gb_CppunitTest_set_include,sc_cond_format_merge,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sc_cond_format_merge)) +$(eval $(call gb_CppunitTest_use_api,sc_cond_format_merge,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sc_cond_format_merge)) $(eval $(call gb_CppunitTest_use_vcl,sc_cond_format_merge)) diff --git a/sc/CppunitTest_sc_copypaste.mk b/sc/CppunitTest_sc_copypaste.mk index 8d71cf6004cf..09aa581b48cf 100644 --- a/sc/CppunitTest_sc_copypaste.mk +++ b/sc/CppunitTest_sc_copypaste.mk @@ -61,7 +61,11 @@ $(eval $(call gb_CppunitTest_set_include,sc_copypaste,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sc_copypaste)) +$(eval $(call gb_CppunitTest_use_api,sc_copypaste,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sc_copypaste)) $(eval $(call gb_CppunitTest_use_vcl,sc_copypaste)) diff --git a/sc/CppunitTest_sc_database_functions_test.mk b/sc/CppunitTest_sc_database_functions_test.mk index 8b9b9ac83625..c902ce6cbaf8 100644 --- a/sc/CppunitTest_sc_database_functions_test.mk +++ b/sc/CppunitTest_sc_database_functions_test.mk @@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_database_functions_test,\ $(eval $(call gb_CppunitTest_use_api,sc_database_functions_test,\ offapi \ udkapi \ + oovbaapi \ )) $(eval $(call gb_CppunitTest_use_ure,sc_database_functions_test)) diff --git a/sc/CppunitTest_sc_dataprovider.mk b/sc/CppunitTest_sc_dataprovider.mk index fe389fdb3ee5..ef9c6c907546 100644 --- a/sc/CppunitTest_sc_dataprovider.mk +++ b/sc/CppunitTest_sc_dataprovider.mk @@ -67,7 +67,11 @@ $(eval $(call gb_CppunitTest_use_custom_headers,sc_dataprovider,\ officecfg/registry \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sc_dataprovider)) +$(eval $(call gb_CppunitTest_use_api,sc_dataprovider,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sc_dataprovider)) $(eval $(call gb_CppunitTest_use_vcl,sc_dataprovider)) diff --git a/sc/CppunitTest_sc_datatransformation.mk b/sc/CppunitTest_sc_datatransformation.mk index b65d315bb944..1d0d99af7b8b 100644 --- a/sc/CppunitTest_sc_datatransformation.mk +++ b/sc/CppunitTest_sc_datatransformation.mk @@ -67,7 +67,11 @@ $(eval $(call gb_CppunitTest_use_custom_headers,sc_datatransformation,\ officecfg/registry \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sc_datatransformation)) +$(eval $(call gb_CppunitTest_use_api,sc_datatransformation,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sc_datatransformation)) $(eval $(call gb_CppunitTest_use_vcl,sc_datatransformation)) diff --git a/sc/CppunitTest_sc_datetime_functions_test.mk b/sc/CppunitTest_sc_datetime_functions_test.mk index 560ae910f684..22047623013e 100644 --- a/sc/CppunitTest_sc_datetime_functions_test.mk +++ b/sc/CppunitTest_sc_datetime_functions_test.mk @@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_datetime_functions_test,\ $(eval $(call gb_CppunitTest_use_api,sc_datetime_functions_test,\ offapi \ udkapi \ + oovbaapi \ )) $(eval $(call gb_CppunitTest_use_ure,sc_datetime_functions_test)) diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 3026f841504a..d00a8d293b7b 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -63,7 +63,11 @@ $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sc_filters_test)) +$(eval $(call gb_CppunitTest_use_api,sc_filters_test,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sc_filters_test)) $(eval $(call gb_CppunitTest_use_vcl,sc_filters_test)) diff --git a/sc/CppunitTest_sc_financial_functions_test.mk b/sc/CppunitTest_sc_financial_functions_test.mk index 748c44b879b8..4089161fab9a 100644 --- a/sc/CppunitTest_sc_financial_functions_test.mk +++ b/sc/CppunitTest_sc_financial_functions_test.mk @@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_financial_functions_test,\ $(eval $(call gb_CppunitTest_use_api,sc_financial_functions_test,\ offapi \ udkapi \ + oovbaapi \ )) $(eval $(call gb_CppunitTest_use_ure,sc_financial_functions_test)) diff --git a/sc/CppunitTest_sc_functions_test_old.mk b/sc/CppunitTest_sc_functions_test_old.mk index cad0a6acf1bc..28ab160ba437 100644 --- a/sc/CppunitTest_sc_functions_test_old.mk +++ b/sc/CppunitTest_sc_functions_test_old.mk @@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_functions_test_old,\ $(eval $(call gb_CppunitTest_use_api,sc_functions_test_old,\ offapi \ udkapi \ + oovbaapi \ )) $(eval $(call gb_CppunitTest_use_ure,sc_functions_test_old)) diff --git a/sc/CppunitTest_sc_html_export_test.mk b/sc/CppunitTest_sc_html_export_test.mk index 08e7d04d4bf1..a96540398e3a 100644 --- a/sc/CppunitTest_sc_html_export_test.mk +++ b/sc/CppunitTest_sc_html_export_test.mk @@ -57,7 +57,11 @@ $(eval $(call gb_CppunitTest_set_include,sc_html_export_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sc_html_export_test)) +$(eval $(call gb_CppunitTest_use_api,sc_html_export_test,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sc_html_export_test)) $(eval $(call gb_CppunitTest_use_vcl,sc_html_export_test)) diff --git a/sc/CppunitTest_sc_information_functions_test.mk b/sc/CppunitTest_sc_information_functions_test.mk index 1c476bd6ac3b..ffe85e9a8c65 100644 --- a/sc/CppunitTest_sc_information_functions_test.mk +++ b/sc/CppunitTest_sc_information_functions_test.mk @@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_information_functions_test,\ $(eval $(call gb_CppunitTest_use_api,sc_information_functions_test,\ offapi \ udkapi \ + oovbaapi \ )) $(eval $(call gb_CppunitTest_use_ure,sc_information_functions_test)) diff --git a/sc/CppunitTest_sc_logical_functions_test.mk b/sc/CppunitTest_sc_logical_functions_test.mk index ec2d07ea5f80..79caec12a78f 100644 --- a/sc/CppunitTest_sc_logical_functions_test.mk +++ b/sc/CppunitTest_sc_logical_functions_test.mk @@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_logical_functions_test,\ $(eval $(call gb_CppunitTest_use_api,sc_logical_functions_test,\ offapi \ udkapi \ + oovbaapi \ )) $(eval $(call gb_CppunitTest_use_ure,sc_logical_functions_test)) diff --git a/sc/CppunitTest_sc_mathematical_functions_test.mk b/sc/CppunitTest_sc_mathematical_functions_test.mk index 94e84e759edb..7cd43a0b128f 100644 --- a/sc/CppunitTest_sc_mathematical_functions_test.mk +++ b/sc/CppunitTest_sc_mathematical_functions_test.mk @@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_mathematical_functions_test,\ $(eval $(call gb_CppunitTest_use_api,sc_mathematical_functions_test,\ offapi \ udkapi \ + oovbaapi \ )) $(eval $(call gb_CppunitTest_use_ure,sc_mathematical_functions_test)) diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk index 6abc275ec991..a13da391da58 100644 --- a/sc/CppunitTest_sc_opencl_test.mk +++ b/sc/CppunitTest_sc_opencl_test.mk @@ -59,7 +59,11 @@ $(eval $(call gb_CppunitTest_set_include,sc_opencl_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sc_opencl_test)) +$(eval $(call gb_CppunitTest_use_api,sc_opencl_test,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sc_opencl_test)) $(eval $(call gb_CppunitTest_use_vcl,sc_opencl_test)) diff --git a/sc/CppunitTest_sc_parallelism.mk b/sc/CppunitTest_sc_parallelism.mk index a411caee2ae2..a2bb02fd2c7b 100644 --- a/sc/CppunitTest_sc_parallelism.mk +++ b/sc/CppunitTest_sc_parallelism.mk @@ -59,7 +59,11 @@ $(eval $(call gb_CppunitTest_set_include,sc_parallelism,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sc_parallelism)) +$(eval $(call gb_CppunitTest_use_api,sc_parallelism,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sc_parallelism)) $(eval $(call gb_CppunitTest_use_vcl,sc_parallelism)) diff --git a/sc/CppunitTest_sc_pivottable_filters_test.mk b/sc/CppunitTest_sc_pivottable_filters_test.mk index 139ed85f3b24..c806c743043d 100755 --- a/sc/CppunitTest_sc_pivottable_filters_test.mk +++ b/sc/CppunitTest_sc_pivottable_filters_test.mk @@ -58,7 +58,11 @@ $(eval $(call gb_CppunitTest_set_include,sc_pivottable_filters_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sc_pivottable_filters_test)) +$(eval $(call gb_CppunitTest_use_api,sc_pivottable_filters_test,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sc_pivottable_filters_test)) $(eval $(call gb_CppunitTest_use_vcl,sc_pivottable_filters_test)) diff --git a/sc/CppunitTest_sc_spreadsheet_functions_test.mk b/sc/CppunitTest_sc_spreadsheet_functions_test.mk index 6049862d5782..76d6cbccd998 100644 --- a/sc/CppunitTest_sc_spreadsheet_functions_test.mk +++ b/sc/CppunitTest_sc_spreadsheet_functions_test.mk @@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_spreadsheet_functions_test,\ $(eval $(call gb_CppunitTest_use_api,sc_spreadsheet_functions_test,\ offapi \ udkapi \ + oovbaapi \ )) $(eval $(call gb_CppunitTest_use_ure,sc_spreadsheet_functions_test)) diff --git a/sc/CppunitTest_sc_statistical_functions_test.mk b/sc/CppunitTest_sc_statistical_functions_test.mk index 931c0b22ad86..1b89d22c3869 100644 --- a/sc/CppunitTest_sc_statistical_functions_test.mk +++ b/sc/CppunitTest_sc_statistical_functions_test.mk @@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_statistical_functions_test,\ $(eval $(call gb_CppunitTest_use_api,sc_statistical_functions_test,\ offapi \ udkapi \ + oovbaapi \ )) $(eval $(call gb_CppunitTest_use_ure,sc_statistical_functions_test)) diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk index cf6125f6ef04..16758ea82f2a 100644 --- a/sc/CppunitTest_sc_subsequent_export_test.mk +++ b/sc/CppunitTest_sc_subsequent_export_test.mk @@ -58,7 +58,11 @@ $(eval $(call gb_CppunitTest_set_include,sc_subsequent_export_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sc_subsequent_export_test)) +$(eval $(call gb_CppunitTest_use_api,sc_subsequent_export_test,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sc_subsequent_export_test)) $(eval $(call gb_CppunitTest_use_vcl,sc_subsequent_export_test)) diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index e23869e164eb..7b5800c38840 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -62,7 +62,11 @@ $(eval $(call gb_CppunitTest_set_include,sc_subsequent_filters_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sc_subsequent_filters_test)) +$(eval $(call gb_CppunitTest_use_api,sc_subsequent_filters_test,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sc_subsequent_filters_test)) $(eval $(call gb_CppunitTest_use_vcl,sc_subsequent_filters_test)) diff --git a/sc/CppunitTest_sc_text_functions_test.mk b/sc/CppunitTest_sc_text_functions_test.mk index 956b2b9d5aa1..e0c1f22ffa5d 100644 --- a/sc/CppunitTest_sc_text_functions_test.mk +++ b/sc/CppunitTest_sc_text_functions_test.mk @@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_text_functions_test,\ $(eval $(call gb_CppunitTest_use_api,sc_text_functions_test,\ offapi \ udkapi \ + oovbaapi \ )) $(eval $(call gb_CppunitTest_use_ure,sc_text_functions_test)) diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index d423f6c73a7b..32bbf28877bc 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -82,7 +82,11 @@ $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sc_ucalc)) +$(eval $(call gb_CppunitTest_use_api,sc_ucalc,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_custom_headers,sc_ucalc,\ officecfg/registry \ diff --git a/sc/Library_scqahelper.mk b/sc/Library_scqahelper.mk index 0e209024b398..f91ec28c224a 100644 --- a/sc/Library_scqahelper.mk +++ b/sc/Library_scqahelper.mk @@ -32,7 +32,11 @@ $(eval $(call gb_Library_add_defs,scqahelper,\ -DSCQAHELPER_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_use_sdk_api,scqahelper)) +$(eval $(call gb_Library_use_api,scqahelper,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_Library_use_libraries,scqahelper,\ comphelper \ diff --git a/svtools/CppunitTest_svtools_graphic.mk b/svtools/CppunitTest_svtools_graphic.mk index f38e1168e5c1..04e562e16691 100644 --- a/svtools/CppunitTest_svtools_graphic.mk +++ b/svtools/CppunitTest_svtools_graphic.mk @@ -14,7 +14,11 @@ $(eval $(call gb_CppunitTest_use_externals,svtools_graphic,\ libxml2 \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,svtools_graphic)) +$(eval $(call gb_CppunitTest_use_api,svtools_graphic,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,svtools_graphic)) diff --git a/sw/CppunitTest_sw_docbookexport.mk b/sw/CppunitTest_sw_docbookexport.mk index bbb3c9e8f8bd..2e34f8b8767b 100644 --- a/sw/CppunitTest_sw_docbookexport.mk +++ b/sw/CppunitTest_sw_docbookexport.mk @@ -43,7 +43,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_docbookexport,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_docbookexport)) +$(eval $(call gb_CppunitTest_use_api,sw_docbookexport,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_docbookexport)) $(eval $(call gb_CppunitTest_use_vcl,sw_docbookexport)) diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 3ea529517dce..c171d3840ecb 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -44,7 +44,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_filters_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_filters_test)) +$(eval $(call gb_CppunitTest_use_api,sw_filters_test,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_filters_test)) $(eval $(call gb_CppunitTest_use_vcl,sw_filters_test)) diff --git a/sw/CppunitTest_sw_fodfexport.mk b/sw/CppunitTest_sw_fodfexport.mk index 4703b85435f7..d49c8c5795ca 100644 --- a/sw/CppunitTest_sw_fodfexport.mk +++ b/sw/CppunitTest_sw_fodfexport.mk @@ -41,7 +41,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_fodfexport,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_fodfexport)) +$(eval $(call gb_CppunitTest_use_api,sw_fodfexport,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_fodfexport)) $(eval $(call gb_CppunitTest_use_vcl,sw_fodfexport)) diff --git a/sw/CppunitTest_sw_globalfilter.mk b/sw/CppunitTest_sw_globalfilter.mk index 97ce20201c6d..d07ecf840daa 100644 --- a/sw/CppunitTest_sw_globalfilter.mk +++ b/sw/CppunitTest_sw_globalfilter.mk @@ -42,7 +42,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_globalfilter,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_globalfilter)) +$(eval $(call gb_CppunitTest_use_api,sw_globalfilter,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_globalfilter)) $(eval $(call gb_CppunitTest_use_vcl,sw_globalfilter)) diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk index 2fe3e02e358a..8af199d3d284 100644 --- a/sw/CppunitTest_sw_htmlexport.mk +++ b/sw/CppunitTest_sw_htmlexport.mk @@ -43,7 +43,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_htmlexport,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_htmlexport)) +$(eval $(call gb_CppunitTest_use_api,sw_htmlexport,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_htmlexport)) $(eval $(call gb_CppunitTest_use_vcl,sw_htmlexport)) diff --git a/sw/CppunitTest_sw_htmlimport.mk b/sw/CppunitTest_sw_htmlimport.mk index 0382c5844021..51fef07ca9b2 100644 --- a/sw/CppunitTest_sw_htmlimport.mk +++ b/sw/CppunitTest_sw_htmlimport.mk @@ -44,7 +44,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_htmlimport,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_htmlimport)) +$(eval $(call gb_CppunitTest_use_api,sw_htmlimport,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_htmlimport)) $(eval $(call gb_CppunitTest_use_vcl,sw_htmlimport)) diff --git a/sw/CppunitTest_sw_layoutwriter.mk b/sw/CppunitTest_sw_layoutwriter.mk index 675299180e44..e5f5a180920e 100644 --- a/sw/CppunitTest_sw_layoutwriter.mk +++ b/sw/CppunitTest_sw_layoutwriter.mk @@ -48,7 +48,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_layoutwriter,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_layoutwriter)) +$(eval $(call gb_CppunitTest_use_api,sw_layoutwriter,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_layoutwriter)) $(eval $(call gb_CppunitTest_use_vcl,sw_layoutwriter)) diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk index 480d2a8a6981..cbe0bc1d7597 100644 --- a/sw/CppunitTest_sw_mailmerge.mk +++ b/sw/CppunitTest_sw_mailmerge.mk @@ -31,7 +31,11 @@ $(eval $(call gb_CppunitTest_use_externals,sw_mailmerge, \ libxml2 \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_mailmerge)) +$(eval $(call gb_CppunitTest_use_api,sw_mailmerge,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_components,sw_mailmerge, \ basic/util/sb \ diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk index 8fb2228d84a3..e4dca1bfd438 100644 --- a/sw/CppunitTest_sw_odfexport.mk +++ b/sw/CppunitTest_sw_odfexport.mk @@ -42,7 +42,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_odfexport,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_odfexport)) +$(eval $(call gb_CppunitTest_use_api,sw_odfexport,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_odfexport)) $(eval $(call gb_CppunitTest_use_vcl,sw_odfexport)) diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk index 302f24a86897..fdef6d0e86ba 100644 --- a/sw/CppunitTest_sw_odfimport.mk +++ b/sw/CppunitTest_sw_odfimport.mk @@ -43,7 +43,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_odfimport,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_odfimport)) +$(eval $(call gb_CppunitTest_use_api,sw_odfimport,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_odfimport)) $(eval $(call gb_CppunitTest_use_vcl,sw_odfimport)) diff --git a/sw/CppunitTest_sw_ooxmlencryption.mk b/sw/CppunitTest_sw_ooxmlencryption.mk index 09b2fb1c0130..5485199be139 100644 --- a/sw/CppunitTest_sw_ooxmlencryption.mk +++ b/sw/CppunitTest_sw_ooxmlencryption.mk @@ -31,7 +31,12 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlencryption,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_ooxmlencryption)) +$(eval $(call gb_CppunitTest_use_api,sw_ooxmlencryption,\ + udkapi \ + offapi \ + oovbaapi \ +)) + $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlencryption)) $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlencryption)) diff --git a/sw/CppunitTest_sw_ooxmlexport8.mk b/sw/CppunitTest_sw_ooxmlexport8.mk index 202e4398abc4..e6cac168ae6f 100644 --- a/sw/CppunitTest_sw_ooxmlexport8.mk +++ b/sw/CppunitTest_sw_ooxmlexport8.mk @@ -55,7 +55,11 @@ $(eval $(call gb_CppunitTest_use_system_darwin_frameworks,sw_ooxmlexport8,\ endif -$(eval $(call gb_CppunitTest_use_sdk_api,sw_ooxmlexport8)) +$(eval $(call gb_CppunitTest_use_api,sw_ooxmlexport8,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlexport8)) $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlexport8)) diff --git a/sw/CppunitTest_sw_ooxmlfieldexport.mk b/sw/CppunitTest_sw_ooxmlfieldexport.mk index 8c753950b161..192e4bc7a5fc 100644 --- a/sw/CppunitTest_sw_ooxmlfieldexport.mk +++ b/sw/CppunitTest_sw_ooxmlfieldexport.mk @@ -31,7 +31,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlfieldexport,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_ooxmlfieldexport)) +$(eval $(call gb_CppunitTest_use_api,sw_ooxmlfieldexport,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlfieldexport)) $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlfieldexport)) diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk index 4638a3d32c61..c6e2f9d35937 100644 --- a/sw/CppunitTest_sw_ooxmlimport.mk +++ b/sw/CppunitTest_sw_ooxmlimport.mk @@ -55,7 +55,11 @@ $(eval $(call gb_CppunitTest_use_system_darwin_frameworks,sw_ooxmlimport,\ endif -$(eval $(call gb_CppunitTest_use_sdk_api,sw_ooxmlimport)) +$(eval $(call gb_CppunitTest_use_api,sw_ooxmlimport,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlimport)) $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlimport)) diff --git a/sw/CppunitTest_sw_ooxmllinks.mk b/sw/CppunitTest_sw_ooxmllinks.mk index 78b81d4a14b4..6e7babb03a5e 100755 --- a/sw/CppunitTest_sw_ooxmllinks.mk +++ b/sw/CppunitTest_sw_ooxmllinks.mk @@ -31,7 +31,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmllinks,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_ooxmllinks)) +$(eval $(call gb_CppunitTest_use_api,sw_ooxmllinks,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_ooxmllinks)) $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmllinks)) diff --git a/sw/CppunitTest_sw_ooxmlw14export.mk b/sw/CppunitTest_sw_ooxmlw14export.mk index a12d9fe2270c..d04297aa0ddf 100644 --- a/sw/CppunitTest_sw_ooxmlw14export.mk +++ b/sw/CppunitTest_sw_ooxmlw14export.mk @@ -31,7 +31,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlw14export,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_ooxmlw14export)) +$(eval $(call gb_CppunitTest_use_api,sw_ooxmlw14export,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlw14export)) $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlw14export)) diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk index a09d3b4a5985..fc77c7cc67e3 100644 --- a/sw/CppunitTest_sw_rtfexport.mk +++ b/sw/CppunitTest_sw_rtfexport.mk @@ -46,7 +46,11 @@ $(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfexport,\ )) endif -$(eval $(call gb_CppunitTest_use_sdk_api,sw_rtfexport)) +$(eval $(call gb_CppunitTest_use_api,sw_rtfexport,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_rtfexport)) $(eval $(call gb_CppunitTest_use_vcl,sw_rtfexport)) diff --git a/sw/CppunitTest_sw_rtfexport2.mk b/sw/CppunitTest_sw_rtfexport2.mk index 3519afec5e7a..98edcaee2fb1 100644 --- a/sw/CppunitTest_sw_rtfexport2.mk +++ b/sw/CppunitTest_sw_rtfexport2.mk @@ -48,7 +48,11 @@ $(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfexport2,\ )) endif -$(eval $(call gb_CppunitTest_use_sdk_api,sw_rtfexport2)) +$(eval $(call gb_CppunitTest_use_api,sw_rtfexport2,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_rtfexport2)) $(eval $(call gb_CppunitTest_use_vcl,sw_rtfexport2)) diff --git a/sw/CppunitTest_sw_rtfexport3.mk b/sw/CppunitTest_sw_rtfexport3.mk index d0ebff13c4aa..51b8583fc0d6 100644 --- a/sw/CppunitTest_sw_rtfexport3.mk +++ b/sw/CppunitTest_sw_rtfexport3.mk @@ -46,7 +46,11 @@ $(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfexport3,\ )) endif -$(eval $(call gb_CppunitTest_use_sdk_api,sw_rtfexport3)) +$(eval $(call gb_CppunitTest_use_api,sw_rtfexport3,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_rtfexport3)) $(eval $(call gb_CppunitTest_use_vcl,sw_rtfexport3)) diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk index 4867f92096da..baa230a1ea5b 100644 --- a/sw/CppunitTest_sw_rtfimport.mk +++ b/sw/CppunitTest_sw_rtfimport.mk @@ -48,7 +48,11 @@ $(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfimport,\ )) endif -$(eval $(call gb_CppunitTest_use_sdk_api,sw_rtfimport)) +$(eval $(call gb_CppunitTest_use_api,sw_rtfimport,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_rtfimport)) $(eval $(call gb_CppunitTest_use_vcl,sw_rtfimport)) diff --git a/sw/CppunitTest_sw_tiledrendering.mk b/sw/CppunitTest_sw_tiledrendering.mk index 3ba3d3eb4e53..9893914197f8 100644 --- a/sw/CppunitTest_sw_tiledrendering.mk +++ b/sw/CppunitTest_sw_tiledrendering.mk @@ -46,7 +46,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_tiledrendering,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_tiledrendering)) +$(eval $(call gb_CppunitTest_use_api,sw_tiledrendering,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_tiledrendering)) $(eval $(call gb_CppunitTest_use_vcl,sw_tiledrendering)) diff --git a/sw/CppunitTest_sw_txtexport.mk b/sw/CppunitTest_sw_txtexport.mk index 700a174edc5b..285ac611704f 100644 --- a/sw/CppunitTest_sw_txtexport.mk +++ b/sw/CppunitTest_sw_txtexport.mk @@ -44,7 +44,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_txtexport,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_txtexport)) +$(eval $(call gb_CppunitTest_use_api,sw_txtexport,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_txtexport)) $(eval $(call gb_CppunitTest_use_vcl,sw_txtexport)) diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk index b657e1999e6c..15d1b4b6cc25 100644 --- a/sw/CppunitTest_sw_uiwriter.mk +++ b/sw/CppunitTest_sw_uiwriter.mk @@ -49,7 +49,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_uiwriter,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_uiwriter)) +$(eval $(call gb_CppunitTest_use_api,sw_uiwriter,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_uiwriter)) $(eval $(call gb_CppunitTest_use_vcl,sw_uiwriter)) diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk index ba31ae9d9a5a..40af8fedb7bb 100644 --- a/sw/CppunitTest_sw_uwriter.mk +++ b/sw/CppunitTest_sw_uwriter.mk @@ -71,7 +71,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_uwriter,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_uwriter)) +$(eval $(call gb_CppunitTest_use_api,sw_uwriter,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_uwriter)) $(eval $(call gb_CppunitTest_use_vcl,sw_uwriter)) diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk index 45680deb9231..b1f3679c0165 100644 --- a/sw/CppunitTest_sw_ww8export.mk +++ b/sw/CppunitTest_sw_ww8export.mk @@ -43,7 +43,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_ww8export,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_ww8export)) +$(eval $(call gb_CppunitTest_use_api,sw_ww8export,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_ww8export)) $(eval $(call gb_CppunitTest_use_vcl,sw_ww8export)) diff --git a/sw/CppunitTest_sw_ww8export2.mk b/sw/CppunitTest_sw_ww8export2.mk index 99551b36750e..85f346d4881a 100644 --- a/sw/CppunitTest_sw_ww8export2.mk +++ b/sw/CppunitTest_sw_ww8export2.mk @@ -42,7 +42,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_ww8export2,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_ww8export2)) +$(eval $(call gb_CppunitTest_use_api,sw_ww8export2,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_ww8export2)) $(eval $(call gb_CppunitTest_use_vcl,sw_ww8export2)) diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk index 7881d6ea656c..593886526cf9 100644 --- a/sw/CppunitTest_sw_ww8import.mk +++ b/sw/CppunitTest_sw_ww8import.mk @@ -40,7 +40,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_ww8import,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_ww8import)) +$(eval $(call gb_CppunitTest_use_api,sw_ww8import,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_ww8import)) $(eval $(call gb_CppunitTest_use_vcl,sw_ww8import)) diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index c468fbdc8e43..457c7351a9bc 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,msword,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_sdk_api,msword)) +$(eval $(call gb_Library_use_api,msword,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_Library_use_libraries,msword,\ basegfx \ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 7c8e8a43c829..396067be688e 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -39,7 +39,11 @@ $(eval $(call gb_Library_use_custom_headers,sw,\ sw/generated \ )) -$(eval $(call gb_Library_use_sdk_api,sw)) +$(eval $(call gb_Library_use_api,sw,\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_Library_add_defs,sw,\ -DSW_DLLIMPLEMENTATION \ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index e33d16450b11..ab131e1e49c9 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -38,7 +38,11 @@ $(eval $(call gb_Library_use_custom_headers,swui,\ officecfg/registry \ )) -$(eval $(call gb_Library_use_sdk_api,swui)) +$(eval $(call gb_Library_use_api,swui,\ + udkapi \ + offapi \ + oovbaapi \ +)) ifneq ($(SYSTEM_LIBXML),) $(eval $(call gb_Library_add_cxxflags,swui,\ diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index 4a7cad8a36c7..ab5906fdd84e 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -33,6 +33,7 @@ #include "fldupde.hxx" #include <com/sun/star/linguistic2/XLinguServiceEventListener.hpp> #include <com/sun/star/linguistic2/XLanguageGuessing.hpp> +#include <ooo/vba/XSinkCaller.hpp> class Color; class SfxItemSet; @@ -119,6 +120,8 @@ class SW_DLLPUBLIC SwModule final : public SfxModule, public SfxListener, public void InsertEnv(SfxRequest&); void InsertLab(SfxRequest&, bool bLabel); + css::uno::Reference< ooo::vba::XSinkCaller > mxAutomationApplicationEventsCaller; + public: // public Data - used for internal Clipboard / Drag & Drop / XSelection SwTransferable *m_pDragDrop, *m_pXSelection; @@ -243,6 +246,9 @@ public: css::uno::Reference< css::linguistic2::XLanguageGuessing > const & GetLanguageGuesser(); + + void RegisterAutomationApplicationEventsCaller(css::uno::Reference< ooo::vba::XSinkCaller > const& xCaller); + void CallAutomationApplicationEventSinks(const OUString& Method, const css::uno::Sequence< css::uno::Any >& Arguments); }; inline const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk index 927873992c28..c0c4862fca3b 100644 --- a/sw/ooxmlexport_setup.mk +++ b/sw/ooxmlexport_setup.mk @@ -105,7 +105,11 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlexport$(1),\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_use_sdk_api,sw_ooxmlexport$(1),)) +$(eval $(call gb_CppunitTest_use_api,sw_ooxmlexport$(1),\ + udkapi \ + offapi \ + oovbaapi \ +)) $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlexport$(1))) $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlexport$(1))) diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index f86032a249e7..d76e7730a783 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -34,6 +34,8 @@ #include <editeng/acorrcfg.hxx> #include "wordvbahelper.hxx" #include <docsh.hxx> +#include <swdll.hxx> +#include <swmodule.hxx> #include "vbalistgalleries.hxx" using namespace ::ooo; @@ -60,17 +62,17 @@ SwVbaApplication::SwVbaApplication( uno::Reference<uno::XComponentContext >& xCo SwVbaApplication::~SwVbaApplication() { - // FIXME: Sadly this is not the place to do this, this dtor is never called, it seems - for (auto& i : mvSinks) - { - if (i.is()) - i->Call("Quit", uno::Sequence<uno::Any>()); - } } sal_uInt32 -SwVbaApplication::AddSink( const css::uno::Reference< XSink >& xSink ) +SwVbaApplication::AddSink( const uno::Reference< XSink >& xSink ) { + { + SolarMutexGuard aGuard; + SwGlobals::ensure(); + } + // No harm in potentially calling this several times + SW_MOD()->RegisterAutomationApplicationEventsCaller( uno::Reference< XSinkCaller >(this) ); mvSinks.push_back(xSink); return mvSinks.size();; } @@ -132,13 +134,6 @@ SwVbaApplication::getSelection() uno::Any SAL_CALL SwVbaApplication::Documents( const uno::Any& index ) { - // FIXME DUMMY just to test calling this somewhere... the dtor is never called - for (auto& i : mvSinks) - { - if (i.is()) - i->Call("Quit", uno::Sequence<uno::Any>()); - } - uno::Reference< XCollection > xCol( new SwVbaDocuments( this, mxContext ) ); if ( index.hasValue() ) return xCol->Item( index, uno::Any() ); @@ -269,6 +264,18 @@ SwVbaApplicationOutgoingConnectionPoint::SwVbaApplicationOutgoingConnectionPoint { } +// XSinkCaller + +void SAL_CALL +SwVbaApplication::CallSinks( const OUString& Method, const uno::Sequence< uno::Any >& Arguments ) +{ + for (auto& i : mvSinks) + { + if (i.is()) + i->Call(Method, Arguments); + } +} + // SwVbaApplicationOutgoingConnectionPoint // XConnectionPoint diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index 4f9e02e6fd45..c968ada70fe4 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -22,6 +22,7 @@ #include <vector> #include <ooo/vba/XSink.hpp> +#include <ooo/vba/XSinkCaller.hpp> #include <ooo/vba/word/XApplication.hpp> #include <ooo/vba/word/XDocument.hpp> #include <ooo/vba/word/XWindow.hpp> @@ -34,7 +35,15 @@ #include <cppuhelper/implbase.hxx> //typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XApplication > SwVbaApplication_BASE; -typedef cppu::ImplInheritanceHelper< VbaApplicationBase, ooo::vba::word::XApplication > SwVbaApplication_BASE; +typedef cppu::ImplInheritanceHelper< VbaApplicationBase, ooo::vba::word::XApplication, ooo::vba::XSinkCaller > SwVbaApplication_BASE; + +// This class is currently not a singleton. One instance is created per document with (potential?) +// StarBasic code in it, I think, and a shared one for all Automation clients connected to the +// ooo::vba::word::Application (Writer.Application) service. (Of course it probably is not common to +// have several Automation clients at once.) + +// Should it be a true singleton? Hard to say. Anyway, it is actually the SwVbaGlobals class that +// should be a singleton in that case, I think. class SwVbaApplication : public SwVbaApplication_BASE { @@ -77,6 +86,10 @@ public: // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; + + // XSinkCaller + virtual void SAL_CALL CallSinks( const OUString& Method, const css::uno::Sequence< css::uno::Any >& Arguments ) override; + protected: virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() override; }; diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 59a28f720d1e..c1dcc597a23a 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -249,6 +249,9 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if( xVbaEvents.is() ) lcl_processCompatibleSfxHint( xVbaEvents, rHint ); + if ( rHint.GetId() == SfxHintId::DocChanged ) + SW_MOD()->CallAutomationApplicationEventSinks( "DocumentChange", css::uno::Sequence< css::uno::Any >() ); + sal_uInt16 nAction = 0; auto pEventHint = dynamic_cast<const SfxEventHint*>(&rHint); if( pEventHint && pEventHint->GetEventId() == SfxEventHintId::LoadFinished ) diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index b4c271d66852..c05c81c4b70b 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -221,6 +221,7 @@ uno::Reference< linguistic2::XLanguageGuessing > const & SwModule::GetLanguageGu SwModule::~SwModule() { + CallAutomationApplicationEventSinks( "Quit", css::uno::Sequence< css::uno::Any >() ); delete m_pErrorHandler; EndListening( *SfxGetpApp() ); } @@ -433,4 +434,15 @@ SfxStyleFamilies* SwModule::CreateStyleFamilies() return pStyleFamilies; } +void SwModule::RegisterAutomationApplicationEventsCaller(css::uno::Reference< ooo::vba::XSinkCaller > const& xCaller) +{ + mxAutomationApplicationEventsCaller = xCaller; +} + +void SwModule::CallAutomationApplicationEventSinks(const OUString& Method, const css::uno::Sequence< css::uno::Any >& Arguments) +{ + if (mxAutomationApplicationEventsCaller.is()) + mxAutomationApplicationEventsCaller->CallSinks(Method, Arguments); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |