[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/headless vcl/inc vcl/opengl vcl/qt5 vcl/quartz vcl/source vcl/unx vcl/win
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Dec 5 17:59:24 UTC 2018
vcl/headless/svpgdi.cxx | 2 +-
vcl/inc/headless/svpgdi.hxx | 2 +-
vcl/inc/openglgdiimpl.hxx | 2 +-
vcl/inc/qt5/Qt5Graphics.hxx | 2 +-
vcl/inc/quartz/salgdi.h | 2 +-
vcl/inc/salgdi.hxx | 2 +-
vcl/inc/salgdiimpl.hxx | 2 +-
vcl/inc/unx/genpspgraphics.h | 2 +-
vcl/inc/unx/salgdi.h | 2 +-
vcl/inc/win/salgdi.h | 2 +-
vcl/opengl/gdiimpl.cxx | 2 +-
vcl/qt5/Qt5Graphics_GDI.cxx | 2 +-
vcl/quartz/salgdicommon.cxx | 4 ++--
vcl/source/gdi/print.cxx | 2 +-
vcl/source/gdi/virdev.cxx | 2 +-
vcl/source/outdev/outdevstate.cxx | 2 +-
vcl/source/window/window.cxx | 2 +-
vcl/unx/generic/gdi/gdiimpl.cxx | 2 +-
vcl/unx/generic/gdi/gdiimpl.hxx | 2 +-
vcl/unx/generic/gdi/salgdi.cxx | 4 ++--
vcl/unx/generic/print/genpspgraphics.cxx | 2 +-
vcl/win/gdi/gdiimpl.cxx | 2 +-
vcl/win/gdi/gdiimpl.hxx | 2 +-
vcl/win/gdi/salgdi.cxx | 4 ++--
24 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit 708da2a6342a58fe379217064848c1c311216f05
Author: Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Wed Dec 5 01:23:17 2018 +0100
Commit: Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Wed Dec 5 18:58:58 2018 +0100
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 at collabora.co.uk>
(cherry picked from commit be504e8c7ef06637f055c43ad350381377df1e90)
Reviewed-on: https://gerrit.libreoffice.org/64631
Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index ec01ec520a86..1c310a2b1c70 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -667,7 +667,7 @@ void SvpSalGraphics::SetFillColor( Color nColor )
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 8546387f8962..9ba284300a37 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -163,7 +163,7 @@ public:
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 bc19dcd338fb..132a64327e42 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -228,7 +228,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/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index 480f2f4a4bf5..9430be94a112 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
@@ -168,7 +168,7 @@ public:
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 b79bf4425534..cacf56dcb84f 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -320,7 +320,7 @@ public:
// 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 b09f3223cdad..c8108c956229 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -113,7 +113,7 @@ public:
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 d4023bd52947..a6dc4a808ee9 100644
--- a/vcl/inc/salgdiimpl.hxx
+++ b/vcl/inc/salgdiimpl.hxx
@@ -79,7 +79,7 @@ public:
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 e7314cb2ace3..efe1bc7bfa3f 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -78,7 +78,7 @@ public:
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 4fd30762d045..97be62230a68 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -109,7 +109,7 @@ public:
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 4b829f36d886..cc59322b3098 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -320,7 +320,7 @@ public:
// 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 6c9f9de494d2..4145eda816f1 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -472,7 +472,7 @@ void OpenGLSalGraphicsImpl::SetFillColor( Color nColor )
}
// 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 0280f9120baa..d2692528274d 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -657,7 +657,7 @@ void Qt5Graphics::SetFillColor() { m_aFillColor = SALCOLOR_NONE; }
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 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;
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index cff0450231f7..3e9ce5d64b9c 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -544,7 +544,7 @@ bool Printer::AcquireGraphics() const
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 9f56bc102902..a86b8c1b2ab4 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -68,7 +68,7 @@ bool VirtualDevice::AcquireGraphics() const
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 8d11aada14fd..bd93aaea593c 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -292,7 +292,7 @@ void OutputDevice::SetRasterOp( RasterOp eRasterOp )
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 349d4d0b5787..aac1dc136a71 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -874,7 +874,7 @@ bool Window::AcquireGraphics() const
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 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" );
}
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 1ba590cc803e..fa6dccb48c5a 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -1544,7 +1544,7 @@ void WinSalGraphicsImpl::SetFillColor( Color nColor )
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 94a6de0e1e44..54d75bd9291c 100644
--- a/vcl/win/gdi/gdiimpl.hxx
+++ b/vcl/win/gdi/gdiimpl.hxx
@@ -85,7 +85,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/win/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx
index 24188e42517d..c1ec8bd88e2d 100644
--- a/vcl/win/gdi/salgdi.cxx
+++ b/vcl/win/gdi/salgdi.cxx
@@ -739,9 +739,9 @@ void WinSalGraphics::SetFillColor( Color nColor )
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 )
More information about the Libreoffice-commits
mailing list