diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-20 09:25:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-21 11:32:43 +0100 |
| commit | a60ffa6985dec32cc73032a7774f58694a6ee9a7 (patch) | |
| tree | e94b9c586e6db1dde0a69aeddbe067bf8be2a47d /sw/source/filter/ww8/docxsdrexport.cxx | |
| parent | 466c3564058aae4946cdd21eab9dfef529554d90 (diff) | |
loplugin:flatten in sw
Change-Id: I64176f48d90303f078e326c8838da9eb2daf8126
Reviewed-on: https://gerrit.libreoffice.org/44937
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/ww8/docxsdrexport.cxx')
| -rw-r--r-- | sw/source/filter/ww8/docxsdrexport.cxx | 85 |
1 files changed, 43 insertions, 42 deletions
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 46671e083558..8b33ea440ca9 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -986,50 +986,51 @@ void DocxSdrExport::writeDMLEffectLst(const SwFrameFormat& rFrameFormat) const SvxShadowItem& aShadowItem = rFrameFormat.GetShadow(); // Output effects - if (aShadowItem.GetLocation() != SvxShadowLocation::NONE) + if (aShadowItem.GetLocation() == SvxShadowLocation::NONE) + return; + + // Distance is measured diagonally from corner + double nShadowDist = sqrt((double)aShadowItem.GetWidth()*aShadowItem.GetWidth()*2.0); + OString aShadowDist(OString::number(TwipsToEMU(nShadowDist))); + OString aShadowColor = msfilter::util::ConvertColor(aShadowItem.GetColor()); + OString aShadowAlpha = lcl_ConvertTransparency(aShadowItem.GetColor()); + sal_uInt32 nShadowDir = 0; + switch (aShadowItem.GetLocation()) { - // Distance is measured diagonally from corner - double nShadowDist = sqrt((double)aShadowItem.GetWidth()*aShadowItem.GetWidth()*2.0); - OString aShadowDist(OString::number(TwipsToEMU(nShadowDist))); - OString aShadowColor = msfilter::util::ConvertColor(aShadowItem.GetColor()); - OString aShadowAlpha = lcl_ConvertTransparency(aShadowItem.GetColor()); - sal_uInt32 nShadowDir = 0; - switch (aShadowItem.GetLocation()) - { - case SvxShadowLocation::TopLeft: - nShadowDir = 13500000; - break; - case SvxShadowLocation::TopRight: - nShadowDir = 18900000; - break; - case SvxShadowLocation::BottomLeft: - nShadowDir = 8100000; - break; - case SvxShadowLocation::BottomRight: - nShadowDir = 2700000; - break; - case SvxShadowLocation::NONE: - case SvxShadowLocation::End: - break; - } - OString aShadowDir(OString::number(nShadowDir)); - - m_pImpl->m_pSerializer->startElementNS(XML_a, XML_effectLst, FSEND); - m_pImpl->m_pSerializer->startElementNS(XML_a, XML_outerShdw, - XML_dist, aShadowDist.getStr(), - XML_dir, aShadowDir.getStr(), FSEND); - if (aShadowAlpha.isEmpty()) - m_pImpl->m_pSerializer->singleElementNS(XML_a, XML_srgbClr, - XML_val, aShadowColor.getStr(), FSEND); - else - { - m_pImpl->m_pSerializer->startElementNS(XML_a, XML_srgbClr, XML_val, aShadowColor.getStr(), FSEND); - m_pImpl->m_pSerializer->singleElementNS(XML_a, XML_alpha, XML_val, aShadowAlpha.getStr(), FSEND); - m_pImpl->m_pSerializer->endElementNS(XML_a, XML_srgbClr); - } - m_pImpl->m_pSerializer->endElementNS(XML_a, XML_outerShdw); - m_pImpl->m_pSerializer->endElementNS(XML_a, XML_effectLst); + case SvxShadowLocation::TopLeft: + nShadowDir = 13500000; + break; + case SvxShadowLocation::TopRight: + nShadowDir = 18900000; + break; + case SvxShadowLocation::BottomLeft: + nShadowDir = 8100000; + break; + case SvxShadowLocation::BottomRight: + nShadowDir = 2700000; + break; + case SvxShadowLocation::NONE: + case SvxShadowLocation::End: + break; } + OString aShadowDir(OString::number(nShadowDir)); + + m_pImpl->m_pSerializer->startElementNS(XML_a, XML_effectLst, FSEND); + m_pImpl->m_pSerializer->startElementNS(XML_a, XML_outerShdw, + XML_dist, aShadowDist.getStr(), + XML_dir, aShadowDir.getStr(), FSEND); + if (aShadowAlpha.isEmpty()) + m_pImpl->m_pSerializer->singleElementNS(XML_a, XML_srgbClr, + XML_val, aShadowColor.getStr(), FSEND); + else + { + m_pImpl->m_pSerializer->startElementNS(XML_a, XML_srgbClr, XML_val, aShadowColor.getStr(), FSEND); + m_pImpl->m_pSerializer->singleElementNS(XML_a, XML_alpha, XML_val, aShadowAlpha.getStr(), FSEND); + m_pImpl->m_pSerializer->endElementNS(XML_a, XML_srgbClr); + } + m_pImpl->m_pSerializer->endElementNS(XML_a, XML_outerShdw); + m_pImpl->m_pSerializer->endElementNS(XML_a, XML_effectLst); + } |