summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2016-09-09 12:42:55 +0300
committerJustin Luth <justin_luth@sil.org>2016-09-09 12:54:23 +0000
commitbdd4a238a1d8a0cbbebbd759011050659668f92b (patch)
treedcf2a125482a84bd416c197a64d492407b1bf699 /writerfilter
parent20c14c812ccc00692d42d294d3b8dea1774e3511 (diff)
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 <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/PropertyMap.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index c0e646cc595c..2631fbc887ae 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1485,12 +1485,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)
{