mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#96971 SetXORMode - remove un-needed parameter

Browse Source 
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>
This commit is contained in:
melikeyurtoglu 2016-01-31 11:39:20 +02:00 committed by jan iversen
parent e420a335f7
commit 258301879b
22 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vcl/headless/svpgdi.cxx
View File

@ -441,9 +441,9 @@ void SvpSalGraphics::SetFillColor( SalColor nSalColor )
m_aFillColor = 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 ) void SvpSalGraphics::SetROPLineColor( SalROPColor nROPColor )

2
vcl/inc/headless/svpgdi.hxx
View File

@ -116,7 +116,7 @@ public:
virtual void SetFillColor() override; virtual void SetFillColor() override;
virtual void SetFillColor( SalColor nSalColor ) 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 SetROPLineColor( SalROPColor nROPColor ) override;
virtual void SetROPFillColor( SalROPColor nROPColor ) override; virtual void SetROPFillColor( SalROPColor nROPColor ) override;

2
vcl/inc/openglgdiimpl.hxx
View File

@ -224,7 +224,7 @@ public:
virtual void SetFillColor( SalColor nSalColor ) override; virtual void SetFillColor( SalColor nSalColor ) override;
// enable/disable XOR drawing // enable/disable XOR drawing
virtual void SetXORMode( bool bSet, bool bInvertOnly ) override; virtual void SetXORMode( bool bSet ) override;
// set line color for raster operations // set line color for raster operations
virtual void SetROPLineColor( SalROPColor nROPColor ) override; virtual void SetROPLineColor( SalROPColor nROPColor ) override;

2
vcl/inc/quartz/salgdi.h
View File

@ -328,7 +328,7 @@ public:
// filled accordingly // filled accordingly
virtual void SetFillColor( SalColor nSalColor ) override; virtual void SetFillColor( SalColor nSalColor ) override;
// enable/disable XOR drawing // enable/disable XOR drawing
virtual void SetXORMode( bool bSet, bool bInvertOnly ) override; virtual void SetXORMode( bool bSet ) override;
// set line color for raster operations // set line color for raster operations
virtual void SetROPLineColor( SalROPColor nROPColor ) override; virtual void SetROPLineColor( SalROPColor nROPColor ) override;
// set fill color for raster operations // set fill color for raster operations

2
vcl/inc/salgdi.hxx
View File

@ -114,7 +114,7 @@ public:
virtual void SetFillColor( SalColor nSalColor ) = 0; virtual void SetFillColor( SalColor nSalColor ) = 0;
// enable/disable XOR drawing // enable/disable XOR drawing
virtual void SetXORMode( bool bSet, bool bInvertOnly ) = 0; virtual void SetXORMode( bool bSet ) = 0;
// set line color for raster operations // set line color for raster operations
virtual void SetROPLineColor( SalROPColor nROPColor ) = 0; virtual void SetROPLineColor( SalROPColor nROPColor ) = 0;

2
vcl/inc/salgdiimpl.hxx
View File

@ -77,7 +77,7 @@ public:
virtual void SetFillColor( SalColor nSalColor ) = 0; virtual void SetFillColor( SalColor nSalColor ) = 0;
// enable/disable XOR drawing // enable/disable XOR drawing
virtual void SetXORMode( bool bSet, bool bInvertOnly ) = 0; virtual void SetXORMode( bool bSet ) = 0;
// set line color for raster operations // set line color for raster operations
virtual void SetROPLineColor( SalROPColor nROPColor ) = 0; virtual void SetROPLineColor( SalROPColor nROPColor ) = 0;

2
vcl/inc/unx/genpspgraphics.h
View File

@ -87,7 +87,7 @@ public:
virtual void SetLineColor( SalColor nSalColor ) override; virtual void SetLineColor( SalColor nSalColor ) override;
virtual void SetFillColor() override; virtual void SetFillColor() override;
virtual void SetFillColor( SalColor nSalColor ) 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 SetROPLineColor( SalROPColor nROPColor ) override;
virtual void SetROPFillColor( SalROPColor nROPColor ) override; virtual void SetROPFillColor( SalROPColor nROPColor ) override;

2
vcl/inc/unx/salgdi.h
View File

@ -110,7 +110,7 @@ public:
virtual void SetFillColor( SalColor nSalColor ) 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 SetROPLineColor( SalROPColor nROPColor ) override;
virtual void SetROPFillColor( SalROPColor nROPColor ) override; virtual void SetROPFillColor( SalROPColor nROPColor ) override;

2
vcl/inc/win/salgdi.h
View File

@ -375,7 +375,7 @@ public:
// filled accordingly // filled accordingly
virtual void SetFillColor( SalColor nSalColor ) override; virtual void SetFillColor( SalColor nSalColor ) override;
// enable/disable XOR drawing // enable/disable XOR drawing
virtual void SetXORMode( bool bSet, bool ) override; virtual void SetXORMode( bool bSet ) override;
// set line color for raster operations // set line color for raster operations
virtual void SetROPLineColor( SalROPColor nROPColor ) override; virtual void SetROPLineColor( SalROPColor nROPColor ) override;
// set fill color for raster operations // set fill color for raster operations

2
vcl/opengl/gdiimpl.cxx
View File

@ -453,7 +453,7 @@ void OpenGLSalGraphicsImpl::SetFillColor( SalColor nSalColor )
} }
// enable/disable XOR drawing // enable/disable XOR drawing
void OpenGLSalGraphicsImpl::SetXORMode( bool bSet, bool ) void OpenGLSalGraphicsImpl::SetXORMode( bool bSet )
{ {
mbXORMode = bSet; mbXORMode = bSet;
} }

4
vcl/quartz/salgdicommon.cxx
View File

@ -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 // return early if XOR mode remains unchanged
if( mbPrinter ) if( mbPrinter )
@ -1982,7 +1982,7 @@ void AquaSalGraphics::SetXORMode( bool bSet, bool bInvertOnly )
mnXorMode = 0; mnXorMode = 0;
return; return;
} }
else if( bSet && bInvertOnly && mnXorMode == 0) else if( bSet && mnXorMode == 0)
{ {
CGContextSetBlendMode( mrContext, kCGBlendModeDifference ); CGContextSetBlendMode( mrContext, kCGBlendModeDifference );
mnXorMode = 2; mnXorMode = 2;

2
vcl/source/gdi/print.cxx
View File

@ -586,7 +586,7 @@ bool Printer::AcquireGraphics() const
if ( mpGraphics ) 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)); mpGraphics->setAntiAliasB2DDraw(bool(mnAntialiasing & AntialiasingFlags::EnableB2dDraw));
} }

2
vcl/source/gdi/virdev.cxx
View File

@ -77,7 +77,7 @@ bool VirtualDevice::AcquireGraphics() const
if ( mpGraphics ) 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)); mpGraphics->setAntiAliasB2DDraw(bool(mnAntialiasing & AntialiasingFlags::EnableB2dDraw));
} }

2
vcl/source/outdev/outdevstate.cxx
View File

@ -297,7 +297,7 @@ void OutputDevice::SetRasterOp( RasterOp eRasterOp )
mbInitLineColor = mbInitFillColor = true; mbInitLineColor = mbInitFillColor = true;
if( mpGraphics || AcquireGraphics() ) if( mpGraphics || AcquireGraphics() )
mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp ); mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp) );
} }
if( mpAlphaVDev ) if( mpAlphaVDev )

2
vcl/source/window/window.cxx
View File

@ -830,7 +830,7 @@ bool Window::AcquireGraphics() const
if ( mpGraphics ) 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)); mpGraphics->setAntiAliasB2DDraw(bool(mnAntialiasing & AntialiasingFlags::EnableB2dDraw));
} }

2
vcl/unx/generic/gdi/gdiimpl.cxx
View File

@ -1191,7 +1191,7 @@ void X11SalGraphicsImpl::SetROPFillColor( SalROPColor nROPColor )
mbBrushGC = false; mbBrushGC = false;
} }
void X11SalGraphicsImpl::SetXORMode( bool bSet, bool ) void X11SalGraphicsImpl::SetXORMode( bool bSet )
{ {
if (mbXORMode != bSet) if (mbXORMode != bSet)
{ {

2
vcl/unx/generic/gdi/gdiimpl.hxx
View File

@ -136,7 +136,7 @@ public:
virtual void SetFillColor( SalColor nSalColor ) override; virtual void SetFillColor( SalColor nSalColor ) override;
// enable/disable XOR drawing // enable/disable XOR drawing
virtual void SetXORMode( bool bSet, bool bInvertOnly ) override; virtual void SetXORMode( bool bSet ) override;
// set line color for raster operations // set line color for raster operations
virtual void SetROPLineColor( SalROPColor nROPColor ) override; virtual void SetROPLineColor( SalROPColor nROPColor ) override;

4
vcl/unx/generic/gdi/salgdi.cxx
View File

@ -387,9 +387,9 @@ void X11SalGraphics::SetROPFillColor( SalROPColor nROPColor )
mxImpl->SetROPFillColor( 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 ) void X11SalGraphics::drawPixel( long nX, long nY )

2
vcl/unx/generic/print/genpspgraphics.cxx
View File

@ -387,7 +387,7 @@ void GenPspGraphics::SetROPFillColor( SalROPColor )
DBG_ASSERT( false, "Error: PrinterGfx::SetROPFillColor() not implemented" ); DBG_ASSERT( false, "Error: PrinterGfx::SetROPFillColor() not implemented" );
} }
void GenPspGraphics::SetXORMode( bool bSet, bool ) void GenPspGraphics::SetXORMode( bool bSet )
{ {
(void)bSet; (void)bSet;
DBG_ASSERT( !bSet, "Error: PrinterGfx::SetXORMode() not implemented" ); DBG_ASSERT( !bSet, "Error: PrinterGfx::SetXORMode() not implemented" );

2
vcl/win/gdi/gdiimpl.cxx
View File

@ -1555,7 +1555,7 @@ void WinSalGraphicsImpl::SetFillColor( SalColor nSalColor )
mbStockBrush = bStockBrush; mbStockBrush = bStockBrush;
} }
void WinSalGraphicsImpl::SetXORMode( bool bSet, bool ) void WinSalGraphicsImpl::SetXORMode( bool bSet)
{ {
mbXORMode = bSet; mbXORMode = bSet;
::SetROP2( mrParent.getHDC(), bSet ? R2_XORPEN : R2_COPYPEN ); ::SetROP2( mrParent.getHDC(), bSet ? R2_XORPEN : R2_COPYPEN );

2
vcl/win/gdi/gdiimpl.hxx
View File

@ -83,7 +83,7 @@ public:
virtual void SetFillColor( SalColor nSalColor ) override; virtual void SetFillColor( SalColor nSalColor ) override;
// enable/disable XOR drawing // enable/disable XOR drawing
virtual void SetXORMode( bool bSet, bool bInvertOnly ) override; virtual void SetXORMode( bool bSet);
// set line color for raster operations // set line color for raster operations
virtual void SetROPLineColor( SalROPColor nROPColor ) override; virtual void SetROPLineColor( SalROPColor nROPColor ) override;

4
vcl/win/gdi/salgdi.cxx
View File

@ -752,9 +752,9 @@ void WinSalGraphics::SetFillColor( SalColor nSalColor )
mpImpl->SetFillColor( 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 ) void WinSalGraphics::SetROPLineColor( SalROPColor nROPColor )