diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-22 14:19:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-23 09:54:16 +0200 |
| commit | c3b305149efd8a2407078ce5908ab1e1df567aba (patch) | |
| tree | 1646cf7ccd37c3ee23b7be0c107be1f7ae9eaee8 | |
| parent | convert BitmapMarkerKind to scoped enum (diff) | |
| download | core-c3b305149efd8a2407078ce5908ab1e1df567aba.tar.gz core-c3b305149efd8a2407078ce5908ab1e1df567aba.zip | |
convert BitmapColorIndex to scoped enum
Change-Id: I3119d29f46376020e6d838578d1e10a6677a1623
| -rw-r--r-- | include/svx/svdhdl.hxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdhdl.cxx | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 2f5edb0283e4..f22281a41a72 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -82,7 +82,7 @@ enum SdrHdlKind }; -enum BitmapColorIndex +enum class BitmapColorIndex { LightGreen, Cyan, diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 732cd919b5cf..6233ad58b566 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -411,19 +411,19 @@ void SdrHdl::CreateB2dIAObject() if(pHdlList && pHdlList->GetView() && !pHdlList->GetView()->areMarkHandlesHidden()) { - BitmapColorIndex eColIndex = LightGreen; + BitmapColorIndex eColIndex = BitmapColorIndex::LightGreen; BitmapMarkerKind eKindOfMarker = BitmapMarkerKind::Rect_7x7; bool bRot = pHdlList->IsRotateShear(); if(pObj) - eColIndex = (bSelect) ? Cyan : LightCyan; + eColIndex = bSelect ? BitmapColorIndex::Cyan : BitmapColorIndex::LightCyan; if(bRot) { // red rotation handles if(pObj && bSelect) - eColIndex = Red; + eColIndex = BitmapColorIndex::Red; else - eColIndex = LightRed; + eColIndex = BitmapColorIndex::LightRed; } switch(eKind) @@ -535,7 +535,7 @@ void SdrHdl::CreateB2dIAObject() case HDL_CUSTOMSHAPE1: { eKindOfMarker = b1PixMore ? BitmapMarkerKind::Customshape_9x9 : BitmapMarkerKind::Customshape_7x7; - eColIndex = Yellow; + eColIndex = BitmapColorIndex::Yellow; break; } default: @@ -598,19 +598,19 @@ void SdrHdl::CreateB2dIAObject() Color aHandleFillColor(COL_LIGHTGREEN); switch (eColIndex) { - case Cyan: + case BitmapColorIndex::Cyan: aHandleFillColor = Color(COL_CYAN); break; - case LightCyan: + case BitmapColorIndex::LightCyan: aHandleFillColor = Color(COL_LIGHTCYAN); break; - case Red: + case BitmapColorIndex::Red: aHandleFillColor = Color(COL_RED); break; - case LightRed: + case BitmapColorIndex::LightRed: aHandleFillColor = Color(COL_LIGHTRED); break; - case Yellow: + case BitmapColorIndex::Yellow: aHandleFillColor = Color(COL_YELLOW); break; default: @@ -1474,7 +1474,7 @@ void ImpEdgeHdl::CreateB2dIAObject() // first throw away old one GetRidOfIAObject(); - BitmapColorIndex eColIndex = LightCyan; + BitmapColorIndex eColIndex = BitmapColorIndex::LightCyan; BitmapMarkerKind eKindOfMarker = BitmapMarkerKind::Rect_7x7; if(pHdlList) @@ -1486,7 +1486,7 @@ void ImpEdgeHdl::CreateB2dIAObject() const SdrEdgeObj* pEdge = static_cast<SdrEdgeObj*>(pObj); if(pEdge->GetConnectedNode(nObjHdlNum == 0) != nullptr) - eColIndex = LightRed; + eColIndex = BitmapColorIndex::LightRed; if(nPPntNum < 2) { @@ -1602,7 +1602,7 @@ void ImpMeasureHdl::CreateB2dIAObject() if(pView && !pView->areMarkHandlesHidden()) { - BitmapColorIndex eColIndex = LightCyan; + BitmapColorIndex eColIndex = BitmapColorIndex::LightCyan; BitmapMarkerKind eKindOfMarker = BitmapMarkerKind::Rect_9x9; if(nObjHdlNum > 1) @@ -1612,7 +1612,7 @@ void ImpMeasureHdl::CreateB2dIAObject() if(bSelect) { - eColIndex = Cyan; + eColIndex = BitmapColorIndex::Cyan; } SdrPageView* pPageView = pView->GetSdrPageView(); |