diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-14 13:55:21 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-15 06:45:52 +0000 |
commit | 7f8bc0af4b35c22ead1310984926b26749b3143d (patch) | |
tree | 511e6e19c6540e23eadb0806d3caec24a196dcd1 /sw/source/uibase | |
parent | 516a320ad496604296433f1471e2dd5434f4872d (diff) |
convert MirrorGraph to scoped enum
Change-Id: I2eae815a10e23a7904e1aa54577a959cb8579172
Reviewed-on: https://gerrit.libreoffice.org/35179
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase')
-rw-r--r-- | sw/source/uibase/shells/grfsh.cxx | 30 | ||||
-rw-r--r-- | sw/source/uibase/utlui/attrdesc.cxx | 8 |
2 files changed, 18 insertions, 20 deletions
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index bbff31c07da0..1c291f973fe3 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -516,29 +516,29 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq ) { GetShell().GetCurAttr( aGrfSet ); SwMirrorGrf aMirror( static_cast<const SwMirrorGrf&>(aGrfSet.Get( RES_GRFATR_MIRRORGRF )) ); - sal_uInt16 nMirror = aMirror.GetValue(); + MirrorGraph nMirror = aMirror.GetValue(); if ( nSlot==SID_FLIP_HORIZONTAL ) switch( nMirror ) { - case RES_MIRROR_GRAPH_DONT: nMirror = RES_MIRROR_GRAPH_VERT; + case MirrorGraph::Dont: nMirror = MirrorGraph::Vertical; break; - case RES_MIRROR_GRAPH_HOR: nMirror = RES_MIRROR_GRAPH_BOTH; + case MirrorGraph::Horizontal: nMirror = MirrorGraph::Both; break; - case RES_MIRROR_GRAPH_VERT: nMirror = RES_MIRROR_GRAPH_DONT; + case MirrorGraph::Vertical: nMirror = MirrorGraph::Dont; break; - case RES_MIRROR_GRAPH_BOTH: nMirror = RES_MIRROR_GRAPH_HOR; + case MirrorGraph::Both: nMirror = MirrorGraph::Horizontal; break; } else switch( nMirror ) { - case RES_MIRROR_GRAPH_DONT: nMirror = RES_MIRROR_GRAPH_HOR; + case MirrorGraph::Dont: nMirror = MirrorGraph::Horizontal; break; - case RES_MIRROR_GRAPH_VERT: nMirror = RES_MIRROR_GRAPH_BOTH; + case MirrorGraph::Vertical: nMirror = MirrorGraph::Both; break; - case RES_MIRROR_GRAPH_HOR: nMirror = RES_MIRROR_GRAPH_DONT; + case MirrorGraph::Horizontal: nMirror = MirrorGraph::Dont; break; - case RES_MIRROR_GRAPH_BOTH: nMirror = RES_MIRROR_GRAPH_VERT; + case MirrorGraph::Both: nMirror = MirrorGraph::Vertical; break; } aMirror.SetValue( (MirrorGraph)nMirror ); @@ -700,19 +700,17 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet) MirrorGraph nState = static_cast< const MirrorGraph >(static_cast<const SwMirrorGrf &>( aCoreSet.Get( RES_GRFATR_MIRRORGRF )).GetValue()); - rSet.Put(SfxBoolItem( nWhich, nState == RES_MIRROR_GRAPH_VERT || - nState == RES_MIRROR_GRAPH_BOTH)); + rSet.Put(SfxBoolItem( nWhich, nState == MirrorGraph::Vertical || + nState == MirrorGraph::Both)); } break; case SID_FLIP_VERTICAL: if( !bParentCntProt ) { - MirrorGraph nState = static_cast< MirrorGraph >(static_cast<const SwMirrorGrf &>( aCoreSet.Get( - RES_GRFATR_MIRRORGRF )).GetValue()); - - rSet.Put(SfxBoolItem( nWhich, nState == RES_MIRROR_GRAPH_HOR || - nState == RES_MIRROR_GRAPH_BOTH)); + MirrorGraph nState = aCoreSet.GetItem<SwMirrorGrf>( RES_GRFATR_MIRRORGRF )->GetValue(); + rSet.Put(SfxBoolItem( nWhich, nState == MirrorGraph::Horizontal || + nState == MirrorGraph::Both)); } break; diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx index b78f77f9d3eb..d4267a45fd4d 100644 --- a/sw/source/uibase/utlui/attrdesc.cxx +++ b/sw/source/uibase/utlui/attrdesc.cxx @@ -686,10 +686,10 @@ bool SwMirrorGrf::GetPresentation( sal_uInt16 nId; switch( GetValue() ) { - case RES_MIRROR_GRAPH_DONT: nId = STR_NO_MIRROR; break; - case RES_MIRROR_GRAPH_VERT: nId = STR_VERT_MIRROR; break; - case RES_MIRROR_GRAPH_HOR: nId = STR_HORI_MIRROR; break; - case RES_MIRROR_GRAPH_BOTH: nId = STR_BOTH_MIRROR; break; + case MirrorGraph::Dont: nId = STR_NO_MIRROR; break; + case MirrorGraph::Vertical: nId = STR_VERT_MIRROR; break; + case MirrorGraph::Horizontal: nId = STR_HORI_MIRROR; break; + case MirrorGraph::Both: nId = STR_BOTH_MIRROR; break; default: nId = 0; break; } if ( nId ) |