writerfilter/source/dmapper/PropertyMap.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit c97f1aff7077959e65852f65e3217e5dffd262ce Author: Justin Luth <[email protected]> Date: Fri Sep 9 23:52:08 2016 +0300 tdf#86926 writerfilter allow fallback if exceptions The multiset routine was put in to increase the speed of applying properties. However, if one property causes an exception, the remaining properties are never applied. There is already a fallback routine (if the multiset can't be created), so use that instead of returning in a failed state. Change-Id: Iac53edd5fca8e8543d536609113a7b1109befd82 Reviewed-on: https://gerrit.libreoffice.org/28765 Tested-by: Jenkins <[email protected]> Reviewed-by: Justin Luth <[email protected]> Change-Id: I9305c56d45a81ed58a7d331afa5559a39f44266e Reviewed-on: https://gerrit.libreoffice.org/28790 Tested-by: Jenkins <[email protected]> Reviewed-by: Justin Luth <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index ac192e6..83e2934 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1453,12 +1453,12 @@ void SectionPropertyMap::ApplyProperties_( try { xMultiSet->setPropertyValues(comphelper::containerToSequence(vNames), comphelper::containerToSequence(vValues)); + return; } catch( const uno::Exception& ) { OSL_FAIL( "Exception in SectionPropertyMap::ApplyProperties_"); } - return; } for (size_t i = 0; i < vNames.size(); ++i) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
