chart2/CppunitTest_chart2_import.mk | 1 +
chart2/CppunitTest_chart2_trendcalculators.mk | 1 +
cppcanvas/CppunitTest_cppcanvas_emfplus.mk | 1 +
dbaccess/CppunitTest_dbaccess_RowSetClones.mk | 1 +
dbaccess/CppunitTest_dbaccess_hsqldb_test.mk | 1 +
dbaccess/CppunitTest_dbaccess_nolib_save.mk | 1 +
sc/CppunitTest_sc_condformats.mk | 1 +
sc/CppunitTest_sc_copypaste.mk | 1 +
sc/CppunitTest_sc_filters_test.mk | 1 +
sc/CppunitTest_sc_functions_test.mk | 1 +
sc/CppunitTest_sc_html_export_test.mk | 1 +
sc/CppunitTest_sc_new_cond_format_api.mk | 1 +
sc/CppunitTest_sc_subsequent_export_test.mk | 1 +
sc/CppunitTest_sc_subsequent_filters_test.mk | 1 +
sd/CppunitTest_sd_filters_test.mk | 1 +
sd/CppunitTest_sd_html_export_tests.mk | 1 +
sd/CppunitTest_sd_misc_tests.mk | 1 +
sfx2/source/doc/docfile.cxx | 22 +++++++---------------
sw/CppunitTest_sw_htmlexport.mk | 1 +
sw/CppunitTest_sw_macros_test.mk | 1 +
sw/CppunitTest_sw_ooxmlimport.mk | 1 +
sw/CppunitTest_sw_uwriter.mk | 1 +
sw/CppunitTest_sw_ww8import.mk | 1 +
sw/source/filter/rtf/swparrtf.cxx | 9 ++++++++-
24 files changed, 37 insertions(+), 16 deletions(-)
New commits:
commit 38041f76d6a290b98d598f562767990cab36c21b
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jul 28 13:34:51 2016 +0100
not interested in exceptions for fftester testing
Change-Id: I825e89a9d515f2f19eca190b1e3cc2d2ad565df3
diff --git a/sw/source/filter/rtf/swparrtf.cxx
b/sw/source/filter/rtf/swparrtf.cxx
index 5bd3826..e463f5a 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -181,7 +181,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
TestImportRTF(const OUString &rURL
}
SwPaM aPaM( aIdx );
aPaM.GetPoint()->nContent.Assign(aIdx.GetNode().GetContentNode(), 0);
- bool bRet = pReader->Read(*pD, OUString(), aPaM, OUString()) == 0;
+ bool bRet = false;
+ try
+ {
+ bRet = pReader->Read(*pD, OUString(), aPaM, OUString()) == 0;
+ }
+ catch (std::exception const& e)
+ {
+ }
delete pReader;
return bRet;
}
commit 2e6d96408ea726b652215b11c4fc9ef56c8e1361
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 27 21:44:27 2016 +0100
Revert "temp tinderbox fix"
This reverts commit d4cb9c3a8851cb874fd8b6c77d4d7521da7579b7.
Change-Id: Ifd11427ea6b4137d0e0c007e7f140fbc6caa3f31
diff --git a/chart2/CppunitTest_chart2_import.mk
b/chart2/CppunitTest_chart2_import.mk
index a2263a8..0816949 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 9e6e275..cc271d8 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 e545e34..90b8aa0 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 418525ce4..c41c3fe 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 eee901d..5a83a4b 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 2732ef4..3559cee 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 775d81c..a31478f 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 ece6209..e0e48e2 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 946799b..4d46b68 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 9be2ff5..9a4a77d 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 2b7f530..c3fa3ab 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 7916363..2ffdd26 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 5dae44c..668bdd2 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 bd0a06b..47df0c0 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 0387424..e206b15 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 c527a6c..5d60aa0 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 fd6250b..f432f3a 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 a77589b..7af4a77 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 7a9e076..bab40cb 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 8792bc1..9a21bb3 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 05da70b..ae84e31 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 8196f08..c23ae7f 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 21d9a74..db85995 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) \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
