vcl/source/outdev/outdev.cxx | 45 ------------------------- vcl/source/outdev/outdevstate.cxx | 68 ++++++++++++++++++++++++++++++++++++++ vcl/source/outdev/text.cxx | 22 ------------ 3 files changed, 68 insertions(+), 67 deletions(-)
New commits: commit 94d0eb659ed1310f3d2647c83db8e54184c55e23 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Mon Apr 28 20:29:21 2014 +1000 VCL move SetLayoutMode & SetDigitLanguage from font.cxx to outdevstate.cxx Change-Id: Iaf48a39fa1d4d7b88143022e517f2c4e119e94d5 diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx index 7ce35cf..228620a 100644 --- a/vcl/source/outdev/outdevstate.cxx +++ b/vcl/source/outdev/outdevstate.cxx @@ -288,6 +288,28 @@ void OutputDevice::SetDrawMode( sal_uLong nDrawMode ) mpAlphaVDev->SetDrawMode( nDrawMode ); } +void OutputDevice::SetLayoutMode( sal_uLong nTextLayoutMode ) +{ + if( mpMetaFile ) + mpMetaFile->AddAction( new MetaLayoutModeAction( nTextLayoutMode ) ); + + mnTextLayoutMode = nTextLayoutMode; + + if( mpAlphaVDev ) + mpAlphaVDev->SetLayoutMode( nTextLayoutMode ); +} + +void OutputDevice::SetDigitLanguage( LanguageType eTextLanguage ) +{ + if( mpMetaFile ) + mpMetaFile->AddAction( new MetaTextLanguageAction( eTextLanguage ) ); + + meTextLanguage = eTextLanguage; + + if( mpAlphaVDev ) + mpAlphaVDev->SetDigitLanguage( eTextLanguage ); +} + void OutputDevice::SetRasterOp( RasterOp eRasterOp ) { diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index dd03ac4..4383e5e 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -681,28 +681,6 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, return nMaxLineWidth; } -void OutputDevice::SetLayoutMode( sal_uLong nTextLayoutMode ) -{ - if( mpMetaFile ) - mpMetaFile->AddAction( new MetaLayoutModeAction( nTextLayoutMode ) ); - - mnTextLayoutMode = nTextLayoutMode; - - if( mpAlphaVDev ) - mpAlphaVDev->SetLayoutMode( nTextLayoutMode ); -} - -void OutputDevice::SetDigitLanguage( LanguageType eTextLanguage ) -{ - if( mpMetaFile ) - mpMetaFile->AddAction( new MetaTextLanguageAction( eTextLanguage ) ); - - meTextLanguage = eTextLanguage; - - if( mpAlphaVDev ) - mpAlphaVDev->SetDigitLanguage( eTextLanguage ); -} - void OutputDevice::SetTextColor( const Color& rColor ) { commit 690b655f06af5717ecb79f0cb804342a78a6ba43 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Mon Apr 28 20:25:25 2014 +1000 VCL move SetRasterOp & SetDrawMode from outdev.cxx to outdevstate.cxx Change-Id: I8c597e5b9049cd23223ecf4376a4449ca1effb38 diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index bd2ad9a..7eb435e 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 7a1ae46..7ce35cf 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() { commit 54a5880ba04b55460bd7854b17d5edb94a78cf91 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Mon Apr 28 20:22:27 2014 +1000 VCL move SetAntialiasing from outdev.cxx to outdevstate.cxx Change-Id: I0d0336f4f3a7add0f11f7b8d19aec517c3d8c9af diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index c0dd42a..bd2ad9a 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -1037,21 +1037,4 @@ void OutputDevice::DrawCheckered(const Point& rPos, const Size& rSize, sal_uInt3 Pop(); } -void OutputDevice::SetAntialiasing( sal_uInt16 nMode ) -{ - if ( mnAntialiasing != nMode ) - { - mnAntialiasing = nMode; - mbInitFont = true; - - if(mpGraphics) - { - mpGraphics->setAntiAliasB2DDraw(mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW); - } - } - - if( mpAlphaVDev ) - mpAlphaVDev->SetAntialiasing( nMode ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx index 908abc3..7a1ae46 100644 --- a/vcl/source/outdev/outdevstate.cxx +++ b/vcl/source/outdev/outdevstate.cxx @@ -262,6 +262,25 @@ void OutputDevice::EnableOutput( bool bEnable ) mpAlphaVDev->EnableOutput( bEnable ); } + +void OutputDevice::SetAntialiasing( sal_uInt16 nMode ) +{ + if ( mnAntialiasing != nMode ) + { + mnAntialiasing = nMode; + mbInitFont = true; + + if(mpGraphics) + { + mpGraphics->setAntiAliasB2DDraw(mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW); + } + } + + if( mpAlphaVDev ) + mpAlphaVDev->SetAntialiasing( nMode ); +} + + void OutputDevice::SetFillColor() { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits