summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-08-22 14:19:11 +0200
committerNoel Grandin <noel@peralex.com>2016-08-23 09:54:16 +0200
commitc3b305149efd8a2407078ce5908ab1e1df567aba (patch)
tree1646cf7ccd37c3ee23b7be0c107be1f7ae9eaee8 /svx/source/svdraw
parent32918f74a6e1f49f5213efe39f27a0720aeca708 (diff)
convert BitmapColorIndex to scoped enum
Change-Id: I3119d29f46376020e6d838578d1e10a6677a1623
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r--svx/source/svdraw/svdhdl.cxx28
1 files changed, 14 insertions, 14 deletions
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();