[PATCH libreoffice-4-0] fdo#63685 wp:inline's distT/B/L/R is in EMU's, not twips

[Miklos Vajna (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3485

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/3485/1

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
---
M writerfilter/source/dmapper/GraphicImport.cxx
1 file changed, 4 insertions(+), 4 deletions(-)



diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 10a17e6..1dd4f14 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -978,16 +978,16 @@
             }
         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();

-- 
To view, visit https://gerrit.libreoffice.org/3485
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ab3f9f41316a01d5a74f3e500bad7a83c8d2dca
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna <vmik...@suse.cz>

_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice