[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source

[Caolán McNamara]

 vcl/source/window/layout.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 14bdff6f667ab28e14618fcb3dfb83bf2c2c765f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 19 16:14:23 2014 +0100

    facepalm: nAvailHeight is not derived from allocation Width
    
    Change-Id: Ic99c6519b02c546e0d3574cb756e3fb172d1ff52
    (cherry picked from commit 36490fff3f4d1b4a7e4b7902a866abb177a0bf54)
    Reviewed-on: https://gerrit.libreoffice.org/11024
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 8d8ab0d..517fa33 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1692,7 +1692,7 @@ void VclScrolledWindow::setAllocation(const Size &rAllocation)
     if (pChild && pChild->IsVisible())
         aChildReq = getLayoutRequisition(*pChild);
 
-    long nAvailHeight = rAllocation.Width();
+    long nAvailHeight = rAllocation.Height();
     long nAvailWidth = rAllocation.Width();
     // vert. ScrollBar
     if (GetStyle() & WB_AUTOVSCROLL)