diff options
23 files changed, 29 insertions, 15 deletions
diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk index a2263a840134..0816949a3fd6 100644 --- a/chart2/CppunitTest_chart2_import.mk +++ b/chart2/CppunitTest_chart2_import.mk @@ -120,6 +120,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ writerfilter/util/writerfilter \ xmloff/util/xo \ xmlscript/util/xmlscript \ diff --git a/chart2/CppunitTest_chart2_trendcalculators.mk b/chart2/CppunitTest_chart2_trendcalculators.mk index 9e6e2758cb74..cc271d8051bf 100644 --- a/chart2/CppunitTest_chart2_trendcalculators.mk +++ b/chart2/CppunitTest_chart2_trendcalculators.mk @@ -120,6 +120,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_trendcalculators,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ writerfilter/util/writerfilter \ xmloff/util/xo \ xmlscript/util/xmlscript \ diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk index e545e347f3d7..90b8aa06c7a7 100644 --- a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk +++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk @@ -54,6 +54,7 @@ $(eval $(call gb_CppunitTest_use_components,cppcanvas_emfplus,\ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ unoxml/source/service/unoxml \ + uui/util/uui \ svtools/util/svt \ )) diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk index 418525ce499d..c41c3fe7a748 100644 --- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk +++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk @@ -105,6 +105,7 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_RowSetClones,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ xmloff/util/xo \ )) diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk index eee901d7fa9f..5a83a4bbe5d3 100644 --- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk +++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_hsqldb_test,\ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ unotools/util/utl \ + uui/util/uui \ xmloff/util/xo \ )) diff --git a/dbaccess/CppunitTest_dbaccess_nolib_save.mk b/dbaccess/CppunitTest_dbaccess_nolib_save.mk index 2732ef487be3..3559ceecf0f7 100644 --- a/dbaccess/CppunitTest_dbaccess_nolib_save.mk +++ b/dbaccess/CppunitTest_dbaccess_nolib_save.mk @@ -98,6 +98,7 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_nolib_save,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ xmloff/util/xo \ )) diff --git a/sc/CppunitTest_sc_condformats.mk b/sc/CppunitTest_sc_condformats.mk index 775d81c6ef6d..a31478fe985e 100644 --- a/sc/CppunitTest_sc_condformats.mk +++ b/sc/CppunitTest_sc_condformats.mk @@ -97,6 +97,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_condformats,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ xmloff/util/xo \ svtools/util/svt \ )) diff --git a/sc/CppunitTest_sc_copypaste.mk b/sc/CppunitTest_sc_copypaste.mk index ece6209d2720..e0e48e280131 100644 --- a/sc/CppunitTest_sc_copypaste.mk +++ b/sc/CppunitTest_sc_copypaste.mk @@ -102,6 +102,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_copypaste,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ xmloff/util/xo \ xmlsecurity/util/xmlsecurity \ xmlsecurity/util/xsec_fw \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 946799b942b7..4d46b681325b 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -105,6 +105,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ xmloff/util/xo \ )) diff --git a/sc/CppunitTest_sc_functions_test.mk b/sc/CppunitTest_sc_functions_test.mk index 9be2ff5cc195..9a4a77d51ef8 100644 --- a/sc/CppunitTest_sc_functions_test.mk +++ b/sc/CppunitTest_sc_functions_test.mk @@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_functions_test,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ xmloff/util/xo \ xmlscript/util/xmlscript \ )) diff --git a/sc/CppunitTest_sc_html_export_test.mk b/sc/CppunitTest_sc_html_export_test.mk index 2b7f53041e52..c3fa3abe8c5e 100644 --- a/sc/CppunitTest_sc_html_export_test.mk +++ b/sc/CppunitTest_sc_html_export_test.mk @@ -102,6 +102,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_html_export_test,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ vbahelper/util/msforms \ xmloff/util/xo \ )) diff --git a/sc/CppunitTest_sc_new_cond_format_api.mk b/sc/CppunitTest_sc_new_cond_format_api.mk index 7916363c77f4..2ffdd2681a32 100644 --- a/sc/CppunitTest_sc_new_cond_format_api.mk +++ b/sc/CppunitTest_sc_new_cond_format_api.mk @@ -95,6 +95,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_new_cond_format_api,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ xmloff/util/xo \ svtools/util/svt \ )) diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk index 5dae44c64d16..668bdd2ca391 100644 --- a/sc/CppunitTest_sc_subsequent_export_test.mk +++ b/sc/CppunitTest_sc_subsequent_export_test.mk @@ -97,6 +97,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ xmloff/util/xo \ xmlsecurity/util/xmlsecurity \ xmlsecurity/util/xsec_fw \ diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index bd0a06b2c092..47df0c097274 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -102,6 +102,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ xmloff/util/xo \ xmlsecurity/util/xmlsecurity \ xmlsecurity/util/xsec_fw \ diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 0387424e8a58..e206b150274d 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -94,6 +94,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_filters_test,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ xmloff/util/xo \ )) diff --git a/sd/CppunitTest_sd_html_export_tests.mk b/sd/CppunitTest_sd_html_export_tests.mk index c527a6cabd90..5d60aa002f25 100644 --- a/sd/CppunitTest_sd_html_export_tests.mk +++ b/sd/CppunitTest_sd_html_export_tests.mk @@ -101,6 +101,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_html_export_tests,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ xmloff/util/xo \ xmlsecurity/util/xsec_fw \ xmlsecurity/util/xmlsecurity \ diff --git a/sd/CppunitTest_sd_misc_tests.mk b/sd/CppunitTest_sd_misc_tests.mk index fd6250b3bf72..f432f3aed4f2 100644 --- a/sd/CppunitTest_sd_misc_tests.mk +++ b/sd/CppunitTest_sd_misc_tests.mk @@ -113,6 +113,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_misc_tests,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ xmloff/util/xo \ xmlsecurity/util/xsec_fw \ xmlsecurity/util/xmlsecurity \ diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index a77589bd0630..7af4a7795844 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -416,24 +416,16 @@ Reference < XContent > SfxMedium::GetContent() const if ( !pImpl->aContent.get().is() ) { Reference < css::ucb::XContent > xContent; - Reference < css::ucb::XCommandEnvironment > xEnv; - try - { - // tdf#95144 add a default css::ucb::XCommandEnvironment - // in order to have http and https protocol manage certificates correctly - css:: uno::Reference< task::XInteractionHandler > xIH( - css::task::InteractionHandler::createWithParent( comphelper::getProcessComponentContext(), nullptr ) ); + // tdf#95144 add a default css::ucb::XCommandEnvironment + // in order to have http and https protocol manage certificates correctly + css:: uno::Reference< task::XInteractionHandler > xIH( + css::task::InteractionHandler::createWithParent( comphelper::getProcessComponentContext(), nullptr ) ); - css::uno::Reference< css::ucb::XProgressHandler > xProgress; - ::ucbhelper::CommandEnvironment* pCommandEnv = new ::ucbhelper::CommandEnvironment(new comphelper::SimpleFileAccessInteraction( xIH ), xProgress); + css::uno::Reference< css::ucb::XProgressHandler > xProgress; + ::ucbhelper::CommandEnvironment* pCommandEnv = new ::ucbhelper::CommandEnvironment(new comphelper::SimpleFileAccessInteraction( xIH ), xProgress); - xEnv = Reference < css::ucb::XCommandEnvironment >(static_cast< css::ucb::XCommandEnvironment* >(pCommandEnv), css::uno::UNO_QUERY); - } - catch(...) - { - //temp tinderbox fix - } + Reference < css::ucb::XCommandEnvironment > xEnv(static_cast< css::ucb::XCommandEnvironment* >(pCommandEnv), css::uno::UNO_QUERY); const SfxUnoAnyItem* pItem = SfxItemSet::GetItem<SfxUnoAnyItem>(pImpl->m_pSet, SID_CONTENT, false); if ( pItem ) diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk index 7a9e07696a71..bab40cbab110 100644 --- a/sw/CppunitTest_sw_htmlexport.mk +++ b/sw/CppunitTest_sw_htmlexport.mk @@ -81,6 +81,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\ ucb/source/ucp/file/ucpfile1 \ unotools/util/utl \ unoxml/source/service/unoxml \ + uui/util/uui \ writerfilter/util/writerfilter \ xmloff/util/xo \ )) diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 8792bc163c4b..9a21bb358d83 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -101,6 +101,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ xmloff/util/xo \ xmlsecurity/util/$(if $(filter WNT,$(OS)),xsec_xmlsec.windows,xsec_xmlsec) \ )) diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk index 05da70bfacff..ae84e315339a 100644 --- a/sw/CppunitTest_sw_ooxmlimport.mk +++ b/sw/CppunitTest_sw_ooxmlimport.mk @@ -94,6 +94,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\ unotools/util/utl \ unoxml/source/service/unoxml \ unoxml/source/rdf/unordf \ + uui/util/uui \ writerfilter/util/writerfilter \ xmloff/util/xo \ )) diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk index 8196f08d336c..c23ae7f8e886 100644 --- a/sw/CppunitTest_sw_uwriter.mk +++ b/sw/CppunitTest_sw_uwriter.mk @@ -89,6 +89,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_uwriter,\ ucb/source/ucp/file/ucpfile1 \ unotools/util/utl \ unoxml/source/service/unoxml \ + uui/util/uui \ )) $(eval $(call gb_CppunitTest_use_configuration,sw_uwriter)) diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk index 21d9a74aa930..db8599553b3f 100644 --- a/sw/CppunitTest_sw_ww8import.mk +++ b/sw/CppunitTest_sw_ww8import.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8import,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + uui/util/uui \ $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ )) |