[Libreoffice-commits] core.git: 2 commits - chart2/source cui/source formula/source include/filter include/svx include/tools include/vcl sc/source sd/qa sd/source svx/source sw/inc sw/qa sw/source tools/source UnoControls/source vcl/qa vcl/quartz vcl/source xmloff/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Feb 26 15:12:20 UTC 2018
UnoControls/source/inc/progressbar.hxx | 9 +--
UnoControls/source/inc/progressmonitor.hxx | 4 -
UnoControls/source/inc/statusindicator.hxx | 6 +-
chart2/source/view/main/3DChartObjects.cxx | 2
cui/source/dialogs/colorpicker.cxx | 12 ++--
cui/source/options/optgdlg.cxx | 2
cui/source/tabpages/chardlg.cxx | 2
formula/source/ui/dlg/funcutl.cxx | 2
include/filter/msfilter/msdffimp.hxx | 2
include/svx/colorwindow.hxx | 2
include/tools/color.hxx | 2
include/vcl/settings.hxx | 2
sc/source/filter/excel/xechart.cxx | 2
sc/source/filter/excel/xichart.cxx | 8 +--
sc/source/filter/excel/xltools.cxx | 2
sd/qa/unit/misc-tests.cxx | 8 +--
sd/source/core/drawdoc4.cxx | 66 ++++++++++++-------------
svx/source/dialog/langbox.cxx | 4 -
svx/source/tbxctrls/tbcontrl.cxx | 2
sw/inc/PostItMgr.hxx | 4 -
sw/qa/extras/odfimport/odfimport.cxx | 6 +-
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 6 +-
sw/source/core/inc/txtfrm.hxx | 2
sw/source/core/layout/paintfrm.cxx | 6 +-
sw/source/core/text/inftxt.cxx | 4 -
sw/source/core/txtnode/fntcache.cxx | 2
sw/source/filter/ww8/ww8par6.cxx | 2
tools/source/generic/color.cxx | 6 +-
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 6 +-
vcl/quartz/salbmp.cxx | 6 +-
vcl/source/app/settings.cxx | 8 +--
xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 4 -
32 files changed, 101 insertions(+), 100 deletions(-)
New commits:
commit c410a3dcfeb68ba2247c0d879727afe4ca8ed3da
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Feb 26 10:55:42 2018 +0200
use less TRGB_COLORDATA
part of removing ColorData
Change-Id: Id2d5843762227559f97cfb5eb61c01c888a0601e
Reviewed-on: https://gerrit.libreoffice.org/50347
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
index f3d073d8bacc..a31208ca0c5a 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -24,6 +24,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <vcl/vclptr.hxx>
+#include <tools/color.hxx>
#include <basecontrol.hxx>
@@ -34,14 +35,14 @@ namespace unocontrols{
#define PROGRESSBAR_FREESPACE 4
#define PROGRESSBAR_DEFAULT_HORIZONTAL true
#define PROGRESSBAR_DEFAULT_BLOCKDIMENSION Size(1,1)
-#define PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lightgray
-#define PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x80 ) // blue
+#define PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR sal_Int32(Color( 0x00, 0xC0, 0xC0, 0xC0 )) // lightgray
+#define PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR sal_Int32(Color( 0x00, 0x00, 0x00, 0x80 )) // blue
#define PROGRESSBAR_DEFAULT_MINRANGE INT_MIN
#define PROGRESSBAR_DEFAULT_MAXRANGE INT_MAX
#define PROGRESSBAR_DEFAULT_BLOCKVALUE 1
#define PROGRESSBAR_DEFAULT_VALUE PROGRESSBAR_DEFAULT_MINRANGE
-#define PROGRESSBAR_LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
-#define PROGRESSBAR_LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
+#define PROGRESSBAR_LINECOLOR_BRIGHT sal_Int32(Color( 0x00, 0xFF, 0xFF, 0xFF )) // white
+#define PROGRESSBAR_LINECOLOR_SHADOW sal_Int32(Color( 0x00, 0x00, 0x00, 0x00 )) // black
class ProgressBar : public css::awt::XControlModel
, public css::awt::XProgressBar
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 75b84e0217b4..1e6827f4c272 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -78,8 +78,8 @@ class ProgressBar;
#define DEFAULT_BUTTONLABEL "Abbrechen"
#define PROGRESSMONITOR_DEFAULT_TOPIC ""
#define PROGRESSMONITOR_DEFAULT_TEXT ""
-#define PROGRESSMONITOR_LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
-#define PROGRESSMONITOR_LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
+#define PROGRESSMONITOR_LINECOLOR_BRIGHT sal_Int32(Color( 0x00, 0xFF, 0xFF, 0xFF )) // white
+#define PROGRESSMONITOR_LINECOLOR_SHADOW sal_Int32(Color( 0x00, 0x00, 0x00, 0x00 )) // black
#define PROGRESSMONITOR_DEFAULT_WIDTH 350
#define PROGRESSMONITOR_DEFAULT_HEIGHT 100
diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx
index 3b27099ec749..a18c98e6f257 100644
--- a/UnoControls/source/inc/statusindicator.hxx
+++ b/UnoControls/source/inc/statusindicator.hxx
@@ -42,9 +42,9 @@ class ProgressBar;
#define FIXEDTEXT_MODELNAME "com.sun.star.awt.UnoControlFixedTextModel"
#define CONTROLNAME_TEXT "Text" // identifier the control in container
#define CONTROLNAME_PROGRESSBAR "ProgressBar" // -||-
-#define STATUSINDICATOR_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lightgray
-#define STATUSINDICATOR_LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
-#define STATUSINDICATOR_LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
+#define STATUSINDICATOR_BACKGROUNDCOLOR sal_Int32(Color( 0x00, 0xC0, 0xC0, 0xC0 )) // lightgray
+#define STATUSINDICATOR_LINECOLOR_BRIGHT sal_Int32(Color( 0x00, 0xFF, 0xFF, 0xFF )) // white
+#define STATUSINDICATOR_LINECOLOR_SHADOW sal_Int32(Color( 0x00, 0x00, 0x00, 0x00 )) // black
#define STATUSINDICATOR_DEFAULT_WIDTH 300
#define STATUSINDICATOR_DEFAULT_HEIGHT 25
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index cc34b315dd08..7f34cb2246d4 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1372,7 +1372,7 @@ Color SvxCharEffectsPage::GetPreviewFontColor(const Color& rColor) const
{
if (rColor.GetColor() == COL_AUTO)
return Color(COL_BLACK);
- if (m_bEnableNoneFontColor && rColor.GetColor() == COL_NONE_COLOR)
+ if (m_bEnableNoneFontColor && rColor == COL_NONE_COLOR)
return Color(COL_BLACK);
return rColor;
}
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index 24a83c140e8a..e4a530248419 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -47,7 +47,7 @@ public:
class Button;
typedef std::function<void(const OUString&, const NamedColor&)> ColorSelectFunction;
-#define COL_NONE_COLOR TRGB_COLORDATA(0x80, 0xFF, 0xFF, 0xFF)
+#define COL_NONE_COLOR ::Color(0x80, 0xFF, 0xFF, 0xFF)
class SVX_DLLPUBLIC SvxColorWindow : public svtools::ToolbarPopup
{
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d1a47efad2a8..e839dbed3d56 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1430,7 +1430,7 @@ namespace
NamedColor GetNoneColor()
{
- return std::make_pair(Color(COL_NONE_COLOR), SvxResId(RID_SVXSTR_NONE));
+ return std::make_pair(COL_NONE_COLOR, SvxResId(RID_SVXSTR_NONE));
}
}
commit 97448039e1e63f3bd6b61ab3215ede721ca368e4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Feb 26 10:32:20 2018 +0200
use less RGB_COLORDATA
part of removing ColorData
Change-Id: If31b5b88545529863377e9a178f45f4516bf6cbb
Reviewed-on: https://gerrit.libreoffice.org/50345
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx
index 1ecd913b553c..aaad77e2748c 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -83,7 +83,7 @@ const TextCacheItem& TextCache::getText(OUString const & rText, bool bIs3dText)
else
aFont = pDevice->GetFont();
aFont.SetFontSize(Size(0, 96));
- aFont.SetColor(COL_GREEN); // RGB_COLORDATA(0xf0, 0xf0, 0xf0));
+ aFont.SetColor(COL_GREEN);
pDevice->SetFont(aFont);
pDevice->Erase();
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 869917270eb7..21d46383d5ac 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -333,7 +333,7 @@ void ColorFieldControl::UpdateBitmap()
while (x--)
{
nSat = pPercent_Horiz[x];
- mxBitmap->DrawPixel(Point(x,y), Color(Color::HSBtoRGB(nHue, nSat, nBri)));
+ mxBitmap->DrawPixel(Point(x,y), Color::HSBtoRGB(nHue, nSat, nBri));
}
}
break;
@@ -345,7 +345,7 @@ void ColorFieldControl::UpdateBitmap()
while (x--)
{
nHue = pGrad_Horiz[x];
- mxBitmap->DrawPixel(Point(x,y), Color(Color::HSBtoRGB(nHue, nSat, nBri)));
+ mxBitmap->DrawPixel(Point(x,y), Color::HSBtoRGB(nHue, nSat, nBri));
}
}
break;
@@ -357,7 +357,7 @@ void ColorFieldControl::UpdateBitmap()
while (x--)
{
nHue = pGrad_Horiz[x];
- mxBitmap->DrawPixel(Point(x,y), Color(Color::HSBtoRGB(nHue, nSat, nBri)));
+ mxBitmap->DrawPixel(Point(x,y), Color::HSBtoRGB(nHue, nSat, nBri));
}
}
break;
@@ -653,7 +653,7 @@ void ColorSliderControl::UpdateBitmap()
for (long y = 0; y <= nY; y++)
{
nHue = static_cast<sal_uInt16>((359 * y) / nY);
- mxBitmap->DrawPixel(Point(0, nY - y), Color(Color::HSBtoRGB(nHue, nSat, nBri)));
+ mxBitmap->DrawPixel(Point(0, nY - y), Color::HSBtoRGB(nHue, nSat, nBri));
}
break;
@@ -662,7 +662,7 @@ void ColorSliderControl::UpdateBitmap()
for (long y = 0; y <= nY; y++)
{
nSat = static_cast<sal_uInt16>((100 * y) / nY);
- mxBitmap->DrawPixel(Point(0, nY - y), Color(Color::HSBtoRGB(nHue, nSat, nBri)));
+ mxBitmap->DrawPixel(Point(0, nY - y), Color::HSBtoRGB(nHue, nSat, nBri));
}
break;
@@ -670,7 +670,7 @@ void ColorSliderControl::UpdateBitmap()
for (long y = 0; y <= nY; y++)
{
nBri = static_cast<sal_uInt16>((100 * y) / nY);
- mxBitmap->DrawPixel(Point(0, nY - y), Color(Color::HSBtoRGB(nHue, nSat, nBri)));
+ mxBitmap->DrawPixel(Point(0, nY - y), Color::HSBtoRGB(nHue, nSat, nBri));
}
break;
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index ac27fac89024..892be4c7ad44 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1903,7 +1903,7 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit&, rEd, void )
}
else
{
- rEd.SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0)));
+ rEd.SetControlForeground( ::Color( 0xf0, 0, 0 ) );
}
m_bDatePatternsValid = bValid;
}
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 9a8412c39e9e..70d3eb222e15 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -449,7 +449,7 @@ void RefEdit::SetRefValid(bool bValid)
SetControlForeground(COL_WHITE);
SetControlBackground(0xff6563);
#else
- SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0)));
+ SetControlForeground( ::Color( 0xf0, 0, 0 ) );
#endif
}
}
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index e79991a052d7..a33ad902408f 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -109,7 +109,7 @@ public:
void ImportGradientColor( SfxItemSet& aSet, MSO_FillType eMSO_FillType, double dTrans, double dBackTrans ) const;
};
-#define COL_DEFAULT RGB_COLORDATA( 0xFA, 0xFB, 0xFC )
+#define COL_DEFAULT ::Color( 0xFA, 0xFB, 0xFC )
typedef ::std::map< sal_Int32, SdrObject* > SvxMSDffShapeIdContainer;
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 823c90909310..29d202908128 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -133,7 +133,7 @@ public:
// Hue: 0-360 degree
// Saturation: 0-100%
// Brightness: 0-100%
- static ColorData HSBtoRGB(sal_uInt16 nHue, sal_uInt16 nSaturation, sal_uInt16 nBrightness);
+ static Color HSBtoRGB(sal_uInt16 nHue, sal_uInt16 nSaturation, sal_uInt16 nBrightness);
void RGBtoHSB(sal_uInt16& nHue, sal_uInt16& nSaturation, sal_uInt16& nBrightness) const;
bool operator==(const Color& rColor) const
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 6b061336f61d..b8cc012414ce 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -570,7 +570,7 @@ public:
void SetEdgeBlending(sal_uInt16 nCount);
sal_uInt16 GetEdgeBlending() const;
- // TopLeft (default RGB_COLORDATA(0xC0, 0xC0, 0xC0)) and BottomRight (default RGB_COLORDATA(0x40, 0x40, 0x40))
+ // TopLeft (default Color(0xC0, 0xC0, 0xC0)) and BottomRight (default Color(0x40, 0x40, 0x40))
// default colors for EdgeBlending
const Color& GetEdgeBlendingTopLeftColor() const;
const Color& GetEdgeBlendingBottomRightColor() const;
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index d9c19c679551..b0d0837214f9 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -706,7 +706,7 @@ sal_uInt32 XclExpChEscherFormat::RegisterColor( sal_uInt16 nPropId )
if( maData.mxEscherSet && maData.mxEscherSet->GetOpt( nPropId, nBGRValue ) )
{
// swap red and blue
- Color aColor( RGB_COLORDATA(
+ Color aColor( Color(
COLORDATA_BLUE( nBGRValue ),
COLORDATA_GREEN( nBGRValue ),
COLORDATA_RED( nBGRValue ) ) );
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 0146f42f36df..91774388322c 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2435,9 +2435,9 @@ void XclImpChChart3d::Convert( ScfPropertySet& rPropSet, bool b3dWallChart ) con
bool bParallel = bRightAngled || (nPerspective == 0);
eProjMode = bParallel ? cssd::ProjectionMode_PARALLEL : cssd::ProjectionMode_PERSPECTIVE;
// ambient color (Gray 20%)
- aAmbientColor = RGB_COLORDATA( 204, 204, 204 );
+ aAmbientColor = Color( 204, 204, 204 );
// light color (Gray 60%)
- aLightColor = RGB_COLORDATA( 102, 102, 102 );
+ aLightColor = Color( 102, 102, 102 );
}
else
{
@@ -2452,9 +2452,9 @@ void XclImpChChart3d::Convert( ScfPropertySet& rPropSet, bool b3dWallChart ) con
bRightAngled = false;
eProjMode = cssd::ProjectionMode_PARALLEL;
// ambient color (Gray 30%)
- aAmbientColor = RGB_COLORDATA( 179, 179, 179 );
+ aAmbientColor = Color( 179, 179, 179 );
// light color (Gray 70%)
- aLightColor = RGB_COLORDATA( 76, 76, 76 );
+ aLightColor = Color( 76, 76, 76 );
}
// properties
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index f70ecfab5a9d..47030af38ddf 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -706,7 +706,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, Color& rColor )
sal_uInt8 nG = rStrm.ReaduInt8();
sal_uInt8 nB = rStrm.ReaduInt8();
rStrm.Ignore( 1 );//nD
- rColor = RGB_COLORDATA( nR, nG, nB );
+ rColor = Color( nR, nG, nB );
return rStrm;
}
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index 0fccc43cbce8..3d3c2c9064bb 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -279,8 +279,8 @@ void SdMiscTest::testFillGradient()
uno::Reference<beans::XPropertySet> xPropSet(xShape1, uno::UNO_QUERY_THROW);
// Set FillStyle and FillGradient
awt::Gradient aGradient;
- aGradient.StartColor = sal_Int32(RGB_COLORDATA(255, 0, 0));
- aGradient.EndColor = sal_Int32(RGB_COLORDATA(0, 255, 0));
+ aGradient.StartColor = sal_Int32(Color(255, 0, 0));
+ aGradient.EndColor = sal_Int32(Color(0, 255, 0));
xPropSet->setPropertyValue("FillStyle", uno::makeAny(drawing::FillStyle_GRADIENT));
xPropSet->setPropertyValue("FillGradient", uno::makeAny(aGradient));
// Add the rectangle to the page.
@@ -294,8 +294,8 @@ void SdMiscTest::testFillGradient()
CPPUNIT_ASSERT(xPropSet2->getPropertyValue("FillStyle") >>= eFillStyle);
CPPUNIT_ASSERT_EQUAL(int(drawing::FillStyle_GRADIENT), static_cast<int>(eFillStyle));
CPPUNIT_ASSERT(xPropSet2->getPropertyValue("FillGradient") >>= aGradient2);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(RGB_COLORDATA(255, 0, 0)),aGradient2.StartColor);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(RGB_COLORDATA(0, 255, 0)),aGradient2.EndColor);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(Color(255, 0, 0)),aGradient2.StartColor);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(Color(0, 255, 0)),aGradient2.EndColor);
}
CPPUNIT_TEST_SUITE_REGISTRATION(SdMiscTest);
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index efb52fefbd4c..e9540d7bf318 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -603,89 +603,89 @@ void SdDrawDocument::CreateDefaultCellStyles()
// ---- default --------------------------------------------------
- Any aGray1( implMakeSolidCellStyle( pSSPool, "gray1" , aDefaultCellStyleName, RGB_COLORDATA(230,230,230)));
- Any aGray2( implMakeSolidCellStyle( pSSPool, "gray2" , aDefaultCellStyleName, RGB_COLORDATA(204,204,204)));
- Any aGray3( implMakeSolidCellStyle( pSSPool, "gray3" , aDefaultCellStyleName, RGB_COLORDATA(179,179,179)));
+ Any aGray1( implMakeSolidCellStyle( pSSPool, "gray1" , aDefaultCellStyleName, Color(230,230,230)));
+ Any aGray2( implMakeSolidCellStyle( pSSPool, "gray2" , aDefaultCellStyleName, Color(204,204,204)));
+ Any aGray3( implMakeSolidCellStyle( pSSPool, "gray3" , aDefaultCellStyleName, Color(179,179,179)));
implCreateTableTemplate( xTableFamily, "default" , aGray1, aGray3, aGray2 );
// ---- BW ------------------------------------------------
- Any aBW1( implMakeSolidCellStyle( pSSPool, "bw1" , aDefaultCellStyleName, RGB_COLORDATA(255,255,255)));
- Any aBW2( implMakeSolidCellStyle( pSSPool, "bw2" , aDefaultCellStyleName, RGB_COLORDATA(230,230,230)));
- Any aBW3( implMakeSolidCellStyle( pSSPool, "bw3" , aDefaultCellStyleName, RGB_COLORDATA(0,0,0)));
+ Any aBW1( implMakeSolidCellStyle( pSSPool, "bw1" , aDefaultCellStyleName, Color(255,255,255)));
+ Any aBW2( implMakeSolidCellStyle( pSSPool, "bw2" , aDefaultCellStyleName, Color(230,230,230)));
+ Any aBW3( implMakeSolidCellStyle( pSSPool, "bw3" , aDefaultCellStyleName, Color(0,0,0)));
implCreateTableTemplate( xTableFamily, "bw" , aBW1, aBW3, aBW2 );
// ---- Orange --------------------------------------------------
- Any aOrange1( implMakeSolidCellStyle( pSSPool, "orange1" , aDefaultCellStyleName, RGB_COLORDATA(255,204,153)));
- Any aOrange2( implMakeSolidCellStyle( pSSPool, "orange2" , aDefaultCellStyleName, RGB_COLORDATA(255,153,102)));
- Any aOrange3( implMakeSolidCellStyle( pSSPool, "orange3" , aDefaultCellStyleName, RGB_COLORDATA(255,102,51)));
+ Any aOrange1( implMakeSolidCellStyle( pSSPool, "orange1" , aDefaultCellStyleName, Color(255,204,153)));
+ Any aOrange2( implMakeSolidCellStyle( pSSPool, "orange2" , aDefaultCellStyleName, Color(255,153,102)));
+ Any aOrange3( implMakeSolidCellStyle( pSSPool, "orange3" , aDefaultCellStyleName, Color(255,102,51)));
implCreateTableTemplate( xTableFamily, "orange" , aOrange1, aOrange3, aOrange2 );
// ---- Turquoise --------------------------------------------------
- Any aTurquoise1( implMakeSolidCellStyle( pSSPool, "turquoise1" , aDefaultCellStyleName, RGB_COLORDATA(71,184,184)));
- Any aTurquoise2( implMakeSolidCellStyle( pSSPool, "turquoise2" , aDefaultCellStyleName, RGB_COLORDATA(51,163,163)));
- Any aTurquoise3( implMakeSolidCellStyle( pSSPool, "turquoise3" , aDefaultCellStyleName, RGB_COLORDATA(25,138,138)));
+ Any aTurquoise1( implMakeSolidCellStyle( pSSPool, "turquoise1" , aDefaultCellStyleName, Color(71,184,184)));
+ Any aTurquoise2( implMakeSolidCellStyle( pSSPool, "turquoise2" , aDefaultCellStyleName, Color(51,163,163)));
+ Any aTurquoise3( implMakeSolidCellStyle( pSSPool, "turquoise3" , aDefaultCellStyleName, Color(25,138,138)));
implCreateTableTemplate( xTableFamily, "turquoise" , aTurquoise1, aTurquoise3, aTurquoise2 );
// ---- Gray ------------------------------------------------
- Any aBlue1( implMakeSolidCellStyle( pSSPool, "blue1" , aDefaultCellStyleName, RGB_COLORDATA(153,204,255)));
- Any aBlue2( implMakeSolidCellStyle( pSSPool, "blue2" , aDefaultCellStyleName, RGB_COLORDATA(0,153,255)));
- Any aBlue3( implMakeSolidCellStyle( pSSPool, "blue3" , aDefaultCellStyleName, RGB_COLORDATA(0,102,204)));
+ Any aBlue1( implMakeSolidCellStyle( pSSPool, "blue1" , aDefaultCellStyleName, Color(153,204,255)));
+ Any aBlue2( implMakeSolidCellStyle( pSSPool, "blue2" , aDefaultCellStyleName, Color(0,153,255)));
+ Any aBlue3( implMakeSolidCellStyle( pSSPool, "blue3" , aDefaultCellStyleName, Color(0,102,204)));
implCreateTableTemplate( xTableFamily, "blue" , aBlue1, aBlue3, aBlue2 );
// ---- Sun ------------------------------------------------
- Any aSun1( implMakeSolidCellStyle( pSSPool, "sun1" , aDefaultCellStyleName, RGB_COLORDATA(230,230,255)));
- Any aSun2( implMakeSolidCellStyle( pSSPool, "sun2" , aDefaultCellStyleName, RGB_COLORDATA(204,204,255)));
- Any aSun3( implMakeSolidCellStyle( pSSPool, "sun3" , aDefaultCellStyleName, RGB_COLORDATA(153,153,255)));
+ Any aSun1( implMakeSolidCellStyle( pSSPool, "sun1" , aDefaultCellStyleName, Color(230,230,255)));
+ Any aSun2( implMakeSolidCellStyle( pSSPool, "sun2" , aDefaultCellStyleName, Color(204,204,255)));
+ Any aSun3( implMakeSolidCellStyle( pSSPool, "sun3" , aDefaultCellStyleName, Color(153,153,255)));
implCreateTableTemplate( xTableFamily, "sun" , aSun1, aSun3, aSun2 );
// ---- Earth ----------------------------------------------
- Any aEarth1( implMakeSolidCellStyle( pSSPool, "earth1" , aDefaultCellStyleName, RGB_COLORDATA(255,255,204)));
- Any aEarth2( implMakeSolidCellStyle( pSSPool, "earth2" , aDefaultCellStyleName, RGB_COLORDATA(255,204,153)));
- Any aEarth3( implMakeSolidCellStyle( pSSPool, "earth3" , aDefaultCellStyleName, RGB_COLORDATA(204,102,51)));
+ Any aEarth1( implMakeSolidCellStyle( pSSPool, "earth1" , aDefaultCellStyleName, Color(255,255,204)));
+ Any aEarth2( implMakeSolidCellStyle( pSSPool, "earth2" , aDefaultCellStyleName, Color(255,204,153)));
+ Any aEarth3( implMakeSolidCellStyle( pSSPool, "earth3" , aDefaultCellStyleName, Color(204,102,51)));
implCreateTableTemplate( xTableFamily, "earth" , aEarth1, aEarth3, aEarth2 );
// ---- Green ----------------------------------------------
- Any aGreen1( implMakeSolidCellStyle( pSSPool, "green1" , aDefaultCellStyleName, RGB_COLORDATA(255,255,204)));
- Any aGreen2( implMakeSolidCellStyle( pSSPool, "green2" , aDefaultCellStyleName, RGB_COLORDATA(148,189,94)));
- Any aGreen3( implMakeSolidCellStyle( pSSPool, "green3" , aDefaultCellStyleName, RGB_COLORDATA(92,133,38)));
+ Any aGreen1( implMakeSolidCellStyle( pSSPool, "green1" , aDefaultCellStyleName, Color(255,255,204)));
+ Any aGreen2( implMakeSolidCellStyle( pSSPool, "green2" , aDefaultCellStyleName, Color(148,189,94)));
+ Any aGreen3( implMakeSolidCellStyle( pSSPool, "green3" , aDefaultCellStyleName, Color(92,133,38)));
implCreateTableTemplate( xTableFamily, "green" , aGreen1, aGreen3, aGreen2 );
// ---- Seaweed ----------------------------------------------
- Any aSeetang1( implMakeSolidCellStyle( pSSPool, "seetang1" , aDefaultCellStyleName, RGB_COLORDATA(204,255,255)));
- Any aSeetang2( implMakeSolidCellStyle( pSSPool, "seetang2" , aDefaultCellStyleName, RGB_COLORDATA(71,184,184)));
- Any aSeetang3( implMakeSolidCellStyle( pSSPool, "seetang3" , aDefaultCellStyleName, RGB_COLORDATA(51,163,163)));
+ Any aSeetang1( implMakeSolidCellStyle( pSSPool, "seetang1" , aDefaultCellStyleName, Color(204,255,255)));
+ Any aSeetang2( implMakeSolidCellStyle( pSSPool, "seetang2" , aDefaultCellStyleName, Color(71,184,184)));
+ Any aSeetang3( implMakeSolidCellStyle( pSSPool, "seetang3" , aDefaultCellStyleName, Color(51,163,163)));
implCreateTableTemplate( xTableFamily, "seetang" , aSeetang1, aSeetang3, aSeetang2 );
// ---- LightBlue ----------------------------------------------
- Any aLightBlue1( implMakeSolidCellStyle( pSSPool, "lightblue1" , aDefaultCellStyleName, RGB_COLORDATA(255,255,255)));
- Any aLightBlue2( implMakeSolidCellStyle( pSSPool, "lightblue2" , aDefaultCellStyleName, RGB_COLORDATA(230,230,255)));
- Any aLightBlue3( implMakeSolidCellStyle( pSSPool, "lightblue3" , aDefaultCellStyleName, RGB_COLORDATA(153,153,204)));
+ Any aLightBlue1( implMakeSolidCellStyle( pSSPool, "lightblue1" , aDefaultCellStyleName, Color(255,255,255)));
+ Any aLightBlue2( implMakeSolidCellStyle( pSSPool, "lightblue2" , aDefaultCellStyleName, Color(230,230,255)));
+ Any aLightBlue3( implMakeSolidCellStyle( pSSPool, "lightblue3" , aDefaultCellStyleName, Color(153,153,204)));
implCreateTableTemplate( xTableFamily, "lightblue" , aLightBlue1, aLightBlue3, aLightBlue2 );
// ---- Yellow ----------------------------------------------
- Any aYellow1( implMakeSolidCellStyle( pSSPool, "yellow1" , aDefaultCellStyleName, RGB_COLORDATA(255,255,204)));
- Any aYellow2( implMakeSolidCellStyle( pSSPool, "yellow2" , aDefaultCellStyleName, RGB_COLORDATA(255,255,153)));
- Any aYellow3( implMakeSolidCellStyle( pSSPool, "yellow3" , aDefaultCellStyleName, RGB_COLORDATA(255,204,153)));
+ Any aYellow1( implMakeSolidCellStyle( pSSPool, "yellow1" , aDefaultCellStyleName, Color(255,255,204)));
+ Any aYellow2( implMakeSolidCellStyle( pSSPool, "yellow2" , aDefaultCellStyleName, Color(255,255,153)));
+ Any aYellow3( implMakeSolidCellStyle( pSSPool, "yellow3" , aDefaultCellStyleName, Color(255,204,153)));
implCreateTableTemplate( xTableFamily, "yellow" , aYellow1, aYellow3, aYellow2 );
}
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 863a2802fb6e..18e93e62e45d 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -784,10 +784,10 @@ IMPL_LINK_NOARG( SvxLanguageComboBox, EditModifyHdl, Edit&, void )
{
#if 0
//! Gives white on white!?! instead of white on reddish.
- SetControlBackground( ::Color( RGB_COLORDATA( 0xff, 0x65, 0x63)));
+ SetControlBackground( ::Color( Color( 0xff, 0x65, 0x63)));
SetControlForeground( ::Color( COL_WHITE));
#else
- SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0)));
+ SetControlForeground( ::Color( 0xf0, 0, 0) );
#endif
}
else
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index dade2cd0026b..1f60c50c15a8 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -66,8 +66,8 @@ class OutlinerSearchable;
class OutlinerParaObject;
namespace i18nutil { struct SearchOptions2; }
-#define COL_NOTES_SIDEPANE_ARROW_ENABLED RGB_COLORDATA(0,0,0)
-#define COL_NOTES_SIDEPANE_ARROW_DISABLED RGB_COLORDATA(172,168,153)
+#define COL_NOTES_SIDEPANE_ARROW_ENABLED Color(0,0,0)
+#define COL_NOTES_SIDEPANE_ARROW_DISABLED Color(172,168,153)
typedef std::list<SwSidebarItem*> SwSidebarItem_list;
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index a638dd818574..5ab5c5910ba3 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -458,7 +458,7 @@ DECLARE_ODFIMPORT_TEST(testFdo75872_ooo33, "fdo75872_ooo33.odt")
uno::Reference<drawing::XShape> xShape = getShape(1);
CPPUNIT_ASSERT_EQUAL(sal_Int32(COL_BLACK),
getProperty<sal_Int32>(xShape, "LineColor"));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(RGB_COLORDATA(153, 204, 255)),
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(Color(153, 204, 255)),
getProperty<sal_Int32>(xShape, "FillColor"));
}
@@ -466,9 +466,9 @@ DECLARE_ODFIMPORT_TEST(testFdo75872_aoo40, "fdo75872_aoo40.odt")
{
// graphics default style: line color and fill color changed
uno::Reference<drawing::XShape> xShape = getShape(1);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(RGB_COLORDATA(128, 128, 128)),
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(Color(128, 128, 128)),
getProperty<sal_Int32>(xShape, "LineColor"));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(RGB_COLORDATA(0xCF, 0xE7, 0xF5)),
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(Color(0xCF, 0xE7, 0xF5)),
getProperty<sal_Int32>(xShape, "FillColor"));
}
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index bacdd60ea0cb..0f1adf0c25c7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -365,9 +365,9 @@ DECLARE_OOXMLEXPORT_TEST(testPictureWithSchemeColor, "picture-with-schemecolor.d
CPPUNIT_ASSERT_EQUAL(341L, pAccess->Width());
CPPUNIT_ASSERT_EQUAL(181L, pAccess->Height());
Color aColor(pAccess->GetPixel(30, 120).GetColor());
- CPPUNIT_ASSERT_EQUAL(aColor.GetColor(), RGB_COLORDATA( 0xb1, 0xc8, 0xdd ));
+ CPPUNIT_ASSERT_EQUAL(aColor, Color( 0xb1, 0xc8, 0xdd ));
aColor = pAccess->GetPixel(130, 260).GetColor();
- CPPUNIT_ASSERT_EQUAL(aColor.GetColor(), RGB_COLORDATA( 0xb1, 0xc8, 0xdd ));
+ CPPUNIT_ASSERT_EQUAL(aColor, Color( 0xb1, 0xc8, 0xdd ));
}
DECLARE_OOXMLEXPORT_TEST(testFdo69656, "Table_cell_auto_width_fdo69656.docx")
@@ -543,7 +543,7 @@ DECLARE_OOXMLEXPORT_TEST(testMsoBrightnessContrast, "msobrightnesscontrast.docx"
CPPUNIT_ASSERT_EQUAL(58L, pAccess->Width());
CPPUNIT_ASSERT_EQUAL(320L, pAccess->Height());
Color aColor(pAccess->GetPixel(30, 20).GetColor());
- CPPUNIT_ASSERT_EQUAL(aColor.GetColor(), RGB_COLORDATA( 0xce, 0xce, 0xce ));
+ CPPUNIT_ASSERT_EQUAL(aColor, Color( 0xce, 0xce, 0xce ));
}
DECLARE_OOXMLEXPORT_TEST(testChartSize, "chart-size.docx")
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 6a22cff6f059..be1c5e2c6273 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -43,7 +43,7 @@ struct SwFillData;
class SwPortionHandler;
class SwScriptInfo;
-#define NON_PRINTING_CHARACTER_COLOR RGB_COLORDATA(0x26, 0x8b, 0xd2)
+#define NON_PRINTING_CHARACTER_COLOR Color(0x26, 0x8b, 0xd2)
/// Represents the visualization of a paragraph. Typical upper is an
/// SwBodyFrame. The first text portion of the first line is az SwParaPortion.
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index f692ff446eb0..e79c37e4564e 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -106,9 +106,9 @@
#include <vcl/BitmapTools.hxx>
-#define COL_NOTES_SIDEPANE RGB_COLORDATA(230,230,230)
-#define COL_NOTES_SIDEPANE_BORDER RGB_COLORDATA(200,200,200)
-#define COL_NOTES_SIDEPANE_SCROLLAREA RGB_COLORDATA(230,230,220)
+#define COL_NOTES_SIDEPANE Color(230,230,230)
+#define COL_NOTES_SIDEPANE_BORDER Color(200,200,200)
+#define COL_NOTES_SIDEPANE_SCROLLAREA Color(230,230,220)
using namespace ::editeng;
using namespace ::com::sun::star;
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index ef5e6be5086e..814d7fad91a4 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -941,7 +941,7 @@ void SwTextPaintInfo::DrawTab( const SwLinePortion &rPor ) const
const sal_Unicode cChar = GetTextFrame()->IsRightToLeft() ? CHAR_TAB_RTL : CHAR_TAB;
const sal_uInt8 nOptions = DRAW_SPECIAL_OPTIONS_CENTER | DRAW_SPECIAL_OPTIONS_ROTATE;
- lcl_DrawSpecial( *this, rPor, aRect, Color(NON_PRINTING_CHARACTER_COLOR), cChar, nOptions );
+ lcl_DrawSpecial( *this, rPor, aRect, NON_PRINTING_CHARACTER_COLOR, cChar, nOptions );
}
}
@@ -961,7 +961,7 @@ void SwTextPaintInfo::DrawLineBreak( const SwLinePortion &rPor ) const
CHAR_LINEBREAK_RTL : CHAR_LINEBREAK;
const sal_uInt8 nOptions = 0;
- lcl_DrawSpecial( *this, rPor, aRect, Color(NON_PRINTING_CHARACTER_COLOR), cChar, nOptions );
+ lcl_DrawSpecial( *this, rPor, aRect, NON_PRINTING_CHARACTER_COLOR, cChar, nOptions );
}
const_cast<SwLinePortion&>(rPor).Width( nOldWidth );
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 7b40379abb9d..40768a132e84 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1753,7 +1753,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
FontLineStyle aPreviousOverline = pTmpFont->GetOverline();
FontStrikeout aPreviousStrikeout = pTmpFont->GetStrikeout();
- pTmpFont->SetColor( Color(NON_PRINTING_CHARACTER_COLOR) );
+ pTmpFont->SetColor( NON_PRINTING_CHARACTER_COLOR );
pTmpFont->SetUnderline(LINESTYLE_NONE);
pTmpFont->SetOverline(LINESTYLE_NONE);
pTmpFont->SetStrikeout(STRIKEOUT_NONE);
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 073c0913480b..085e2ea6d75b 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4764,7 +4764,7 @@ void SwWW8Shade::SetShade(Color nFore, Color nBack, sal_uInt16 nIndex)
nGreen += aBackColor.GetGreen()* (1000 - nWW8BrushStyle);
nBlue += aBackColor.GetBlue() * (1000 - nWW8BrushStyle);
- aColor = RGB_COLORDATA( nRed/1000, nGreen/1000, nBlue/1000 );
+ aColor = Color( nRed/1000, nGreen/1000, nBlue/1000 );
}
break;
}
diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx
index f11f6fd564eb..9f88f2c111b3 100644
--- a/tools/source/generic/color.cxx
+++ b/tools/source/generic/color.cxx
@@ -142,7 +142,7 @@ void Color::RGBtoHSB( sal_uInt16& nHue, sal_uInt16& nSat, sal_uInt16& nBri ) con
}
}
-ColorData Color::HSBtoRGB( sal_uInt16 nHue, sal_uInt16 nSat, sal_uInt16 nBri )
+Color Color::HSBtoRGB( sal_uInt16 nHue, sal_uInt16 nSat, sal_uInt16 nBri )
{
sal_uInt8 cR=0,cG=0,cB=0;
sal_uInt8 nB = static_cast<sal_uInt8>( nBri * 255 / 100 );
@@ -180,7 +180,7 @@ ColorData Color::HSBtoRGB( sal_uInt16 nHue, sal_uInt16 nSat, sal_uInt16 nBri )
}
}
- return RGB_COLORDATA( cR, cG, cB );
+ return Color( cR, cG, cB );
}
SvStream& Color::Read( SvStream& rIStm )
@@ -220,7 +220,7 @@ SvStream& ReadColor( SvStream& rIStream, Color& rColor )
rIStream.ReadUInt16( nGreen );
rIStream.ReadUInt16( nBlue );
- rColor.mnColor = RGB_COLORDATA( nRed>>8, nGreen>>8, nBlue>>8 );
+ rColor = Color( nRed>>8, nGreen>>8, nBlue>>8 );
}
else
{
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index cb03680a4703..9ae6e19be328 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -260,7 +260,7 @@ void PdfExportTest::testTdf105461()
unsigned int nRed = 0, nGreen = 0, nBlue = 0, nAlpha = 0;
FPDFPath_GetFillColor(pPdfPageObject, &nRed, &nGreen, &nBlue, &nAlpha);
- if (RGB_COLORDATA(nRed, nGreen, nBlue) == COL_YELLOW)
+ if (Color(nRed, nGreen, nBlue) == COL_YELLOW)
++nYellowPathCount;
}
@@ -316,7 +316,7 @@ void PdfExportTest::testTdf107868()
unsigned int nRed = 0, nGreen = 0, nBlue = 0, nAlpha = 0;
FPDFPath_GetFillColor(pPdfPageObject, &nRed, &nGreen, &nBlue, &nAlpha);
- if (RGB_COLORDATA(nRed, nGreen, nBlue) == COL_WHITE)
+ if (Color(nRed, nGreen, nBlue) == COL_WHITE)
++nWhitePathCount;
}
@@ -713,7 +713,7 @@ void PdfExportTest::testTdf108963()
unsigned int nRed = 0, nGreen = 0, nBlue = 0, nAlpha = 0;
FPDFPath_GetFillColor(pPdfPageObject, &nRed, &nGreen, &nBlue, &nAlpha);
- if (RGB_COLORDATA(nRed, nGreen, nBlue) == COL_YELLOW)
+ if (Color(nRed, nGreen, nBlue) == COL_YELLOW)
{
++nYellowPathCount;
// The path described a yellow rectangle, but it was not rotated.
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index e7a614dbe50f..dde6470aeb08 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -381,7 +381,7 @@ public:
}
virtual Color ReadPixel() override
{
- const Color c = RGB_COLORDATA( pData[1], pData[2], pData[3] );
+ const Color c = Color( pData[1], pData[2], pData[3] );
pData += 4;
return c;
}
@@ -406,7 +406,7 @@ public:
}
virtual Color ReadPixel() override
{
- const Color c = RGB_COLORDATA( pData[2], pData[1], pData[0] );
+ const Color c = Color( pData[2], pData[1], pData[0] );
pData += 3;
return c;
}
@@ -434,7 +434,7 @@ public:
}
virtual Color ReadPixel() override
{
- const Color c = RGB_COLORDATA( (*pData & 0xf800) >> 8, (*pData & 0x07e0) >> 3 , (*pData & 0x001f) << 3 );
+ const Color c = Color( (*pData & 0xf800) >> 8, (*pData & 0x07e0) >> 3 , (*pData & 0x001f) << 3 );
pData++;
return c;
}
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 1284abaf79a7..20fa2c749fe5 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -542,8 +542,8 @@ ImplStyleData::ImplStyleData() :
meUseImagesInMenus = TRISTATE_INDET;
meContextMenuShortcuts = TRISTATE_INDET;
mnEdgeBlending = 35;
- maEdgeBlendingTopLeftColor = RGB_COLORDATA(0xC0, 0xC0, 0xC0);
- maEdgeBlendingBottomRightColor = RGB_COLORDATA(0x40, 0x40, 0x40);
+ maEdgeBlendingTopLeftColor = Color(0xC0, 0xC0, 0xC0);
+ maEdgeBlendingBottomRightColor = Color(0x40, 0x40, 0x40);
mnListBoxMaximumLineCount = 25;
mnColorValueSetColumnCount = 12;
mnColorValueSetMaximumRowCount = 10;
@@ -2234,7 +2234,7 @@ Color StyleSettings::GetFaceGradientColor() const
GetFaceColor().RGBtoHSB( h, s, b );
if( s > 1) s=1;
if( b < 98) b=98;
- return Color( Color::HSBtoRGB( h, s, b ) );
+ return Color::HSBtoRGB( h, s, b );
}
Color StyleSettings::GetSeparatorColor() const
@@ -2244,7 +2244,7 @@ Color StyleSettings::GetSeparatorColor() const
GetShadowColor().RGBtoHSB( h, s, b );
b += b/4;
s -= s/4;
- return Color( Color::HSBtoRGB( h, s, b ) );
+ return Color::HSBtoRGB( h, s, b );
}
void StyleSettings::CopyData()
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index 3041578f0cf9..51c83ba96505 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -153,11 +153,11 @@ void XMLGraphicsDefaultStyle::SetDefaults()
XMLPropertyByIndex(nStrokeIndex)))
{
sal_Int32 const nStroke(
- bIsAOO4 ? RGB_COLORDATA(128, 128, 128) : COL_BLACK);
+ bIsAOO4 ? Color(128, 128, 128) : COL_BLACK);
xDefaults->setPropertyValue("LineColor", makeAny(nStroke));
}
sal_Int32 const nFillColor( bIsAOO4
- ? RGB_COLORDATA(0xCF, 0xE7, 0xF5) : RGB_COLORDATA(153, 204, 255));
+ ? Color(0xCF, 0xE7, 0xF5) : Color(153, 204, 255));
sal_Int32 const nFillIndex(
pImpPrMap->GetEntryIndex(XML_NAMESPACE_DRAW, "fill-color", 0));
if (std::none_of(GetProperties().begin(), GetProperties().end(),
More information about the Libreoffice-commits
mailing list