diff options
author | Noel Grandin <noel@peralex.com> | 2016-09-21 10:37:51 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-21 09:24:55 +0000 |
commit | 51c6e9153de507f37d1474b31f557265cb304c06 (patch) | |
tree | 6d02d302fbee51a934c9fb8235cf4b410fde5d53 /sw/source | |
parent | 25e4708c1f49986f3f082beb2e940aa2d7fb4d81 (diff) |
convert SfxItemPresentation to scoped enum
Change-Id: Ibf605706a9f804ab509ac4f92f5f88fcf3daebc1
Reviewed-on: https://gerrit.libreoffice.org/29131
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/utlui/attrdesc.cxx | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index a37fe0af15a7..c3d8cc09ad5f 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -1277,7 +1277,7 @@ void SwFormatSurround::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::number(GetValue()).getStr())); OUString aPresentation; - GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS, MAP_100TH_MM, MAP_100TH_MM, aPresentation); + GetPresentation(SfxItemPresentation::Nameless, MAP_100TH_MM, MAP_100TH_MM, aPresentation); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(aPresentation.toUtf8().getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("bAnchorOnly"), BAD_CAST(OString::boolean(bAnchorOnly).getStr())); @@ -1730,7 +1730,7 @@ void SwFormatAnchor::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nOrder"), BAD_CAST(OString::number(mnOrder).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nOrderCounter"), BAD_CAST(OString::number(mnOrderCounter).getStr())); OUString aPresentation; - GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS, MAP_100TH_MM, MAP_100TH_MM, aPresentation); + GetPresentation(SfxItemPresentation::Nameless, MAP_100TH_MM, MAP_100TH_MM, aPresentation); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(aPresentation.toUtf8().getStr())); xmlTextWriterEndElement(pWriter); diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx index 8037c8249825..965157df48b4 100644 --- a/sw/source/uibase/utlui/attrdesc.cxx +++ b/sw/source/uibase/utlui/attrdesc.cxx @@ -707,7 +707,7 @@ bool SwRotationGrf::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { - if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) + if( SfxItemPresentation::Complete == ePres ) rText = SW_RESSTR( STR_ROTATION ); else if( rText.getLength() ) rText.clear(); @@ -719,7 +719,7 @@ bool SwLuminanceGrf::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { - if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) + if( SfxItemPresentation::Complete == ePres ) rText = SW_RESSTR( STR_LUMINANCE ); else if( rText.getLength() ) rText.clear(); @@ -732,7 +732,7 @@ bool SwContrastGrf::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { - if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) + if( SfxItemPresentation::Complete == ePres ) rText = SW_RESSTR( STR_CONTRAST ); else if( rText.getLength() ) rText.clear(); @@ -745,7 +745,7 @@ bool SwChannelGrf::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { - if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) + if( SfxItemPresentation::Complete == ePres ) { sal_uInt16 nId; switch ( Which() ) @@ -772,7 +772,7 @@ bool SwGammaGrf::GetPresentation( OUString &rText, const IntlWrapper* /*pIntl*/) const { OUStringBuffer aText; - if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) + if( SfxItemPresentation::Complete == ePres ) aText.append(SW_RESSTR(STR_GAMMA)); aText.append(unicode::formatPercent(GetValue(), Application::GetSettings().GetUILanguageTag())); @@ -785,7 +785,7 @@ bool SwInvertGrf::GetPresentation( OUString &rText, const IntlWrapper* /*pIntl*/) const { rText.clear(); - if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) + if( SfxItemPresentation::Complete == ePres ) { const sal_uInt16 nId = GetValue() ? STR_INVERT : STR_INVERT_NOT; rText = SW_RESSTR( nId ); @@ -797,7 +797,7 @@ bool SwTransparencyGrf::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { - if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) + if( SfxItemPresentation::Complete == ePres ) rText = SW_RESSTR( STR_TRANSPARENCY ); else if( rText.getLength() ) rText.clear(); @@ -811,7 +811,7 @@ bool SwDrawModeGrf::GetPresentation( OUString &rText, const IntlWrapper* /*pIntl*/) const { rText.clear(); - if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) + if( SfxItemPresentation::Complete == ePres ) { sal_uInt16 nId; switch ( GetValue() ) @@ -834,7 +834,7 @@ bool SwFormatFollowTextFlow::GetPresentation( SfxItemPresentation ePres, const IntlWrapper* /*pIntl*/ ) const { rText.clear(); - if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) + if( SfxItemPresentation::Complete == ePres ) { const sal_uInt16 nId = GetValue() ? STR_FOLLOW_TEXT_FLOW : STR_DONT_FOLLOW_TEXT_FLOW; rText = SW_RESSTR( nId ); |