diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-20 14:57:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-21 06:05:28 +0100 |
| commit | bcb1e01c32e09d9abeb91b73303f2eb6b3b5abfe (patch) | |
| tree | f252d97b5b6172bad53ff4efd454129b81678d04 /filter | |
| parent | 924c0e34fdc36cd44100dafc2c68656ce32374e6 (diff) | |
ColorData->Color in filter
Change-Id: I19675b635d8428a78c9e64b775cc7a2b82c5f84e
Reviewed-on: https://gerrit.libreoffice.org/50039
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/util.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 5aa4bb35bc75..376eee8c7d03 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5630,7 +5630,7 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_, SvStream* pStData_, SdrModel* pSdrModel_,// see SetModel() below long nApplicationScale, - ColorData mnDefaultColor_, + Color mnDefaultColor_, SvStream* pStData2_, bool bSkipImages ) :DffPropertyReader( *this ), diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index 86d31971ad75..bcc877a40957 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -1318,7 +1318,7 @@ sal_uInt8 TransColToIco( const Color& rCol ) case COL_AUTO: nCol = 0; break; default: - static const ColorData aColArr[ 16 ] = { + static const Color aColArr[ 16 ] = { COL_BLACK, COL_LIGHTBLUE, COL_LIGHTCYAN, COL_LIGHTGREEN, COL_LIGHTMAGENTA,COL_LIGHTRED, COL_YELLOW, COL_WHITE, COL_BLUE, COL_CYAN, COL_GREEN, COL_MAGENTA, |