summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r--svx/source/svdraw/svdcrtv.cxx6
-rw-r--r--svx/source/svdraw/svdedxv.cxx2
-rw-r--r--svx/source/svdraw/svdetc.cxx2
-rw-r--r--svx/source/svdraw/svdhdl.cxx24
-rw-r--r--svx/source/svdraw/svdibrow.cxx6
-rw-r--r--svx/source/svdraw/svdobj.cxx2
-rw-r--r--svx/source/svdraw/svdpntv.cxx2
7 files changed, 22 insertions, 22 deletions
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index b27b92964517..aa7a82473bdd 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -439,7 +439,7 @@ bool SdrCreateView::ImpBegCreateObj(SdrInventor nInvent, sal_uInt16 nIdent, cons
if (mpModel && dynamic_cast<const SdrCaptionObj *>(pAktCreate) != nullptr)
{
SfxItemSet aSet(mpModel->GetItemPool());
- aSet.Put(XFillColorItem(OUString(),Color(COL_WHITE))); // in case someone turns on Solid
+ aSet.Put(XFillColorItem(OUString(),COL_WHITE)); // in case someone turns on Solid
aSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
pAktCreate->SetMergedItemSet(aSet);
@@ -449,9 +449,9 @@ bool SdrCreateView::ImpBegCreateObj(SdrInventor nInvent, sal_uInt16 nIdent, cons
{
// default for all text frames: no background, no border
SfxItemSet aSet(mpModel->GetItemPool());
- aSet.Put(XFillColorItem(OUString(),Color(COL_WHITE))); // in case someone turns on Solid
+ aSet.Put(XFillColorItem(OUString(),COL_WHITE)); // in case someone turns on Solid
aSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
- aSet.Put(XLineColorItem(OUString(),Color(COL_BLACK))); // in case someone turns on Solid
+ aSet.Put(XLineColorItem(OUString(),COL_BLACK)); // in case someone turns on Solid
aSet.Put(XLineStyleItem(drawing::LineStyle_NONE));
pAktCreate->SetMergedItemSet(aSet);
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index f01dd86a3d2c..51ef80fb46b6 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -985,7 +985,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,void)
pFI->SetFieldColor(*pFldCol);
delete pFldCol;
} else {
- pFI->SetFieldColor(Color(COL_LIGHTGRAY)); // TODO: remove this later on (357)
+ pFI->SetFieldColor(COL_LIGHTGRAY); // TODO: remove this later on (357)
}
}
}
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 823dc300f3e9..4b29e2c53efe 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -682,7 +682,7 @@ namespace
}
- aSpotColor[i] = Color( COL_WHITE );
+ aSpotColor[i] = COL_WHITE;
impGetSdrPageFillColor(rPage, aSpotPos[i], rTextEditPV, rTextEditPV.GetVisibleLayers(), aSpotColor[i], false);
}
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 63b42083fe4b..711a96e1dfff 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -589,19 +589,19 @@ void SdrHdl::CreateB2dIAObject()
switch (eColIndex)
{
case BitmapColorIndex::Cyan:
- aHandleFillColor = Color(COL_CYAN);
+ aHandleFillColor = COL_CYAN;
break;
case BitmapColorIndex::LightCyan:
- aHandleFillColor = Color(COL_LIGHTCYAN);
+ aHandleFillColor = COL_LIGHTCYAN;
break;
case BitmapColorIndex::Red:
- aHandleFillColor = Color(COL_RED);
+ aHandleFillColor = COL_RED;
break;
case BitmapColorIndex::LightRed:
- aHandleFillColor = Color(COL_LIGHTRED);
+ aHandleFillColor = COL_LIGHTRED;
break;
case BitmapColorIndex::Yellow:
- aHandleFillColor = Color(COL_YELLOW);
+ aHandleFillColor = COL_YELLOW;
break;
default:
break;
@@ -1146,10 +1146,10 @@ BitmapEx SdrHdlColor::CreateColorDropper(Color aCol)
sal_Int32 nWidth = aMarkerSize.Width();
sal_Int32 nHeight = aMarkerSize.Height();
- pWrite->SetLineColor(Color(COL_LIGHTGRAY));
+ pWrite->SetLineColor(COL_LIGHTGRAY);
pWrite->DrawLine(Point(0, 0), Point(0, nHeight - 1));
pWrite->DrawLine(Point(1, 0), Point(nWidth - 1, 0));
- pWrite->SetLineColor(Color(COL_GRAY));
+ pWrite->SetLineColor(COL_GRAY);
pWrite->DrawLine(Point(1, nHeight - 1), Point(nWidth - 1, nHeight - 1));
pWrite->DrawLine(Point(nWidth - 1, 1), Point(nWidth - 1, nHeight - 2));
@@ -1283,7 +1283,7 @@ void SdrHdlGradient::CreateB2dIAObject()
);
DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!");
- pNewOverlayObject->setBaseColor(IsGradient() ? Color(COL_BLACK) : Color(COL_BLUE));
+ pNewOverlayObject->setBaseColor(IsGradient() ? COL_BLACK : COL_BLUE);
xManager->add(*pNewOverlayObject);
maOverlayGroup.append(pNewOverlayObject);
@@ -1302,7 +1302,7 @@ void SdrHdlGradient::CreateB2dIAObject()
aPositionLeft,
aPosition2,
aPositionRight,
- IsGradient() ? Color(COL_BLACK) : Color(COL_BLUE)
+ IsGradient() ? COL_BLACK : COL_BLUE
);
DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!");
@@ -1432,7 +1432,7 @@ void SdrHdlLine::CreateB2dIAObject()
// OVERLAYMANAGER
// color(?)
- pNewOverlayObject->setBaseColor(Color(COL_LIGHTRED));
+ pNewOverlayObject->setBaseColor(COL_LIGHTRED);
xManager->add(*pNewOverlayObject);
maOverlayGroup.append(pNewOverlayObject);
@@ -1492,7 +1492,7 @@ void SdrHdlBezWgt::CreateB2dIAObject()
pNewOverlayObject->setHittable(false);
// color(?)
- pNewOverlayObject->setBaseColor(Color(COL_LIGHTBLUE));
+ pNewOverlayObject->setBaseColor(COL_LIGHTBLUE);
xManager->add(*pNewOverlayObject);
maOverlayGroup.append(pNewOverlayObject);
@@ -1538,7 +1538,7 @@ void E3dVolumeMarker::CreateB2dIAObject()
aWireframePoly);
// OVERLAYMANAGER
- pNewOverlayObject->setBaseColor(Color(COL_BLACK));
+ pNewOverlayObject->setBaseColor(COL_BLACK);
xManager->add(*pNewOverlayObject);
maOverlayGroup.append(pNewOverlayObject);
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index c36516c65a2b..e96176ed7071 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -340,7 +340,7 @@ void SdrItemBrowserControl::PaintField(OutputDevice& rDev, const tools::Rectangl
if (nColumnId==ITEMBROWSER_NAMECOL_ID)
{
rDev.SetLineColor();
- rDev.SetFillColor( Color( COL_LIGHTGRAY ) );
+ rDev.SetFillColor( COL_LIGHTGRAY );
aR.SetLeft(0 );
aR.SetRight(rDev.GetOutputSize().Width() );
rDev.DrawRect(aR);
@@ -481,9 +481,9 @@ bool SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos)
aRect.AdjustRight( -1 );
pEditControl->SetPosSizePixel(aRect.TopLeft(),aRect.GetSize());
pEditControl->SetText(pEntry->aValue);
- pEditControl->SetBackground( Wallpaper(Color(COL_LIGHTGRAY)));
+ pEditControl->SetBackground( Wallpaper(COL_LIGHTGRAY));
vcl::Font aFont(pEditControl->GetFont());
- aFont.SetFillColor(Color(COL_LIGHTGRAY));
+ aFont.SetFillColor(COL_LIGHTGRAY);
pEditControl->SetFont(aFont);
pEditControl->Show();
pEditControl->GrabFocus();
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 64d3b886987f..7980458914df 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1093,7 +1093,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const
// solid black lines and no fill
aNewSet.Put(XLineStyleItem(drawing::LineStyle_SOLID));
- aNewSet.Put(XLineColorItem(OUString(), Color(COL_BLACK)));
+ aNewSet.Put(XLineColorItem(OUString(), COL_BLACK));
aNewSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
pClone->SetMergedItemSet(aNewSet);
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index d5f9ab4aa988..d10a49689d2a 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -178,7 +178,7 @@ void SdrPaintView::ImpClearVars()
if (mpModel)
SetDefaultStyleSheet(mpModel->GetDefaultStyleSheet(), true);
- maGridColor = Color( COL_BLACK );
+ maGridColor = COL_BLACK;
}
SdrPaintView::SdrPaintView(SdrModel* pModel, OutputDevice* pOut)
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 10:09:58 +0000