Revert "temp tinderbox fix"

This reverts commit d4cb9c3a.

Change-Id: Ifd11427ea6b4137d0e0c007e7f140fbc6caa3f31

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 \

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 \

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 \
 ))
 

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 \
 ))
 

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 \
 ))
 

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 \
 ))
 

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 \
 ))

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 \

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 \
 ))
 

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 \
 ))

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 \
 ))

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 \
 ))

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 \

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 \

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 \
 ))
 

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 \

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 \

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 )

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 \
 ))

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) \
 ))

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 \
 ))

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))

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) \
 ))