diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-04-21 14:39:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-21 15:03:13 +0100 |
| commit | 7cf22a0a3202da296c1d1a3dafe6e1e5e1d7405d (patch) | |
| tree | 0898297aab7c1b359ede0b5258de358d7e9c48dd /svx | |
| parent | One more unused part of comphelper/implbase_var.hxx (diff) | |
| download | core-7cf22a0a3202da296c1d1a3dafe6e1e5e1d7405d.tar.gz core-7cf22a0a3202da296c1d1a3dafe6e1e5e1d7405d.zip | |
fix indent
Change-Id: I2628ac3fbabe9f33c41c7f3612eae608fb854ae3
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index ea648c8b6e98..19ea1e71d69c 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -643,8 +643,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) // setup the device & draw vcl::Font aOldFont( pDevice->GetFont() ); - Color aOldColor( pDevice->GetTextColor() ); - Color aOldFillColor( pDevice->GetFillColor() ); + pDevice->Push(PushFlags::FILLCOLOR | PushFlags::FONT | PushFlags::TEXTCOLOR); Color aFontCol = COL_AUTO, aBackCol = COL_AUTO; @@ -682,7 +681,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) break; //TODO Draw the other background styles: gradient, hatching and bitmap - } + } // when the font and background color are too similar, adjust the Font-Color if( (aFontCol != COL_AUTO) || (aBackCol != COL_AUTO) ) @@ -741,9 +740,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) pDevice->DrawText( aPos, aStyleName ); - pDevice->SetFillColor( aOldFillColor ); - pDevice->SetTextColor( aOldColor ); - pDevice->SetFont( aOldFont ); + pDevice->Pop(); // draw separator, if present DrawEntry( rUDEvt, false, false ); |