diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-04-19 17:14:05 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-05-07 10:30:32 +0200 |
| commit | 85a198815d47a2009ee135c5da665558b9a1f988 (patch) | |
| tree | bfd603f93041d4a18ad62834895c4290fcde0b3b /writerfilter | |
| parent | 9b4ee3cc2663d95cb5d29ebc96a2226235d4dbaf (diff) | |
fdo#63685 wp:inline's distT/B/L/R is in EMU's, not twips
Regression from 3d7e168a2a43c2414b0633379102ddb29437e75b.
(cherry picked from commit a88ac708403c03d0f950f09ec29c0d5a1e5a85b4)
Change-Id: I9ab3f9f41316a01d5a74f3e500bad7a83c8d2dca
Reviewed-on: https://gerrit.libreoffice.org/3485
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
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 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(); |