From c8b7ed1d8b93a8ca8d67b67c49c2de9b12715596 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 19 Apr 2013 17:14:05 +0200 Subject: fdo#63685 wp:inline's distT/B/L/R is in EMU's, not twips MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Regression from 3d7e168a2a43c2414b0633379102ddb29437e75b. (cherry picked from commit a88ac708403c03d0f950f09ec29c0d5a1e5a85b4) Change-Id: I9ab3f9f41316a01d5a74f3e500bad7a83c8d2dca Reviewed-on: https://gerrit.libreoffice.org/3485 Reviewed-by: Luboš Luňák Tested-by: Luboš Luňák --- writerfilter/source/dmapper/GraphicImport.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 10a17e67e829..1dd4f143d526 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -978,16 +978,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(); -- cgit v1.2.3