summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormelikeyurtoglu <aysemelikeyurtoglu@gmail.com>2016-01-31 11:39:20 +0200
committerjan iversen <jani@documentfoundation.org>2016-06-09 11:31:11 +0000
commit258301879bcd20397c38bbd522dea2c923bd9fc2 (patch)
tree01ee1fe2d3f8df727039c97025e3577575a53e93
parenttdf#94004 Wrap Power trendline equation (diff)
downloadcore-258301879bcd20397c38bbd522dea2c923bd9fc2.tar.gz
core-258301879bcd20397c38bbd522dea2c923bd9fc2.zip
tdf#96971 SetXORMode - remove un-needed parameter
Change-Id: I901e5de3e4e25f0cae5c71d6e83fd94459fe7b7e Signed-off-by: melikeyurtoglu <aysemelikeyurtoglu@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/21951 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: jan iversen <jani@documentfoundation.org>
Diffstat
-rw-r--r--vcl/headless/svpgdi.cxx4
-rw-r--r--vcl/inc/headless/svpgdi.hxx2
-rw-r--r--vcl/inc/openglgdiimpl.hxx2
-rw-r--r--vcl/inc/quartz/salgdi.h2
-rw-r--r--vcl/inc/salgdi.hxx2
-rw-r--r--vcl/inc/salgdiimpl.hxx2
-rw-r--r--vcl/inc/unx/genpspgraphics.h2
-rw-r--r--vcl/inc/unx/salgdi.h2
-rw-r--r--vcl/inc/win/salgdi.h2
-rw-r--r--vcl/opengl/gdiimpl.cxx2
-rw-r--r--vcl/quartz/salgdicommon.cxx4
-rw-r--r--vcl/source/gdi/print.cxx2
-rw-r--r--vcl/source/gdi/virdev.cxx2
-rw-r--r--vcl/source/outdev/outdevstate.cxx2
-rw-r--r--vcl/source/window/window.cxx2
-rw-r--r--vcl/unx/generic/gdi/gdiimpl.cxx2
-rw-r--r--vcl/unx/generic/gdi/gdiimpl.hxx2
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx4
-rw-r--r--vcl/unx/generic/print/genpspgraphics.cxx2
-rw-r--r--vcl/win/gdi/gdiimpl.cxx2
-rw-r--r--vcl/win/gdi/gdiimpl.hxx2
-rw-r--r--vcl/win/gdi/salgdi.cxx4
22 files changed, 26 insertions, 26 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 2cbfb23360c7..34fa731e7396 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -441,9 +441,9 @@ void SvpSalGraphics::SetFillColor( SalColor nSalColor )
m_aFillColor = nSalColor;
}
-void SvpSalGraphics::SetXORMode(bool bSet, bool bInvert)
+void SvpSalGraphics::SetXORMode(bool bSet )
{
- m_ePaintMode = bInvert ? INVERT : (bSet ? XOR : OVERPAINT);
+ m_ePaintMode = bSet ? XOR : OVERPAINT;
}
void SvpSalGraphics::SetROPLineColor( SalROPColor nROPColor )
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index dc88a6025995..372be72ca846 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -116,7 +116,7 @@ public:
virtual void SetFillColor() override;
virtual void SetFillColor( SalColor nSalColor ) override;
- virtual void SetXORMode( bool bSet, bool ) override;
+ virtual void SetXORMode( bool bSet ) 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 d0b5f9aa478a..4269df1e0c24 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -224,7 +224,7 @@ public:
virtual void SetFillColor( SalColor nSalColor ) override;
// enable/disable XOR drawing
- virtual void SetXORMode( bool bSet, bool bInvertOnly ) override;
+ virtual void SetXORMode( bool bSet ) override;
// set line color for raster operations
virtual void SetROPLineColor( SalROPColor nROPColor ) override;
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 09dc6193148b..3f051a473d50 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -328,7 +328,7 @@ public:
// filled accordingly
virtual void SetFillColor( SalColor nSalColor ) override;
// enable/disable XOR drawing
- virtual void SetXORMode( bool bSet, bool bInvertOnly ) override;
+ virtual void SetXORMode( bool bSet ) 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 56fe42dbfe38..5dd9b4c570dd 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -114,7 +114,7 @@ public:
virtual void SetFillColor( SalColor nSalColor ) = 0;
// enable/disable XOR drawing
- virtual void SetXORMode( bool bSet, bool bInvertOnly ) = 0;
+ virtual void SetXORMode( bool bSet ) = 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 c2c008e68462..35ce26b351ce 100644
--- a/vcl/inc/salgdiimpl.hxx
+++ b/vcl/inc/salgdiimpl.hxx
@@ -77,7 +77,7 @@ public:
virtual void SetFillColor( SalColor nSalColor ) = 0;
// enable/disable XOR drawing
- virtual void SetXORMode( bool bSet, bool bInvertOnly ) = 0;
+ virtual void SetXORMode( bool bSet ) = 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 b7658b93f3dd..01b3c6a080ce 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -87,7 +87,7 @@ public:
virtual void SetLineColor( SalColor nSalColor ) override;
virtual void SetFillColor() override;
virtual void SetFillColor( SalColor nSalColor ) override;
- virtual void SetXORMode( bool bSet, bool ) override;
+ virtual void SetXORMode( bool bSet ) 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 40aa91b6ac70..cd59a0fce231 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -110,7 +110,7 @@ public:
virtual void SetFillColor( SalColor nSalColor ) override;
- virtual void SetXORMode( bool bSet, bool ) override;
+ virtual void SetXORMode( bool bSet ) 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 d2a81624cb4a..4ae6278a7172 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -375,7 +375,7 @@ public:
// filled accordingly
virtual void SetFillColor( SalColor nSalColor ) override;
// enable/disable XOR drawing
- virtual void SetXORMode( bool bSet, bool ) override;
+ virtual void SetXORMode( bool bSet ) 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 183a3fe7fda3..3341f0fe3319 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -453,7 +453,7 @@ void OpenGLSalGraphicsImpl::SetFillColor( SalColor nSalColor )
}
// enable/disable XOR drawing
-void OpenGLSalGraphicsImpl::SetXORMode( bool bSet, bool )
+void OpenGLSalGraphicsImpl::SetXORMode( bool bSet )
{
mbXORMode = bSet;
}
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 93c22b3c98c8..bdcf538d1019 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1969,7 +1969,7 @@ void AquaSalGraphics::SetROPLineColor( SalROPColor nROPColor )
}
}
-void AquaSalGraphics::SetXORMode( bool bSet, bool bInvertOnly )
+void AquaSalGraphics::SetXORMode( bool bSet )
{
// return early if XOR mode remains unchanged
if( mbPrinter )
@@ -1982,7 +1982,7 @@ void AquaSalGraphics::SetXORMode( bool bSet, bool bInvertOnly )
mnXorMode = 0;
return;
}
- else if( bSet && bInvertOnly && mnXorMode == 0)
+ else if( bSet && mnXorMode == 0)
{
CGContextSetBlendMode( mrContext, kCGBlendModeDifference );
mnXorMode = 2;
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index c0d016f7ba1b..3349da5e5bb6 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -586,7 +586,7 @@ bool Printer::AcquireGraphics() const
if ( mpGraphics )
{
- mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
+ mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp) );
mpGraphics->setAntiAliasB2DDraw(bool(mnAntialiasing & AntialiasingFlags::EnableB2dDraw));
}
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index b32486ed7c0b..0f25ecc8a80a 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -77,7 +77,7 @@ bool VirtualDevice::AcquireGraphics() const
if ( mpGraphics )
{
- mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
+ mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp) );
mpGraphics->setAntiAliasB2DDraw(bool(mnAntialiasing & AntialiasingFlags::EnableB2dDraw));
}
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index adf3c4134c55..698c3a4c9581 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -297,7 +297,7 @@ void OutputDevice::SetRasterOp( RasterOp eRasterOp )
mbInitLineColor = mbInitFillColor = true;
if( mpGraphics || AcquireGraphics() )
- mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
+ mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp) );
}
if( mpAlphaVDev )
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 6cdb1f66f085..13364c97ffe0 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -830,7 +830,7 @@ bool Window::AcquireGraphics() const
if ( mpGraphics )
{
- mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
+ mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp) );
mpGraphics->setAntiAliasB2DDraw(bool(mnAntialiasing & AntialiasingFlags::EnableB2dDraw));
}
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 7845d49f9df3..6590b11f3064 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -1191,7 +1191,7 @@ void X11SalGraphicsImpl::SetROPFillColor( SalROPColor nROPColor )
mbBrushGC = false;
}
-void X11SalGraphicsImpl::SetXORMode( bool bSet, bool )
+void X11SalGraphicsImpl::SetXORMode( bool bSet )
{
if (mbXORMode != bSet)
{
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 5b04ba67be0c..4896e633ba6d 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -136,7 +136,7 @@ public:
virtual void SetFillColor( SalColor nSalColor ) override;
// enable/disable XOR drawing
- virtual void SetXORMode( bool bSet, bool bInvertOnly ) override;
+ virtual void SetXORMode( bool bSet ) 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 814173fbcbe7..896f6cf0ce44 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -387,9 +387,9 @@ void X11SalGraphics::SetROPFillColor( SalROPColor nROPColor )
mxImpl->SetROPFillColor( nROPColor );
}
-void X11SalGraphics::SetXORMode( bool bSet, bool bInvertOnly )
+void X11SalGraphics::SetXORMode( bool bSet )
{
- mxImpl->SetXORMode( bSet, bInvertOnly );
+ mxImpl->SetXORMode( bSet );
}
void X11SalGraphics::drawPixel( long nX, long nY )
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 78eee8212a43..9c032853e9f5 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -387,7 +387,7 @@ void GenPspGraphics::SetROPFillColor( SalROPColor )
DBG_ASSERT( false, "Error: PrinterGfx::SetROPFillColor() not implemented" );
}
-void GenPspGraphics::SetXORMode( bool bSet, bool )
+void GenPspGraphics::SetXORMode( bool bSet )
{
(void)bSet;
DBG_ASSERT( !bSet, "Error: PrinterGfx::SetXORMode() not implemented" );
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 915cd9351521..f9deaf7b2b5e 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -1555,7 +1555,7 @@ void WinSalGraphicsImpl::SetFillColor( SalColor nSalColor )
mbStockBrush = bStockBrush;
}
-void WinSalGraphicsImpl::SetXORMode( bool bSet, bool )
+void WinSalGraphicsImpl::SetXORMode( bool bSet)
{
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 9ba7dd8bf7fe..db6e46ab5bb8 100644
--- a/vcl/win/gdi/gdiimpl.hxx
+++ b/vcl/win/gdi/gdiimpl.hxx
@@ -83,7 +83,7 @@ public:
virtual void SetFillColor( SalColor nSalColor ) override;
// enable/disable XOR drawing
- virtual void SetXORMode( bool bSet, bool bInvertOnly ) override;
+ virtual void SetXORMode( bool bSet);
// 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 7a27878f0620..dceb8bb561e3 100644
--- a/vcl/win/gdi/salgdi.cxx
+++ b/vcl/win/gdi/salgdi.cxx
@@ -752,9 +752,9 @@ void WinSalGraphics::SetFillColor( SalColor nSalColor )
mpImpl->SetFillColor( nSalColor );
}
-void WinSalGraphics::SetXORMode( bool bSet, bool bInvertOnly )
+void WinSalGraphics::SetXORMode( bool bSet)
{
- mpImpl->SetXORMode( bSet, bInvertOnly );
+ mpImpl->SetXORMode( bSet);
}
void WinSalGraphics::SetROPLineColor( SalROPColor nROPColor )
generated by cgit (git 2.34.1) at 2024-09-11 15:30:52 +0000