diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-02-22 12:28:06 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-02-26 11:43:11 +0100 |
| commit | 71a99a730229fac391822fb164661017c9409b56 (patch) | |
| tree | 6cba00aae608a1b387bed6a70ac7ce16fa2cd5ae | |
| parent | f3d1b49a02744532d637ea398b76b7486e83ea63 (diff) | |
tdf#115883 DOCX import: catch RuntimeException from SwXFrame
getPropertyValue("Surround") for a non-inserted frame can throw, but
hasPropertyValue("Surround") still returns true. So fix the regression
by just catching the exception, assuming that in that case no increased
spacing is needed.
Reviewed-on: https://gerrit.libreoffice.org/50175
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 5e1a50cc433a865da677faf7d502ba41858e45f6)
Change-Id: I49a78ce8d41b4e1cc7d23721d5dc70f7550c94af
Reviewed-on: https://gerrit.libreoffice.org/50349
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf115883.docx | bin | 0 -> 33313 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 9 |
3 files changed, 14 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf115883.docx b/sw/qa/extras/ooxmlimport/data/tdf115883.docx Binary files differnew file mode 100644 index 000000000000..f90ac638d7a4 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf115883.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 2aee8d4d7227..d84bffd0f4cf 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -754,6 +754,12 @@ DECLARE_OOXMLIMPORT_TEST(testTdf105975formula, "tdf105975.docx") CPPUNIT_ASSERT_EQUAL(OUString("25"), xEnumerationAccess->getPresentation(false).trim()); } +DECLARE_OOXMLIMPORT_TEST(testTdf115883, "tdf115883.docx") +{ + // Import failed due to an unhandled exception when getting the Surround + // property of a not yet inserted frame. +} + DECLARE_OOXMLIMPORT_TEST(testTdf75573, "tdf75573_page1frame.docx") { // the problem was that the frame was discarded diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 96799cb2cbc7..c00e4bfec593 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1206,7 +1206,14 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) } rPendingFloatingTables.clear(); - HandleIncreasedAnchoredObjectSpacing(rDM_Impl); + try + { + HandleIncreasedAnchoredObjectSpacing(rDM_Impl); + } + catch (const uno::Exception& rException) + { + SAL_WARN("writerfilter", "HandleIncreasedAnchoredObjectSpacing() failed: " << rException.Message); + } if ( m_nLnnMod ) { |