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/quartz | |
| 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/quartz')
| -rw-r--r-- | vcl/quartz/salgdicommon.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index 6d66c7e7556c..2e22d6077a2e 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -1816,7 +1816,7 @@ void AquaSalGraphics::SetROPLineColor( SalROPColor nROPColor ) } } -void AquaSalGraphics::SetXORMode( bool bSet ) +void AquaSalGraphics::SetXORMode( bool bSet, bool bInvertOnly ) { // return early if XOR mode remains unchanged if( mbPrinter ) @@ -1829,7 +1829,7 @@ void AquaSalGraphics::SetXORMode( bool bSet ) mnXorMode = 0; return; } - else if( bSet && mnXorMode == 0) + else if( bSet && bInvertOnly && mnXorMode == 0) { CGContextSetBlendMode( mrContext, kCGBlendModeDifference ); mnXorMode = 2; |