diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-18 15:13:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-18 18:43:35 +0200 |
| commit | e5dbc6e02b96887772e1f305f4cd97b6d4b96734 (patch) | |
| tree | 2783d2161fa3b3392f24f67ea5499a0adb6a26a3 /svtools | |
| parent | WB_TOPBORDER,WB_3DTAB are dead (diff) | |
| download | core-e5dbc6e02b96887772e1f305f4cd97b6d4b96734.tar.gz core-e5dbc6e02b96887772e1f305f4cd97b6d4b96734.zip | |
WB_RADIOSEL is dead
since
commit 37229126c0a821a925839bbca4b6ec7245f861e9
Make WB_RADIOSEL style behaviour as default.
Change-Id: I606a01f4c8a84780af96265493372bb0df3fc40d
Reviewed-on: https://gerrit.libreoffice.org/41297
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/valueset.cxx | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 269ad084b042..04d94b4c06d4 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -243,11 +243,6 @@ void ValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, ValueSe maVirDev->DrawRect(aRect); Point aTxtPos(aRect.Left() + 2, aRect.Top()); long nTxtWidth = rRenderContext.GetTextWidth(pItem->maText); - if (nStyle & WB_RADIOSEL) - { - aTxtPos.X() += 4; - aTxtPos.Y() += 4; - } if ((aTxtPos.X() + nTxtWidth) > aRect.Right()) { maVirDev->SetClipRegion(vcl::Region(aRect)); @@ -398,8 +393,6 @@ void ValueSet::Format(vcl::RenderContext const & rRenderContext) { nNoneHeight = nTxtHeight + nOff; nNoneSpace = mnSpacing; - if (nStyle & WB_RADIOSEL) - nNoneHeight += 8; } else { @@ -802,43 +795,6 @@ void ValueSet::ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16 nIt rRenderContext.DrawRect(aRect); } } - else if (nStyle & WB_RADIOSEL) - { - aRect.Left() += 3; - aRect.Top() += 3; - aRect.Right() -= 3; - aRect.Bottom() -= 3; - if (nStyle & WB_DOUBLEBORDER) - { - aRect.Left()++; - aRect.Top()++; - aRect.Right()--; - aRect.Bottom()--; - } - - if (bFocus) - ShowFocus(aRect); - - aRect.Left()++; - aRect.Top()++; - aRect.Right()--; - aRect.Bottom()--; - - if (bDrawSel) - { - rRenderContext.SetLineColor(aDoubleColor); - aRect.Left()++; - aRect.Top()++; - aRect.Right()--; - aRect.Bottom()--; - rRenderContext.DrawRect(aRect); - aRect.Left()++; - aRect.Top()++; - aRect.Right()--; - aRect.Bottom()--; - rRenderContext.DrawRect(aRect); - } - } else { if (bDrawSel) @@ -2217,8 +2173,6 @@ Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesireCol if ( nStyle & WB_NONEFIELD ) { aSize.Height() += nTxtHeight + n + mnSpacing; - if ( nStyle & WB_RADIOSEL ) - aSize.Height() += 8; } // sum possible ScrollBar width |