diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2015-10-30 22:02:50 +1000 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2015-11-12 22:41:10 +0000 |
| commit | 78f90a6db00b5dd69bb14178a8b31fc0f845d59c (patch) | |
| tree | 1887bcb005453c3dc5d41f0ee8ba864a2f38530f | |
| parent | 11d0bacd7441ee206163b62dce33fc28a25f99dc (diff) | |
tdf#95071: fix spacing calculations for border with page offset
With commit ebf767eeb2a169ba533e1b2ffccf16f41d95df35, some previously
hidden bugs manifested themselves, this is one of them.
The margin size calculated incorrectly when border offset was from
page. The border is drawn from the margin inwards, so the margin
should be equal to OOXML w:space attribute, and border distance
should be OOXML page margin - border distance - border width.
Incorrect calculation gave negative margin, with IllegalArgumentException
thrown in SfxItemPropertySet::setPropertyValue.
Reviewed-on: https://gerrit.libreoffice.org/19586
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Cherry-picked from 061d98ccc7fc95234514d5dee3d9e80e49b10dc7
Change-Id: Ifcf4a348e975df53410933aab3684d17f68b688c
Reviewed-on: https://gerrit.libreoffice.org/19940
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mikekaganski@hotmail.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/plausable-border.docx | bin | 15737 -> 15719 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 10 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/plausable-border.docx b/sw/qa/extras/ooxmlexport/data/plausable-border.docx Binary files differindex a1a95470a057..c6f049fe2d18 100644 --- a/sw/qa/extras/ooxmlexport/data/plausable-border.docx +++ b/sw/qa/extras/ooxmlexport/data/plausable-border.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 8a186ef4e793..42dc7362c1e7 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -567,7 +567,7 @@ DECLARE_OOXMLIMPORT_TEST(testN758883, "n758883.docx") uno::Reference<beans::XPropertySet> xPropertySet(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY); sal_Int32 nValue = 0; xPropertySet->getPropertyValue("LeftMargin") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(794), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(847), nValue); // No assert for the 3rd problem: see the comment in the test doc. diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index b9f46ff8039b..dab485fbbdca 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -700,18 +700,18 @@ void SectionPropertyMap::SetBorderDistance( uno::Reference< beans::XPropertySet PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); sal_Int32 nDist = nDistance; - if( nOffsetFrom == 1 ) + if( nOffsetFrom == 1 ) // From page { const OUString sMarginName = rPropNameSupplier.GetName( eMarginId ); uno::Any aMargin = xStyle->getPropertyValue( sMarginName ); sal_Int32 nMargin = 0; aMargin >>= nMargin; - // Change the margins with the ( border distance - line width ) - xStyle->setPropertyValue( sMarginName, uno::makeAny( nDistance - nLineWidth ) ); + // Change the margins with the border distance + xStyle->setPropertyValue( sMarginName, uno::makeAny( nDistance ) ); - // Set the distance to ( Margin - distance ) - nDist = nMargin - nDistance; + // Set the distance to ( Margin - distance - nLineWidth ) + nDist = nMargin - nDistance - nLineWidth; } const OUString sBorderDistanceName = rPropNameSupplier.GetName( eDistId ); if (xStyle.is()) |