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>
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index ec01ec5..1c310a2 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -667,7 +667,7 @@
m_aFillColor = nColor;
}
void SvpSalGraphics::SetXORMode(bool bSet )
void SvpSalGraphics::SetXORMode(bool bSet, bool )
{
m_ePaintMode = bSet ? PaintMode::Xor : PaintMode::Over;
}
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 8546387..9ba2843 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -163,7 +163,7 @@
virtual void SetFillColor() override;
virtual void SetFillColor( Color nColor ) override;
virtual void SetXORMode( bool bSet ) override;
virtual void SetXORMode( bool bSet, bool ) override;
virtual void SetROPLineColor( SalROPColor nROPColor ) override;
virtual void SetROPFillColor( SalROPColor nROPColor ) override;
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index bc19dcd..132a643 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -228,7 +228,7 @@
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/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index 480f2f4..9430be9 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
@@ -168,7 +168,7 @@
virtual void SetLineColor(Color nColor) override;
virtual void SetFillColor() override;
virtual void SetFillColor(Color nColor) override;
virtual void SetXORMode(bool bSet) override;
virtual void SetXORMode(bool bSet, bool bInvertOnly) override;
virtual void SetROPLineColor(SalROPColor nROPColor) override;
virtual void SetROPFillColor(SalROPColor nROPColor) override;
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index b79bf44..cacf56d 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -320,7 +320,7 @@
// filled accordingly
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;
// set fill color for raster operations
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index b09f3223..c8108c9 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -113,7 +113,7 @@
virtual void SetFillColor( Color nColor ) = 0;
// enable/disable XOR drawing
virtual void SetXORMode( bool bSet ) = 0;
virtual void SetXORMode( bool bSet, bool bInvertOnly ) = 0;
// set line color for raster operations
virtual void SetROPLineColor( SalROPColor nROPColor ) = 0;
diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx
index d4023bd..a6dc4a8 100644
--- a/vcl/inc/salgdiimpl.hxx
+++ b/vcl/inc/salgdiimpl.hxx
@@ -79,7 +79,7 @@
virtual void SetFillColor( Color nColor ) = 0;
// enable/disable XOR drawing
virtual void SetXORMode( bool bSet ) = 0;
virtual void SetXORMode( bool bSet, bool bInvertOnly ) = 0;
// set line color for raster operations
virtual void SetROPLineColor( SalROPColor nROPColor ) = 0;
diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index e7314cb..efe1bc7 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -78,7 +78,7 @@
virtual void SetLineColor( Color nColor ) override;
virtual void SetFillColor() override;
virtual void SetFillColor( Color nColor ) override;
virtual void SetXORMode( bool bSet ) override;
virtual void SetXORMode( bool bSet, bool ) override;
virtual void SetROPLineColor( SalROPColor nROPColor ) override;
virtual void SetROPFillColor( SalROPColor nROPColor ) override;
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 4fd3076..97be622 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -109,7 +109,7 @@
virtual void SetFillColor( Color nColor ) override;
virtual void SetXORMode( bool bSet ) override;
virtual void SetXORMode( bool bSet, bool ) override;
virtual void SetROPLineColor( SalROPColor nROPColor ) override;
virtual void SetROPFillColor( SalROPColor nROPColor ) override;
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 4b829f3..cc59322 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -320,7 +320,7 @@
// filled accordingly
virtual void SetFillColor( Color nColor ) override;
// enable/disable XOR drawing
virtual void SetXORMode( bool bSet ) override;
virtual void SetXORMode( bool bSet, bool ) override;
// set line color for raster operations
virtual void SetROPLineColor( SalROPColor nROPColor ) override;
// set fill color for raster operations
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 6c9f9de..4145eda 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -472,7 +472,7 @@
}
// enable/disable XOR drawing
void OpenGLSalGraphicsImpl::SetXORMode( bool bSet )
void OpenGLSalGraphicsImpl::SetXORMode( bool bSet, bool )
{
if (mbXORMode != bSet)
{
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
index 0280f91..d269252 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -657,7 +657,7 @@
void Qt5Graphics::SetFillColor(Color nColor) { m_aFillColor = nColor; }
void Qt5Graphics::SetXORMode(bool bSet)
void Qt5Graphics::SetXORMode(bool bSet, boo)
{
if (bSet)
m_eCompositionMode = QPainter::CompositionMode_Xor;
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 6d66c7e..2e22d60 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1816,7 +1816,7 @@
}
}
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 @@
mnXorMode = 0;
return;
}
else if( bSet && mnXorMode == 0)
else if( bSet && bInvertOnly && mnXorMode == 0)
{
CGContextSetBlendMode( mrContext, kCGBlendModeDifference );
mnXorMode = 2;
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index cff0450..3e9ce5d 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -544,7 +544,7 @@
if ( mpGraphics )
{
mpGraphics->SetXORMode( (RasterOp::Invert == meRasterOp) || (RasterOp::Xor == meRasterOp) );
mpGraphics->SetXORMode( (RasterOp::Invert == meRasterOp) || (RasterOp::Xor == meRasterOp), RasterOp::Invert == meRasterOp );
mpGraphics->setAntiAliasB2DDraw(bool(mnAntialiasing & AntialiasingFlags::EnableB2dDraw));
}
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 9f56bc1..a86b8c1 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -68,7 +68,7 @@
if ( mpGraphics )
{
mpGraphics->SetXORMode( (RasterOp::Invert == meRasterOp) || (RasterOp::Xor == meRasterOp) );
mpGraphics->SetXORMode( (RasterOp::Invert == meRasterOp) || (RasterOp::Xor == meRasterOp), RasterOp::Invert == meRasterOp );
mpGraphics->setAntiAliasB2DDraw(bool(mnAntialiasing & AntialiasingFlags::EnableB2dDraw));
}
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index 8d11aad..bd93aae 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -292,7 +292,7 @@
mbInitLineColor = mbInitFillColor = true;
if( mpGraphics || AcquireGraphics() )
mpGraphics->SetXORMode( (RasterOp::Invert == meRasterOp) || (RasterOp::Xor == meRasterOp) );
mpGraphics->SetXORMode( (RasterOp::Invert == meRasterOp) || (RasterOp::Xor == meRasterOp), RasterOp::Invert == meRasterOp );
}
if( mpAlphaVDev )
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 349d4d0b..aac1dc1 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -874,7 +874,7 @@
if ( mpGraphics )
{
mpGraphics->SetXORMode( (RasterOp::Invert == meRasterOp) || (RasterOp::Xor == meRasterOp) );
mpGraphics->SetXORMode( (RasterOp::Invert == meRasterOp) || (RasterOp::Xor == meRasterOp), RasterOp::Invert == meRasterOp );
mpGraphics->setAntiAliasB2DDraw(bool(mnAntialiasing & AntialiasingFlags::EnableB2dDraw));
}
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 7e2b412..e0a4879 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -1165,7 +1165,7 @@
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 0ea0e29..282b9a2 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -141,7 +141,7 @@
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 d2b92d8..1af6139 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -411,9 +411,9 @@
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 3043d99..e40b9fd 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -359,7 +359,7 @@
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" );
}
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 1ba590c..fa6dccb 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -1544,7 +1544,7 @@
mbStockBrush = bStockBrush;
}
void WinSalGraphicsImpl::SetXORMode( bool bSet)
void WinSalGraphicsImpl::SetXORMode( bool bSet, bool )
{
mbXORMode = bSet;
::SetROP2( mrParent.getHDC(), bSet ? R2_XORPEN : R2_COPYPEN );
diff --git a/vcl/win/gdi/gdiimpl.hxx b/vcl/win/gdi/gdiimpl.hxx
index 94a6de0..54d75bd 100644
--- a/vcl/win/gdi/gdiimpl.hxx
+++ b/vcl/win/gdi/gdiimpl.hxx
@@ -85,7 +85,7 @@
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/win/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx
index 24188e4..c1ec8bd 100644
--- a/vcl/win/gdi/salgdi.cxx
+++ b/vcl/win/gdi/salgdi.cxx
@@ -739,9 +739,9 @@
mpImpl->SetFillColor( nColor );
}
void WinSalGraphics::SetXORMode( bool bSet)
void WinSalGraphics::SetXORMode( bool bSet, bool bInvertOnly )
{
mpImpl->SetXORMode( bSet);
mpImpl->SetXORMode( bSet, bInvertOnly );
}
void WinSalGraphics::SetROPLineColor( SalROPColor nROPColor )
