diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-07 08:45:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-07 09:00:34 +0100 |
| commit | 856c57f20f9b07c686a854e0ccbb6ee3b0ee4791 (patch) | |
| tree | 1f7e1c4b49b20f02ddb464d7e58515af8ce150b1 /drawinglayer | |
| parent | a498b12dc1723b072a165f8c528c377024fd4c98 (diff) | |
use more Color in cppcanvas..drawinglayer
Change-Id: Ib0f15e8d4c01c1d2059cf32cc882042766d2a682
Reviewed-on: https://gerrit.libreoffice.org/50861
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/tools/wmfemfhelper.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx index adfbc4549e80..9f1d84c0aca8 100644 --- a/drawinglayer/source/tools/wmfemfhelper.cxx +++ b/drawinglayer/source/tools/wmfemfhelper.cxx @@ -2464,7 +2464,7 @@ namespace wmfemfhelper { /** SIMPLE, DONE */ const MetaTextColorAction* pA = static_cast<const MetaTextColorAction*>(pAction); - const bool bActivate(COL_TRANSPARENT != pA->GetColor().GetColor()); + const bool bActivate(COL_TRANSPARENT != pA->GetColor()); rPropertyHolders.Current().setTextColorActive(bActivate); rPropertyHolders.Current().setTextColor(pA->GetColor().getBColor()); @@ -2482,7 +2482,7 @@ namespace wmfemfhelper // emulate OutputDevice::SetTextFillColor(...) WITH argument const Color& rFontFillColor = pA->GetColor(); rPropertyHolders.Current().setTextFillColor(rFontFillColor.getBColor()); - rPropertyHolders.Current().setTextFillColorActive(COL_TRANSPARENT != rFontFillColor.GetColor()); + rPropertyHolders.Current().setTextFillColorActive(COL_TRANSPARENT != rFontFillColor); } else { @@ -2594,7 +2594,7 @@ namespace wmfemfhelper // older Metafiles have no MetaActionType::TEXTCOLOR which defines // the FontColor now, so use the Font's color when not transparent const Color& rFontColor = pA->GetFont().GetColor(); - const bool bActivate(COL_TRANSPARENT != rFontColor.GetColor()); + const bool bActivate(COL_TRANSPARENT != rFontColor); if(bActivate) { @@ -2611,7 +2611,7 @@ namespace wmfemfhelper { const Color& rFontFillColor = pA->GetFont().GetFillColor(); rPropertyHolders.Current().setTextFillColor(rFontFillColor.getBColor()); - rPropertyHolders.Current().setTextFillColorActive(COL_TRANSPARENT != rFontFillColor.GetColor()); + rPropertyHolders.Current().setTextFillColorActive(COL_TRANSPARENT != rFontFillColor); } else { |