From a88ac708403c03d0f950f09ec29c0d5a1e5a85b4 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 19 Apr 2013 17:14:05 +0200 Subject: [PATCH] fdo#63685 wp:inline's distT/B/L/R is in EMU's, not twips Regression from 3d7e168a2a43c2414b0633379102ddb29437e75b. Change-Id: I9ab3f9f41316a01d5a74f3e500bad7a83c8d2dca --- sw/qa/extras/ooxmlimport/data/fdo63685.docx | Bin 0 -> 10964 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 10 ++++++++++ writerfilter/source/dmapper/GraphicImport.cxx | 8 ++++---- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 sw/qa/extras/ooxmlimport/data/fdo63685.docx diff --git a/sw/qa/extras/ooxmlimport/data/fdo63685.docx b/sw/qa/extras/ooxmlimport/data/fdo63685.docx new file mode 100644 index 0000000000000000000000000000000000000000..a1348fcff3b61d5a369004ce85b204a282c1e2e2 GIT binary patch literal 10964 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 Nbx8dFT-3ks{tE`Q_N4#- literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index b8addaccac92..db545c36af33 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -125,6 +125,7 @@ public: void testFdo59273(); void testTableWidth(); void testConditionalstylesTbllook(); + void testFdo63685(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) @@ -201,6 +202,7 @@ void Test::run() {"fdo59273.docx", &Test::testFdo59273}, {"table_width.docx", &Test::testTableWidth}, {"conditionalstyles-tbllook.docx", &Test::testConditionalstylesTbllook}, + {"fdo63685.docx", &Test::testFdo63685}, }; header(); for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i) @@ -1324,6 +1326,14 @@ void Test::testConditionalstylesTbllook() CPPUNIT_ASSERT_EQUAL(sal_Int32(0x7F7F7F), getProperty(xTable->getCellByName("A1"), "BackColor")); } +void Test::testFdo63685() +{ + uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); + // Was 85697, i.e. original 114120 was converted to mm100 from twips, not from EMUs. + CPPUNIT_ASSERT_EQUAL(sal_Int32(318), getProperty(xDraws->getByIndex(0), "TopMargin")); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 895e814b84fb..b44056417581 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -991,16 +991,16 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) } break; case NS_ooxml::LN_CT_Inline_distT: - m_pImpl->nTopMargin = ConversionHelper::convertTwipToMM100(nIntValue); + m_pImpl->nTopMargin = ConversionHelper::convertEMUToMM100(nIntValue); break; case NS_ooxml::LN_CT_Inline_distB: - m_pImpl->nBottomMargin = ConversionHelper::convertTwipToMM100(nIntValue); + m_pImpl->nBottomMargin = ConversionHelper::convertEMUToMM100(nIntValue); break; case NS_ooxml::LN_CT_Inline_distL: - m_pImpl->nLeftMargin = ConversionHelper::convertTwipToMM100(nIntValue); + m_pImpl->nLeftMargin = ConversionHelper::convertEMUToMM100(nIntValue); break; case NS_ooxml::LN_CT_Inline_distR: - m_pImpl->nRightMargin = ConversionHelper::convertTwipToMM100(nIntValue); + m_pImpl->nRightMargin = ConversionHelper::convertEMUToMM100(nIntValue); break; case NS_ooxml::LN_CT_GraphicalObjectData_uri: val.getString();