diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-22 08:47:03 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-22 08:47:26 +0200 |
| commit | f4badd9a485f32f787d78431ed673e2932973887 (patch) | |
| tree | 663c65cce23449ddaee37f2e2f5a6a948c2bd38b | |
| parent | d214f1cb437ad1733cbebc95586d58f0ec19c16e (diff) | |
tdf#92454 DOCX import: allow overriding para prop from num style in para style
Word has a feature like this: a paragraph style can refer to a numbering
style, and both can specify paragraph margins. If that's the case, then
the ones from the paragraph style has priority.
In Writer, the numbering style has priority, so the only chance for
correct import result is to set the margin directly on the paragraph in
this case.
Change-Id: Iff3b03bcc56e0db3a48452c293acf41c91b8f159
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf92454.docx | bin | 0 -> 32409 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 9 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 7 |
3 files changed, 16 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf92454.docx b/sw/qa/extras/ooxmlimport/data/tdf92454.docx Binary files differnew file mode 100644 index 000000000000..70426685e207 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf92454.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 0f43ba9b7572..2345c5ccc7c0 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -2818,6 +2818,15 @@ DECLARE_OOXMLIMPORT_TEST(testIndents, "indents.docx") } while (xParaEnum->hasMoreElements()); } +DECLARE_OOXMLIMPORT_TEST(testTdf92454, "tdf92454.docx") +{ + // The first paragraph had a large indentation / left margin as inheritance + // in Word and Writer works differently, and no direct value was set to be + // explicit. + uno::Reference<beans::XPropertyState> xParagraph(getParagraph(1), uno::UNO_QUERY); + // This was beans::PropertyState_DEFAULT_VALUE. + CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DIRECT_VALUE, xParagraph->getPropertyState("ParaFirstLineIndent")); +} CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 9af39a7927da..eecbb43cfce1 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -2042,6 +2042,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) rContext->Insert(PROP_PARA_RIGHT_MARGIN, uno::makeAny(nParaRightMargin)); } + + // Indent properties from the paragraph style have priority + // over the ones from the numbering styles in Word, not in + // Writer. + boost::optional<PropertyMap::Property> oProperty; + if (pStyleSheetProperties && (oProperty = pStyleSheetProperties->getProperty(PROP_PARA_FIRST_LINE_INDENT))) + rContext->Insert(PROP_PARA_FIRST_LINE_INDENT, oProperty->second); } if( pStyleSheetProperties && pStyleSheetProperties->GetListLevel() >= 0 ) |