[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Mar 15 06:46:32 UTC 2017
sw/inc/grfatr.hxx | 14 ++---
sw/qa/extras/ww8export/ww8export.cxx | 2
sw/source/core/doc/DocumentContentOperationsManager.cxx | 2
sw/source/core/doc/notxtfrm.cxx | 22 ++++----
sw/source/core/graphic/grfatr.cxx | 42 ++++++++--------
sw/source/core/graphic/ndgrf.cxx | 12 ++--
sw/source/core/inc/UndoInsert.hxx | 3 -
sw/source/core/layout/atrfrm.cxx | 8 +--
sw/source/core/undo/unins.cxx | 4 -
sw/source/filter/html/htmlflywriter.cxx | 8 +--
sw/source/filter/ww8/wrtw8esh.cxx | 8 +--
sw/source/filter/ww8/ww8graf.cxx | 14 ++---
sw/source/ui/frmdlg/frmpage.cxx | 22 ++++----
sw/source/uibase/shells/grfsh.cxx | 30 +++++------
sw/source/uibase/utlui/attrdesc.cxx | 8 +--
15 files changed, 98 insertions(+), 101 deletions(-)
New commits:
commit 7f8bc0af4b35c22ead1310984926b26749b3143d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Mar 14 13:55:21 2017 +0200
convert MirrorGraph to scoped enum
Change-Id: I2eae815a10e23a7904e1aa54577a959cb8579172
Reviewed-on: https://gerrit.libreoffice.org/35179
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index b169ce4..396c443 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -29,14 +29,12 @@
#include <swatrset.hxx>
#include <format.hxx>
-enum MirrorGraph
+enum class MirrorGraph
{
-RES_MIRROR_GRAPH_BEGIN,
- RES_MIRROR_GRAPH_DONT = RES_MIRROR_GRAPH_BEGIN,
- RES_MIRROR_GRAPH_VERT,
- RES_MIRROR_GRAPH_HOR,
- RES_MIRROR_GRAPH_BOTH,
-RES_MIRROR_GRAPH_END
+ Dont,
+ Vertical,
+ Horizontal,
+ Both
};
class SW_DLLPUBLIC SwMirrorGrf : public SfxEnumItem<MirrorGraph>
@@ -44,7 +42,7 @@ class SW_DLLPUBLIC SwMirrorGrf : public SfxEnumItem<MirrorGraph>
bool bGrfToggle; // Flip graphics on even pages.
public:
- SwMirrorGrf( MirrorGraph eMiro = RES_MIRROR_GRAPH_DONT )
+ SwMirrorGrf( MirrorGraph eMiro = MirrorGraph::Dont )
: SfxEnumItem( RES_GRFATR_MIRRORGRF, eMiro ), bGrfToggle( false )
{}
SwMirrorGrf( const SwMirrorGrf &rMirrorGrf )
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index a2c95ca..4e70aa3 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -1202,7 +1202,7 @@ DECLARE_WW8EXPORT_TEST(testRES_MIRROR_GRAPH_BOTH, "tdf56321_flipImage_both.doc")
SwNode* pNode = pDoc->GetNodes()[ n ];
if (SwGrfNode *pGrfNode = pNode->GetGrfNode())
{
- CPPUNIT_ASSERT_EQUAL(RES_MIRROR_GRAPH_BOTH, pGrfNode->GetSwAttrSet().GetMirrorGrf().GetValue());
+ CPPUNIT_ASSERT_EQUAL((int)MirrorGraph::Both, (int)pGrfNode->GetSwAttrSet().GetMirrorGrf().GetValue());
break;
}
}
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 18f1c71..f935aa0 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -2710,7 +2710,7 @@ void DocumentContentOperationsManager::ReRead( SwPaM& rPam, const OUString& rGrf
}
// Because we don't know if we can mirror the graphic, the mirror attribute is always reset
- if( RES_MIRROR_GRAPH_DONT != pGrfNd->GetSwAttrSet().
+ if( MirrorGraph::Dont != pGrfNd->GetSwAttrSet().
GetMirrorGrf().GetValue() )
pGrfNd->SetAttr( SwMirrorGrf() );
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index ebcca78..e4e945f 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -325,15 +325,15 @@ void SwNoTextFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRec
@param Size the graphic's size (also returned)
@param nMirror the current mirror attribute
*/
-static void lcl_CalcRect( Point& rPt, Size& rDim, sal_uInt16 nMirror )
+static void lcl_CalcRect( Point& rPt, Size& rDim, MirrorGraph nMirror )
{
- if( nMirror == RES_MIRROR_GRAPH_VERT || nMirror == RES_MIRROR_GRAPH_BOTH )
+ if( nMirror == MirrorGraph::Vertical || nMirror == MirrorGraph::Both )
{
rPt.setX(rPt.getX() + rDim.Width() -1);
rDim.Width() = -rDim.Width();
}
- if( nMirror == RES_MIRROR_GRAPH_HOR || nMirror == RES_MIRROR_GRAPH_BOTH )
+ if( nMirror == MirrorGraph::Horizontal || nMirror == MirrorGraph::Both )
{
rPt.setY(rPt.getY() + rDim.Height() -1);
rDim.Height() = -rDim.Height();
@@ -351,7 +351,7 @@ void SwNoTextFrame::GetGrfArea( SwRect &rRect, SwRect* pOrigRect ) const
const SwAttrSet& rAttrSet = GetNode()->GetSwAttrSet();
const SwCropGrf& rCrop = rAttrSet.GetCropGrf();
- sal_uInt16 nMirror = rAttrSet.GetMirrorGrf().GetValue();
+ MirrorGraph nMirror = rAttrSet.GetMirrorGrf().GetValue();
if( rAttrSet.GetMirrorGrf().IsGrfToggle() )
{
@@ -359,10 +359,10 @@ void SwNoTextFrame::GetGrfArea( SwRect &rRect, SwRect* pOrigRect ) const
{
switch ( nMirror )
{
- case RES_MIRROR_GRAPH_DONT: nMirror = RES_MIRROR_GRAPH_VERT; break;
- case RES_MIRROR_GRAPH_VERT: nMirror = RES_MIRROR_GRAPH_DONT; break;
- case RES_MIRROR_GRAPH_HOR: nMirror = RES_MIRROR_GRAPH_BOTH; break;
- default: nMirror = RES_MIRROR_GRAPH_HOR; break;
+ case MirrorGraph::Dont: nMirror = MirrorGraph::Vertical; break;
+ case MirrorGraph::Vertical: nMirror = MirrorGraph::Dont; break;
+ case MirrorGraph::Horizontal: nMirror = MirrorGraph::Both; break;
+ default: nMirror = MirrorGraph::Horizontal; break;
}
}
}
@@ -387,7 +387,7 @@ void SwNoTextFrame::GetGrfArea( SwRect &rRect, SwRect* pOrigRect ) const
}
// crop values have to be mirrored too
- if( nMirror == RES_MIRROR_GRAPH_VERT || nMirror == RES_MIRROR_GRAPH_BOTH )
+ if( nMirror == MirrorGraph::Vertical || nMirror == MirrorGraph::Both )
{
long nTmpCrop = nLeftCrop;
nLeftCrop = nRightCrop;
@@ -409,7 +409,7 @@ void SwNoTextFrame::GetGrfArea( SwRect &rRect, SwRect* pOrigRect ) const
}
// crop values have to be mirrored too
- if( nMirror == RES_MIRROR_GRAPH_HOR || nMirror == RES_MIRROR_GRAPH_BOTH )
+ if( nMirror == MirrorGraph::Horizontal || nMirror == MirrorGraph::Both )
{
long nTmpCrop = nTopCrop;
nTopCrop = nBottomCrop;
@@ -449,7 +449,7 @@ void SwNoTextFrame::GetGrfArea( SwRect &rRect, SwRect* pOrigRect ) const
aGrfPt.setY(aGrfPt.getY() + nTopCrop);
aTmpSz.Height()-= nTopCrop + nBottomCrop;
- if( RES_MIRROR_GRAPH_DONT != nMirror )
+ if( MirrorGraph::Dont != nMirror )
lcl_CalcRect( aGrfPt, aTmpSz, nMirror );
pOrigRect->Pos ( aGrfPt );
diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
index 626d596..07f1b98 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -37,7 +37,7 @@ SfxPoolItem* SwMirrorGrf::Clone( SfxItemPool* ) const
sal_uInt16 SwMirrorGrf::GetValueCount() const
{
- return RES_MIRROR_GRAPH_END - RES_MIRROR_GRAPH_BEGIN;
+ return 4;
}
bool SwMirrorGrf::operator==( const SfxPoolItem& rItem) const
@@ -46,17 +46,17 @@ bool SwMirrorGrf::operator==( const SfxPoolItem& rItem) const
static_cast<const SwMirrorGrf&>(rItem).IsGrfToggle() == IsGrfToggle();
}
-static bool lcl_IsHoriOnEvenPages(int nEnum, bool bToggle)
+static bool lcl_IsHoriOnEvenPages(MirrorGraph nEnum, bool bToggle)
{
- bool bEnum = nEnum == RES_MIRROR_GRAPH_VERT ||
- nEnum == RES_MIRROR_GRAPH_BOTH;
+ bool bEnum = nEnum == MirrorGraph::Vertical ||
+ nEnum == MirrorGraph::Both;
return bEnum != bToggle;
}
-static bool lcl_IsHoriOnOddPages(int nEnum)
+static bool lcl_IsHoriOnOddPages(MirrorGraph nEnum)
{
- bool bEnum = nEnum == RES_MIRROR_GRAPH_VERT ||
- nEnum == RES_MIRROR_GRAPH_BOTH;
+ bool bEnum = nEnum == MirrorGraph::Vertical ||
+ nEnum == MirrorGraph::Both;
return bEnum;
}
@@ -75,8 +75,8 @@ bool SwMirrorGrf::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
bVal = lcl_IsHoriOnOddPages(GetValue());
break;
case MID_MIRROR_VERT:
- bVal = GetValue() == RES_MIRROR_GRAPH_HOR ||
- GetValue() == RES_MIRROR_GRAPH_BOTH;
+ bVal = GetValue() == MirrorGraph::Horizontal ||
+ GetValue() == MirrorGraph::Both;
break;
default:
OSL_ENSURE( false, "unknown MemberId" );
@@ -97,15 +97,15 @@ bool SwMirrorGrf::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
case MID_MIRROR_HORZ_EVEN_PAGES:
case MID_MIRROR_HORZ_ODD_PAGES:
{
- bool bIsVert = GetValue() == RES_MIRROR_GRAPH_HOR ||
- GetValue() == RES_MIRROR_GRAPH_BOTH;
+ bool bIsVert = GetValue() == MirrorGraph::Horizontal ||
+ GetValue() == MirrorGraph::Both;
bool bOnOddPages = nMemberId == MID_MIRROR_HORZ_EVEN_PAGES ?
lcl_IsHoriOnOddPages(GetValue()) : bVal;
bool bOnEvenPages = nMemberId == MID_MIRROR_HORZ_ODD_PAGES ?
lcl_IsHoriOnEvenPages(GetValue(), IsGrfToggle()) : bVal;
MirrorGraph nEnum = bOnOddPages ?
- bIsVert ? RES_MIRROR_GRAPH_BOTH : RES_MIRROR_GRAPH_VERT :
- bIsVert ? RES_MIRROR_GRAPH_HOR : RES_MIRROR_GRAPH_DONT;
+ bIsVert ? MirrorGraph::Both : MirrorGraph::Vertical :
+ bIsVert ? MirrorGraph::Horizontal : MirrorGraph::Dont;
bool bToggle = bOnOddPages != bOnEvenPages;
SetValue(nEnum);
SetGrfToggle( bToggle );
@@ -114,17 +114,17 @@ bool SwMirrorGrf::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
case MID_MIRROR_VERT:
if ( bVal )
{
- if ( GetValue() == RES_MIRROR_GRAPH_VERT )
- SetValue( RES_MIRROR_GRAPH_BOTH );
- else if ( GetValue() != RES_MIRROR_GRAPH_BOTH )
- SetValue( RES_MIRROR_GRAPH_HOR );
+ if ( GetValue() == MirrorGraph::Vertical )
+ SetValue( MirrorGraph::Both );
+ else if ( GetValue() != MirrorGraph::Both )
+ SetValue( MirrorGraph::Horizontal );
}
else
{
- if ( GetValue() == RES_MIRROR_GRAPH_BOTH )
- SetValue( RES_MIRROR_GRAPH_VERT );
- else if ( GetValue() == RES_MIRROR_GRAPH_HOR )
- SetValue( RES_MIRROR_GRAPH_DONT );
+ if ( GetValue() == MirrorGraph::Both )
+ SetValue( MirrorGraph::Vertical );
+ else if ( GetValue() == MirrorGraph::Horizontal )
+ SetValue( MirrorGraph::Dont );
}
break;
default:
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index eaab3ba..25e499f 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -1002,13 +1002,13 @@ GraphicAttr& SwGrfNode::GetGraphicAttr( GraphicAttr& rGA,
{
switch( rMirror.GetValue() )
{
- case RES_MIRROR_GRAPH_DONT:
+ case MirrorGraph::Dont:
nMirror = BmpMirrorFlags::Horizontal;
break;
- case RES_MIRROR_GRAPH_VERT:
+ case MirrorGraph::Vertical:
nMirror = BmpMirrorFlags::NONE;
break;
- case RES_MIRROR_GRAPH_HOR:
+ case MirrorGraph::Horizontal:
nMirror = BmpMirrorFlags::Horizontal|BmpMirrorFlags::Vertical;
break;
default:
@@ -1019,13 +1019,13 @@ GraphicAttr& SwGrfNode::GetGraphicAttr( GraphicAttr& rGA,
else
switch( rMirror.GetValue() )
{
- case RES_MIRROR_GRAPH_BOTH:
+ case MirrorGraph::Both:
nMirror = BmpMirrorFlags::Horizontal|BmpMirrorFlags::Vertical;
break;
- case RES_MIRROR_GRAPH_VERT:
+ case MirrorGraph::Vertical:
nMirror = BmpMirrorFlags::Horizontal;
break;
- case RES_MIRROR_GRAPH_HOR:
+ case MirrorGraph::Horizontal:
nMirror = BmpMirrorFlags::Vertical;
break;
default: break;
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index 453f8fd..09b9d89 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -34,6 +34,7 @@ class SwUndoDelete;
class SwUndoFormatAttr;
class SwDoc;
namespace sw { class DocumentContentOperationsManager; }
+enum class MirrorGraph;
class SwUndoInsert: public SwUndo, private SwUndoSaveContent
{
@@ -137,7 +138,7 @@ class SwUndoReRead : public SwUndo
OUString *pNm;
OUString *pFltr;
sal_uLong nPos;
- sal_uInt16 nMirr;
+ MirrorGraph nMirr;
void SaveGraphicData( const SwGrfNode& );
void SetAndSave( ::sw::UndoRedoContext & );
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index c9f3e15..b3306a0 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3405,13 +3405,13 @@ IMapObject* SwFrameFormat::GetIMapObject( const Point& rPoint,
sal_uInt32 nFlags = 0;
if ( pFly != pRef && pNd->IsGrfNode() )
{
- const sal_uInt16 nMirror = pNd->GetSwAttrSet().
+ const MirrorGraph nMirror = pNd->GetSwAttrSet().
GetMirrorGrf().GetValue();
- if ( RES_MIRROR_GRAPH_BOTH == nMirror )
+ if ( MirrorGraph::Both == nMirror )
nFlags = IMAP_MIRROR_HORZ | IMAP_MIRROR_VERT;
- else if ( RES_MIRROR_GRAPH_VERT == nMirror )
+ else if ( MirrorGraph::Vertical == nMirror )
nFlags = IMAP_MIRROR_VERT;
- else if ( RES_MIRROR_GRAPH_HOR == nMirror )
+ else if ( MirrorGraph::Horizontal == nMirror )
nFlags = IMAP_MIRROR_HORZ;
}
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index ae7abdb..a290811 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -811,7 +811,7 @@ void SwUndoReRead::SetAndSave(::sw::UndoRedoContext & rContext)
Graphic* pOldGrf = pGrf;
OUString* pOldNm = pNm;
OUString* pOldFltr = pFltr;
- sal_uInt16 nOldMirr = nMirr;
+ MirrorGraph nOldMirr = nMirr;
// since all of them are cleared/modified by SaveGraphicData:
SaveGraphicData( *pGrfNd );
@@ -827,7 +827,7 @@ void SwUndoReRead::SetAndSave(::sw::UndoRedoContext & rContext)
delete pOldGrf;
}
- if( RES_MIRROR_GRAPH_DONT != nOldMirr )
+ if( MirrorGraph::Dont != nOldMirr )
pGrfNd->SetAttr( SwMirrorGrf() );
rContext.SetSelections(pGrfNd->GetFlyFormat(), nullptr);
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index bf6f1d2..a1d77f52 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -1774,7 +1774,7 @@ static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt, const SwFrameFormat& rF
{
const SwMirrorGrf& rMirror = pGrfNd->GetSwAttrSet().GetMirrorGrf();
- if( !pGrfNd->IsLinkedFile() || RES_MIRROR_GRAPH_DONT != rMirror.GetValue() )
+ if( !pGrfNd->IsLinkedFile() || MirrorGraph::Dont != rMirror.GetValue() )
{
// create a (mirrored) jpeg file
if( rHTMLWrt.GetOrigFileName() )
@@ -1785,9 +1785,9 @@ static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt, const SwFrameFormat& rF
XOutFlags::UseNativeIfPossible;
switch( rMirror.GetValue() )
{
- case RES_MIRROR_GRAPH_VERT: nFlags = XOutFlags::MirrorHorz; break;
- case RES_MIRROR_GRAPH_HOR: nFlags = XOutFlags::MirrorVert; break;
- case RES_MIRROR_GRAPH_BOTH:
+ case MirrorGraph::Vertical: nFlags = XOutFlags::MirrorHorz; break;
+ case MirrorGraph::Horizontal: nFlags = XOutFlags::MirrorVert; break;
+ case MirrorGraph::Both:
nFlags = XOutFlags::MirrorVert | XOutFlags::MirrorHorz;
break;
default: break;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 85b1296..63cf2d6 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1592,15 +1592,15 @@ sal_uInt32 AddMirrorFlags(sal_uInt32 nFlags, const SwMirrorGrf &rMirror)
switch (rMirror.GetValue())
{
default:
- case RES_MIRROR_GRAPH_DONT:
+ case MirrorGraph::Dont:
break;
- case RES_MIRROR_GRAPH_VERT:
+ case MirrorGraph::Vertical:
nFlags |= SHAPEFLAG_FLIPH;
break;
- case RES_MIRROR_GRAPH_HOR:
+ case MirrorGraph::Horizontal:
nFlags |= SHAPEFLAG_FLIPV;
break;
- case RES_MIRROR_GRAPH_BOTH:
+ case MirrorGraph::Both:
nFlags |= SHAPEFLAG_FLIPH;
nFlags |= SHAPEFLAG_FLIPV;
break;
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 9298401..af59184 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2082,12 +2082,12 @@ SwWW8ImplReader::SetAttributesAtGrfNode(SvxMSDffImportRec const*const pRecord,
if( bFlipH )
{
if( bFlipV )
- aMirror.SetValue(RES_MIRROR_GRAPH_BOTH);
+ aMirror.SetValue(MirrorGraph::Both);
else
- aMirror.SetValue(RES_MIRROR_GRAPH_VERT);
+ aMirror.SetValue(MirrorGraph::Vertical);
}
else
- aMirror.SetValue(RES_MIRROR_GRAPH_HOR);
+ aMirror.SetValue(MirrorGraph::Horizontal);
pGrfNd->SetAttr( aMirror );
}
@@ -2967,13 +2967,13 @@ void MatchEscherMirrorIntoFlySet(const SvxMSDffImportRec &rRecord,
{
if (rRecord.bVFlip || rRecord.bHFlip)
{
- MirrorGraph eType(RES_MIRROR_GRAPH_DONT);
+ MirrorGraph eType(MirrorGraph::Dont);
if (rRecord.bVFlip && rRecord.bHFlip)
- eType = RES_MIRROR_GRAPH_BOTH;
+ eType = MirrorGraph::Both;
else if (rRecord.bVFlip)
- eType = RES_MIRROR_GRAPH_HOR;
+ eType = MirrorGraph::Horizontal;
else
- eType = RES_MIRROR_GRAPH_VERT;
+ eType = MirrorGraph::Vertical;
rFlySet.Put( SwMirrorGrf(eType) );
}
}
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 715558e..bfcf5c6 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2451,21 +2451,21 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
bEnable = true;
- MirrorGraph eMirror = static_cast< MirrorGraph >(static_cast<const SwMirrorGrf* >(pItem)->GetValue());
+ MirrorGraph eMirror = static_cast<const SwMirrorGrf* >(pItem)->GetValue();
switch( eMirror )
{
- case RES_MIRROR_GRAPH_DONT: break;
- case RES_MIRROR_GRAPH_VERT: m_pMirrorHorzBox->Check(); break;
- case RES_MIRROR_GRAPH_HOR: m_pMirrorVertBox->Check(); break;
- case RES_MIRROR_GRAPH_BOTH: m_pMirrorHorzBox->Check();
- m_pMirrorVertBox->Check();
- break;
+ case MirrorGraph::Dont: break;
+ case MirrorGraph::Vertical: m_pMirrorHorzBox->Check(); break;
+ case MirrorGraph::Horizontal: m_pMirrorVertBox->Check(); break;
+ case MirrorGraph::Both: m_pMirrorHorzBox->Check();
+ m_pMirrorVertBox->Check();
+ break;
default:
;
}
const int nPos = (static_cast<const SwMirrorGrf* >(pItem)->IsGrfToggle() ? 1 : 0)
- + ((eMirror == RES_MIRROR_GRAPH_VERT || eMirror == RES_MIRROR_GRAPH_BOTH) ? 2 : 0);
+ + ((eMirror == MirrorGraph::Vertical || eMirror == MirrorGraph::Both) ? 2 : 0);
bEnableMirrorRB = nPos != 0;
@@ -2541,9 +2541,9 @@ bool SwGrfExtPage::FillItemSet( SfxItemSet *rSet )
MirrorGraph eMirror;
eMirror = m_pMirrorVertBox->IsChecked() && bHori ?
- RES_MIRROR_GRAPH_BOTH : bHori ?
- RES_MIRROR_GRAPH_VERT : m_pMirrorVertBox->IsChecked() ?
- RES_MIRROR_GRAPH_HOR : RES_MIRROR_GRAPH_DONT;
+ MirrorGraph::Both : bHori ?
+ MirrorGraph::Vertical : m_pMirrorVertBox->IsChecked() ?
+ MirrorGraph::Horizontal : MirrorGraph::Dont;
bool bMirror = !m_pAllPagesRB->IsChecked();
SwMirrorGrf aMirror( eMirror );
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index bbff31c..1c291f9 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 b78f77f..d4267a4 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 )
More information about the Libreoffice-commits
mailing list