summaryrefslogtreecommitdiff
path: root/vcl/unx/generic/gdi/cairotextrender.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-03-14 11:11:02 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-03-26 08:44:50 +0200
commitbea081b5099786e5fcadddd72c247b9a9488286a (patch)
treedd165f81e850cb9bcfa23b713bd60e3fb26d21ee /vcl/unx/generic/gdi/cairotextrender.cxx
parenta488c7ad2763b944713997911c1ddb0315d8c93f (diff)
replace SalColor with Color
Change-Id: I615640a378a61cf6e44e84a647ce06bdd8a52807 Reviewed-on: https://gerrit.libreoffice.org/51239 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/unx/generic/gdi/cairotextrender.cxx')
-rw-r--r--vcl/unx/generic/gdi/cairotextrender.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 449b6c080831..7febf686e9fd 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -76,7 +76,7 @@ CairoFontsCache::LRUFonts CairoFontsCache::maLRUFonts;
}
CairoTextRender::CairoTextRender()
- : mnTextColor(MAKE_SALCOLOR(0x00, 0x00, 0x00)) //black
+ : mnTextColor(Color(0x00, 0x00, 0x00)) //black
{
for(FreetypeFont* & rp : mpFreetypeFont)
rp = nullptr;
@@ -209,9 +209,9 @@ void CairoTextRender::DrawTextLayout(const CommonSalLayout& rLayout)
clipRegion(cr);
cairo_set_source_rgb(cr,
- SALCOLOR_RED(mnTextColor)/255.0,
- SALCOLOR_GREEN(mnTextColor)/255.0,
- SALCOLOR_BLUE(mnTextColor)/255.0);
+ mnTextColor.GetRed()/255.0,
+ mnTextColor.GetGreen()/255.0,
+ mnTextColor.GetBlue()/255.0);
FT_Face aFace = rFont.GetFtFace();
CairoFontsCache::CacheId aId;
@@ -339,11 +339,11 @@ void CairoTextRender::SetFont( const FontSelectPattern *pEntry, int nFallbackLev
}
void
-CairoTextRender::SetTextColor( SalColor nSalColor )
+CairoTextRender::SetTextColor( Color nColor )
{
- if( mnTextColor != nSalColor )
+ if( mnTextColor != nColor )
{
- mnTextColor = nSalColor;
+ mnTextColor = nColor;
}
}