Kaydet (Commit) 2e6d9640 authored tarafından Caolán McNamara's avatar Caolán McNamara

Revert "temp tinderbox fix"

This reverts commit d4cb9c3a.

Change-Id: Ifd11427ea6b4137d0e0c007e7f140fbc6caa3f31
üst 1e21c32a
......@@ -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 \
......
......@@ -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 \
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
))
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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 \
))
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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 )
......
......@@ -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 \
))
......
......@@ -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) \
))
......
......@@ -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 \
))
......
......@@ -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))
......
......@@ -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) \
))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment