[Libreoffice-commits] core.git: sw/qa writerfilter/source
Miklos Vajna
vmiklos at suse.cz
Wed Feb 27 07:54:01 PST 2013
sw/qa/extras/ooxmlimport/data/fdo53985.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 11 +++++++++++
writerfilter/source/dmapper/PropertyMap.cxx | 15 ++++++++++++++-
3 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit 8281578b89c3df3fe3452a594f6b21483683638a
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Wed Feb 27 14:46:35 2013 +0100
fdo#53985 DOCX import: don't try to set empty PageDescName
Regression from 50cb1667020494906afaacb68d4163d1eda527cf.
Change-Id: Ie04d5ad37555ed4cfeb34ccb8dc021675fbd25ea
diff --git a/sw/qa/extras/ooxmlimport/data/fdo53985.docx b/sw/qa/extras/ooxmlimport/data/fdo53985.docx
new file mode 100644
index 0000000..0c8b32f
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo53985.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index f6eb0ef..62a2c98 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -117,6 +117,7 @@ public:
void testGroupshapeLine();
void testN779642();
void testTbLrHeight();
+ void testFdo53985();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -185,6 +186,7 @@ void Test::run()
{"groupshape-line.docx", &Test::testGroupshapeLine},
{"n779642.docx", &Test::testN779642},
{"tblr-height.docx", &Test::testTbLrHeight},
+ {"fdo53985.docx", &Test::testFdo53985},
};
header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1196,6 +1198,15 @@ void Test::testTbLrHeight()
CPPUNIT_ASSERT_EQUAL(text::SizeType::FIX, getProperty<sal_Int16>(xTableRows->getByIndex(0), "SizeType"));
}
+void Test::testFdo53985()
+{
+ // Unhandled excetion prevented import of the rest of the document.
+
+ uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(5), xTables->getCount()); // Only 4 tables were imported.
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index c2fe9ef..8f19057 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -840,7 +840,20 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
ApplyColumnProperties( xSection );
uno::Reference<beans::XPropertySet> xRangeProperties(lcl_GetRangeProperties(m_bIsFirstSection, rDM_Impl, m_xStartingRange));
if (xRangeProperties.is())
- xRangeProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_PAGE_DESC_NAME), uno::makeAny(m_bTitlePage ? m_sFirstPageStyleName : m_sFollowPageStyleName));
+ {
+ OUString aName = m_bTitlePage ? m_sFirstPageStyleName : m_sFollowPageStyleName;
+ if (!aName.isEmpty())
+ {
+ try
+ {
+ xRangeProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_PAGE_DESC_NAME), uno::makeAny(aName));
+ }
+ catch( const uno::Exception& )
+ {
+ SAL_WARN("writerfilter", "failed to set PageDescName!");
+ }
+ }
+ }
}
// If the section is of type "New column" (0x01), then simply insert a column break.
// But only if there actually are columns on the page, otherwise a column break
More information about the Libreoffice-commits
mailing list