diff options
Diffstat (limited to 'vcl/inc/unx/salgdi.h')
| -rw-r--r-- | vcl/inc/unx/salgdi.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 887039b6b1d3..dded647ab97d 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -91,7 +91,7 @@ public: const SalColormap& GetColormap() const { return *m_pColormap; } using SalGraphics::GetPixel; - inline Pixel GetPixel( SalColor nSalColor ) const; + inline Pixel GetPixel( Color nColor ) const; const SalX11Screen& GetScreenNumber() const { return m_nXScreen; } @@ -104,17 +104,17 @@ public: virtual bool setClipRegion( const vcl::Region& ) override; virtual void SetLineColor() override; - virtual void SetLineColor( SalColor nSalColor ) override; + virtual void SetLineColor( Color nColor ) override; virtual void SetFillColor() override; - virtual void SetFillColor( SalColor nSalColor ) override; + virtual void SetFillColor( Color nColor ) override; virtual void SetXORMode( bool bSet ) override; virtual void SetROPLineColor( SalROPColor nROPColor ) override; virtual void SetROPFillColor( SalROPColor nROPColor ) override; - virtual void SetTextColor( SalColor nSalColor ) override; + virtual void SetTextColor( Color nColor ) override; virtual void SetFont( const FontSelectPattern*, int nFallbackLevel ) override; virtual void GetFontMetric( ImplFontMetricDataRef&, int nFallbackLevel ) override; virtual const FontCharMapRef GetFontCharMap() const override; @@ -149,7 +149,7 @@ public: virtual bool supportsOperation( OutDevSupportType ) const override; virtual void drawPixel( long nX, long nY ) override; - virtual void drawPixel( long nX, long nY, SalColor nSalColor ) override; + virtual void drawPixel( long nX, long nY, Color nColor ) override; virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) override; virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) override; virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override; @@ -215,10 +215,10 @@ public: virtual void drawMask( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, - SalColor nMaskColor ) override; + Color nMaskColor ) override; virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) override; - virtual SalColor getPixel( long nX, long nY ) override; + virtual Color getPixel( long nX, long nY ) override; virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) override; virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override; @@ -305,7 +305,7 @@ public: protected: using SalGraphics::SetClipRegion; void SetClipRegion( GC pGC, Region pXReg = nullptr ) const; - bool GetDitherPixmap ( SalColor nSalColor ); + bool GetDitherPixmap ( Color nColor ); using SalGraphics::DrawBitmap; @@ -327,8 +327,8 @@ protected: Region mpClipRegion; #if ENABLE_CAIRO_CANVAS vcl::Region maClipRegion; - SalColor mnPenColor; - SalColor mnFillColor; + Color mnPenColor; + Color mnFillColor; #endif // ENABLE_CAIRO_CANVAS GC pFontGC_; // Font attributes @@ -356,8 +356,8 @@ inline const SalVisual& X11SalGraphics::GetVisual() const inline Display *X11SalGraphics::GetXDisplay() const { return GetColormap().GetXDisplay(); } -inline Pixel X11SalGraphics::GetPixel( SalColor nSalColor ) const -{ return GetColormap().GetPixel( nSalColor ); } +inline Pixel X11SalGraphics::GetPixel( Color nColor ) const +{ return GetColormap().GetPixel( nColor ); } #endif // INCLUDED_VCL_INC_UNX_SALGDI_H |