diff options
| -rw-r--r-- | include/svx/tbxcolorupdate.hxx | 1 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbxcolorupdate.cxx | 40 |
2 files changed, 15 insertions, 26 deletions
diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx index 0df0efde4090..7dad6e7347dc 100644 --- a/include/svx/tbxcolorupdate.hxx +++ b/include/svx/tbxcolorupdate.hxx @@ -33,7 +33,6 @@ namespace svx { //........................................................................ -#define TBX_UPDATER_MODE_NONE 0x00 #define TBX_UPDATER_MODE_CHAR_COLOR 0x01 #define TBX_UPDATER_MODE_CHAR_BACKGROUND 0x02 #define TBX_UPDATER_MODE_CHAR_COLOR_NEW 0x03 diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index 179af8e6c907..5a9273233b99 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -125,36 +125,26 @@ namespace svx pBmpAcc->SetFillColor( maCurColor = aColor ); - if( TBX_UPDATER_MODE_CHAR_COLOR_NEW == mnDrawMode || TBX_UPDATER_MODE_NONE == mnDrawMode ) + if( TBX_UPDATER_MODE_CHAR_COLOR_NEW == mnDrawMode ) { - if( TBX_UPDATER_MODE_CHAR_COLOR_NEW == mnDrawMode ) + if( maBmpSize.Width() <= 16 ) + maUpdRect = Rectangle( Point( 0,12 ), Size( maBmpSize.Width(), 4 ) ); + else if(76 == maBmpSize.Width() && 12 == maBmpSize.Height()) { - if( maBmpSize.Width() <= 16 ) - maUpdRect = Rectangle( Point( 0,12 ), Size( maBmpSize.Width(), 4 ) ); - else if(76 == maBmpSize.Width() && 12 == maBmpSize.Height()) - { - maUpdRect.Left() = 22; - maUpdRect.Top() = 2; - maUpdRect.Right() = 73; - maUpdRect.Bottom() = 9; - } - else if(30 == maBmpSize.Width() && 16 == maBmpSize.Height()) - { - maUpdRect.Left() = 17; - maUpdRect.Top() = 2; - maUpdRect.Right() = 27; - maUpdRect.Bottom() = 13; - } - else - maUpdRect = Rectangle( Point( 1, maBmpSize.Height() - 7 ), Size( maBmpSize.Width() - 2 ,6 ) ); + maUpdRect.Left() = 22; + maUpdRect.Top() = 2; + maUpdRect.Right() = 73; + maUpdRect.Bottom() = 9; } - else + else if(30 == maBmpSize.Width() && 16 == maBmpSize.Height()) { - if( maBmpSize.Width() <= 16 ) - maUpdRect = Rectangle( Point( 7, 7 ), Size( 8, 8 ) ); - else - maUpdRect = Rectangle( Point( maBmpSize.Width() - 12, maBmpSize.Height() - 12 ), Size( 11, 11 ) ); + maUpdRect.Left() = 17; + maUpdRect.Top() = 2; + maUpdRect.Right() = 27; + maUpdRect.Bottom() = 13; } + else + maUpdRect = Rectangle( Point( 1, maBmpSize.Height() - 7 ), Size( maBmpSize.Width() - 2 ,6 ) ); pBmpAcc->DrawRect( maUpdRect ); |