diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-29 21:09:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-30 08:40:08 +0100 |
| commit | 799f159ac00ca155275aebd930f538a1924ca471 (patch) | |
| tree | 571aec7cc5b16ef434ba0cbfe21944c8eab5de0e /vcl | |
| parent | f8325dd3ea14a4766cd2bb7c0249338b59c2ed28 (diff) | |
remove unused HeaderBarItemBits enum values
Change-Id: I84752cb9d683cb22c96d91cc54d7c4dc474603fc
Reviewed-on: https://gerrit.libreoffice.org/64269
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/treelist/headbar.cxx | 50 |
1 files changed, 11 insertions, 39 deletions
diff --git a/vcl/source/treelist/headbar.cxx b/vcl/source/treelist/headbar.cxx index 96b75c7cb8fe..aefedb609505 100644 --- a/vcl/source/treelist/headbar.cxx +++ b/vcl/source/treelist/headbar.cxx @@ -429,22 +429,11 @@ void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos long nTxtPosY = 0; if (!pItem->maOutText.isEmpty() || (nArrowWidth && aTxtSize.Height())) { - if (nBits & HeaderBarItemBits::TOP) - { - nTxtPosY = aRect.Top(); - if (!(nBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE))) - nTxtPosY += aImageSize.Height(); - } - else if (nBits & HeaderBarItemBits::BOTTOM) - nTxtPosY = aRect.Bottom()-aTxtSize.Height(); - else - { - long nTempHeight = aTxtSize.Height(); - nTempHeight += aImageSize.Height(); - nTxtPosY = aRect.Top()+((aRect.GetHeight()-nTempHeight)/2); - if (!(nBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE))) - nTxtPosY += aImageSize.Height(); - } + long nTempHeight = aTxtSize.Height(); + nTempHeight += aImageSize.Height(); + nTxtPosY = aRect.Top()+((aRect.GetHeight()-nTempHeight)/2); + if (!(nBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE))) + nTxtPosY += aImageSize.Height(); } // display text @@ -490,21 +479,11 @@ void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos nImagePos = aRect.Left() + HEADERBAR_TEXTOFF; } - if (nBits & HeaderBarItemBits::TOP) - nImagePosY = aRect.Top(); - else if (nBits & HeaderBarItemBits::BOTTOM) - { - nImagePosY = aRect.Bottom() - aImageSize.Height(); - if (!(nBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE))) - nImagePosY -= aTxtSize.Height(); - } - else - { - long nTempHeight = aImageSize.Height(); - if (!(nBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE))) - nTempHeight += aTxtSize.Height(); - nImagePosY = aRect.Top() + ((aRect.GetHeight() - nTempHeight) / 2); - } + long nTempHeight = aImageSize.Height(); + if (!(nBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE))) + nTempHeight += aTxtSize.Height(); + nImagePosY = aRect.Top() + ((aRect.GetHeight() - nTempHeight) / 2); + if (nImagePos + aImageSize.Width() <= aRect.Right()) { DrawImageFlags nStyle = DrawImageFlags::NONE; @@ -559,14 +538,7 @@ void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos else if (aImageSize.Width() && aImageSize.Height()) nArrowY = nImagePosY + (aImageSize.Height() / 2); else - { - if (nBits & HeaderBarItemBits::TOP) - nArrowY = aRect.Top() + 1; - else if (nBits & HeaderBarItemBits::BOTTOM) - nArrowY = aRect.Bottom() - HEAD_ARROWSIZE2 - 1; - else - nArrowY = aRect.Top() + ((aRect.GetHeight() - HEAD_ARROWSIZE2) / 2); - } + nArrowY = aRect.Top() + ((aRect.GetHeight() - HEAD_ARROWSIZE2) / 2); nArrowY -= HEAD_ARROWSIZE1 - 1; if (nBits & HeaderBarItemBits::DOWNARROW) { |