diff options
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, |