diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-06 10:34:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-06 11:50:16 +0100 |
| commit | f02b1ba18deeab9744c5fe25162f5853d69b438e (patch) | |
| tree | d770d9dd6fb7a52e125ce221987bfba12c70ce15 /xmloff/source/style/xmlnumi.cxx | |
| parent | d15ff312ad80e4d1f210636e3374a81c14c229a2 (diff) | |
use more Color in xmloff
Change-Id: Iec12d2e9f3e254dc6525dc285259321b13f75c4a
Reviewed-on: https://gerrit.libreoffice.org/50794
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff/source/style/xmlnumi.cxx')
| -rw-r--r-- | xmloff/source/style/xmlnumi.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 7c0a4665b611..42ccda81d3ea 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -37,6 +37,7 @@ #include <osl/diagnose.h> #include <tools/fontenum.hxx> +#include <tools/color.hxx> #include <sax/tools/converter.hxx> @@ -174,7 +175,7 @@ class SvxXMLListLevelStyleContext_Impl : public SvXMLImportContext sal_Unicode cBullet; sal_Int16 nRelSize; - sal_Int32 m_nColor; + Color m_nColor; sal_Int16 ePosAndSpaceMode; sal_Int16 eLabelFollowedBy; @@ -188,7 +189,7 @@ class SvxXMLListLevelStyleContext_Impl : public SvXMLImportContext bool bHasColor : 1; void SetRelSize( sal_Int16 nRel ) { nRelSize = nRel; } - void SetColor( sal_Int32 nColor ) + void SetColor( Color nColor ) { m_nColor = nColor; bHasColor = true; } void SetSpaceBefore( sal_Int32 nSet ) { nSpaceBefore = nSet; } void SetMinLabelWidth( sal_Int32 nSet ) { nMinLabelWidth = nSet; } @@ -738,14 +739,14 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl( sal_Int32 nColor(0); if (::sax::Converter::convertColor( nColor, rValue )) { - rListLevel.SetColor( nColor ); + rListLevel.SetColor( Color(nColor) ); } } break; case XML_TOK_STYLE_ATTRIBUTES_ATTR_WINDOW_FONT_COLOR: { if( IsXMLToken( rValue, XML_TRUE ) ) - rListLevel.SetColor( sal_Int32(0xffffffff) ); + rListLevel.SetColor( Color(0xffffffff) ); } break; case XML_TOK_STYLE_ATTRIBUTES_ATTR_FONT_SIZE: |