diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-28 20:25:25 +1000 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-28 20:25:25 +1000 |
commit | 690b655f06af5717ecb79f0cb804342a78a6ba43 (patch) | |
tree | 7542008edb160efeb8eba10987020f3274cce90c /vcl/source/outdev | |
parent | 54a5880ba04b55460bd7854b17d5edb94a78cf91 (diff) |
VCL move SetRasterOp & SetDrawMode from outdev.cxx to outdevstate.cxx
Change-Id: I8c597e5b9049cd23223ecf4376a4449ca1effb38
Diffstat (limited to 'vcl/source/outdev')
-rw-r--r-- | vcl/source/outdev/outdev.cxx | 28 | ||||
-rw-r--r-- | vcl/source/outdev/outdevstate.cxx | 29 |
2 files changed, 28 insertions, 29 deletions
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index bd2ad9a1f23a..7eb435ec9b82 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -753,34 +753,6 @@ void OutputDevice::ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const } -void OutputDevice::SetDrawMode( sal_uLong nDrawMode ) -{ - - mnDrawMode = nDrawMode; - - if( mpAlphaVDev ) - mpAlphaVDev->SetDrawMode( nDrawMode ); -} - -void OutputDevice::SetRasterOp( RasterOp eRasterOp ) -{ - - if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaRasterOpAction( eRasterOp ) ); - - if ( meRasterOp != eRasterOp ) - { - meRasterOp = eRasterOp; - mbInitLineColor = mbInitFillColor = true; - - if( mpGraphics || AcquireGraphics() ) - mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp ); - } - - if( mpAlphaVDev ) - mpAlphaVDev->SetRasterOp( eRasterOp ); -} - Color OutputDevice::ImplDrawModeToColor( const Color& rColor ) const { Color aColor( rColor ); diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx index 7a1ae462bd1f..7ce35cf10b6f 100644 --- a/vcl/source/outdev/outdevstate.cxx +++ b/vcl/source/outdev/outdevstate.cxx @@ -262,7 +262,6 @@ void OutputDevice::EnableOutput( bool bEnable ) mpAlphaVDev->EnableOutput( bEnable ); } - void OutputDevice::SetAntialiasing( sal_uInt16 nMode ) { if ( mnAntialiasing != nMode ) @@ -280,6 +279,34 @@ void OutputDevice::SetAntialiasing( sal_uInt16 nMode ) mpAlphaVDev->SetAntialiasing( nMode ); } +void OutputDevice::SetDrawMode( sal_uLong nDrawMode ) +{ + + mnDrawMode = nDrawMode; + + if( mpAlphaVDev ) + mpAlphaVDev->SetDrawMode( nDrawMode ); +} + +void OutputDevice::SetRasterOp( RasterOp eRasterOp ) +{ + + if ( mpMetaFile ) + mpMetaFile->AddAction( new MetaRasterOpAction( eRasterOp ) ); + + if ( meRasterOp != eRasterOp ) + { + meRasterOp = eRasterOp; + mbInitLineColor = mbInitFillColor = true; + + if( mpGraphics || AcquireGraphics() ) + mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp ); + } + + if( mpAlphaVDev ) + mpAlphaVDev->SetRasterOp( eRasterOp ); +} + void OutputDevice::SetFillColor() { |