diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-12-12 09:18:39 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-13 09:26:04 +0100 |
| commit | 134898e42ac6c455d5df0c2de3842d1bd7309f5f (patch) | |
| tree | 7c0c1ea898d492b6f757bd9652eba37a7b4e9c57 /writerfilter | |
| parent | 0c8a30ba47c6ed64c45063a060356e61e82a789f (diff) | |
tdf#113183 DOCX import: fix not independent text box alignments
The alternative would be to clear them in
writerfilter::dmapper::DomainMapper::getPositionOffset(), but that runs
before writerfilter::dmapper::PositionHandler::lcl_sprm(), so it would
be too early.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
(cherry picked from commit 312cecf11c1ab8acef6ce08ccb90d5322836b08f)
Change-Id: I287b9a4025c4b1844ae467c48815b5d7ffe3f98e
Reviewed-on: https://gerrit.libreoffice.org/46322
Tested-by: Jenkins <ci@libreoffice.org>
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/dmapper/GraphicHelpers.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx index 62579dbaa864..8108445d24fb 100644 --- a/writerfilter/source/dmapper/GraphicHelpers.cxx +++ b/writerfilter/source/dmapper/GraphicHelpers.cxx @@ -133,9 +133,11 @@ void PositionHandler::lcl_sprm(Sprm& rSprm) { case NS_ooxml::LN_CT_PosH_posOffset: m_nPosition = oox::drawingml::convertEmuToHmm(m_rPositionOffsets.first.toInt32()); + m_rPositionOffsets.first.clear(); break; case NS_ooxml::LN_CT_PosV_posOffset: m_nPosition = oox::drawingml::convertEmuToHmm(m_rPositionOffsets.second.toInt32()); + m_rPositionOffsets.second.clear(); break; case NS_ooxml::LN_CT_PosH_align: { @@ -150,6 +152,7 @@ void PositionHandler::lcl_sprm(Sprm& rSprm) m_nOrient = text::HoriOrientation::INSIDE; else if (rAlign == "outside") m_nOrient = text::HoriOrientation::OUTSIDE; + rAlign.clear(); break; } case NS_ooxml::LN_CT_PosV_align: @@ -165,6 +168,7 @@ void PositionHandler::lcl_sprm(Sprm& rSprm) m_nOrient = text::VertOrientation::NONE; else if (rAlign == "outside") m_nOrient = text::VertOrientation::NONE; + rAlign.clear(); break; } } |