diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-08 08:58:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-08 09:07:34 +0000 |
| commit | 1f4e0359d3cee2780944f64025a63c208720c74d (patch) | |
| tree | f99934a01892ede88b5213655de481919e5edfab /sw/source/filter/ww8/docxsdrexport.cxx | |
| parent | 9cacb6ad9f5a012bc892cf9893cd8d37a2a5f304 (diff) | |
convert SvxShadowLocation to scoped enum
Change-Id: Ie51995579312328538263172cd3173641df89bca
Reviewed-on: https://gerrit.libreoffice.org/34965
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 | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 4a71fe2c2506..c4b2e8b63dc1 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -298,25 +298,25 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons // Count effectExtent values, their value is needed before dist{T,B,L,R} is written. SvxShadowItem aShadowItem = pFrameFormat->GetShadow(); sal_Int32 nLeftExt = 0, nRightExt = 0, nTopExt = 0, nBottomExt = 0; - if (aShadowItem.GetLocation() != SVX_SHADOW_NONE) + if (aShadowItem.GetLocation() != SvxShadowLocation::NONE) { sal_Int32 nShadowWidth(TwipsToEMU(aShadowItem.GetWidth())); switch (aShadowItem.GetLocation()) { - case SVX_SHADOW_TOPLEFT: + case SvxShadowLocation::TopLeft: nTopExt = nLeftExt = nShadowWidth; break; - case SVX_SHADOW_TOPRIGHT: + case SvxShadowLocation::TopRight: nTopExt = nRightExt = nShadowWidth; break; - case SVX_SHADOW_BOTTOMLEFT: + case SvxShadowLocation::BottomLeft: nBottomExt = nLeftExt = nShadowWidth; break; - case SVX_SHADOW_BOTTOMRIGHT: + case SvxShadowLocation::BottomRight: nBottomExt = nRightExt = nShadowWidth; break; - case SVX_SHADOW_NONE: - case SVX_SHADOW_END: + case SvxShadowLocation::NONE: + case SvxShadowLocation::End: break; } } @@ -882,27 +882,27 @@ void DocxSdrExport::writeDMLDrawing(const SdrObject* pSdrObject, const SwFrameFo void DocxSdrExport::Impl::textFrameShadow(const SwFrameFormat& rFrameFormat) { const SvxShadowItem& aShadowItem = rFrameFormat.GetShadow(); - if (aShadowItem.GetLocation() == SVX_SHADOW_NONE) + if (aShadowItem.GetLocation() == SvxShadowLocation::NONE) return; OString aShadowWidth(OString::number(double(aShadowItem.GetWidth()) / 20) + "pt"); OString aOffset; switch (aShadowItem.GetLocation()) { - case SVX_SHADOW_TOPLEFT: + case SvxShadowLocation::TopLeft: aOffset = "-" + aShadowWidth + ",-" + aShadowWidth; break; - case SVX_SHADOW_TOPRIGHT: + case SvxShadowLocation::TopRight: aOffset = aShadowWidth + ",-" + aShadowWidth; break; - case SVX_SHADOW_BOTTOMLEFT: + case SvxShadowLocation::BottomLeft: aOffset = "-" + aShadowWidth + "," + aShadowWidth; break; - case SVX_SHADOW_BOTTOMRIGHT: + case SvxShadowLocation::BottomRight: aOffset = aShadowWidth + "," + aShadowWidth; break; - case SVX_SHADOW_NONE: - case SVX_SHADOW_END: + case SvxShadowLocation::NONE: + case SvxShadowLocation::End: break; } if (aOffset.isEmpty()) @@ -985,7 +985,7 @@ void DocxSdrExport::writeDMLEffectLst(const SwFrameFormat& rFrameFormat) const SvxShadowItem& aShadowItem = rFrameFormat.GetShadow(); // Output effects - if (aShadowItem.GetLocation() != SVX_SHADOW_NONE) + if (aShadowItem.GetLocation() != SvxShadowLocation::NONE) { // Distance is measured diagonally from corner double nShadowDist = sqrt((double)aShadowItem.GetWidth()*aShadowItem.GetWidth()*2.0); @@ -995,20 +995,20 @@ void DocxSdrExport::writeDMLEffectLst(const SwFrameFormat& rFrameFormat) sal_uInt32 nShadowDir = 0; switch (aShadowItem.GetLocation()) { - case SVX_SHADOW_TOPLEFT: + case SvxShadowLocation::TopLeft: nShadowDir = 13500000; break; - case SVX_SHADOW_TOPRIGHT: + case SvxShadowLocation::TopRight: nShadowDir = 18900000; break; - case SVX_SHADOW_BOTTOMLEFT: + case SvxShadowLocation::BottomLeft: nShadowDir = 8100000; break; - case SVX_SHADOW_BOTTOMRIGHT: + case SvxShadowLocation::BottomRight: nShadowDir = 2700000; break; - case SVX_SHADOW_NONE: - case SVX_SHADOW_END: + case SvxShadowLocation::NONE: + case SvxShadowLocation::End: break; } OString aShadowDir(OString::number(nShadowDir)); |