include/tools/wintypes.hxx | 1 - vcl/source/control/button.cxx | 20 -------------------- 2 files changed, 21 deletions(-)
New commits: commit e86def1f3f86731230a27926d61d525653f62c72 Author: Noel Grandin <[email protected]> Date: Mon Aug 21 10:46:22 2017 +0200 WB_CBLINESTYLE is dead since commit 51e6fc0c9e401162036913a943708b7cca1b2598 Date: Wed Oct 1 13:31:44 2008 +0000 CWS-TOOLING: integrate CWS vcl92 Change-Id: I31e39286d207ab7be91411b5644578762ec0d0d1 Reviewed-on: https://gerrit.libreoffice.org/41383 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx index 85fb52ace63a..c8b4083c88bb 100644 --- a/include/tools/wintypes.hxx +++ b/include/tools/wintypes.hxx @@ -193,7 +193,6 @@ WinBits const WB_EXTRAOFFSET = 0x02000000; WinBits const WB_NOMULTILINE = 0x10000000; // Window-Bits for CheckBox -WinBits const WB_CBLINESTYLE = SAL_CONST_INT64(0x2000000000); WinBits const WB_EARLYTOGGLE = SAL_CONST_INT64(0x4000000000); // Window-Bits for Edit diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index b97809572d62..e2b62b4a4a2e 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -3026,7 +3026,6 @@ void CheckBox::ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, pDev->Push( PushFlags::CLIPREGION | PushFlags::LINECOLOR ); pDev->IntersectClipRegion( tools::Rectangle( rPos, rSize ) ); - long nLineY = rPos.Y() + (rSize.Height()-1)/2; if ( ( !aText.isEmpty() && ! (ImplGetButtonState() & DrawButtonFlags::NoText) ) || ( HasImage() && ! (ImplGetButtonState() & DrawButtonFlags::NoImage) ) ) { @@ -3049,7 +3048,6 @@ void CheckBox::ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, } ImplDrawAlignedImage( pDev, aPos, aSize, 1, nDrawFlags, nTextStyle ); - nLineY = aPos.Y() + aSize.Height()/2; rMouseRect = tools::Rectangle( aPos, aSize ); rMouseRect.Left() = rPos.X(); @@ -3096,24 +3094,6 @@ void CheckBox::ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, ImplSetFocusRect( rStateRect ); } - const int nLineSpace = 4; - if( (GetStyle() & WB_CBLINESTYLE) != 0 && - rMouseRect.Right()-1-nLineSpace < rPos.X()+rSize.Width() ) - { - const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - if ( rStyleSettings.GetOptions() & StyleSettingsOptions::Mono ) - SetLineColor( Color( COL_BLACK ) ); - else - SetLineColor( rStyleSettings.GetShadowColor() ); - long nLineX = rMouseRect.Right()+nLineSpace; - DrawLine( Point( nLineX, nLineY ), Point( rPos.X() + rSize.Width()-1, nLineY ) ); - if ( !(rStyleSettings.GetOptions() & StyleSettingsOptions::Mono) ) - { - SetLineColor( rStyleSettings.GetLightColor() ); - DrawLine( Point( nLineX, nLineY+1 ), Point( rPos.X() + rSize.Width()-1, nLineY+1 ) ); - } - } - pDev->Pop(); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
