diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-28 19:25:55 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-28 20:13:57 +1000 |
| commit | 0f83b6379af62a9a0556371ee82a152c7d4e93b3 (patch) | |
| tree | a2741b00ce532d577850e12dac955fe23ff37016 | |
| parent | 0ada64dfd99fdaa1b182f88d32e4f4c6fbd2b5f6 (diff) | |
VCL: Move SetFont up the include file
Change-Id: I6721e78f8a10d95a54ff09c1f25f0ae3ece71cfa
| -rw-r--r-- | vcl/source/outdev/outdevstate.cxx | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx index d149542d56b3..908abc3e37f2 100644 --- a/vcl/source/outdev/outdevstate.cxx +++ b/vcl/source/outdev/outdevstate.cxx @@ -371,29 +371,6 @@ void OutputDevice::SetBackground( const Wallpaper& rBackground ) mpAlphaVDev->SetBackground( rBackground ); } - -void OutputDevice::InitFillColor() -{ - DBG_TESTSOLARMUTEX(); - - if( mbFillColor ) - { - if( ROP_0 == meRasterOp ) - mpGraphics->SetROPFillColor( SAL_ROP_0 ); - else if( ROP_1 == meRasterOp ) - mpGraphics->SetROPFillColor( SAL_ROP_1 ); - else if( ROP_INVERT == meRasterOp ) - mpGraphics->SetROPFillColor( SAL_ROP_INVERT ); - else - mpGraphics->SetFillColor( ImplColorToSal( maFillColor ) ); - } - else - mpGraphics->SetFillColor(); - - mbInitFillColor = false; -} - - void OutputDevice::SetFont( const Font& rNewFont ) { @@ -501,4 +478,25 @@ void OutputDevice::SetFont( const Font& rNewFont ) } } +void OutputDevice::InitFillColor() +{ + DBG_TESTSOLARMUTEX(); + + if( mbFillColor ) + { + if( ROP_0 == meRasterOp ) + mpGraphics->SetROPFillColor( SAL_ROP_0 ); + else if( ROP_1 == meRasterOp ) + mpGraphics->SetROPFillColor( SAL_ROP_1 ); + else if( ROP_INVERT == meRasterOp ) + mpGraphics->SetROPFillColor( SAL_ROP_INVERT ); + else + mpGraphics->SetFillColor( ImplColorToSal( maFillColor ) ); + } + else + mpGraphics->SetFillColor(); + + mbInitFillColor = false; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |