diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-03 10:53:58 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-03 12:16:38 +0200 |
commit | 77e9216ca1073caa0dcec23ef89808cc7f80fc06 (patch) | |
tree | 71ea2c3841f1a1017123dec44552239d74fd7a4a /vcl/source/window/layout.cxx | |
parent | 81903d443116c643a9ff92d92c092812abc7f57d (diff) |
loplugin:unusedfields
and filter out the weld fields, since we're not touching them yet
Change-Id: I3cc23c46d2650f13cb29c7d381687939d23e2882
Reviewed-on: https://gerrit.libreoffice.org/80104
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/window/layout.cxx')
-rw-r--r-- | vcl/source/window/layout.cxx | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index d0c155d1a4d4..2599b4278664 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1528,11 +1528,6 @@ Size VclFrame::calculateRequisition() const aRet.setWidth( std::max(aLabelSize.Width(), aRet.Width()) ); } - const FrameStyle &rFrameStyle = - GetSettings().GetStyleSettings().GetFrameStyle(); - aRet.AdjustWidth(rFrameStyle.left + rFrameStyle.right ); - aRet.AdjustHeight(rFrameStyle.top + rFrameStyle.bottom ); - return aRet; } @@ -1540,11 +1535,8 @@ void VclFrame::setAllocation(const Size &rAllocation) { //SetBackground( Color(0xFF, 0x00, 0xFF) ); - const FrameStyle &rFrameStyle = - GetSettings().GetStyleSettings().GetFrameStyle(); - Size aAllocation(rAllocation.Width() - rFrameStyle.left - rFrameStyle.right, - rAllocation.Height() - rFrameStyle.top - rFrameStyle.bottom); - Point aChildPos(rFrameStyle.left, rFrameStyle.top); + Size aAllocation(rAllocation); + Point aChildPos; vcl::Window *pChild = get_child(); vcl::Window *pLabel = get_label_widget(); @@ -1732,21 +1724,13 @@ Size VclExpander::calculateRequisition() const aRet.AdjustHeight(aExpanderSize.Height() ); aRet.setWidth( std::max(aExpanderSize.Width(), aRet.Width()) ); - const FrameStyle &rFrameStyle = - GetSettings().GetStyleSettings().GetFrameStyle(); - aRet.AdjustWidth(rFrameStyle.left + rFrameStyle.right ); - aRet.AdjustHeight(rFrameStyle.top + rFrameStyle.bottom ); - return aRet; } void VclExpander::setAllocation(const Size &rAllocation) { - const FrameStyle &rFrameStyle = - GetSettings().GetStyleSettings().GetFrameStyle(); - Size aAllocation(rAllocation.Width() - rFrameStyle.left - rFrameStyle.right, - rAllocation.Height() - rFrameStyle.top - rFrameStyle.bottom); - Point aChildPos(rFrameStyle.left, rFrameStyle.top); + Size aAllocation(rAllocation); + Point aChildPos; WindowImpl* pWindowImpl = ImplGetWindowImpl(); |