diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-04-19 17:14:05 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-04-19 17:32:21 +0200 |
commit | a88ac708403c03d0f950f09ec29c0d5a1e5a85b4 (patch) | |
tree | cd88bbf7db2e010105b51ca4ff145b4359280ad9 /writerfilter | |
parent | tools ::Time: change constructor to fixed-length integers (diff) | |
download | core-a88ac708403c03d0f950f09ec29c0d5a1e5a85b4.tar.gz core-a88ac708403c03d0f950f09ec29c0d5a1e5a85b4.zip |
fdo#63685 wp:inline's distT/B/L/R is in EMU's, not twips
Regression from 3d7e168a2a43c2414b0633379102ddb29437e75b.
Change-Id: I9ab3f9f41316a01d5a74f3e500bad7a83c8d2dca
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
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(); |