diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-02 11:43:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-05 07:35:01 +0100 |
| commit | 61d79dd740958186c4a4344e18eaeb5b2c139c91 (patch) | |
| tree | abea71a038352572871ea1fb2a9c40d2f196ddd6 /oox/source/drawingml/clrscheme.cxx | |
| parent | 04c9cb68dffa2af15661cc35bc61032b036ed2cd (diff) | |
use more Color in oox
Change-Id: I8fdc6742de5af9101e246411e7208650bae2c4c7
Reviewed-on: https://gerrit.libreoffice.org/50617
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox/source/drawingml/clrscheme.cxx')
| -rw-r--r-- | oox/source/drawingml/clrscheme.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/drawingml/clrscheme.cxx b/oox/source/drawingml/clrscheme.cxx index 0c6517abfbc3..8e2272f0039b 100644 --- a/oox/source/drawingml/clrscheme.cxx +++ b/oox/source/drawingml/clrscheme.cxx @@ -52,7 +52,7 @@ struct find_by_token { } - bool operator()(const std::pair<sal_Int32, sal_Int32>& r) + bool operator()(const std::pair<sal_Int32, ::Color>& r) { return r.first == m_token; } @@ -61,7 +61,7 @@ private: sal_Int32 m_token; }; -bool ClrScheme::getColor( sal_Int32 nSchemeClrToken, sal_Int32& rColor ) const +bool ClrScheme::getColor( sal_Int32 nSchemeClrToken, ::Color& rColor ) const { OSL_ASSERT((nSchemeClrToken & sal_Int32(0xFFFF0000))==0); switch( nSchemeClrToken ) @@ -80,7 +80,7 @@ bool ClrScheme::getColor( sal_Int32 nSchemeClrToken, sal_Int32& rColor ) const return aIter != maClrScheme.end(); } -void ClrScheme::setColor( sal_Int32 nSchemeClrToken, sal_Int32 nColor ) +void ClrScheme::setColor( sal_Int32 nSchemeClrToken, ::Color nColor ) { const auto aIter = std::find_if(maClrScheme.begin(), maClrScheme.end(), find_by_token(nSchemeClrToken) ); if ( aIter != maClrScheme.end() ) @@ -89,7 +89,7 @@ void ClrScheme::setColor( sal_Int32 nSchemeClrToken, sal_Int32 nColor ) maClrScheme.emplace_back(nSchemeClrToken, nColor); } -bool ClrScheme::getColorByIndex(size_t nIndex, sal_Int32& rColor) const +bool ClrScheme::getColorByIndex(size_t nIndex, ::Color& rColor) const { if (nIndex >= maClrScheme.size()) return false; |