summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-07-24 11:55:34 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-07-24 15:05:22 +0200
commitbe07f2b19ddce09eb4f18b0a7cc4f1583b3f86e0 (patch)
treedea9b087dc271b3ed344cd5700fb5417425431a6 /vcl
parent8c1d25e0dbbcc9b6d4ed58f4bc9e8ffff7e10e5e (diff)
remove unused SvLBoxButtonKind::StaticImage
and consequently unused SvBmp::STATICIMAGE Change-Id: Ie48deb0c757e6eb9e22e7b29cde72b0145c16943 Reviewed-on: https://gerrit.libreoffice.org/76235 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/treelist/svlbitm.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/vcl/source/treelist/svlbitm.cxx b/vcl/source/treelist/svlbitm.cxx
index 56b4f016d9e9..58433644ee93 100644
--- a/vcl/source/treelist/svlbitm.cxx
+++ b/vcl/source/treelist/svlbitm.cxx
@@ -40,7 +40,7 @@ void SvLBoxButtonData::InitData( bool _bRadioBtn, const Control* pCtrl )
{
nWidth = nHeight = 0;
- aBmps.resize(int(SvBmp::STATICIMAGE)+1);
+ aBmps.resize(int(SvBmp::HITRISTATE)+1);
bDataOk = false;
pImpl->bDefaultImages = true;
@@ -307,14 +307,13 @@ void SvLBoxButton::Paint(
const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
const SvViewDataEntry* /*pView*/, const SvTreeListEntry& /*rEntry*/)
{
- SvBmp nIndex = eKind == SvLBoxButtonKind::StaticImage ? SvBmp::STATICIMAGE : SvLBoxButtonData::GetIndex(nItemFlags);
+ SvBmp nIndex = SvLBoxButtonData::GetIndex(nItemFlags);
DrawImageFlags nStyle = eKind != SvLBoxButtonKind::DisabledCheckbox && rDev.IsEnabled() ? DrawImageFlags::NONE : DrawImageFlags::Disable;
//Native drawing
bool bNativeOK = false;
ControlType eCtrlType = (pData->IsRadio())? ControlType::Radiobutton : ControlType::Checkbox;
- if ( nIndex != SvBmp::STATICIMAGE && rRenderContext.IsNativeControlSupported( eCtrlType, ControlPart::Entire) )
-
+ if ( rRenderContext.IsNativeControlSupported( eCtrlType, ControlPart::Entire) )
{
Size aSize(pData->Width(), pData->Height());
ImplAdjustBoxSize(aSize, eCtrlType, rRenderContext);
@@ -386,7 +385,7 @@ void SvLBoxButton::InitViewData(SvTreeListBox* pView,SvTreeListEntry* pEntry, Sv
Size aSize( pData->Width(), pData->Height() );
ControlType eCtrlType = (pData->IsRadio())? ControlType::Radiobutton : ControlType::Checkbox;
- if ( eKind != SvLBoxButtonKind::StaticImage && pView )
+ if ( pView )
ImplAdjustBoxSize(aSize, eCtrlType, *pView);
pViewData->mnWidth = aSize.Width();
pViewData->mnHeight = aSize.Height();