[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/window/layout.cxx |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 383db30b15b2eba94ac49ab4125ddb9a20946684
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 30 12:58:13 2018 +0100

    aChildAllocation variable only set
    
    Change-Id: I4a5c4e2b9c82dcaf8a48d411539a17dc0f1cfa15

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 2032cd433a98..64c8676e357f 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1909,7 +1909,6 @@ void VclScrolledWindow::InitScrollBars(const Size &rRequest)
 
 void VclScrolledWindow::setAllocation(const Size &rAllocation)
 {
-    Size aChildAllocation(rAllocation);
     Size aChildReq;
 
     vcl::Window *pChild = get_child();
@@ -1940,7 +1939,7 @@ void VclScrolledWindow::setAllocation(const Size &rAllocation)
             m_pVScroll->Show(nAvailHeight < aChildReq.Height());
     }
 
-    Size aInnerSize(aChildAllocation);
+    Size aInnerSize(rAllocation);
     long nScrollBarWidth = 0, nScrollBarHeight = 0;
 
     if (m_pVScroll->IsVisible())
@@ -1949,9 +1948,7 @@ void VclScrolledWindow::setAllocation(const Size &rAllocation)
         Point aScrollPos(rAllocation.Width() - nScrollBarWidth, 0);
         Size aScrollSize(nScrollBarWidth, rAllocation.Height());
         setLayoutAllocation(*m_pVScroll, aScrollPos, aScrollSize);
-        aChildAllocation.AdjustWidth( -nScrollBarWidth );
         aInnerSize.AdjustWidth( -nScrollBarWidth );
-        aChildAllocation.setHeight( aChildReq.Height() );
     }
 
     if (m_pHScroll->IsVisible())
@@ -1960,9 +1957,7 @@ void VclScrolledWindow::setAllocation(const Size &rAllocation)
         Point aScrollPos(0, rAllocation.Height() - nScrollBarHeight);
         Size aScrollSize(rAllocation.Width(), nScrollBarHeight);
         setLayoutAllocation(*m_pHScroll, aScrollPos, aScrollSize);
-        aChildAllocation.AdjustHeight( -nScrollBarHeight );
         aInnerSize.AdjustHeight( -nScrollBarHeight );
-        aChildAllocation.setWidth( aChildReq.Width() );
     }
 
     if (m_pVScroll->IsVisible() && m_pHScroll->IsVisible())