diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-16 17:53:34 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-05 10:33:43 -0500 |
| commit | ec8c747b457c2b1161b875474d2ba4e15819a3c7 (patch) | |
| tree | a48a87939bf6f8a21d7a68e48ff9f626271f639f /writerfilter | |
| parent | 58b9fa3873190ca8b53c68f59b6bfdee08fd4cc4 (diff) | |
fdo#82067 RTF import: handle negative SHPLEFT / SHPTOP
(cherry picked from commit dc0149869bc0cc09e92816ae6f34831bf5353e3b)
Change-Id: Id82d6d54b160b5b78a53c526e6ccab0514c21312
Reviewed-on: https://gerrit.libreoffice.org/11283
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 94e518a4a721..62a779486d0b 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -925,14 +925,14 @@ int RTFDocumentImpl::resolvePict(bool const bInline, RTFSprms aPoshSprms; if (m_aStates.top().aShape.nHoriOrientRelationToken > 0) aPoshSprms.set(NS_ooxml::LN_CT_PosH_relativeFrom, RTFValue::Pointer_t(new RTFValue(m_aStates.top().aShape.nHoriOrientRelationToken))); - if (m_aStates.top().aShape.nLeft > 0) + if (m_aStates.top().aShape.nLeft != 0) writerfilter::dmapper::PositionHandler::setPositionOffset(OUString::number(MM100_TO_EMU(m_aStates.top().aShape.nLeft)), false); aAnchorSprms.set(NS_ooxml::LN_CT_Anchor_positionH, RTFValue::Pointer_t(new RTFValue(aPoshSprms))); RTFSprms aPosvSprms; if (m_aStates.top().aShape.nVertOrientRelationToken > 0) aPosvSprms.set(NS_ooxml::LN_CT_PosV_relativeFrom, RTFValue::Pointer_t(new RTFValue(m_aStates.top().aShape.nVertOrientRelationToken))); - if (m_aStates.top().aShape.nTop > 0) + if (m_aStates.top().aShape.nTop != 0) writerfilter::dmapper::PositionHandler::setPositionOffset(OUString::number(MM100_TO_EMU(m_aStates.top().aShape.nTop)), true); aAnchorSprms.set(NS_ooxml::LN_CT_Anchor_positionV, RTFValue::Pointer_t(new RTFValue(aPosvSprms))); |