[Libreoffice-commits] core.git: include/svx reportdesign/source sd/qa sd/source svx/source sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Feb 21 08:16:54 UTC 2018
include/svx/xtable.hxx | 4 --
reportdesign/source/ui/report/ReportController.cxx | 2 -
sd/qa/unit/dialogs-test.cxx | 2 -
sd/source/core/anminfo.cxx | 4 +-
sd/source/core/drawdoc4.cxx | 30 ++++++++++-----------
sd/source/ui/func/fuoaprms.cxx | 2 -
svx/source/engine3d/view3d.cxx | 10 +++----
svx/source/svdraw/svdattr.cxx | 2 -
svx/source/xoutdev/xpool.cxx | 4 +-
svx/source/xoutdev/xtabgrdt.cxx | 12 ++++----
svx/source/xoutdev/xtabhtch.cxx | 6 ++--
svx/source/xoutdev/xtable.cxx | 8 -----
svx/source/xoutdev/xtabptrn.cxx | 8 ++---
sw/source/core/unocore/unoframe.cxx | 4 +-
14 files changed, 43 insertions(+), 55 deletions(-)
New commits:
commit 346db1dac29d63445049c14c6c3e022d419e388e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Feb 20 14:26:12 2018 +0200
RGB_Color method is unnecessary
it has exactly the same effect as just letting the constant be converted
to Color via the Color(ColorData) constructor.
This commit is part of the process of removing ColorData.
Change-Id: Ie12ad451ba3f43a627ebdbb132a5369f5760ba52
Reviewed-on: https://gerrit.libreoffice.org/50038
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 199aef66ebd9..76f93c18940e 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -43,10 +43,6 @@
#include <limits>
#include <memory>
-// function to convert in real RGB_Colours;
-// it can't be compared with enum COL_NAME
-SVX_DLLPUBLIC Color RGB_Color( ColorData nColorName );
-
class SVX_DLLPUBLIC XColorEntry : public XPropertyEntry
{
private:
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index eb01ee3810c4..1e71f487d053 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2353,7 +2353,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
const Graphic aNullGraphic;
const ::Color aNullLineCol(COL_DEFAULT_SHAPE_STROKE); // #i121448# Use defined default color
const ::Color aNullFillCol(COL_DEFAULT_SHAPE_FILLING); // #i121448# Use defined default color
- const XGradient aNullGrad(RGB_Color(COL_BLACK), RGB_Color(COL_WHITE));
+ const XGradient aNullGrad(COL_BLACK, COL_WHITE);
const XHatch aNullHatch(aNullLineCol);
std::vector<SfxPoolItem*> pDefaults
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 84eafc718c40..2f78adbc3c3d 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -518,7 +518,7 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID)
aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_TEXTEFFECT, sal_uInt16(presentation::AnimationEffect_NONE)));
aSet.InvalidateItem(ATTR_ANIMATION_SPEED);
aSet.Put(SfxBoolItem(ATTR_ANIMATION_FADEOUT, false));
- aSet.Put(SvxColorItem(RGB_Color(COL_LIGHTGRAY), ATTR_ANIMATION_COLOR));
+ aSet.Put(SvxColorItem(COL_LIGHTGRAY, ATTR_ANIMATION_COLOR));
aSet.Put(SfxBoolItem(ATTR_ANIMATION_INVISIBLE, false));
aSet.Put(SfxBoolItem(ATTR_ANIMATION_SOUNDON, false));
aSet.InvalidateItem(ATTR_ANIMATION_SOUNDFILE);
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx
index 9902d3dcc6fa..b3192a2e97cf 100644
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
@@ -52,8 +52,8 @@ SdAnimationInfo::SdAnimationInfo(SdrObject& rObject)
mnVerb (0),
mrObject (rObject)
{
- maBlueScreen = RGB_Color(COL_LIGHTMAGENTA);
- maDimColor = RGB_Color(COL_LIGHTGRAY);
+ maBlueScreen = COL_LIGHTMAGENTA;
+ maDimColor = COL_LIGHTGRAY;
}
SdAnimationInfo::SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rObject)
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 0772dbe74eb6..8b584df557da 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -139,17 +139,17 @@ void SdDrawDocument::CreateLayoutTemplates()
SfxItemSet& rISet = pSheet->GetItemSet();
::basegfx::B2DPolyPolygon aNullPolyPolygon;
- Color aNullCol(RGB_Color(COL_DEFAULT_SHAPE_STROKE));
+ Color aNullCol(COL_DEFAULT_SHAPE_STROKE);
XDash aNullDash;
- XGradient aNullGrad(aNullCol,RGB_Color(COL_WHITE));
+ XGradient aNullGrad(aNullCol,COL_WHITE);
aNullGrad.SetStartIntens( 100 );
aNullGrad.SetEndIntens( 100 );
XHatch aNullHatch(aNullCol);
// Line attributes (Extended OutputDevice)
rISet.Put(XLineStyleItem(drawing::LineStyle_SOLID));
- rISet.Put(XLineColorItem(OUString(), RGB_Color(COL_DEFAULT_SHAPE_STROKE)));
+ rISet.Put(XLineColorItem(OUString(), COL_DEFAULT_SHAPE_STROKE));
rISet.Put(XLineWidthItem(0));
rISet.Put(XLineDashItem(aNullDash));
rISet.Put(XLineStartItem(aNullPolyPolygon));
@@ -162,7 +162,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Fill attributes (Extended OutputDevice)
rISet.Put(XFillStyleItem(drawing::FillStyle_SOLID));
- rISet.Put(XFillColorItem(OUString(), RGB_Color(COL_DEFAULT_SHAPE_FILLING)));
+ rISet.Put(XFillColorItem(OUString(), COL_DEFAULT_SHAPE_FILLING));
rISet.Put( XFillGradientItem( aNullGrad) );
rISet.Put(XFillHatchItem(aNullHatch));
@@ -174,7 +174,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Shadow attributes (Drawing Engine)
rISet.Put(makeSdrShadowItem(false));
- rISet.Put(makeSdrShadowColorItem(RGB_Color(COL_GRAY)));
+ rISet.Put(makeSdrShadowColorItem(COL_GRAY));
rISet.Put(makeSdrShadowXDistItem(200)); // 3 mm Shadow distance
rISet.Put(makeSdrShadowYDistItem(200));
@@ -260,7 +260,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(XLineStyleItem(drawing::LineStyle_SOLID));
- pISet->Put(XLineColorItem(OUString(), RGB_Color(COL_BLACK)));
+ pISet->Put(XLineColorItem(OUString(), COL_BLACK));
pISet->Put(XLineWidthItem(150));
::basegfx::B2DPolygon aArrow;
@@ -282,7 +282,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(makeSdrShadowItem(true));
- pISet->Put(makeSdrShadowColorItem(RGB_Color(COL_GRAY)));
+ pISet->Put(makeSdrShadowColorItem(COL_GRAY));
pISet->Put(makeSdrShadowXDistItem(200)); // 3 mm shadow distance
pISet->Put(makeSdrShadowYDistItem(200));
@@ -294,7 +294,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
- pISet->Put(XLineColorItem(OUString(), RGB_Color(COL_BLACK)));
+ pISet->Put(XLineColorItem(OUString(), COL_BLACK));
// Object no fill no line
@@ -378,10 +378,10 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
pISet->Put(XFillStyleItem(drawing::FillStyle_SOLID));
- pISet->Put(XFillColorItem(OUString(), RGB_Color(COL_CYAN)));
+ pISet->Put(XFillColorItem(OUString(), COL_CYAN));
pISet->Put(makeSdrShadowItem(true));
- pISet->Put(makeSdrShadowColorItem(RGB_Color(COL_GRAY)));
+ pISet->Put(makeSdrShadowColorItem(COL_GRAY));
pISet->Put(makeSdrShadowXDistItem(200)); // 2 mm shadow distance
pISet->Put(makeSdrShadowYDistItem(200));
@@ -405,7 +405,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XFillColorItem(OUString(), aOrange4));
pISet->Put(makeSdrShadowItem(true));
- pISet->Put(makeSdrShadowColorItem(RGB_Color(COL_GRAY)));
+ pISet->Put(makeSdrShadowColorItem(COL_GRAY));
pISet->Put(makeSdrShadowXDistItem(200)); // 2 mm shadow distance
pISet->Put(makeSdrShadowYDistItem(200));
@@ -477,7 +477,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
- pISet->Put(XLineColorItem(OUString(), RGB_Color(COL_BLACK)));
+ pISet->Put(XLineColorItem(OUString(), COL_BLACK));
pISet->Put(SvxFontHeightItem(423, 100, EE_CHAR_FONTHEIGHT )); // 12 pt
@@ -544,15 +544,15 @@ void SdDrawDocument::CreateDefaultCellStyles()
pSheet->SetHelpId( OUString(), HID_SD_CELL_STYLE_DEFAULT );
SfxItemSet& rISet = pSheet->GetItemSet();
- Color aNullCol(RGB_Color(COL_BLACK));
+ Color aNullCol(COL_BLACK);
- XGradient aNullGrad(aNullCol,RGB_Color(COL_WHITE));
+ XGradient aNullGrad(aNullCol,COL_WHITE);
aNullGrad.SetStartIntens( 100 );
aNullGrad.SetEndIntens( 100 );
XHatch aNullHatch(aNullCol);
rISet.Put(XFillStyleItem(drawing::FillStyle_SOLID));
- rISet.Put(XFillColorItem(OUString(), RGB_Color(0x00ccccff)));
+ rISet.Put(XFillColorItem(OUString(), 0x00ccccff));
vcl::Font aLatinFont, aCJKFont, aCTLFont;
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 900fe8b7c1d1..5d9375a7862a 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -379,7 +379,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
else if (nFadeColorSet == ATTR_MIXED)
aSet.InvalidateItem(ATTR_ANIMATION_COLOR);
else
- aSet.Put(SvxColorItem(RGB_Color(COL_LIGHTGRAY), ATTR_ANIMATION_COLOR));
+ aSet.Put(SvxColorItem(COL_LIGHTGRAY, ATTR_ANIMATION_COLOR));
if (nInvisibleSet == ATTR_SET)
aSet.Put(SfxBoolItem(ATTR_ANIMATION_INVISIBLE, bInvisible));
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 70ef4953c5aa..33d051f23309 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -651,21 +651,21 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj)
{
const SfxItemSet& rSet = pObj->GetMergedItemSet();
const SvxColorItem& rTextColorItem = rSet.Get(EE_CHAR_COLOR);
- if(rTextColorItem.GetValue() == RGB_Color(COL_BLACK))
+ if(rTextColorItem.GetValue() == COL_BLACK)
{
//For black text objects, the color set to gray
if(pObj->GetPage())
{
// if black is only default attribute from
// pattern set it hard so that it is used in undo.
- pObj->SetMergedItem(SvxColorItem(RGB_Color(COL_BLACK), EE_CHAR_COLOR));
+ pObj->SetMergedItem(SvxColorItem(COL_BLACK, EE_CHAR_COLOR));
// add undo now
if( GetModel()->IsUndoEnabled() )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj));
}
- pObj->SetMergedItem(SvxColorItem(RGB_Color(COL_GRAY), EE_CHAR_COLOR));
+ pObj->SetMergedItem(SvxColorItem(COL_GRAY, EE_CHAR_COLOR));
}
}
}
@@ -1488,8 +1488,8 @@ void E3dView::ResetCreationActive ()
void E3dView::InitView ()
{
eDragConstraint = E3dDragConstraint::XYZ;
- aDefaultLightColor = RGB_Color(COL_WHITE);
- aDefaultAmbientColor = RGB_Color(COL_BLACK);
+ aDefaultLightColor = COL_WHITE;
+ aDefaultAmbientColor = COL_BLACK;
mpMirrorOverlay = nullptr;
}
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 639a81087bee..a2437a1a064d 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -109,7 +109,7 @@ SdrItemPool::SdrItemPool(
: XOutdevItemPool(_pMaster)
{
// prepare some constants
- const Color aNullCol(RGB_Color(COL_BLACK));
+ const Color aNullCol(COL_BLACK);
const sal_Int32 nDefEdgeDist(500); // Defaulting hard for Draw (100TH_MM) currently. MapMode will have to be taken into account in the future.
// init the non-persistent items
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 27e39b87b221..7b8d75c3009a 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -38,9 +38,9 @@ XOutdevItemPool::XOutdevItemPool(SfxItemPool* _pMaster)
const basegfx::B2DPolyPolygon aNullPol;
const Color aNullLineCol(COL_DEFAULT_SHAPE_STROKE); // #i121448# Use defined default color
const Color aNullFillCol(COL_DEFAULT_SHAPE_FILLING); // #i121448# Use defined default color
- const Color aNullShadowCol(RGB_Color(COL_LIGHTGRAY));
+ const Color aNullShadowCol(COL_LIGHTGRAY);
const XDash aNullDash;
- const XGradient aNullGrad(RGB_Color(COL_BLACK), RGB_Color(COL_WHITE));
+ const XGradient aNullGrad(COL_BLACK, COL_WHITE);
const XHatch aNullHatch(aNullLineCol);
// get master pointer, evtl. add myself to the end of the pools
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index c068547c4c01..5bf0e3e96646 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -68,17 +68,17 @@ bool XGradientList::Create()
rtl::OUStringBuffer aStr(SvxResId(RID_SVXSTR_GRADIENT));
aStr.append(" 1");
sal_Int32 nLen = aStr.getLength() - 1;
- Insert(o3tl::make_unique<XGradientEntry>(XGradient(RGB_Color(COL_BLACK ),RGB_Color(COL_WHITE ),css::awt::GradientStyle_LINEAR , 0,10,10, 0,100,100),aStr.toString()));
+ Insert(o3tl::make_unique<XGradientEntry>(XGradient(COL_BLACK, COL_WHITE, css::awt::GradientStyle_LINEAR , 0,10,10, 0,100,100),aStr.toString()));
aStr[nLen] = '2';
- Insert(o3tl::make_unique<XGradientEntry>(XGradient(RGB_Color(COL_BLUE ),RGB_Color(COL_RED ),css::awt::GradientStyle_AXIAL , 300,20,20,10,100,100),aStr.toString()));
+ Insert(o3tl::make_unique<XGradientEntry>(XGradient(COL_BLUE, COL_RED, css::awt::GradientStyle_AXIAL , 300,20,20,10,100,100),aStr.toString()));
aStr[nLen] = '3';
- Insert(o3tl::make_unique<XGradientEntry>(XGradient(RGB_Color(COL_RED ),RGB_Color(COL_YELLOW ),css::awt::GradientStyle_RADIAL , 600,30,30,20,100,100),aStr.toString()));
+ Insert(o3tl::make_unique<XGradientEntry>(XGradient(COL_RED, COL_YELLOW,css::awt::GradientStyle_RADIAL , 600,30,30,20,100,100),aStr.toString()));
aStr[nLen] = '4';
- Insert(o3tl::make_unique<XGradientEntry>(XGradient(RGB_Color(COL_YELLOW ),RGB_Color(COL_GREEN ),css::awt::GradientStyle_ELLIPTICAL, 900,40,40,30,100,100),aStr.toString()));
+ Insert(o3tl::make_unique<XGradientEntry>(XGradient(COL_YELLOW , COL_GREEN, css::awt::GradientStyle_ELLIPTICAL, 900,40,40,30,100,100),aStr.toString()));
aStr[nLen] = '5';
- Insert(o3tl::make_unique<XGradientEntry>(XGradient(RGB_Color(COL_GREEN ),RGB_Color(COL_MAGENTA),css::awt::GradientStyle_SQUARE , 1200,50,50,40,100,100),aStr.toString()));
+ Insert(o3tl::make_unique<XGradientEntry>(XGradient(COL_GREEN , COL_MAGENTA,css::awt::GradientStyle_SQUARE , 1200,50,50,40,100,100),aStr.toString()));
aStr[nLen] = '6';
- Insert(o3tl::make_unique<XGradientEntry>(XGradient(RGB_Color(COL_MAGENTA),RGB_Color(COL_YELLOW ),css::awt::GradientStyle_RECT , 1900,60,60,50,100,100),aStr.toString()));
+ Insert(o3tl::make_unique<XGradientEntry>(XGradient(COL_MAGENTA, COL_YELLOW ,css::awt::GradientStyle_RECT , 1900,60,60,50,100,100),aStr.toString()));
return true;
}
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 788f80e328a1..b808a275dc65 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -67,11 +67,11 @@ bool XHatchList::Create()
aStr.append(" 1");
sal_Int32 nLen = aStr.getLength() - 1;
- Insert(o3tl::make_unique<XHatchEntry>(XHatch(RGB_Color(COL_BLACK),css::drawing::HatchStyle_SINGLE,100, 0),aStr.toString()));
+ Insert(o3tl::make_unique<XHatchEntry>(XHatch(COL_BLACK,css::drawing::HatchStyle_SINGLE,100, 0),aStr.toString()));
aStr[nLen] = '2';
- Insert(o3tl::make_unique<XHatchEntry>(XHatch(RGB_Color(COL_RED ),css::drawing::HatchStyle_DOUBLE, 80,450),aStr.toString()));
+ Insert(o3tl::make_unique<XHatchEntry>(XHatch(COL_RED ,css::drawing::HatchStyle_DOUBLE, 80,450),aStr.toString()));
aStr[nLen] = '3';
- Insert(o3tl::make_unique<XHatchEntry>(XHatch(RGB_Color(COL_BLUE ),css::drawing::HatchStyle_TRIPLE,120, 0),aStr.toString()));
+ Insert(o3tl::make_unique<XHatchEntry>(XHatch(COL_BLUE ,css::drawing::HatchStyle_TRIPLE,120, 0),aStr.toString()));
return true;
}
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index b77c250e9553..746ece2fa2dc 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -31,14 +31,6 @@
using namespace com::sun::star;
-// Helper for other sub-classes to have easy-to-read constructors
-Color RGB_Color( ColorData nColorName )
-{
- Color aColor( nColorName );
- Color aRGBColor( aColor.GetRed(), aColor.GetGreen(), aColor.GetBlue() );
- return aRGBColor;
-}
-
XColorEntry::XColorEntry(const Color& rColor, const OUString& rName)
: XPropertyEntry(rName),
aColor(rColor)
diff --git a/svx/source/xoutdev/xtabptrn.cxx b/svx/source/xoutdev/xtabptrn.cxx
index a42be9e1e6b5..ff9fc20f3471 100644
--- a/svx/source/xoutdev/xtabptrn.cxx
+++ b/svx/source/xoutdev/xtabptrn.cxx
@@ -56,28 +56,28 @@ bool XPatternList::Create()
// white/white bitmap
aStr.append(" 1");
- aBitmap = createHistorical8x8FromArray(aArray, RGB_Color(COL_WHITE), RGB_Color(COL_WHITE));
+ aBitmap = createHistorical8x8FromArray(aArray, COL_WHITE, COL_WHITE);
Insert(o3tl::make_unique<XBitmapEntry>(Graphic(aBitmap), aStr.toString()));
// black/white bitmap
aArray[ 0] = 1; aArray[ 9] = 1; aArray[18] = 1; aArray[27] = 1;
aArray[36] = 1; aArray[45] = 1; aArray[54] = 1; aArray[63] = 1;
aStr[nLen] = '2';
- aBitmap = createHistorical8x8FromArray(aArray, RGB_Color(COL_BLACK), RGB_Color(COL_WHITE));
+ aBitmap = createHistorical8x8FromArray(aArray, COL_BLACK, COL_WHITE);
Insert(o3tl::make_unique<XBitmapEntry>(Graphic(aBitmap), aStr.toString()));
// lightred/white bitmap
aArray[ 7] = 1; aArray[14] = 1; aArray[21] = 1; aArray[28] = 1;
aArray[35] = 1; aArray[42] = 1; aArray[49] = 1; aArray[56] = 1;
aStr[nLen] = '3';
- aBitmap = createHistorical8x8FromArray(aArray, RGB_Color(COL_LIGHTRED), RGB_Color(COL_WHITE));
+ aBitmap = createHistorical8x8FromArray(aArray, COL_LIGHTRED, COL_WHITE);
Insert(o3tl::make_unique<XBitmapEntry>(Graphic(aBitmap), aStr.toString()));
// lightblue/white bitmap
aArray[24] = 1; aArray[25] = 1; aArray[26] = 1;
aArray[29] = 1; aArray[30] = 1; aArray[31] = 1;
aStr[nLen] = '4';
- aBitmap = createHistorical8x8FromArray(aArray, RGB_Color(COL_LIGHTBLUE), RGB_Color(COL_WHITE));
+ aBitmap = createHistorical8x8FromArray(aArray, COL_LIGHTBLUE, COL_WHITE);
Insert(o3tl::make_unique<XBitmapEntry>(Graphic(aBitmap), aStr.toString()));
return true;
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 0ab6c8c26aa1..c576e2ffc459 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -384,7 +384,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
{
if(pXFillGradientItem)
{
- const XGradient aNullGrad(RGB_Color(COL_BLACK), RGB_Color(COL_WHITE));
+ const XGradient aNullGrad(COL_BLACK, COL_WHITE);
XFillGradientItem aXFillGradientItem(aNullGrad);
aXFillGradientItem.PutValue(*pXFillGradientItem, MID_FILLGRADIENT);
@@ -535,7 +535,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
{
if(pXFillFloatTransparenceItem)
{
- const XGradient aNullGrad(RGB_Color(COL_BLACK), RGB_Color(COL_WHITE));
+ const XGradient aNullGrad(COL_BLACK, COL_WHITE);
XFillFloatTransparenceItem aXFillFloatTransparenceItem(aNullGrad, false);
aXFillFloatTransparenceItem.PutValue(*pXFillFloatTransparenceItem, MID_FILLGRADIENT);
More information about the Libreoffice-commits
mailing list