diff options
-rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 59950273ee18..d8cd372ef675 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1380,8 +1380,8 @@ DECLARE_OOXMLIMPORT_TEST(testConditionalstylesTablelook, "conditionalstyles-tbll DECLARE_OOXMLIMPORT_TEST(testFdo63685, "fdo63685.docx") { - // Was 85697, i.e. original 114120 was converted to mm100 from twips, not from EMUs. - CPPUNIT_ASSERT_EQUAL(sal_Int32(318), getProperty<sal_Int32>(getShape(1), "TopMargin")); + // An inline image's wrapping should be always zero, even if the doc model has a non-zero value. + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(getShape(1), "TopMargin")); } DECLARE_OOXMLIMPORT_TEST(testN592908_Frame, "n592908-frame.docx") diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 0111889bbb47..154b9e2bb137 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -870,16 +870,16 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) } break; case NS_ooxml::LN_CT_Inline_distT: - m_pImpl->nTopMargin = oox::drawingml::convertEmuToHmm(nIntValue); + m_pImpl->nTopMargin = 0; break; case NS_ooxml::LN_CT_Inline_distB: - m_pImpl->nBottomMargin = oox::drawingml::convertEmuToHmm(nIntValue); + m_pImpl->nBottomMargin = 0; break; case NS_ooxml::LN_CT_Inline_distL: - m_pImpl->nLeftMargin = oox::drawingml::convertEmuToHmm(nIntValue); + m_pImpl->nLeftMargin = 0; break; case NS_ooxml::LN_CT_Inline_distR: - m_pImpl->nRightMargin = oox::drawingml::convertEmuToHmm(nIntValue); + m_pImpl->nRightMargin = 0; break; case NS_ooxml::LN_CT_GraphicalObjectData_uri: rValue.getString(); |