[Libreoffice-commits] core.git: basctl/source canvas/workben chart2/source cppcanvas/source cui/source desktop/source drawinglayer/source editeng/source emfio/inc emfio/source extensions/source filter/source forms/source fpicker/source include/svtools include/svx include/vcl sc/qa sc/source sd/qa sd/source sfx2/source slideshow/source starmath/source svl/source svtools/source svx/source sw/qa sw/source toolkit/source vcl/inc vcl/qa vcl/source vcl/unx vcl/workben
Noel Grandin
noel.grandin at collabora.co.uk
Tue Feb 27 10:28:57 UTC 2018
basctl/source/basicide/baside2.cxx | 2
basctl/source/basicide/baside2b.cxx | 4
basctl/source/dlged/dlged.cxx | 2
canvas/workben/canvasdemo.cxx | 6
chart2/source/controller/accessibility/AccessibleBase.cxx | 2
chart2/source/view/axes/VCartesianAxis.cxx | 4
chart2/source/view/axes/VPolarAngleAxis.cxx | 2
cppcanvas/source/mtfrenderer/implrenderer.cxx | 6
cppcanvas/source/mtfrenderer/textaction.cxx | 6
cui/source/customize/SvxToolbarConfigPage.cxx | 2
cui/source/customize/cfg.cxx | 4
cui/source/dialogs/screenshotannotationdlg.cxx | 2
cui/source/options/fontsubs.cxx | 2
cui/source/options/optcolor.cxx | 6
cui/source/tabpages/backgrnd.cxx | 6
cui/source/tabpages/chardlg.cxx | 8
cui/source/tabpages/grfpage.cxx | 4
cui/source/tabpages/numpages.cxx | 4
cui/source/tabpages/tpcolor.cxx | 2
cui/source/tabpages/tptrans.cxx | 2
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2
desktop/source/lib/init.cxx | 4
desktop/source/splash/splash.cxx | 6
drawinglayer/source/tools/converters.cxx | 2
editeng/source/editeng/eerdll.cxx | 6
editeng/source/editeng/impedit3.cxx | 6
editeng/source/items/frmitems.cxx | 2
editeng/source/items/svxfont.cxx | 2
editeng/source/items/textitem.cxx | 2
editeng/source/outliner/outliner.cxx | 2
editeng/source/rtf/rtfitem.cxx | 4
emfio/inc/mtftools.hxx | 2
emfio/source/reader/mtftools.cxx | 26 -
emfio/source/reader/wmfreader.cxx | 4
extensions/source/scanner/grid.cxx | 6
extensions/source/scanner/sanedlg.cxx | 4
filter/source/flash/swfwriter.cxx | 2
filter/source/flash/swfwriter1.cxx | 10
filter/source/graphicfilter/eps/eps.cxx | 12
filter/source/graphicfilter/idxf/dxf2mtf.cxx | 6
filter/source/graphicfilter/ieps/ieps.cxx | 2
filter/source/graphicfilter/ios2met/ios2met.cxx | 64 +--
filter/source/graphicfilter/ipict/ipict.cxx | 34 -
filter/source/graphicfilter/ipict/shape.cxx | 2
filter/source/msfilter/escherex.cxx | 2
filter/source/msfilter/msdffimp.cxx | 4
filter/source/msfilter/mstoolbar.cxx | 2
filter/source/msfilter/svdfppt.cxx | 4
filter/source/svg/svgwriter.cxx | 14
filter/source/svg/svgwriter.hxx | 4
forms/source/component/imgprod.cxx | 4
forms/source/solar/control/navtoolbar.cxx | 2
fpicker/source/office/iodlg.cxx | 2
include/svtools/valueset.hxx | 2
include/svx/sdr/overlay/overlaymanager.hxx | 4
include/svx/svdpagv.hxx | 2
include/vcl/outdev.hxx | 6
include/vcl/pdfwriter.hxx | 6
sc/qa/unit/subsequent_export-test.cxx | 2
sc/qa/unit/ucalc.cxx | 2
sc/source/core/data/docpool.cxx | 4
sc/source/core/data/documen3.cxx | 2
sc/source/core/data/global.cxx | 6
sc/source/filter/excel/excrecds.cxx | 2
sc/source/filter/excel/xehelper.cxx | 2
sc/source/filter/excel/xestyle.cxx | 2
sc/source/filter/excel/xistyle.cxx | 2
sc/source/filter/inc/xlview.hxx | 2
sc/source/filter/lotus/lotattr.cxx | 18
sc/source/filter/oox/stylesbuffer.cxx | 2
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 6
sc/source/ui/condformat/colorformat.cxx | 6
sc/source/ui/condformat/condformatdlgentry.cxx | 4
sc/source/ui/dbgui/csvcontrol.cxx | 4
sc/source/ui/dbgui/csvruler.cxx | 2
sc/source/ui/dbgui/scendlg.cxx | 2
sc/source/ui/formdlg/dwfunctr.cxx | 2
sc/source/ui/miscdlgs/acredlin.cxx | 8
sc/source/ui/miscdlgs/mvtabdlg.cxx | 6
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 6
sc/source/ui/navipi/scenwnd.cxx | 2
sc/source/ui/view/cellsh2.cxx | 2
sc/source/ui/view/cellsh3.cxx | 2
sc/source/ui/view/gridwin.cxx | 6
sc/source/ui/view/gridwin4.cxx | 4
sc/source/ui/view/output.cxx | 6
sc/source/ui/view/tabsplit.cxx | 8
sd/qa/unit/export-tests.cxx | 4
sd/source/core/drawdoc4.cxx | 6
sd/source/core/stlpool.cxx | 24 -
sd/source/filter/html/htmlex.cxx | 4
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/animations/motionpathtag.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 6
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 2
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 2
sd/source/ui/dlg/docprev.cxx | 2
sd/source/ui/dlg/headerfooterdlg.cxx | 2
sd/source/ui/slideshow/showwin.cxx | 12
sd/source/ui/slideshow/slideshowimpl.cxx | 4
sd/source/ui/table/TableDesignPane.cxx | 4
sd/source/ui/view/DocumentRenderer.cxx | 2
sfx2/source/dialog/dinfdlg.cxx | 2
slideshow/source/engine/shapes/viewmediashape.cxx | 2
starmath/source/ElementsDockingWindow.cxx | 4
starmath/source/node.cxx | 36 -
starmath/source/view.cxx | 6
starmath/source/visitors.cxx | 6
svl/source/numbers/zforscan.cxx | 20 -
svtools/source/brwbox/brwbox1.cxx | 2
svtools/source/brwbox/brwbox2.cxx | 8
svtools/source/brwbox/datwin.cxx | 2
svtools/source/brwbox/editbrowsebox.cxx | 2
svtools/source/contnr/iconview.cxx | 2
svtools/source/contnr/imivctl1.cxx | 2
svtools/source/contnr/svimpbox.cxx | 2
svtools/source/contnr/treelistbox.cxx | 2
svtools/source/control/calendar.cxx | 2
svtools/source/control/headbar.cxx | 6
svtools/source/control/tabbar.cxx | 22 -
svtools/source/control/valueset.cxx | 16
svtools/source/filter/DocumentToGraphicRenderer.cxx | 2
svtools/source/graphic/grfmgr2.cxx | 14
svtools/source/misc/embedhlp.cxx | 4
svx/source/dialog/_bmpmask.cxx | 10
svx/source/dialog/_contdlg.cxx | 6
svx/source/dialog/contwnd.cxx | 6
svx/source/dialog/ctredlin.cxx | 4
svx/source/dialog/dlgctl3d.cxx | 4
svx/source/dialog/dlgctrl.cxx | 10
svx/source/dialog/framelink.cxx | 2
svx/source/dialog/hexcolorcontrol.cxx | 2
svx/source/dialog/imapwnd.cxx | 10
svx/source/dialog/langbox.cxx | 2
svx/source/dialog/pagectrl.cxx | 4
svx/source/dialog/paraprev.cxx | 2
svx/source/dialog/svxruler.cxx | 4
svx/source/dialog/swframeexample.cxx | 14
svx/source/engine3d/float3d.cxx | 2
svx/source/form/tbxform.cxx | 4
svx/source/sdr/contact/viewcontactofgraphic.cxx | 2
svx/source/sdr/overlay/overlayanimatedbitmapex.cxx | 2
svx/source/sdr/overlay/overlaybitmapex.cxx | 2
svx/source/sdr/overlay/overlaycrosshair.cxx | 2
svx/source/sdr/overlay/overlayhelpline.cxx | 2
svx/source/sdr/overlay/overlayline.cxx | 2
svx/source/sdr/overlay/overlaymanager.cxx | 4
svx/source/sdr/overlay/overlaypolypolygon.cxx | 2
svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx | 2
svx/source/sdr/overlay/overlayrollingrectangle.cxx | 2
svx/source/sdr/properties/textproperties.cxx | 2
svx/source/svdraw/svdcrtv.cxx | 6
svx/source/svdraw/svdedxv.cxx | 2
svx/source/svdraw/svdetc.cxx | 2
svx/source/svdraw/svdhdl.cxx | 24 -
svx/source/svdraw/svdibrow.cxx | 6
svx/source/svdraw/svdobj.cxx | 2
svx/source/svdraw/svdpntv.cxx | 2
svx/source/table/tablehandles.cxx | 2
svx/source/tbxctrls/colrctrl.cxx | 4
svx/source/tbxctrls/tbxcolorupdate.cxx | 6
svx/source/xoutdev/_xoutbmp.cxx | 10
svx/source/xoutdev/xattr.cxx | 4
sw/qa/extras/uiwriter/uiwriter.cxx | 2
sw/source/core/frmedt/fefly1.cxx | 2
sw/source/core/inc/wrong.hxx | 2
sw/source/core/layout/paintfrm.cxx | 4
sw/source/core/text/itrpaint.cxx | 4
sw/source/core/text/redlnitr.cxx | 2
sw/source/core/text/txtdrop.cxx | 2
sw/source/core/text/txtinit.cxx | 2
sw/source/core/text/txtpaint.hxx | 4
sw/source/filter/html/htmlatr.cxx | 2
sw/source/filter/html/svxcss1.cxx | 4
sw/source/filter/ww8/ww8par2.cxx | 2
sw/source/filter/ww8/ww8par6.cxx | 4
sw/source/ui/chrdlg/drpcps.cxx | 2
sw/source/ui/config/optpage.cxx | 32 -
sw/source/ui/misc/num.cxx | 2
sw/source/ui/misc/outline.cxx | 2
sw/source/uibase/app/docshini.cxx | 2
sw/source/uibase/config/viewopt.cxx | 6
sw/source/uibase/dbui/mailmergehelper.cxx | 4
sw/source/uibase/docvw/AnnotationMenuButton.cxx | 2
sw/source/uibase/docvw/PostItMgr.cxx | 8
sw/source/uibase/frmdlg/colex.cxx | 6
sw/source/uibase/lingu/sdrhhcwrap.cxx | 2
sw/source/uibase/misc/swruler.cxx | 2
sw/source/uibase/shells/basesh.cxx | 2
sw/source/uibase/uiview/srcview.cxx | 2
toolkit/source/awt/vclxwindows.cxx | 2
toolkit/source/helper/formpdfexport.cxx | 2
vcl/inc/svdata.hxx | 2
vcl/qa/cppunit/svm/svmtest.cxx | 6
vcl/source/app/settings.cxx | 102 ++---
vcl/source/control/button.cxx | 26 -
vcl/source/control/combobox.cxx | 2
vcl/source/control/edit.cxx | 8
vcl/source/control/fixed.cxx | 2
vcl/source/control/fixedhyper.cxx | 2
vcl/source/control/group.cxx | 4
vcl/source/control/listbox.cxx | 2
vcl/source/control/spinfld.cxx | 2
vcl/source/control/tabctrl.cxx | 6
vcl/source/edit/texteng.cxx | 6
vcl/source/edit/textview.cxx | 2
vcl/source/edit/vclmedit.cxx | 6
vcl/source/filter/igif/gifread.cxx | 6
vcl/source/filter/ixbm/xbmread.cxx | 6
vcl/source/filter/ixpm/xpmread.cxx | 4
vcl/source/filter/jpeg/JpegReader.cxx | 4
vcl/source/filter/wmf/wmfwr.cxx | 22 -
vcl/source/gdi/alpha.cxx | 2
vcl/source/gdi/bitmap.cxx | 44 +-
vcl/source/gdi/bitmapex.cxx | 6
vcl/source/gdi/gdimetafiletools.cxx | 2
vcl/source/gdi/gdimtf.cxx | 12
vcl/source/gdi/pdfwriter_impl.cxx | 240 ++++++------
vcl/source/gdi/pdfwriter_impl.hxx | 10
vcl/source/gdi/pdfwriter_impl2.cxx | 2
vcl/source/gdi/print.cxx | 4
vcl/source/gdi/print2.cxx | 2
vcl/source/gdi/print3.cxx | 6
vcl/source/gdi/svmconverter.cxx | 2
vcl/source/gdi/virdev.cxx | 6
vcl/source/outdev/gradient.cxx | 4
vcl/source/outdev/hatch.cxx | 4
vcl/source/outdev/outdev.cxx | 4
vcl/source/outdev/outdevstate.cxx | 24 -
vcl/source/outdev/text.cxx | 36 -
vcl/source/outdev/textline.cxx | 12
vcl/source/outdev/transparent.cxx | 10
vcl/source/window/decoview.cxx | 20 -
vcl/source/window/menu.cxx | 4
vcl/source/window/menubarwindow.cxx | 4
vcl/source/window/paint.cxx | 4
vcl/source/window/printdlg.cxx | 4
vcl/source/window/toolbox.cxx | 12
vcl/source/window/toolbox2.cxx | 2
vcl/source/window/window.cxx | 8
vcl/source/window/window2.cxx | 8
vcl/unx/generic/gdi/salbmp.cxx | 8
vcl/unx/generic/window/salframe.cxx | 2
vcl/workben/outdevgrind.cxx | 26 -
vcl/workben/vcldemo.cxx | 22 -
246 files changed, 891 insertions(+), 891 deletions(-)
New commits:
commit c98d3303027bd8bf8e0881b61918710ac479864c
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Feb 26 13:30:35 2018 +0200
replace Color(COL_*) with COL_*
using
git grep -lwP "Color\s*\(\s*(COL_\w+)\s*\)"
| xargs perl -pi -e "s/Color\s*\(\s*(COL_\w+)\s*\)//g"
and then some manual fixup where the resulting expression no longer
compiled
Change-Id: I0e268d78611c3be40bba9f60ecfdc087a36c0df4
Reviewed-on: https://gerrit.libreoffice.org/50372
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index f27cff062a77..6d6ef01ed0a8 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -101,7 +101,7 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage,
const Color aOldFillColor( pPrinter->GetFillColor() );
const vcl::Font aOldFont( pPrinter->GetFont() );
- pPrinter->SetLineColor( Color( COL_BLACK ) );
+ pPrinter->SetLineColor( COL_BLACK );
pPrinter->SetFillColor();
vcl::Font aFont( aOldFont );
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index b7e0fbe518ad..06604ba9c0b6 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -129,11 +129,11 @@ void lcl_DrawIDEWindowFrame(DockingWindow const * pWin, vcl::RenderContext& rRen
Size aSz(pWin->GetOutputSizePixel());
const Color aOldLineColor(rRenderContext.GetLineColor());
- rRenderContext.SetLineColor(Color(COL_WHITE));
+ rRenderContext.SetLineColor(COL_WHITE);
// White line on top
rRenderContext.DrawLine(Point(0, 0), Point(aSz.Width(), 0));
// Black line at bottom
- rRenderContext.SetLineColor(Color(COL_BLACK));
+ rRenderContext.SetLineColor(COL_BLACK);
rRenderContext.DrawLine(Point(0, aSz.Height() - 1),
Point(aSz.Width(), aSz.Height() - 1));
rRenderContext.SetLineColor(aOldLineColor);
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index b82b5915c43e..ec3a2e0c3045 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -557,7 +557,7 @@ void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle
if (pTargetPaintWindow)
{
OutputDevice& rTargetOutDev = pTargetPaintWindow->GetTargetOutputDevice();
- rTargetOutDev.DrawWallpaper(aPaintRect, Wallpaper(Color(COL_WHITE)));
+ rTargetOutDev.DrawWallpaper(aPaintRect, Wallpaper(COL_WHITE));
}
// do paint (unbuffered) and mark repaint end
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 294b7d25c2e4..94e6531d208c 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -112,9 +112,9 @@ class DemoRenderer
maBox(),
maViewState(),
maRenderState(),
- maColorBlack( vcl::unotools::colorToStdColorSpaceSequence( Color(COL_BLACK)) ),
- maColorWhite( vcl::unotools::colorToStdColorSpaceSequence( Color(COL_WHITE)) ),
- maColorRed( vcl::unotools::colorToStdColorSpaceSequence( Color(COL_RED)) ),
+ maColorBlack( vcl::unotools::colorToStdColorSpaceSequence( COL_BLACK) ),
+ maColorWhite( vcl::unotools::colorToStdColorSpaceSequence( COL_WHITE) ),
+ maColorRed( vcl::unotools::colorToStdColorSpaceSequence( COL_RED) ),
mxCanvas(xCanvas),
mxDefaultFont(),
mxDevice( xDevice )
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 354fcc7b83f2..784dc5096b4b 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -731,7 +731,7 @@ sal_Int32 SAL_CALL AccessibleBase::getBackground()
sal_Int32 AccessibleBase::getColor( eColorType eColType )
{
- sal_Int32 nResult = static_cast< sal_Int32 >( Color( COL_TRANSPARENT ).GetColor());
+ sal_Int32 nResult = static_cast< sal_Int32 >( Color(COL_TRANSPARENT).GetColor());
if( m_bAlwaysTransparent )
return nResult;
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 9493102a93c4..2089b2705d40 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -700,7 +700,7 @@ bool VCartesianAxis::createTextShapes(
getAxisLabelProperties(aPropNames, aPropValues, m_aAxisProperties, rAxisLabelProperties, nLimitedSpaceForText, bLimitedHeight);
uno::Any* pColorAny = PropertyMapper::getValuePointer(aPropValues,aPropNames,"CharColor");
- sal_Int32 nColor = Color( COL_AUTO ).GetColor();
+ sal_Int32 nColor = Color(COL_AUTO).GetColor();
if(pColorAny)
*pColorAny >>= nColor;
@@ -888,7 +888,7 @@ bool VCartesianAxis::createTextShapesSimple(
getAxisLabelProperties(aPropNames, aPropValues, m_aAxisProperties, rAxisLabelProperties, -1, bLimitedHeight);
uno::Any* pColorAny = PropertyMapper::getValuePointer(aPropValues,aPropNames,"CharColor");
- sal_Int32 nColor = Color( COL_AUTO ).GetColor();
+ sal_Int32 nColor = Color(COL_AUTO).GetColor();
if(pColorAny)
*pColorAny >>= nColor;
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx
index 7e4132f84321..ee2c7343d760 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -67,7 +67,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis(
, rAxisLabelProperties.m_aFontReferenceSize );
uno::Any* pColorAny = PropertyMapper::getValuePointer(aPropValues,aPropNames,"CharColor");
- sal_Int32 nColor = Color( COL_AUTO ).GetColor();
+ sal_Int32 nColor = Color(COL_AUTO).GetColor();
if(pColorAny)
*pColorAny >>= nColor;
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 491fc81bf89c..fa08f0325714 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -912,21 +912,21 @@ namespace cppcanvas
::Color aTextColor = vcl::unotools::doubleSequenceToColor(
rState.textColor, xColorSpace );
- aReliefColor = ::Color( COL_LIGHTGRAY );
+ aReliefColor = ::COL_LIGHTGRAY;
// we don't have a automatic color, so black is always
// drawn on white (literally copied from
// vcl/source/gdi/outdev3.cxx)
if( aTextColor.GetColor() == COL_BLACK )
{
- aTextColor = ::Color( COL_WHITE );
+ aTextColor = ::COL_WHITE;
rParms.mrStates.getState().textColor =
vcl::unotools::colorToDoubleSequence(
aTextColor, xColorSpace );
}
if( aTextColor.GetColor() == COL_WHITE )
- aReliefColor = ::Color( COL_BLACK );
+ aReliefColor = ::COL_BLACK;
aReliefColor.SetTransparency( aTextColor.GetTransparency() );
}
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 550b98e699a6..cc5c382187dc 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -1610,7 +1610,7 @@ namespace cppcanvas
mnOutlineWidth( calcOutlineWidth(rState,rVDev) ),
maFillColor(
vcl::unotools::colorToDoubleSequence(
- ::Color( COL_WHITE ),
+ ::COL_WHITE,
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )),
maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ),
maLinesOverallSize(),
@@ -1652,7 +1652,7 @@ namespace cppcanvas
mnOutlineWidth( calcOutlineWidth(rState,rVDev) ),
maFillColor(
vcl::unotools::colorToDoubleSequence(
- ::Color( COL_WHITE ),
+ ::COL_WHITE,
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )),
maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ),
maLinesOverallSize(),
@@ -1746,7 +1746,7 @@ namespace cppcanvas
double nOutlineWidth ) :
maFillColor(
vcl::unotools::colorToDoubleSequence(
- ::Color( COL_WHITE ),
+ ::COL_WHITE,
rCanvas->getDevice()->getDeviceColorSpace() )),
mnOutlineWidth( nOutlineWidth ),
mrCanvas( rCanvas ),
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
index 50511fdecf3e..5e2746ffc66d 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -882,7 +882,7 @@ Image SvxToolbarEntriesListBox::GetSizedImage(
rVDev.DrawImage( aPos, aImage );
// Draw separator line 2 pixels left from the right border
- Color aLineColor = GetDisplayBackground().GetColor().IsDark() ? Color( COL_WHITE ) : Color( COL_BLACK );
+ Color aLineColor = GetDisplayBackground().GetColor().IsDark() ? COL_WHITE : COL_BLACK;
rVDev.SetLineColor( aLineColor );
rVDev.DrawLine( Point( aNewSize.Width()-3, 0 ), Point( aNewSize.Width()-3, aNewSize.Height()-1 ));
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 9b96ccc0e7e4..fbc0e61fa355 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -979,11 +979,11 @@ public:
if (rRenderContext.GetFillColor() == COL_WHITE)
{
- rRenderContext.SetFillColor(Color(COL_BLACK));
+ rRenderContext.SetFillColor(COL_BLACK);
}
else
{
- rRenderContext.SetFillColor(Color(COL_WHITE));
+ rRenderContext.SetFillColor(COL_WHITE);
}
long n = 0;
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index b8010a8ef1be..01f14fc446dc 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -510,7 +510,7 @@ void ScreenshotAnnotationDlg_Impl::RepaintToBuffer(
for (auto&& rCandidate : maSelected)
{
static double fLineWidthEntries(5.0);
- PaintControlDataEntry(*rCandidate, Color(COL_LIGHTRED), fLineWidthEntries, fTransparence * 0.2);
+ PaintControlDataEntry(*rCandidate, COL_LIGHTRED, fLineWidthEntries, fTransparence * 0.2);
}
// paint hilighted entry
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index b7ceda7a8576..311668f9c852 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -403,7 +403,7 @@ void SvxFontSubstTabPage::CheckEnable()
if (m_pCheckLB->IsEnabled())
{
m_pCheckLB->DisableTable();
- m_pCheckLB->SetTextColor(Color(COL_GRAY));
+ m_pCheckLB->SetTextColor(COL_GRAY);
m_pCheckLB->Invalidate();
m_pCheckLB->SelectAll(false);
}
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index f4312f67cc22..9bb88e7c412b 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -412,7 +412,7 @@ void ColorConfigWindow_Impl::Entry::Update (
) {
Color aColor(rValue.getColor());
if (rValue.getColor() == rValue.getDefaultColor())
- m_pColorList->SelectEntry(Color(COL_AUTO));
+ m_pColorList->SelectEntry(COL_AUTO);
else
m_pColorList->SelectEntry(aColor);
}
@@ -549,7 +549,7 @@ void ColorConfigWindow_Impl::SetAppearance ()
Wallpaper const aTransparentWall(COL_TRANSPARENT);
StyleSettings const& rStyleSettings = GetSettings().GetStyleSettings();
Color const aBackColor = rStyleSettings.GetHighContrastMode() ?
- rStyleSettings.GetShadowColor() : Color(COL_LIGHTGRAY);
+ rStyleSettings.GetShadowColor() : COL_LIGHTGRAY;
Wallpaper const aBackWall(aBackColor);
for (size_t i = 0; i != vChapters.size(); ++i)
vChapters[i]->Show(aBackWall);
@@ -565,7 +565,7 @@ void ColorConfigWindow_Impl::SetAppearance ()
aRCheckCol.Invert();
// if inversion didn't work (gray) then it's set to black
if (aRCheckCol == aWinCol)
- aRCheckCol = Color(COL_BLACK);
+ aRCheckCol = COL_BLACK;
// setting new text color for each entry
for (size_t i = 0; i != vEntries.size(); ++i)
vEntries[i]->SetTextColor(aRCheckCol);
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index da9e79626002..024a8361b144 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -284,7 +284,7 @@ void BackgroundPreviewImpl::Paint(vcl::RenderContext& rRenderContext, const ::to
if (bIsBmp)
{
- rRenderContext.SetFillColor(Color(COL_TRANSPARENT));
+ rRenderContext.SetFillColor(COL_TRANSPARENT);
}
rRenderContext.DrawRect(aDrawRect);
@@ -759,7 +759,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet )
else if ( SfxItemState::DEFAULT == rOldSet.GetItemState( nWhich, false ) )
rCoreSet->ClearItem( nWhich );
}
- else if ( SID_ATTR_BRUSH_CHAR == nSlot && aBgdColor != Color( COL_WHITE ) )
+ else if ( SID_ATTR_BRUSH_CHAR == nSlot && aBgdColor != COL_WHITE )
{
rCoreSet->Put( SvxBrushItem( aBgdColor, nWhich ) );
bModified = true;
@@ -1045,7 +1045,7 @@ SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl()
IMPL_LINK_NOARG(SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, void)
{
sal_uInt16 nItemId = m_pBackgroundColorSet->GetSelectItemId();
- Color aColor = nItemId ? ( m_pBackgroundColorSet->GetItemColor( nItemId ) ) : Color( COL_TRANSPARENT );
+ Color aColor = nItemId ? ( m_pBackgroundColorSet->GetItemColor( nItemId ) ) : COL_TRANSPARENT;
aBgdColor = aColor;
m_bColorSelected = true;
m_pPreviewWin1->NotifyChange( aBgdColor );
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index a4cba1fa4c52..497dae51e59b 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1370,9 +1370,9 @@ void SvxCharEffectsPage::EnableNoneFontColor()
Color SvxCharEffectsPage::GetPreviewFontColor(const Color& rColor) const
{
if (rColor.GetColor() == COL_AUTO)
- return Color(COL_BLACK);
+ return COL_BLACK;
if (m_bEnableNoneFontColor && rColor == COL_NONE_COLOR)
- return Color(COL_BLACK);
+ return COL_BLACK;
return rColor;
}
@@ -1763,7 +1763,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
}
else
{
- m_pUnderlineColorLB->SelectEntry(Color(COL_AUTO));
+ m_pUnderlineColorLB->SelectEntry(COL_AUTO);
m_pUnderlineColorLB->Disable();
}
}
@@ -1807,7 +1807,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
}
else
{
- m_pOverlineColorLB->SelectEntry(Color(COL_AUTO));
+ m_pOverlineColorLB->SelectEntry(COL_AUTO);
m_pOverlineColorLB->Disable();
}
}
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 3ce3925c937d..c2ecb7e0d912 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -784,7 +784,7 @@ void SvxCropExample::Paint(vcl::RenderContext& rRenderContext, const ::tools::Re
rRenderContext.SetRasterOp(RasterOp::OverPaint);
rRenderContext.DrawRect(::tools::Rectangle(Point(), aWinSize));
- rRenderContext.SetLineColor(Color(COL_WHITE));
+ rRenderContext.SetLineColor(COL_WHITE);
::tools::Rectangle aRect(Point((aWinSize.Width() - aFrameSize.Width())/2,
(aWinSize.Height() - aFrameSize.Height())/2),
aFrameSize);
@@ -792,7 +792,7 @@ void SvxCropExample::Paint(vcl::RenderContext& rRenderContext, const ::tools::Re
Size aSz(2, 0);
aSz = rRenderContext.PixelToLogic(aSz);
- rRenderContext.SetFillColor(Color(COL_TRANSPARENT));
+ rRenderContext.SetFillColor(COL_TRANSPARENT);
rRenderContext.SetRasterOp(RasterOp::Invert);
aRect.AdjustLeft(aTopLeft.Y() );
aRect.AdjustTop(aTopLeft.X() );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index e46831efbf59..31217781f427 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1136,7 +1136,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent,
get(m_pPreviewWIN, "preview");
- m_pPreviewWIN->SetBackground(Wallpaper(Color(COL_TRANSPARENT)));
+ m_pPreviewWIN->SetBackground(Wallpaper(COL_TRANSPARENT));
SetExchangeSupport();
aActBulletFont = lcl_GetDefaultBulletFont();
@@ -2605,7 +2605,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent,
get(m_pStandardPB, "standard");
get(m_pPreviewWIN, "preview");
- m_pPreviewWIN->SetBackground(Wallpaper(Color(COL_TRANSPARENT)));
+ m_pPreviewWIN->SetBackground(Wallpaper(COL_TRANSPARENT));
m_pRelativeCB->Check();
m_pAlignLB->SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl));
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 134e6a6f33c2..d9519b32baa0 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -59,7 +59,7 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr
, rOutAttrs ( rInAttrs )
// All the horrific pointers we store and should not
, pnColorListState( nullptr )
- , aXFillColorItem( OUString(), Color( COL_BLACK ) )
+ , aXFillColorItem( OUString(), COL_BLACK )
, aXFillAttr( rInAttrs.GetPool() )
, rXFSet( aXFillAttr.GetItemSet() )
, eCM( ColorModel::RGB )
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index 553e94d232f3..206e46704f4c 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -374,7 +374,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
// disable unused XFillFloatTransparenceItem
if(bSwitchOffGradient && (bGradActive || bGradUsed))
{
- XGradient aGrad(COL_BLACK, Color(COL_WHITE));
+ XGradient aGrad(COL_BLACK, COL_WHITE);
aGrad.SetStartIntens(100);
aGrad.SetEndIntens(100);
XFillFloatTransparenceItem aItem(aGrad);
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 256ed0234fca..5c57b4f9d3d0 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -571,7 +571,7 @@ void ExtensionBox_Impl::DrawRow(vcl::RenderContext& rRenderContext, const tools:
rRenderContext.DrawImage(aPos, Size(SMALL_ICON_SIZE, SMALL_ICON_SIZE), m_aWarningImage);
}
- rRenderContext.SetLineColor(Color(COL_LIGHTGRAY));
+ rRenderContext.SetLineColor(COL_LIGHTGRAY);
rRenderContext.DrawLine(rRect.BottomLeft(), rRect.BottomRight());
}
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b6d4f6eb5951..fdc02e3128d3 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2031,7 +2031,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
#if !defined(ANDROID)
// Set background to transparent by default.
- pDevice->SetBackground(Wallpaper(Color(COL_TRANSPARENT)));
+ pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
#endif
pDevice->SetOutputSizePixelScaleOffsetAndBuffer(
@@ -3446,7 +3446,7 @@ static void doc_paintWindow(LibreOfficeKitDocument* /*pThis*/, unsigned nLOKWind
}
ScopedVclPtrInstance<VirtualDevice> pDevice(nullptr, Size(1, 1), DeviceFormat::DEFAULT);
- pDevice->SetBackground(Wallpaper(Color(COL_TRANSPARENT)));
+ pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndBuffer(Size(nWidth, nHeight), Fraction(1.0), Point(), pBuffer);
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index a58b8227d928..b7724ec1e636 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -296,7 +296,7 @@ SplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& aArguments )
_textBaseline = _height;
if ( NOT_LOADED_COLOR == _cProgressFrameColor )
- _cProgressFrameColor = Color( COL_LIGHTGRAY );
+ _cProgressFrameColor = COL_LIGHTGRAY;
if ( NOT_LOADED_COLOR == _cProgressBarColor )
{
@@ -304,11 +304,11 @@ SplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& aArguments )
if ( _width > 500 )
_cProgressBarColor = Color( 157, 202, 18 );
else
- _cProgressBarColor = Color( COL_BLUE );
+ _cProgressBarColor = COL_BLUE;
}
if ( NOT_LOADED_COLOR == _cProgressTextColor )
- _cProgressTextColor = Color( COL_BLACK );
+ _cProgressTextColor = COL_BLACK;
Application::AddEventListener(
LINK( this, SplashScreen, AppEventListenerHdl ) );
diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx
index cb14d9dbb567..64810162305e 100644
--- a/drawinglayer/source/tools/converters.cxx
+++ b/drawinglayer/source/tools/converters.cxx
@@ -74,7 +74,7 @@ namespace drawinglayer
pContent->SetMapMode(aMapModePixel);
// set to all white
- pContent->SetBackground(Wallpaper(Color(COL_WHITE)));
+ pContent->SetBackground(Wallpaper(COL_WHITE));
pContent->Erase();
// create pixel processor, also already takes care of AAing and
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 9033db06b84d..c8feafaedcf4 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -114,7 +114,7 @@ DefItems::DefItems()
rDefItems[17] = new SvxVerJustifyItem( SvxCellVerJustify::Standard, EE_PARA_VER_JUST );
// Character attributes:
- rDefItems[18] = new SvxColorItem( Color( COL_AUTO ), EE_CHAR_COLOR );
+ rDefItems[18] = new SvxColorItem( COL_AUTO, EE_CHAR_COLOR );
rDefItems[19] = new SvxFontItem( EE_CHAR_FONTINFO );
rDefItems[20] = new SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT );
rDefItems[21] = new SvxCharScaleWidthItem( 100, EE_CHAR_FONTWIDTH );
@@ -146,11 +146,11 @@ DefItems::DefItems()
rDefItems[47] = new SvxOverlineItem( LINESTYLE_NONE, EE_CHAR_OVERLINE );
rDefItems[48] = new SvxCaseMapItem( SvxCaseMap::NotMapped, EE_CHAR_CASEMAP );
rDefItems[49] = new SfxGrabBagItem( EE_CHAR_GRABBAG );
- rDefItems[50] = new SvxBackgroundColorItem( Color( COL_AUTO ), EE_CHAR_BKGCOLOR );
+ rDefItems[50] = new SvxBackgroundColorItem( COL_AUTO, EE_CHAR_BKGCOLOR );
// Features
rDefItems[51] = new SfxVoidItem( EE_FEATURE_TAB );
rDefItems[52] = new SfxVoidItem( EE_FEATURE_LINEBR );
- rDefItems[53] = new SvxCharSetColorItem( Color( COL_RED ), EE_FEATURE_NOTCONV );
+ rDefItems[53] = new SvxCharSetColorItem( COL_RED, EE_FEATURE_NOTCONV );
rDefItems[54] = new SvxFieldItem( SvxFieldData(), EE_FEATURE_FIELD );
assert(EDITITEMCOUNT == 55 && "ITEMCOUNT changed, adjust DefItems!");
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index a5879f7bdb6d..cbb8c2b3d3d9 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2875,9 +2875,9 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo
else if ( nAttr & ExtTextInputAttr::DashDotUnderline )
rFont.SetUnderline( LINESTYLE_DOTTED );
else if ( nAttr & ExtTextInputAttr::RedText )
- rFont.SetColor( Color( COL_RED ) );
+ rFont.SetColor( COL_RED );
else if ( nAttr & ExtTextInputAttr::HalfToneText )
- rFont.SetColor( Color( COL_LIGHTGRAY ) );
+ rFont.SetColor( COL_LIGHTGRAY );
if ( nAttr & ExtTextInputAttr::Highlight )
{
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
@@ -2889,7 +2889,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo
{
rFont.SetUnderline( LINESTYLE_WAVE );
if( pOut )
- pOut->SetTextLineColor( Color( COL_LIGHTGRAY ) );
+ pOut->SetTextLineColor( COL_LIGHTGRAY );
}
}
}
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index f39dc856fb3d..040f1a53fe09 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3055,7 +3055,7 @@ SvxBrushItem::SvxBrushItem(SvStream& rStream, sal_uInt16 nVersion, sal_uInt16 _n
break;
case 0: // BRUSH_NULL:
- aColor = Color( COL_TRANSPARENT );
+ aColor = COL_TRANSPARENT;
break;
default:
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 77a95bfac63a..fff084f04427 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -84,7 +84,7 @@ void SvxFont::DrawArrow( OutputDevice &rOut, const tools::Rectangle& rRect,
Color aOldLineColor = rOut.GetLineColor();
Color aOldFillColor = rOut.GetFillColor();
rOut.SetFillColor( rCol );
- rOut.SetLineColor( Color( COL_BLACK ) );
+ rOut.SetLineColor( COL_BLACK );
rOut.DrawPolygon( aPoly );
rOut.DrawLine( aTmp, aNxt );
rOut.SetLineColor( aOldLineColor );
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 515125461713..a5d8b7925558 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1726,7 +1726,7 @@ SvStream& SvxColorItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
{
if( VERSION_USEAUTOCOLOR == nItemVersion &&
COL_AUTO == mColor.GetColor() )
- WriteColor( rStrm, Color( COL_BLACK ) );
+ WriteColor( rStrm, Color(COL_BLACK) );
else
WriteColor( rStrm, mColor );
return rStrm;
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index f89b715cc428..26fb338b5424 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1073,7 +1073,7 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos,
}
const Color& rOldLineColor = pOutDev->GetLineColor();
- pOutDev->SetLineColor( Color( COL_BLACK ) );
+ pOutDev->SetLineColor( COL_BLACK );
pOutDev->DrawLine( aStartPos, aEndPos );
pOutDev->SetLineColor( rOldLineColor );
}
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index be516bbcd4ef..0c81088e140e 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -1662,12 +1662,12 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
if( USHRT_MAX != nColor )
aCol = GetColor( nColor );
else
- aCol = Color( COL_BLACK );
+ aCol = COL_BLACK;
if( USHRT_MAX != nFillColor )
aFCol = GetColor( nFillColor );
else
- aFCol = Color( COL_WHITE );
+ aFCol = COL_WHITE;
}
Color aColor;
diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx
index 6c12078f051e..4dff8d391e0a 100644
--- a/emfio/inc/mtftools.hxx
+++ b/emfio/inc/mtftools.hxx
@@ -336,7 +336,7 @@ namespace emfio
Bitmap aBmp;
WinMtfFillStyle()
- : aFillColor(Color(COL_BLACK))
+ : aFillColor(COL_BLACK)
, bTransparent(false)
, aType(WinMtfFillStyleType::Solid)
{}
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index b0cef5242839..a6caafd8cfe0 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -566,48 +566,48 @@ namespace emfio
{
case WHITE_BRUSH :
{
- maFillStyle = WinMtfFillStyle( Color( COL_WHITE ) );
+ maFillStyle = WinMtfFillStyle( COL_WHITE );
mbFillStyleSelected = true;
}
break;
case LTGRAY_BRUSH :
{
- maFillStyle = WinMtfFillStyle( Color( COL_LIGHTGRAY ) );
+ maFillStyle = WinMtfFillStyle( COL_LIGHTGRAY );
mbFillStyleSelected = true;
}
break;
case GRAY_BRUSH :
case DKGRAY_BRUSH :
{
- maFillStyle = WinMtfFillStyle( Color( COL_GRAY ) );
+ maFillStyle = WinMtfFillStyle( COL_GRAY );
mbFillStyleSelected = true;
}
break;
case BLACK_BRUSH :
{
- maFillStyle = WinMtfFillStyle( Color( COL_BLACK ) );
+ maFillStyle = WinMtfFillStyle( COL_BLACK );
mbFillStyleSelected = true;
}
break;
case NULL_BRUSH :
{
- maFillStyle = WinMtfFillStyle( Color( COL_TRANSPARENT ), true );
+ maFillStyle = WinMtfFillStyle( COL_TRANSPARENT, true );
mbFillStyleSelected = true;
}
break;
case WHITE_PEN :
{
- maLineStyle = WinMtfLineStyle( Color( COL_WHITE ) );
+ maLineStyle = WinMtfLineStyle( COL_WHITE );
}
break;
case BLACK_PEN :
{
- maLineStyle = WinMtfLineStyle( Color( COL_BLACK ) );
+ maLineStyle = WinMtfLineStyle( COL_BLACK );
}
break;
case NULL_PEN :
{
- maLineStyle = WinMtfLineStyle( Color( COL_TRANSPARENT ), true );
+ maLineStyle = WinMtfLineStyle( COL_TRANSPARENT, true );
}
break;
default:
@@ -1043,8 +1043,8 @@ namespace emfio
{
maNopFillStyle = maFillStyle;
maNopLineStyle = maLineStyle;
- maFillStyle = WinMtfFillStyle( Color( COL_TRANSPARENT ), true );
- maLineStyle = WinMtfLineStyle( Color( COL_TRANSPARENT ), true );
+ maFillStyle = WinMtfFillStyle( COL_TRANSPARENT, true );
+ maLineStyle = WinMtfLineStyle( COL_TRANSPARENT, true );
mbNopMode = true;
}
}
@@ -1639,7 +1639,7 @@ namespace emfio
}
pVDev->SetMapMode( aMapMode );
pVDev->SetOutputSizePixel( aSizePixel );
- pVDev->SetFillColor( Color( COL_BLACK ) );
+ pVDev->SetFillColor( COL_BLACK );
const tools::PolyPolygon aClip( maClipPath.getClipPath() );
pVDev->DrawPolyPolygon( aClip );
const Point aEmptyPoint;
@@ -1691,9 +1691,9 @@ namespace emfio
else
{
// need to blend in Mask quality (1Bit)
- Bitmap aMask(aVDevMask.CreateMask(Color(COL_WHITE)));
+ Bitmap aMask(aVDevMask.CreateMask(COL_WHITE));
- if ( rBitmap.GetTransparentColor() == Color( COL_WHITE ) )
+ if ( rBitmap.GetTransparentColor() == COL_WHITE )
{
aMask.CombineSimple( rBitmap.GetMask(), BmpCombine::Or );
}
diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
index 97a7f806c764..483c6ba95841 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -846,13 +846,13 @@ namespace emfio
case W_META_CREATEBRUSH:
{
- CreateObject(o3tl::make_unique<WinMtfFillStyle>( Color( COL_WHITE ), false ));
+ CreateObject(o3tl::make_unique<WinMtfFillStyle>( COL_WHITE, false ));
}
break;
case W_META_CREATEPATTERNBRUSH:
{
- CreateObject(o3tl::make_unique<WinMtfFillStyle>( Color( COL_WHITE ), false ));
+ CreateObject(o3tl::make_unique<WinMtfFillStyle>( COL_WHITE, false ));
}
break;
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index 89091b8d8df0..30a325bd3ac0 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -455,7 +455,7 @@ void GridWindow::setBoundings(double fMinX, double fMinY, double fMaxX, double f
void GridWindow::drawGrid(vcl::RenderContext& rRenderContext)
{
char pBuf[256];
- rRenderContext.SetLineColor(Color(COL_BLACK));
+ rRenderContext.SetLineColor(COL_BLACK);
// draw vertical lines
for (double fX = m_fMinChunkX; fX < m_fMaxX; fX += m_fChunkX)
{
@@ -494,7 +494,7 @@ void GridWindow::drawOriginal(vcl::RenderContext& rRenderContext)
{
if (m_nValues && m_pXValues && m_pOrigYValues)
{
- rRenderContext.SetLineColor(Color(COL_RED));
+ rRenderContext.SetLineColor(COL_RED);
for (int i = 0; i < m_nValues - 1; i++)
{
drawLine(rRenderContext,
@@ -509,7 +509,7 @@ void GridWindow::drawNew(vcl::RenderContext& rRenderContext)
if (m_nValues && m_pXValues && m_pNewYValues)
{
rRenderContext.SetClipRegion(vcl::Region(m_aGridArea));
- rRenderContext.SetLineColor(Color(COL_YELLOW));
+ rRenderContext.SetLineColor(COL_YELLOW);
for (int i = 0; i < m_nValues - 1; i++)
{
drawLine(rRenderContext,
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index d435b836f588..bfe51fd77bf1 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -952,8 +952,8 @@ void ScanPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang
{
Window::Paint(rRenderContext, rRect);
rRenderContext.SetMapMode(MapMode(MapUnit::MapAppFont));
- rRenderContext.SetFillColor(Color(COL_WHITE));
- rRenderContext.SetLineColor(Color(COL_WHITE));
+ rRenderContext.SetFillColor(COL_WHITE);
+ rRenderContext.SetLineColor(COL_WHITE);
rRenderContext.DrawRect(tools::Rectangle(Point(0, 0),
Size(PREVIEW_WIDTH, PREVIEW_HEIGHT)));
rRenderContext.SetMapMode(MapMode(MapUnit::MapPixel));
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index 071f567073e5..2d9f44c577a5 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -62,7 +62,7 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int
// define an invisible button with the size of a page
tools::Rectangle aRect( 0, 0, static_cast<long>( mnDocWidth * mnDocXScale ), static_cast<long>( mnDocHeight * mnDocYScale ) );
tools::Polygon aPoly( aRect );
- FillStyle aFill = FillStyle( Color(COL_WHITE) );
+ FillStyle aFill = FillStyle( COL_WHITE );
mnWhiteBackgroundShapeId = defineShape( aPoly, aFill );
::basegfx::B2DHomMatrix m; // #i73264#
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 90464d195b25..bab13eea44cb 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -401,10 +401,10 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
Color aTextColor( mpVDev->GetTextColor() );
if ( aTextColor.GetColor() == COL_BLACK )
- aTextColor = Color( COL_WHITE );
+ aTextColor = COL_WHITE;
if ( aTextColor.GetColor() == COL_WHITE )
- aReliefColor = Color( COL_BLACK );
+ aReliefColor = COL_BLACK;
Point aPos( rPos );
@@ -434,7 +434,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
Color aShadowColor( COL_BLACK );
if ( (aTextColor.GetColor() == COL_BLACK) || (aTextColor.GetLuminance() < 8) )
- aShadowColor = Color( COL_LIGHTGRAY );
+ aShadowColor = COL_LIGHTGRAY;
Point aPos( rPos );
aPos += Point( nOff, nOff );
@@ -465,7 +465,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
aPos = rPos + Point(+6,+0);
Impl_writeText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
- Impl_writeText( rPos, rText, pDXArray, nWidth, Color( COL_WHITE ) );
+ Impl_writeText( rPos, rText, pDXArray, nWidth, COL_WHITE );
}
}
}
@@ -569,7 +569,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
#if 0 // makes the calculated bound rect visible for debugging
{
tools::Polygon aTmpPoly( aPoly );
- sal_uInt16 nID = FlashGeometryExporter::writePolygonShape( aMovieStream, aTmpPoly, false, Color(COL_MAGENTA), Color(COL_MAGENTA), mpClipPolyPolygon );
+ sal_uInt16 nID = FlashGeometryExporter::writePolygonShape( aMovieStream, aTmpPoly, false, COL_MAGENTA, COL_MAGENTA, mpClipPolyPolygon );
ImplPlaceObject( nID );
}
#endif
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 8dc125837701..4643533770c4 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -397,18 +397,18 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter
nBoundingY2 = pMTF->GetPrefSize().Height();
pGDIStack = nullptr;
- aColor = Color( COL_TRANSPARENT );
+ aColor = COL_TRANSPARENT;
bLineColor = true;
- aLineColor = Color( COL_BLACK );
+ aLineColor = COL_BLACK;
bFillColor = true;
- aFillColor = Color( COL_WHITE );
+ aFillColor = COL_WHITE;
bTextFillColor = true;
- aTextFillColor = Color( COL_BLACK );
+ aTextFillColor = COL_BLACK;
fLineWidth = 1;
fMiterLimit = 15; // use same limit as most graphic systems and basegfx
eLineCap = SvtGraphicStroke::capButt;
eJoinType = SvtGraphicStroke::joinMiter;
- aBackgroundColor = Color( COL_WHITE );
+ aBackgroundColor = COL_WHITE;
eTextAlign = ALIGN_BASELINE;
nNextChrSetId = 1;
@@ -495,7 +495,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview )
nLines *= aSizeBitmap.Height();
ImplWriteLong( nLines );
sal_Int32 nCount2, nCount = 4;
- const BitmapColor aBlack( pAcc->GetBestMatchingColor( Color( COL_BLACK ) ) );
+ const BitmapColor aBlack( pAcc->GetBestMatchingColor( Color(COL_BLACK) ) );
for ( long nY = 0; nY < aSizeBitmap.Height(); nY++ )
{
nCount2 = 0;
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index 3e8976e50c36..203fc9a7f911 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -157,8 +157,8 @@ bool DXF2GDIMetaFile::SetLineAttribute(const DXFBasicEntity & rE)
pVirDev->SetLineColor( aActLineColor = aColor );
}
- if (aActFillColor!=Color( COL_TRANSPARENT )) {
- pVirDev->SetFillColor(aActFillColor = Color( COL_TRANSPARENT ));
+ if (aActFillColor!=COL_TRANSPARENT) {
+ pVirDev->SetFillColor(aActFillColor = COL_TRANSPARENT);
}
return true;
}
@@ -177,7 +177,7 @@ bool DXF2GDIMetaFile::SetAreaAttribute(const DXFBasicEntity & rE)
pVirDev->SetLineColor( aActLineColor = aColor );
}
- if ( aActFillColor == Color( COL_TRANSPARENT ) || aActFillColor != aColor) {
+ if ( aActFillColor == COL_TRANSPARENT || aActFillColor != aColor) {
pVirDev->SetFillColor( aActFillColor = aColor );
}
return true;
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index e2b5b8e383ab..ee634180c1f1 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -457,7 +457,7 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead,
pVDev->EnableOutput( false );
aMtf.Record( pVDev );
- pVDev->SetLineColor( Color( COL_RED ) );
+ pVDev->SetLineColor( COL_RED );
pVDev->SetFillColor();
aFont.SetColor( COL_LIGHTRED );
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 7a1255ba2d98..6d6d5ee7d38d 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -705,7 +705,7 @@ void OS2METReader::ChangeBrush(const Color& rPatColor, bool bFill )
if( bFill )
aColor = rPatColor;
else
- aColor = Color( COL_TRANSPARENT );
+ aColor = COL_TRANSPARENT;
if( pVirDev->GetFillColor() != aColor )
pVirDev->SetFillColor( aColor );
@@ -947,7 +947,7 @@ void OS2METReader::ReadBox(bool bGivenPos)
}
else
{
- ChangeBrush( Color( COL_TRANSPARENT ), false );
+ ChangeBrush( COL_TRANSPARENT, false );
SetRasterOp(aAttr.eLinMix);
}
@@ -1148,7 +1148,7 @@ void OS2METReader::ReadFullArc(bool bGivenPos, sal_uInt16 nOrderSize)
else
{
SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
- ChangeBrush(Color( COL_TRANSPARENT ), false);
+ ChangeBrush(COL_TRANSPARENT, false);
SetRasterOp(aAttr.eLinMix);
}
pVirDev->DrawEllipse(aRect);
@@ -1369,7 +1369,7 @@ void OS2METReader::ReadMarker(bool bGivenPos, sal_uInt16 nOrderLen)
}
else
{
- ChangeBrush(Color(COL_TRANSPARENT), false);
+ ChangeBrush(COL_TRANSPARENT, false);
}
if (bCoord32) nNumPoints=nOrderLen/8; else nNumPoints=nOrderLen/4;
if (!bGivenPos) nNumPoints++;
@@ -1600,7 +1600,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
if( p->bStroke )
{
SetPen( aAttr.aPatCol, aAttr.nStrLinWidth );
- ChangeBrush(Color(COL_TRANSPARENT), false);
+ ChangeBrush(COL_TRANSPARENT, false);
SetRasterOp( aAttr.ePatMix );
if ( IsLineInfo() )
{
@@ -1648,7 +1648,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
{
SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
SetRasterOp(aAttr.eLinMix);
- ChangeBrush(Color(COL_TRANSPARENT), false);
+ ChangeBrush(COL_TRANSPARENT, false);
nC=p->aPPoly.Count();
for (i=0; i<nC; i++)
{
@@ -1732,10 +1732,10 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
else {
const auto nVal = ReadLittleEndian3BytesLong();
- if ((nFlags&0x40)!=0 && nVal==1) aCol=Color(COL_BLACK);
- else if ((nFlags&0x40)!=0 && nVal==2) aCol=Color(COL_WHITE);
- else if ((nFlags&0x40)!=0 && nVal==4) aCol=Color(COL_WHITE);
- else if ((nFlags&0x40)!=0 && nVal==5) aCol=Color(COL_BLACK);
+ if ((nFlags&0x40)!=0 && nVal==1) aCol=COL_BLACK;
+ else if ((nFlags&0x40)!=0 && nVal==2) aCol=COL_WHITE;
+ else if ((nFlags&0x40)!=0 && nVal==4) aCol=COL_WHITE;
+ else if ((nFlags&0x40)!=0 && nVal==5) aCol=COL_BLACK;
else aCol=GetPaletteColor(nVal);
if (nA==1) switch (nP) {
case 1: aAttr.aLinCol=aCol; break;
@@ -1792,10 +1792,10 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
else {
const auto nVal = ReadLittleEndian3BytesLong();
- if ((nFlags&0x40)!=0 && nVal==1) aCol=Color(COL_BLACK);
- else if ((nFlags&0x40)!=0 && nVal==2) aCol=Color(COL_WHITE);
- else if ((nFlags&0x40)!=0 && nVal==4) aCol=Color(COL_WHITE);
- else if ((nFlags&0x40)!=0 && nVal==5) aCol=Color(COL_BLACK);
+ if ((nFlags&0x40)!=0 && nVal==1) aCol=COL_BLACK;
+ else if ((nFlags&0x40)!=0 && nVal==2) aCol=COL_WHITE;
+ else if ((nFlags&0x40)!=0 && nVal==4) aCol=COL_WHITE;
+ else if ((nFlags&0x40)!=0 && nVal==5) aCol=COL_BLACK;
else aCol=GetPaletteColor(nVal);
aAttr.aLinCol = aAttr.aChrCol = aAttr.aMrkCol = aAttr.aPatCol =
aAttr.aImgCol = aCol;
@@ -1823,8 +1823,8 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
aAttr.aImgCol=aDefAttr.aImgCol;
}
else {
- if (nVal==0x0007) aCol=Color(COL_WHITE);
- else if (nVal==0x0008) aCol=Color(COL_BLACK);
+ if (nVal==0x0007) aCol=COL_WHITE;
+ else if (nVal==0x0008) aCol=COL_BLACK;
else if (nVal==0xff08) aCol=GetPaletteColor(1);
else aCol=GetPaletteColor(static_cast<sal_uInt32>(nVal) & 0x000000ff);
aAttr.aLinCol = aAttr.aChrCol = aAttr.aMrkCol = aAttr.aPatCol =
@@ -1847,8 +1847,8 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
aAttr.aImgBgCol=aDefAttr.aImgBgCol;
}
else {
- if (nVal==0x0007) aCol=Color(COL_WHITE);
- else if (nVal==0x0008) aCol=Color(COL_BLACK);
+ if (nVal==0x0007) aCol=COL_WHITE;
+ else if (nVal==0x0008) aCol=COL_BLACK;
else if (nVal==0xff08) aCol=GetPaletteColor(0);
else aCol=GetPaletteColor(static_cast<sal_uInt32>(nVal) & 0x000000ff);
aAttr.aLinBgCol = aAttr.aChrBgCol = aAttr.aMrkBgCol =
@@ -1871,10 +1871,10 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
else {
const auto nVal = ReadLittleEndian3BytesLong();
- if ((nFlags&0x40)!=0 && nVal==1) aCol=Color(COL_BLACK);
- else if ((nFlags&0x40)!=0 && nVal==2) aCol=Color(COL_WHITE);
- else if ((nFlags&0x40)!=0 && nVal==4) aCol=Color(COL_WHITE);
- else if ((nFlags&0x40)!=0 && nVal==5) aCol=Color(COL_BLACK);
+ if ((nFlags&0x40)!=0 && nVal==1) aCol=COL_BLACK;
+ else if ((nFlags&0x40)!=0 && nVal==2) aCol=COL_WHITE;
+ else if ((nFlags&0x40)!=0 && nVal==4) aCol=COL_WHITE;
+ else if ((nFlags&0x40)!=0 && nVal==5) aCol=COL_BLACK;
else aCol=GetPaletteColor(nVal);
aAttr.aLinBgCol = aAttr.aChrBgCol = aAttr.aMrkBgCol =
aAttr.aPatBgCol = aAttr.aImgBgCol = aCol;
@@ -2645,24 +2645,24 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF
pBitmapList=nullptr;
pAttrStack=nullptr;
- aDefAttr.aLinCol =Color(COL_BLACK);
- aDefAttr.aLinBgCol =Color(COL_WHITE);
+ aDefAttr.aLinCol =COL_BLACK;
+ aDefAttr.aLinBgCol =COL_WHITE;
aDefAttr.eLinMix =RasterOp::OverPaint;
aDefAttr.eLinBgMix =RasterOp::OverPaint;
- aDefAttr.aChrCol =Color(COL_BLACK);
- aDefAttr.aChrBgCol =Color(COL_WHITE);
+ aDefAttr.aChrCol =COL_BLACK;
+ aDefAttr.aChrBgCol =COL_WHITE;
aDefAttr.eChrMix =RasterOp::OverPaint;
aDefAttr.eChrBgMix =RasterOp::OverPaint;
- aDefAttr.aMrkCol =Color(COL_BLACK);
- aDefAttr.aMrkBgCol =Color(COL_WHITE);
+ aDefAttr.aMrkCol =COL_BLACK;
+ aDefAttr.aMrkBgCol =COL_WHITE;
aDefAttr.eMrkMix =RasterOp::OverPaint;
aDefAttr.eMrkBgMix =RasterOp::OverPaint;
- aDefAttr.aPatCol =Color(COL_BLACK);
- aDefAttr.aPatBgCol =Color(COL_WHITE);
+ aDefAttr.aPatCol =COL_BLACK;
+ aDefAttr.aPatBgCol =COL_WHITE;
aDefAttr.ePatMix =RasterOp::OverPaint;
aDefAttr.ePatBgMix =RasterOp::OverPaint;
- aDefAttr.aImgCol =Color(COL_BLACK);
- aDefAttr.aImgBgCol =Color(COL_WHITE);
+ aDefAttr.aImgCol =COL_BLACK;
+ aDefAttr.aImgBgCol =COL_WHITE;
aDefAttr.eImgMix =RasterOp::OverPaint;
aDefAttr.eImgBgMix =RasterOp::OverPaint;
aDefAttr.nArcP =1;
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index c34b55bec422..193c18656d62 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -414,15 +414,15 @@ Color PictReader::ReadColor()
pPict->ReadUInt32( nCol );
switch (nCol)
{
- case 33: aCol=Color( COL_BLACK ); break;
- case 30: aCol=Color( COL_WHITE ); break;
- case 205: aCol=Color( COL_LIGHTRED ); break;
- case 341: aCol=Color( COL_LIGHTGREEN ); break;
- case 409: aCol=Color( COL_LIGHTBLUE ); break;
- case 273: aCol=Color( COL_LIGHTCYAN ); break;
- case 137: aCol=Color( COL_LIGHTMAGENTA ); break;
- case 69: aCol=Color( COL_YELLOW ); break;
- default: aCol=Color( COL_LIGHTGRAY );
+ case 33: aCol=COL_BLACK; break;
+ case 30: aCol=COL_WHITE; break;
+ case 205: aCol=COL_LIGHTRED; break;
+ case 341: aCol=COL_LIGHTGREEN; break;
+ case 409: aCol=COL_LIGHTBLUE; break;
+ case 273: aCol=COL_LIGHTCYAN; break;
+ case 137: aCol=COL_LIGHTMAGENTA; break;
+ case 69: aCol=COL_YELLOW; break;
+ default: aCol=COL_LIGHTGRAY;
}
return aCol;
}
@@ -635,11 +635,11 @@ void PictReader::DrawingMethod(PictDrawingMethod eMethod)
SetLineColor( aActForeColor );
else
SetLineColor(eActPenPattern.getColor(aActBackColor, aActForeColor));
- SetFillColor( Color(COL_TRANSPARENT) );
+ SetFillColor( COL_TRANSPARENT );
pVirDev->SetRasterOp(eActROP);
break;
case PictDrawingMethod::PAINT:
- SetLineColor( Color(COL_TRANSPARENT) );
+ SetLineColor( COL_TRANSPARENT );
if (eActPenPattern.isDefault())
SetFillColor( aActForeColor );
else
@@ -647,7 +647,7 @@ void PictReader::DrawingMethod(PictDrawingMethod eMethod)
pVirDev->SetRasterOp(eActROP);
break;
case PictDrawingMethod::ERASE:
- SetLineColor( Color(COL_TRANSPARENT) );
+ SetLineColor( COL_TRANSPARENT );
if (eActBackPattern.isDefault())
SetFillColor( aActBackColor );// Osnola: previously aActForeColor
else // checkMe
@@ -655,12 +655,12 @@ void PictReader::DrawingMethod(PictDrawingMethod eMethod)
pVirDev->SetRasterOp(RasterOp::OverPaint);
break;
case PictDrawingMethod::INVERT: // checkme
- SetLineColor( Color(COL_TRANSPARENT));
- SetFillColor( Color( COL_BLACK ) );
+ SetLineColor( COL_TRANSPARENT);
+ SetFillColor( COL_BLACK );
pVirDev->SetRasterOp(RasterOp::Invert);
break;
case PictDrawingMethod::FILL:
- SetLineColor( Color(COL_TRANSPARENT) );
+ SetLineColor( COL_TRANSPARENT );
if (eActFillPattern.isDefault())
SetFillColor( aActForeColor );
else
@@ -1891,8 +1891,8 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile )
nOrigPos = pPict->Tell();
SvStreamEndian nOrigNumberFormat = pPict->GetEndian();
- aActForeColor = Color(COL_BLACK);
- aActBackColor = Color(COL_WHITE);
+ aActForeColor = COL_BLACK;
+ aActBackColor = COL_WHITE;
nActPenSize = Size(1,1);
eActROP = RasterOp::OverPaint;
eActMethod = PictDrawingMethod::UNDEFINED;
diff --git a/filter/source/graphicfilter/ipict/shape.cxx b/filter/source/graphicfilter/ipict/shape.cxx
index 357f4a4e2adb..219c48d4aec3 100644
--- a/filter/source/graphicfilter/ipict/shape.cxx
+++ b/filter/source/graphicfilter/ipict/shape.cxx
@@ -99,7 +99,7 @@ namespace PictReaderShape {
// must be changed if other parameter are changed to draw
// a line/fill shape
Color oldFColor = dev->GetFillColor(), oldLColor = dev->GetLineColor();
- dev->SetFillColor(oldLColor); dev->SetLineColor(Color(COL_TRANSPARENT));
+ dev->SetFillColor(oldLColor); dev->SetLineColor(COL_TRANSPARENT);
dev->DrawPolygon(poly);
dev->SetLineColor(oldLColor); dev->SetFillColor(oldFColor);
return true;
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 9039c367fa7e..4c6abe080894 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1368,7 +1368,7 @@ GraphicObject* lclDrawHatch( const drawing::Hatch& rHatch, const Color& rBackCol
aMtf.Clear();
aMtf.Record(pVDev);
pVDev->SetLineColor();
- pVDev->SetFillColor(bFillBackground ? rBackColor : Color(COL_TRANSPARENT));
+ pVDev->SetFillColor(bFillBackground ? rBackColor : COL_TRANSPARENT);
pVDev->DrawRect(rRect);
pVDev->DrawHatch(tools::PolyPolygon(rRect), Hatch(static_cast<HatchStyle>(rHatch.Style), Color(rHatch.Color), rHatch.Distance, static_cast<sal_uInt16>(rHatch.Angle)));
aMtf.Stop();
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index fa05c6a71e58..218a1bb177a6 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3373,11 +3373,11 @@ Color SvxMSDffManager::MSO_CLR_ToColor( sal_uInt32 nColorCode, sal_uInt16 nConte
case DFF_Prop_shadowColor :
case DFF_Prop_fillBackColor :
case DFF_Prop_fillColor :
- aColor = Color( COL_WHITE );
+ aColor = COL_WHITE;
break;
case DFF_Prop_lineColor :
{
- aColor = Color( COL_BLACK );
+ aColor = COL_BLACK;
}
break;
}
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index fff43f3f9693..788888321add 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -297,7 +297,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect
// according to the spec:
// "the iconMask is white in all the areas in which the icon is
// displayed as transparent and is black in all other areas."
- aBitEx = BitmapEx( aBitEx.GetBitmap(), pSpecificInfo->getIconMask()->getBitMap().CreateMask( Color( COL_WHITE ) ) );
+ aBitEx = BitmapEx( aBitEx.GetBitmap(), pSpecificInfo->getIconMask()->getBitMap().CreateMask( COL_WHITE ) );
Graphic aGraphic( aBitEx );
helper.addIcon( aGraphic.GetXGraphic(), sCommand );
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 7d018dff716b..09bc2aacdbb7 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2906,7 +2906,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
// one: default to white.
SfxItemSet aNewSet(*pObject->GetMergedItemSet().GetPool());
aNewSet.Put(XFillStyleItem(css::drawing::FillStyle_SOLID));
- aNewSet.Put(XFillColorItem(OUString(), Color(COL_WHITE)));
+ aNewSet.Put(XFillColorItem(OUString(), COL_WHITE));
pObject->SetMergedItemSet(aNewSet);
}
}
@@ -5749,7 +5749,7 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, T
break;
case drawing::FillStyle_HATCH :
case drawing::FillStyle_BITMAP :
- aDefColor = Color( COL_WHITE );
+ aDefColor = COL_WHITE;
break;
default: break;
}
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index b22910df87c1..441ea483898c 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2022,7 +2022,7 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape )
ImplMap( rShape.maShapePolyPoly, aPolyPoly );
- const bool bLineOnly = ( rShape.maShapeFillColor == Color( COL_TRANSPARENT ) ) && ( !rShape.mapShapeGradient.get() );
+ const bool bLineOnly = ( rShape.maShapeFillColor == COL_TRANSPARENT ) && ( !rShape.mapShapeGradient.get() );
tools::Rectangle aBoundRect( aPolyPoly.GetBoundRect() );
maAttributeWriter.AddPaintAttr( rShape.maShapeLineColor, rShape.maShapeFillColor, &aBoundRect, rShape.mapShapeGradient.get() );
@@ -2459,10 +2459,10 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
Color aTextColor( mpVDev->GetTextColor() );
if ( aTextColor.GetColor() == COL_BLACK )
- aTextColor = Color( COL_WHITE );
+ aTextColor = COL_WHITE;
if ( aTextColor.GetColor() == COL_WHITE )
- aReliefColor = Color( COL_BLACK );
+ aReliefColor = COL_BLACK;
Point aPos( rPos );
@@ -2492,7 +2492,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
Color aShadowColor( COL_BLACK );
if ( (aTextColor.GetColor() == COL_BLACK) || (aTextColor.GetLuminance() < 8) )
- aShadowColor = Color( COL_LIGHTGRAY );
+ aShadowColor = COL_LIGHTGRAY;
Point aPos( rPos );
aPos += Point( nOff, nOff );
@@ -2523,7 +2523,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
aPos = rPos + Point( +6, +0);
ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
- ImplWriteText( rPos, rText, pDXArray, nWidth, Color( COL_WHITE ) );
+ ImplWriteText( rPos, rText, pDXArray, nWidth, COL_WHITE );
}
}
}
@@ -2961,7 +2961,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
if( rPoly.GetSize() )
{
- maAttributeWriter.AddPaintAttr( mpVDev->GetLineColor(), Color( COL_TRANSPARENT ) );
+ maAttributeWriter.AddPaintAttr( mpVDev->GetLineColor(), COL_TRANSPARENT );
ImplAddLineAttr( pA->GetLineInfo() );
ImplWritePolyPolygon( rPoly, true );
}
@@ -3279,7 +3279,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
ImplWriteShape( *mapCurShape );
mapCurShape->maShapeFillColor = mapCurShape->maShapeLineColor;
- mapCurShape->maShapeLineColor = Color(COL_TRANSPARENT);
+ mapCurShape->maShapeLineColor = COL_TRANSPARENT;
mapCurShape->mnStrokeWidth = 0;
mapCurShape->maDashArray.clear();
mapCurShape->maLineJoin = basegfx::B2DLineJoin::Miter;
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index b54e6fffe6dc..6de5495c68b4 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -189,8 +189,8 @@ struct SVGShapeDescriptor
SVGShapeDescriptor() :
- maShapeFillColor( Color( COL_TRANSPARENT ) ),
- maShapeLineColor( Color( COL_TRANSPARENT ) ),
+ maShapeFillColor( COL_TRANSPARENT ),
+ maShapeLineColor( COL_TRANSPARENT ),
mnStrokeWidth( 0 ),
maLineJoin(basegfx::B2DLineJoin::Miter), // miter is Svg 'stroke-linejoin' default
maLineCap(css::drawing::LineCap_BUTT) // butt is Svg 'stroke-linecap' default
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index 40bfe13b78bb..3985351032a1 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -428,7 +428,7 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic )
if( pBmpAcc->HasPalette() )
{
- const BitmapColor aWhite( pMskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
+ const BitmapColor aWhite( pMskAcc->GetBestMatchingColor( Color(COL_WHITE) ) );
if( mnTransIndex < 256 )
{
@@ -479,7 +479,7 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic )
else
{
css::uno::Sequence<sal_Int32> aData( nPartWidth * nPartHeight );
- const BitmapColor aWhite( pMskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) );
+ const BitmapColor aWhite( pMskAcc->GetBestMatchingColor( Color(COL_WHITE) ) );
sal_Int32* pTmp = aData.getArray();
for( long nY = nStartY; nY <= nEndY; nY++ )
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index f80952e44162..1eea34edd9b4 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -300,7 +300,7 @@ namespace frm
else if ( LID_RECORD_FILLER == pSupportedFeatures->nId )
{
pItemWindow = VclPtr<FixedText>::Create( m_pToolbar, WB_CENTER | WB_VCENTER );
- pItemWindow->SetBackground(Wallpaper(Color(COL_TRANSPARENT)));
+ pItemWindow->SetBackground(Wallpaper(COL_TRANSPARENT));
}
else
{
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 8bc9a1dee129..a481a56ba4e6 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -2484,7 +2484,7 @@ void SvtFileDialog::AddControls_Impl( )
_pPrevWin->Show();
_pPrevBmp = VclPtr<FixedBitmap>::Create( _pPrevWin, WinBits( WB_BORDER ) );
- _pPrevBmp->SetBackground( Wallpaper( Color( COL_WHITE ) ) );
+ _pPrevBmp->SetBackground( Wallpaper( COL_WHITE ) );
_pPrevBmp->SetSizePixel(_pPrevWin->GetSizePixel());
_pPrevBmp->Show();
_pPrevBmp->SetAccessibleName(FpsResId(STR_PREVIEW));
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 83f5e7d075f8..7ff5fc597876 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -366,7 +366,7 @@ public:
void SetColor( const Color& rColor );
void SetColor()
{
- SetColor(Color(COL_TRANSPARENT));
+ SetColor(COL_TRANSPARENT);
}
bool IsColor() const
{
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index 47ccf96ec19f..0396ec7cdd98 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -65,8 +65,8 @@ namespace sdr
// Stripe support. All striped OverlayObjects use these stripe
// values. Changes change all those objects.
- Color maStripeColorA; // defaults to Color(COL_BLACK)
- Color maStripeColorB; // defaults to Color(COL_WHITE)
+ Color maStripeColorA; // defaults to COL_BLACK
+ Color maStripeColorB; // defaults to COL_WHITE
sal_uInt32 mnStripeLengthPixel; // defaults to 4L
// hold an incarnation of Drawinglayer configuration options
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index b0f7b40e5e91..5b108ac2e2fb 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -165,7 +165,7 @@ public:
void DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr,
const tools::Rectangle& rRect = tools::Rectangle(),
basegfx::B2IRange const* pPageFrame = nullptr);
- void DrawPageViewGrid(OutputDevice& rOut, const tools::Rectangle& rRect, Color aColor = Color( COL_BLACK ) );
+ void DrawPageViewGrid(OutputDevice& rOut, const tools::Rectangle& rRect, Color aColor = COL_BLACK );
tools::Rectangle GetPageRect() const;
SdrPage* GetPage() const { return mpPage; }
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 6f1d211174eb..ff90e3fb40da 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -722,8 +722,8 @@ public:
const Point& rPos,
const Size& rSize,
sal_uInt32 nLen = 8,
- Color aStart = Color(COL_WHITE),
- Color aEnd = Color(COL_BLACK));
+ Color aStart = COL_WHITE,
+ Color aEnd = COL_BLACK);
void DrawGrid( const tools::Rectangle& rRect, const Size& rDist, DrawGridFlags nFlags );
@@ -1581,7 +1581,7 @@ public:
bool bReduceTransparency,
bool bTransparencyAutoMode,
bool bDownsampleBitmaps,
- const Color& rBackground = Color( COL_TRANSPARENT ) );
+ const Color& rBackground = COL_TRANSPARENT );
SAL_DLLPRIVATE void ImplPrintTransparent (
const Bitmap& rBmp, const Bitmap& rMask,
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 302d98fc85b0..1db80a5b6da1 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -744,10 +744,10 @@ The following structure describes the permissions used in PDF security
void SetDigitLanguage( LanguageType eLang );
void SetLineColor( const Color& rColor );
- void SetLineColor() { SetLineColor( Color( COL_TRANSPARENT ) ); }
+ void SetLineColor() { SetLineColor( COL_TRANSPARENT ); }
void SetFillColor( const Color& rColor );
- void SetFillColor() { SetFillColor( Color( COL_TRANSPARENT ) ); }
+ void SetFillColor() { SetFillColor( COL_TRANSPARENT ); }
void SetFont( const vcl::Font& rNewFont );
void SetTextColor( const Color& rColor );
@@ -782,7 +782,7 @@ The following structure describes the permissions used in PDF security
void DrawPixel( const Point& rPt, const Color& rColor );
void DrawPixel( const Point& rPt )
- { DrawPixel( rPt, Color( COL_TRANSPARENT ) ); }
+ { DrawPixel( rPt, COL_TRANSPARENT ); }
void DrawLine( const Point& rStartPt, const Point& rEndPt );
void DrawLine( const Point& rStartPt, const Point& rEndPt,
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index c1480acf67ad..8899e6861811 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -2827,7 +2827,7 @@ void ScExportTest::testSharedFormulaExportXLSX()
for (SCROW i = 0; i <= 1; ++i)
{
Color aTabBgColor = rDoc.GetTabBgColor(i);
- if (aTabBgColor != Color(COL_AUTO))
+ if (aTabBgColor != COL_AUTO)
{
cerr << "The tab color of Sheet " << (i+1) << " should not be explicitly set." << endl;
return false;
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index df70447d3c4d..4310cc3020fb 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4401,7 +4401,7 @@ void Test::testSetBackgroundColor()
Color aColor;
//test yellow
- aColor=Color(COL_YELLOW);
+ aColor=COL_YELLOW;
getDocShell().GetDocFunc().SetTabBgColor(0,aColor,false, true);
CPPUNIT_ASSERT_EQUAL_MESSAGE("the correct color is not set",
aColor, m_pDoc->GetTabBgColor(0));
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 3387d51dc380..7bcfa8e603d8 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -216,7 +216,7 @@ ScDocumentPool::ScDocumentPool()
rPoolDefaults[ ATTR_FONT_CROSSEDOUT - ATTR_STARTINDEX ] = new SvxCrossedOutItem( STRIKEOUT_NONE, ATTR_FONT_CROSSEDOUT );
rPoolDefaults[ ATTR_FONT_CONTOUR - ATTR_STARTINDEX ] = new SvxContourItem( false, ATTR_FONT_CONTOUR );
rPoolDefaults[ ATTR_FONT_SHADOWED - ATTR_STARTINDEX ] = new SvxShadowedItem( false, ATTR_FONT_SHADOWED );
- rPoolDefaults[ ATTR_FONT_COLOR - ATTR_STARTINDEX ] = new SvxColorItem( Color(COL_AUTO), ATTR_FONT_COLOR );
+ rPoolDefaults[ ATTR_FONT_COLOR - ATTR_STARTINDEX ] = new SvxColorItem( COL_AUTO, ATTR_FONT_COLOR );
rPoolDefaults[ ATTR_FONT_LANGUAGE - ATTR_STARTINDEX ] = new SvxLanguageItem( LANGUAGE_DONTKNOW, ATTR_FONT_LANGUAGE );
rPoolDefaults[ ATTR_CJK_FONT - ATTR_STARTINDEX ] = pCjkFont;
rPoolDefaults[ ATTR_CJK_FONT_HEIGHT - ATTR_STARTINDEX ] = new SvxFontHeightItem( 200, 100, ATTR_CJK_FONT_HEIGHT );
@@ -258,7 +258,7 @@ ScDocumentPool::ScDocumentPool()
rPoolDefaults[ ATTR_MERGE_FLAG - ATTR_STARTINDEX ] = new ScMergeFlagAttr;
rPoolDefaults[ ATTR_VALUE_FORMAT - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_VALUE_FORMAT, 0 );
rPoolDefaults[ ATTR_LANGUAGE_FORMAT - ATTR_STARTINDEX ] = new SvxLanguageItem( ScGlobal::eLnge, ATTR_LANGUAGE_FORMAT );
- rPoolDefaults[ ATTR_BACKGROUND - ATTR_STARTINDEX ] = new SvxBrushItem( Color(COL_TRANSPARENT), ATTR_BACKGROUND );
+ rPoolDefaults[ ATTR_BACKGROUND - ATTR_STARTINDEX ] = new SvxBrushItem( COL_TRANSPARENT, ATTR_BACKGROUND );
rPoolDefaults[ ATTR_PROTECTION - ATTR_STARTINDEX ] = new ScProtectionAttr;
rPoolDefaults[ ATTR_BORDER - ATTR_STARTINDEX ] = new SvxBoxItem( ATTR_BORDER );
rPoolDefaults[ ATTR_BORDER_INNER - ATTR_STARTINDEX ] = pGlobalBorderInnerAttr;
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 8f37ada3dcbb..b4f300b352b3 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -451,7 +451,7 @@ Color ScDocument::GetTabBgColor( SCTAB nTab ) const
{
if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
return maTabs[nTab]->GetTabBgColor();
- return Color(COL_AUTO);
+ return COL_AUTO;
}
void ScDocument::SetTabBgColor( SCTAB nTab, const Color& rColor )
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index d3777cfe7135..b6924ae6e198 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -464,10 +464,10 @@ void ScGlobal::Init()
pRscString = new std::map<const char*, OUString>;
- pEmptyBrushItem = new SvxBrushItem( Color( COL_TRANSPARENT ), ATTR_BACKGROUND );
+ pEmptyBrushItem = new SvxBrushItem( COL_TRANSPARENT, ATTR_BACKGROUND );
pButtonBrushItem = new SvxBrushItem( Color(), ATTR_BACKGROUND );
- pEmbeddedBrushItem = new SvxBrushItem( Color( COL_LIGHTCYAN ), ATTR_BACKGROUND );
- pProtectedBrushItem = new SvxBrushItem( Color( COL_LIGHTGRAY ), ATTR_BACKGROUND );
+ pEmbeddedBrushItem = new SvxBrushItem( COL_LIGHTCYAN, ATTR_BACKGROUND );
+ pProtectedBrushItem = new SvxBrushItem( COL_LIGHTGRAY, ATTR_BACKGROUND );
InitPPT();
//ScCompiler::InitSymbolsNative();
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index 4dab73a20805..ba8904885925 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -425,7 +425,7 @@ void XclExpXmlSheetPr::SaveXml( XclExpXmlStream& rStrm )
// OOXTODO: XML_outlinePr
- if (maTabColor != Color(COL_AUTO))
+ if (maTabColor != COL_AUTO)
rWorksheet->singleElement(
XML_tabColor, XML_rgb, XclXmlUtils::ToOString(maTabColor).getStr(), FSEND);
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 45553c6b2110..3da3b4d32536 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -498,7 +498,7 @@ XclExpStringRef lclCreateFormattedString(
aFont.SetEscapement( nEsc );
// modify automatic font color for hyperlinks
if( bIsHyperlink && aItemSet.Get( ATTR_FONT_COLOR ).GetValue().GetColor() == COL_AUTO)
- aFont.SetColor( Color( COL_LIGHTBLUE ) );
+ aFont.SetColor( COL_LIGHTBLUE );
// insert font into buffer
sal_uInt16 nFontIdx = rFontBuffer.Insert( aFont, EXC_COLOR_CELLTEXT );
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 466ad9a395bd..2262a448d1ec 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -327,7 +327,7 @@ XclExpPaletteImpl::XclExpPaletteImpl( const XclDefaultPalette& rDefPal ) :
for( sal_uInt16 nIdx = 0; nIdx < nCount; ++nIdx )
maPalette.emplace_back( mrDefPal.GetDefColor( GetXclIndex( nIdx ) ) );
- InsertColor( Color( COL_BLACK ), EXC_COLOR_CELLTEXT );
+ InsertColor( COL_BLACK, EXC_COLOR_CELLTEXT );
}
sal_uInt32 XclExpPaletteImpl::InsertColor( const Color& rColor, XclExpColorType eType, sal_uInt16 nAutoDefault )
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 8b54b6241afd..1187deb0c658 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1070,7 +1070,7 @@ void XclImpCellArea::FillToItemSet( SfxItemSet& rItemSet, const XclImpPalette& r
// do not use IsTransparent() - old Calc filter writes tranparency with different color indexes
if( mnPattern == EXC_PATT_NONE )
{
- aBrushItem.SetColor( Color( COL_TRANSPARENT ) );
+ aBrushItem.SetColor( COL_TRANSPARENT );
}
else
{
diff --git a/sc/source/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx
index a742bb678427..824f9a783269 100644
--- a/sc/source/filter/inc/xlview.hxx
+++ b/sc/source/filter/inc/xlview.hxx
@@ -141,7 +141,7 @@ struct XclTabViewData
bool mbShowZeros; /// true = Show zero value zells.
bool mbShowOutline; /// true = Show outlines.
Color maTabBgColor; /// Tab Color default = (COL_AUTO )
- bool IsDefaultTabBgColor() const { return maTabBgColor == Color(COL_AUTO); };
+ bool IsDefaultTabBgColor() const { return maTabBgColor == COL_AUTO; };
sal_uInt32 mnTabBgColorId; /// palette color id
explicit XclTabViewData();
diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx
index e303b435abbe..6883178e43eb 100644
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@@ -51,14 +51,14 @@ LotAttrCache::LotAttrCache (LOTUS_ROOT* pLotRoot)
pDocPool = mpLotusRoot->pDoc->GetPool();
pColTab = new Color [ 8 ];
- pColTab[ 0 ] = Color( COL_WHITE );
- pColTab[ 1 ] = Color( COL_LIGHTBLUE );
- pColTab[ 2 ] = Color( COL_LIGHTGREEN );
- pColTab[ 3 ] = Color( COL_LIGHTCYAN );
- pColTab[ 4 ] = Color( COL_LIGHTRED );
- pColTab[ 5 ] = Color( COL_LIGHTMAGENTA );
- pColTab[ 6 ] = Color( COL_YELLOW );
- pColTab[ 7 ] = Color( COL_BLACK );
+ pColTab[ 0 ] = COL_WHITE;
+ pColTab[ 1 ] = COL_LIGHTBLUE;
+ pColTab[ 2 ] = COL_LIGHTGREEN;
+ pColTab[ 3 ] = COL_LIGHTCYAN;
+ pColTab[ 4 ] = COL_LIGHTRED;
+ pColTab[ 5 ] = COL_LIGHTMAGENTA;
+ pColTab[ 6 ] = COL_YELLOW;
+ pColTab[ 7 ] = COL_BLACK;
ppColorItems[ 0 ] = new SvxColorItem( GetColor( 1 ), ATTR_FONT_COLOR ); // 1
ppColorItems[ 1 ] = new SvxColorItem( GetColor( 2 ), ATTR_FONT_COLOR );
@@ -67,7 +67,7 @@ LotAttrCache::LotAttrCache (LOTUS_ROOT* pLotRoot)
ppColorItems[ 4 ] = new SvxColorItem( GetColor( 5 ), ATTR_FONT_COLOR );
ppColorItems[ 5 ] = new SvxColorItem( GetColor( 6 ), ATTR_FONT_COLOR ); // 6
- pWhite = new SvxColorItem( Color( COL_WHITE ), ATTR_FONT_COLOR );
+ pWhite = new SvxColorItem( COL_WHITE, ATTR_FONT_COLOR );
}
LotAttrCache::~LotAttrCache()
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index dc5621c08ca5..04d5c773d650 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -1887,7 +1887,7 @@ void Fill::fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) const
SvxBrushItem aBrushItem( ATTR_BACKGROUND );
if ( maApiData.mbTransparent )
{
- aBrushItem.SetColor( ::Color( COL_TRANSPARENT ) );
+ aBrushItem.SetColor( ::COL_TRANSPARENT );
}
else
{
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 9c09a1ee0eb0..c149fd1b2bad 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -4455,7 +4455,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
else
{
OUStringBuffer aBuffer;
- ::sax::Converter::convertColor(aBuffer, Color(COL_LIGHTRED).GetColor());
+ ::sax::Converter::convertColor(aBuffer, COL_LIGHTRED);
AddAttribute(XML_NAMESPACE_CALC_EXT, XML_NEGATIVE_COLOR, aBuffer.makeStringAndClear());
}
}
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index b0e7c6d3d8c0..6b8980ae2905 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -432,11 +432,11 @@ void ScZoomSliderWnd::DoPaint(vcl::RenderContext& rRenderContext)
pVDev->DrawGradient(aRect, aGradient);
// draw slider
- pVDev->SetLineColor(Color(COL_WHITE));
+ pVDev->SetLineColor(COL_WHITE);
pVDev->DrawRect(aSecondLine);
pVDev->DrawRect(aRight);
- pVDev->SetLineColor(Color(COL_GRAY));
+ pVDev->SetLineColor(COL_GRAY);
pVDev->DrawRect(aFirstLine);
pVDev->DrawRect(aLeft);
@@ -446,7 +446,7 @@ void ScZoomSliderWnd::DoPaint(vcl::RenderContext& rRenderContext)
aSnappingPointIter != mpImpl->maSnappingPointOffsets.end();
++aSnappingPointIter)
{
- pVDev->SetLineColor(Color(COL_GRAY));
+ pVDev->SetLineColor(COL_GRAY);
tools::Rectangle aSnapping(aRect);
aSnapping.SetBottom( aSlider.Top() );
aSnapping.SetTop( aSnapping.Bottom() - nSnappingHeight );
diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx
index b86d2c3d1bee..290bcbad4d40 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -151,9 +151,9 @@ void ScDataBarSettingsDlg::dispose()
void ScDataBarSettingsDlg::Init()
{
- mpLbNeg->SelectEntry(Color(COL_LIGHTRED));
- mpLbAxisCol->SelectEntry(Color(COL_BLACK));
- mpLbPos->SelectEntry(Color(COL_LIGHTBLUE));
+ mpLbNeg->SelectEntry(COL_LIGHTRED);
+ mpLbAxisCol->SelectEntry(COL_BLACK);
+ mpLbPos->SelectEntry(COL_LIGHTBLUE);
mpBtnOk->SetClickHdl( LINK( this, ScDataBarSettingsDlg, OkBtnHdl ) );
mpLbTypeMin->SetSelectHdl( LINK( this, ScDataBarSettingsDlg, TypeSelectHdl ) );
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index ede6a4ead202..cbec1095517c 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -936,8 +936,8 @@ void ScColorScale3FrmtEntry::Init()
maLbEntryTypeMin->SetSelectHdl( LINK( this, ScColorScale3FrmtEntry, EntryTypeHdl ) );
maLbEntryTypeMax->SetSelectHdl( LINK( this, ScColorScale3FrmtEntry, EntryTypeHdl ) );
maLbEntryTypeMiddle->SetSelectHdl( LINK( this, ScColorScale3FrmtEntry, EntryTypeHdl ) );
- maLbColMin->SelectEntry(Color(COL_LIGHTRED));
- maLbColMiddle->SelectEntry(Color(COL_YELLOW));
+ maLbColMin->SelectEntry(COL_LIGHTRED);
+ maLbColMiddle->SelectEntry(COL_YELLOW);
maLbColMax->SelectEntry(Color(0x00CC00));
}
diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx
index e79cdad8c076..ab43130cfbcb 100644
--- a/sc/source/ui/dbgui/csvcontrol.cxx
+++ b/sc/source/ui/dbgui/csvcontrol.cxx
@@ -259,8 +259,8 @@ sal_Int32 ScCsvControl::GetLineFromY( sal_Int32 nY ) const
void ScCsvControl::ImplInvertRect( OutputDevice& rOutDev, const tools::Rectangle& rRect )
{
rOutDev.Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR | PushFlags::RASTEROP );
- rOutDev.SetLineColor( Color( COL_BLACK ) );
- rOutDev.SetFillColor( Color( COL_BLACK ) );
+ rOutDev.SetLineColor( COL_BLACK );
+ rOutDev.SetFillColor( COL_BLACK );
rOutDev.SetRasterOp( RasterOp::Invert );
rOutDev.DrawRect( rRect );
rOutDev.Pop();
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index 6233c6795c03..9370a3decc89 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -145,7 +145,7 @@ void ScCsvRuler::InitColors()
maBackColor = rSett.GetFaceColor();
maActiveColor = rSett.GetWindowColor();
maTextColor = rSett.GetLabelTextColor();
- maSplitColor = maBackColor.IsDark() ? maTextColor : Color( COL_LIGHTRED );
+ maSplitColor = maBackColor.IsDark() ? maTextColor : COL_LIGHTRED;
InvalidateGfx();
}
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index 77eb9ba6f610..5520213fbbbb 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -73,7 +73,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( vcl::Window* pParent, const OUString& rName,
m_pBtnOk->SetClickHdl( LINK( this, ScNewScenarioDlg, OkHdl ) );
m_pCbShowFrame->SetClickHdl( LINK( this, ScNewScenarioDlg, EnableHdl ) );
- m_pLbColor->SelectEntry( Color( COL_LIGHTGRAY ) );
+ m_pLbColor->SelectEntry( COL_LIGHTGRAY );
m_pCbShowFrame->Check();
m_pCbTwoWay->Check();
m_pCbCopyAll->Check(false);
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index e3abe848a2c6..c5cad42309be 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -69,7 +69,7 @@ ScFunctionWin::ScFunctionWin(vcl::Window* pParent, const css::uno::Reference<css
nArgs=0;
aCatBox->SetDropDownLineCount(9);
vcl::Font aFont=aFiFuncDesc->GetFont();
- aFont.SetColor(Color(COL_BLACK));
+ aFont.SetColor(COL_BLACK);
aFiFuncDesc->SetFont(aFont);
aFiFuncDesc->SetBackground( GetBackground() ); //! never transparent?
aFiFuncDesc->set_height_request(5 * aFiFuncDesc->GetTextHeight());
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index c8b162a493e1..6a6f6f3e2684 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -477,12 +477,12 @@ SvTreeListEntry* ScAcceptChgDlg::AppendChangeAction(
if(!bFlag&& bUseColor&& pParent==nullptr)
{
pEntry = pTheView->InsertEntry(
- aBuf.makeStringAndClear() ,pNewData, Color(COL_LIGHTBLUE), pParent, TREELIST_APPEND);
+ aBuf.makeStringAndClear() ,pNewData, COL_LIGHTBLUE, pParent, TREELIST_APPEND);
}
else if(bFlag&& bUseColor&& pParent!=nullptr)
{
pEntry = pTheView->InsertEntry(
- aBuf.makeStringAndClear(), pNewData, Color(COL_GREEN), pParent, TREELIST_APPEND);
+ aBuf.makeStringAndClear(), pNewData, COL_GREEN, pParent, TREELIST_APPEND);
SvTreeListEntry* pExpEntry=pParent;
while(pExpEntry!=nullptr && !pTheView->IsExpanded(pExpEntry))
@@ -739,7 +739,7 @@ SvTreeListEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionC
pEntry=pTheView->InsertEntry(aString,pNewData,pParent);
}
else
- pEntry=pTheView->InsertEntry(aString,pNewData,Color(COL_LIGHTBLUE),pParent);
+ pEntry=pTheView->InsertEntry(aString,pNewData,COL_LIGHTBLUE,pParent);
return pEntry;
}
@@ -1364,7 +1364,7 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvTreeListBox*, pTable, bool )
{
bTheTestFlag=InsertAcceptedORejected(pEntry);
}
- if(bTheTestFlag) pTheView->InsertEntry(aStrNoEntry,nullptr,Color(COL_GRAY),pEntry);
+ if(bTheTestFlag) pTheView->InsertEntry(aStrNoEntry,nullptr,COL_GRAY,pEntry);
}
}
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 54375859b6e6..0e7bc58ff38f 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -144,7 +144,7 @@ void ScMoveTableDlg::CheckNewTabName()
{
// New sheet name is empty. This is not good.
pFtWarn->Show();
- pFtWarn->SetControlBackground(Color(COL_YELLOW));
+ pFtWarn->SetControlBackground(COL_YELLOW);
pFtWarn->SetText(msStrTabNameEmpty);
pBtnOk->Disable();
return;
@@ -154,7 +154,7 @@ void ScMoveTableDlg::CheckNewTabName()
{
// New sheet name contains invalid characters.
pFtWarn->Show();
- pFtWarn->SetControlBackground(Color(COL_YELLOW));
+ pFtWarn->SetControlBackground(COL_YELLOW);
pFtWarn->SetText(msStrTabNameInvalid);
pBtnOk->Disable();
return;
@@ -176,7 +176,7 @@ void ScMoveTableDlg::CheckNewTabName()
if ( bFound )
{
pFtWarn->Show();
- pFtWarn->SetControlBackground(Color(COL_YELLOW));
+ pFtWarn->SetControlBackground(COL_YELLOW);
pFtWarn->SetText(msStrTabNameUsed);
pBtnOk->Disable();
}
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 78fa4903941c..522596bbe002 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -115,7 +115,7 @@ void ScTabBgColorDlg::FillColorValueSets_Impl()
IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, void)
{
sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId();
- Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : Color( COL_AUTO );
+ Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : COL_AUTO;
m_aTabBgColor = aColor;
EndDialog( RET_OK );
}
@@ -124,7 +124,7 @@ IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, void)
IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorOKHdl_Impl, Button*, void)
{
sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId();
- Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : Color( COL_AUTO );
+ Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : COL_AUTO;
m_aTabBgColor = aColor;
EndDialog( RET_OK );
}
@@ -165,7 +165,7 @@ void ScTabBgColorDlg::ScTabBgColorValueSet::KeyInput( const KeyEvent& rKEvt )
case KEY_RETURN:
{
sal_uInt16 nItemId = GetSelectItemId();
- const Color& aColor = nItemId ? ( GetItemColor( nItemId ) ) : Color( COL_AUTO );
+ const Color& aColor = nItemId ? ( GetItemColor( nItemId ) ) : COL_AUTO;
m_pTabBgColorDlg->m_aTabBgColor = aColor;
m_pTabBgColorDlg->EndDialog(RET_OK);
}
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index b0ffd8b125ab..b035b5e35412 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -215,7 +215,7 @@ ScScenarioWindow::ScScenarioWindow( vcl::Window* pParent, const OUString& aQH_Li
aLbScenario->SetQuickHelpText(aQH_List);
aEdComment->SetQuickHelpText(aQH_Comment);
- aEdComment->SetBackground( Color( COL_LIGHTGRAY ) );
+ aEdComment->SetBackground( Color(COL_LIGHTGRAY) );
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
if (pViewFrm)
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 1c5c3acb485a..7ab26814d1a4 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -172,7 +172,7 @@ static bool lcl_GetSortParam( const ScViewData* pData, const ScSortParam& rSortP
((rSortParam.nCol1 == rSortParam.nCol2 && aExternalRange.aStart.Col() != aExternalRange.aEnd.Col()) ||
(rSortParam.nRow1 == rSortParam.nRow2 && aExternalRange.aStart.Row() != aExternalRange.aEnd.Row())))
{
- pTabViewShell->AddHighlightRange( aExternalRange,Color( COL_LIGHTBLUE ) );
+ pTabViewShell->AddHighlightRange( aExternalRange,COL_LIGHTBLUE );
ScRange rExtendRange( aExternalRange.aStart.Col(), aExternalRange.aStart.Row(), nTab, aExternalRange.aEnd.Col(), aExternalRange.aEnd.Row(), nTab );
OUString aExtendStr(rExtendRange.Format(ScRefFlags::VALID, pDoc));
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 3322d1701c56..6bb35605525d 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -491,7 +491,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
if ( pReqArgs->GetItemState( SID_NEW_TABLENAME, true, &pItem ) == SfxItemState::SET )
aArgComment = static_cast<const SfxStringItem*>(pItem)->GetValue();
- aColor = Color( COL_LIGHTGRAY ); // Default
+ aColor = COL_LIGHTGRAY; // Default
nFlags = ScScenarioFlags::NONE; // not TwoWay
pTabViewShell->MakeScenario( aArgName, aArgComment, aColor, nFlags );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index fb2ac988fd25..007522ec6324 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -6222,7 +6222,7 @@ void ScGridWindow::UpdateDragRectOverlay()
sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
sdr::overlay::OverlayType::Invert,
- Color(COL_BLACK),
+ COL_BLACK,
aRanges,
false);
@@ -6268,7 +6268,7 @@ void ScGridWindow::UpdateHeaderOverlay()
sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
sdr::overlay::OverlayType::Invert,
- Color(COL_BLACK),
+ COL_BLACK,
aRanges,
false);
@@ -6335,7 +6335,7 @@ void ScGridWindow::UpdateShrinkOverlay()
sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
sdr::overlay::OverlayType::Invert,
- Color(COL_BLACK),
+ COL_BLACK,
aRanges,
false);
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index b5b5a1215639..c8190c608992 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1350,7 +1350,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
{
// use single font and call DrawText directly
rDefPattern.GetFont( aFont, SC_AUTOCOL_BLACK );
- aFont.SetColor( Color( COL_LIGHTGRAY ) );
+ aFont.SetColor( COL_LIGHTGRAY );
// font size is set as needed
}
else
@@ -1360,7 +1360,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
pEditEng->SetRefMapMode(rRenderContext.GetMapMode());
SfxItemSet* pEditDefaults = new SfxItemSet( pEditEng->GetEmptyItemSet() );
rDefPattern.FillEditItemSet( pEditDefaults );
- pEditDefaults->Put( SvxColorItem( Color( COL_LIGHTGRAY ), EE_CHAR_COLOR ) );
+ pEditDefaults->Put( SvxColorItem( COL_LIGHTGRAY, EE_CHAR_COLOR ) );
pEditEng->SetDefaults( pEditDefaults );
}
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 9bf0c94d3b88..a5bf884681ad 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -295,9 +295,9 @@ void ScOutputData::SetSyntaxMode( bool bNewMode )
if (bNewMode)
if (!pValueColor)
{
- pValueColor = new Color( COL_LIGHTBLUE );
- pTextColor = new Color( COL_BLACK );
- pFormulaColor = new Color( COL_GREEN );
+ pValueColor = new Color(COL_LIGHTBLUE);
+ pTextColor = new Color(COL_BLACK);
+ pFormulaColor = new Color(COL_GREEN);
}
}
diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx
index 541cd47268b2..59ca3922ce8a 100644
--- a/sc/source/ui/view/tabsplit.cxx
+++ b/sc/source/ui/view/tabsplit.cxx
@@ -70,8 +70,8 @@ void ScTabSplitter::Paint( vcl::RenderContext& rRenderContext, const tools::Rect
rRenderContext.DrawRect(tools::Rectangle(rRect.Left(), rRect.Top(), rRect.Right(), rRect.Bottom()));
// Draw handle
- rRenderContext.SetLineColor(Color(COL_BLACK));
- rRenderContext.SetFillColor(Color(COL_BLACK));
+ rRenderContext.SetLineColor(COL_BLACK);
+ rRenderContext.SetFillColor(COL_BLACK);
const long xc = rRect.Right() + rRect.Left();
const long h4 = rRect.GetHeight() / 4;
// First xc fraction is truncated, second one is rounded. This will draw a centered line
@@ -101,8 +101,8 @@ void ScTabSplitter::Paint( vcl::RenderContext& rRenderContext, const tools::Rect
rRenderContext.DrawRect(tools::Rectangle(rRect.Left(), rRect.Top(), rRect.Right(), rRect.Bottom()));
// Draw handle
- rRenderContext.SetLineColor(Color(COL_BLACK));
- rRenderContext.SetFillColor(Color(COL_BLACK));
+ rRenderContext.SetLineColor(COL_BLACK);
+ rRenderContext.SetFillColor(COL_BLACK);
const long yc = rRect.Top() + rRect.Bottom();
const long w4 = rRect.GetWidth() / 4;
// First yc fraction is truncated, second one is rounded. This will draw a centered line
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index e0c31b2b0da3..d1d9e24c7ef4 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -279,10 +279,10 @@ void SdExportTest::testTransparentBackground()
const SdrPage *pPage = GetPage( 1, xDocShRef );
const SdrTextObj *pObj1 = dynamic_cast<SdrTextObj *>( pPage->GetObj( 0 ) );
- checkFontAttributes<Color, SvxBackgroundColorItem>( pObj1, Color(COL_TRANSPARENT) );
+ checkFontAttributes<Color, SvxBackgroundColorItem>( pObj1, COL_TRANSPARENT );
const SdrTextObj *pObj2 = dynamic_cast<SdrTextObj *>( pPage->GetObj( 1 ) );
- checkFontAttributes<Color, SvxBackgroundColorItem>( pObj2, Color(COL_YELLOW));
+ checkFontAttributes<Color, SvxBackgroundColorItem>( pObj2, COL_YELLOW);
xDocShRef->DoClose();
}
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index a990a41ef772..7fda9ef61e67 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -214,7 +214,7 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put(SvxCaseMapItem(SvxCaseMap::NotMapped, EE_CHAR_CASEMAP ));
rISet.Put(SvxEmphasisMarkItem(FontEmphasisMark::NONE, EE_CHAR_EMPHASISMARK));
rISet.Put(SvxCharReliefItem(FontRelief::NONE, EE_CHAR_RELIEF));
- rISet.Put(SvxColorItem(Color(COL_AUTO), EE_CHAR_COLOR ));
+ rISet.Put(SvxColorItem(COL_AUTO, EE_CHAR_COLOR ));
// Paragraph attributes (Edit Engine)
rISet.Put(SvxLRSpaceItem(EE_PARA_LRSPACE));
@@ -573,7 +573,7 @@ void SdDrawDocument::CreateDefaultCellStyles()
rISet.Put( SvxFontHeightItem( 635, 100, EE_CHAR_FONTHEIGHT_CJK ) ); // 18 pt
rISet.Put( SvxFontHeightItem( convertFontHeightToCTL( 635 ), 100, EE_CHAR_FONTHEIGHT_CTL ) ); // 18 pt
- rISet.Put(SvxColorItem(Color(COL_AUTO), EE_CHAR_COLOR ));
+ rISet.Put(SvxColorItem(COL_AUTO, EE_CHAR_COLOR ));
// Paragraph attributes (Edit Engine)
rISet.Put(SvxLRSpaceItem(EE_PARA_LRSPACE));
@@ -1202,7 +1202,7 @@ void SdDrawDocument::SetTextDefaults() const
aNumberFormat.SetBulletFont(&aBulletFont);
aNumberFormat.SetBulletChar( 0x25CF ); // StarBats: 0xF000 + 34
aNumberFormat.SetBulletRelSize(45);
- aNumberFormat.SetBulletColor(Color(COL_AUTO));
+ aNumberFormat.SetBulletColor(COL_AUTO);
aNumberFormat.SetStart(1);
aNumberFormat.SetNumAdjust(SvxAdjust::Left);
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 3f92f2250a98..6a25bb423751 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list