diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-20 15:22:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-21 06:05:41 +0100 |
| commit | 72593849bb644684a8c00f70a3f18bcfabca737f (patch) | |
| tree | 6325d6a52bce0f0539dde6fee53aa7fd792e8eb2 /svtools | |
| parent | bcb1e01c32e09d9abeb91b73303f2eb6b3b5abfe (diff) | |
ColorData->Color in sd..svx
Change-Id: I70de56b6bfb1ea4655ec03510fad92bf6645f64e
Reviewed-on: https://gerrit.libreoffice.org/50046
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/config/colorcfg.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/edit/editsyntaxhighlighter.cxx | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index c7be767896a3..de54a88c64d7 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -262,7 +262,7 @@ void ColorConfig_Impl::ImplCommit() { pPropValues[nIndex].Name = pColorNames[nIndex]; //save automatic colors as void value - if(COL_AUTO != sal::static_int_cast<ColorData>(m_aConfigValues[i].nColor)) + if(m_aConfigValues[i].nColor != COL_AUTO) pPropValues[nIndex].Value <<= m_aConfigValues[i].nColor; nIndex++; @@ -353,7 +353,7 @@ void ColorConfig_Impl::ImplUpdateApplicationSettings() StyleSettings aStyleSettings( aSettings.GetStyleSettings() ); ColorConfigValue aRet = GetColorConfigValue(svtools::FONTCOLOR); - if(COL_AUTO == sal::static_int_cast<ColorData>(aRet.nColor)) + if(aRet.nColor == COL_AUTO) aRet.nColor = ColorConfig::GetDefaultColor(svtools::FONTCOLOR).GetColor(); Color aFontColor(aRet.nColor); @@ -490,7 +490,7 @@ ColorConfigValue ColorConfig::GetColorValue(ColorConfigEntry eEntry, bool bSmart if (bSmart) { - if(COL_AUTO == sal::static_int_cast<ColorData>(aRet.nColor)) + if(aRet.nColor == COL_AUTO) aRet.nColor = ColorConfig::GetDefaultColor(eEntry).GetColor(); } diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx index 004cecdd18f5..99c1fde4c4ea 100644 --- a/svtools/source/edit/editsyntaxhighlighter.cxx +++ b/svtools/source/edit/editsyntaxhighlighter.cxx @@ -124,13 +124,13 @@ Color MultiLineEditSyntaxHighlight::GetColorValue(TokenType aToken) { switch (aToken) { - case TokenType::Identifier: aColor = static_cast<ColorData>(m_aColorConfig.GetColorValue(svtools::SQLIDENTIFIER).nColor); break; - case TokenType::Number: aColor = static_cast<ColorData>(m_aColorConfig.GetColorValue(svtools::SQLNUMBER).nColor); break; - case TokenType::String: aColor = static_cast<ColorData>(m_aColorConfig.GetColorValue(svtools::SQLSTRING).nColor); break; - case TokenType::Operator: aColor = static_cast<ColorData>(m_aColorConfig.GetColorValue(svtools::SQLOPERATOR).nColor); break; - case TokenType::Keywords: aColor = static_cast<ColorData>(m_aColorConfig.GetColorValue(svtools::SQLKEYWORD).nColor); break; - case TokenType::Parameter: aColor = static_cast<ColorData>(m_aColorConfig.GetColorValue(svtools::SQLPARAMETER).nColor); break; - case TokenType::Comment: aColor = static_cast<ColorData>(m_aColorConfig.GetColorValue(svtools::SQLCOMMENT).nColor); break; + case TokenType::Identifier: aColor = m_aColorConfig.GetColorValue(svtools::SQLIDENTIFIER).nColor; break; + case TokenType::Number: aColor = m_aColorConfig.GetColorValue(svtools::SQLNUMBER).nColor; break; + case TokenType::String: aColor = m_aColorConfig.GetColorValue(svtools::SQLSTRING).nColor; break; + case TokenType::Operator: aColor = m_aColorConfig.GetColorValue(svtools::SQLOPERATOR).nColor; break; + case TokenType::Keywords: aColor = m_aColorConfig.GetColorValue(svtools::SQLKEYWORD).nColor; break; + case TokenType::Parameter: aColor = m_aColorConfig.GetColorValue(svtools::SQLPARAMETER).nColor; break; + case TokenType::Comment: aColor = m_aColorConfig.GetColorValue(svtools::SQLCOMMENT).nColor; break; default: aColor = Color(0,0,0); } break; |