diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2018-12-05 01:23:17 +0100 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2018-12-05 18:58:58 +0100 |
| commit | 708da2a6342a58fe379217064848c1c311216f05 (patch) | |
| tree | 34de7b9a6cd1af376201c4f19ef69acb3d895990 /vcl/unx/generic | |
| parent | 07b098c126cdd01a2ce4335aeb4e1dad134c7f32 (diff) | |
tdf#121719: Revert fix for tdf#96971
it's still used on Mac. Revert it until XOL is removed
This reverts 258301879bcd20397c38bbd522dea2c923bd9fc2
This also includes https://gerrit.libreoffice.org/#/c/64596/
Thanks Stephan
Change-Id: I06548a590f370618ad640724a1b9c59a3faceec2
Reviewed-on: https://gerrit.libreoffice.org/64582
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit be504e8c7ef06637f055c43ad350381377df1e90)
Reviewed-on: https://gerrit.libreoffice.org/64631
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/gdi/gdiimpl.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/gdiimpl.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/salgdi.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/generic/print/genpspgraphics.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx index 7e2b412b55de..e0a4879ff6fb 100644 --- a/vcl/unx/generic/gdi/gdiimpl.cxx +++ b/vcl/unx/generic/gdi/gdiimpl.cxx @@ -1165,7 +1165,7 @@ void X11SalGraphicsImpl::SetROPFillColor( SalROPColor nROPColor ) mbBrushGC = false; } -void X11SalGraphicsImpl::SetXORMode( bool bSet ) +void X11SalGraphicsImpl::SetXORMode( bool bSet, bool ) { if (mbXORMode != bSet) { diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx index 0ea0e2958a03..282b9a29a8d9 100644 --- a/vcl/unx/generic/gdi/gdiimpl.hxx +++ b/vcl/unx/generic/gdi/gdiimpl.hxx @@ -141,7 +141,7 @@ public: virtual void SetFillColor( Color nColor ) override; // enable/disable XOR drawing - virtual void SetXORMode( bool bSet ) override; + virtual void SetXORMode( bool bSet, bool bInvertOnly ) override; // set line color for raster operations virtual void SetROPLineColor( SalROPColor nROPColor ) override; diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index d2b92d8623b8..1af613902663 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -411,9 +411,9 @@ void X11SalGraphics::SetROPFillColor( SalROPColor nROPColor ) mxImpl->SetROPFillColor( nROPColor ); } -void X11SalGraphics::SetXORMode( bool bSet ) +void X11SalGraphics::SetXORMode( bool bSet, bool bInvertOnly ) { - mxImpl->SetXORMode( bSet ); + mxImpl->SetXORMode( bSet, bInvertOnly ); } void X11SalGraphics::drawPixel( long nX, long nY ) diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 3043d99e01be..e40b9fd5cc82 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -359,7 +359,7 @@ void GenPspGraphics::SetROPFillColor( SalROPColor ) SAL_WARN( "vcl", "Error: PrinterGfx::SetROPFillColor() not implemented" ); } -void GenPspGraphics::SetXORMode( bool bSet ) +void GenPspGraphics::SetXORMode( bool bSet, bool ) { SAL_WARN_IF( bSet, "vcl", "Error: PrinterGfx::SetXORMode() not implemented" ); } |