Kaydet (Commit) b3c6f276 authored tarafından Chris Sherlock's avatar Chris Sherlock

vcl: CairoTextRender::nTextColor_ to mnTextColor

Change-Id: Ia53dc393e4284989f6e967c4fa42e7ba6fc58183
üst 49a6d015
...@@ -73,7 +73,7 @@ class CairoTextRender : public TextRenderImpl ...@@ -73,7 +73,7 @@ class CairoTextRender : public TextRenderImpl
bool mbPrinter; bool mbPrinter;
ServerFont* mpServerFont[ MAX_FALLBACK ]; ServerFont* mpServerFont[ MAX_FALLBACK ];
SalColor nTextColor_; SalColor mnTextColor;
CairoFontsCache m_aCairoFontsCache; CairoFontsCache m_aCairoFontsCache;
bool bDisableGraphite_; bool bDisableGraphite_;
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
CairoTextRender::CairoTextRender(bool bPrinter): CairoTextRender::CairoTextRender(bool bPrinter):
mbPrinter(bPrinter), mbPrinter(bPrinter),
nTextColor_(MAKE_SALCOLOR(0x00, 0x00, 0x00)) //black mnTextColor(MAKE_SALCOLOR(0x00, 0x00, 0x00)) //black
{ {
for( int i = 0; i < MAX_FALLBACK; ++i ) for( int i = 0; i < MAX_FALLBACK; ++i )
mpServerFont[i] = NULL; mpServerFont[i] = NULL;
...@@ -229,9 +229,9 @@ void CairoTextRender::DrawServerFontLayout( const ServerFontLayout& rLayout ) ...@@ -229,9 +229,9 @@ void CairoTextRender::DrawServerFontLayout( const ServerFontLayout& rLayout )
clipRegion(cr); clipRegion(cr);
cairo_set_source_rgb(cr, cairo_set_source_rgb(cr,
SALCOLOR_RED(nTextColor_)/255.0, SALCOLOR_RED(mnTextColor)/255.0,
SALCOLOR_GREEN(nTextColor_)/255.0, SALCOLOR_GREEN(mnTextColor)/255.0,
SALCOLOR_BLUE(nTextColor_)/255.0); SALCOLOR_BLUE(mnTextColor)/255.0);
ServerFont& rFont = rLayout.GetServerFont(); ServerFont& rFont = rLayout.GetServerFont();
...@@ -380,9 +380,9 @@ sal_uInt16 CairoTextRender::SetFont( FontSelectPattern *pEntry, int nFallbackLev ...@@ -380,9 +380,9 @@ sal_uInt16 CairoTextRender::SetFont( FontSelectPattern *pEntry, int nFallbackLev
void void
CairoTextRender::SetTextColor( SalColor nSalColor ) CairoTextRender::SetTextColor( SalColor nSalColor )
{ {
if( nTextColor_ != nSalColor ) if( mnTextColor != nSalColor )
{ {
nTextColor_ = nSalColor; mnTextColor = nSalColor;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment