diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-26 17:13:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-28 07:34:27 +0100 |
| commit | e2cb154195fdc2ffccdb6f5e87cae8b29640b3eb (patch) | |
| tree | 7c3d53d78e0867aa879b98d84211d1e73602520f /oox | |
| parent | 0ea41fea75cd1ac1d81fa57c4411e75a6b4001f0 (diff) | |
convert COL_ constants to be of type Color
Change-Id: I0e25c8950ac26b851ff42f71e1471fcbe4770d48
Reviewed-on: https://gerrit.libreoffice.org/50373
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 9cc62a072abc..e055ca52a87a 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1313,7 +1313,7 @@ void DrawingML::WritePattFill(const Reference<XPropertySet>& rXPropSet, const cs WriteColor(rHatch.Color); mpFS->endElementNS( XML_a , XML_fgClr ); - sal_uInt32 nColor = COL_WHITE; + ::Color nColor = COL_WHITE; sal_Int32 nAlpha = 0; bool isBackgroundFilled = false; @@ -1332,7 +1332,7 @@ void DrawingML::WritePattFill(const Reference<XPropertySet>& rXPropSet, const cs } mpFS->startElementNS( XML_a , XML_bgClr, FSEND ); - WriteColor(nColor, nAlpha); + WriteColor(sal_uInt32(nColor), nAlpha); mpFS->endElementNS( XML_a , XML_bgClr ); mpFS->endElementNS( XML_a , XML_pattFill ); @@ -1739,11 +1739,11 @@ void DrawingML::WriteRunProperties( const Reference< XPropertySet >& rRun, bool if( CGETAD( CharColor ) ) { sal_uInt32 color = *o3tl::doAccess<sal_uInt32>(mAny); - SAL_INFO("oox.shape", "run color: " << color << " auto: " << COL_AUTO); + SAL_INFO("oox.shape", "run color: " << color << " auto: " << sal_uInt32(COL_AUTO)); // tdf#104219 In LibreOffice and MS Office, there are two types of colors: // Automatic and Fixed. OOXML is setting automatic color, by not providing color. - if( color != COL_AUTO ) + if( color != sal_uInt32(COL_AUTO) ) { color &= 0xffffff; // TODO: special handle embossed/engraved @@ -1755,7 +1755,7 @@ void DrawingML::WriteRunProperties( const Reference< XPropertySet >& rRun, bool { sal_uInt32 color = *o3tl::doAccess<sal_uInt32>(mAny); // if color is automatic, then we shouldn't write information about color but to take color from character - if( color != COL_AUTO ) + if( color != sal_uInt32(COL_AUTO) ) { mpFS->startElementNS( XML_a, XML_uFill, FSEND); WriteSolidFill( color ); @@ -2196,7 +2196,7 @@ void DrawingML::WriteParagraphNumbering(const Reference< XPropertySet >& rXPropS { if(bHasBulletColor) { - if (nBulletColor == COL_AUTO ) + if (nBulletColor == sal_uInt32(COL_AUTO) ) { nBulletColor = mbIsBackgroundDark ? 0xffffff : 0x000000; } |