diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-05-13 11:58:23 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-05-16 14:56:59 +0200 |
| commit | b757369d4f8907ba4f53def7c5da54fd34fbd520 (patch) | |
| tree | 9de9cb87368c6ba6109b07171bbb56d6b824869f /vcl/inc/unx/salgdi.h | |
| parent | 54532d6a645cc1fbea22042e3c1a70a16d967adc (diff) | |
cairo svp: More build fixes.
Change-Id: I1f615c51f637a6e93afc8428c7ad8d869fa61637
Diffstat (limited to 'vcl/inc/unx/salgdi.h')
| -rw-r--r-- | vcl/inc/unx/salgdi.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 84f1e8ff14eb..8cb5e313b4d5 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -114,7 +114,7 @@ public: virtual void SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE; virtual void SetTextColor( SalColor nSalColor ) SAL_OVERRIDE; - virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE; + virtual void SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE; virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE; virtual const FontCharMapPtr GetFontCharMap() const SAL_OVERRIDE; virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE; @@ -216,11 +216,6 @@ public: virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, - SalColor nTransparentColor ) SAL_OVERRIDE; - - virtual void drawBitmap( - const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap, const SalBitmap& rMaskBitmap ) SAL_OVERRIDE; virtual void drawMask( |