[Libreoffice-commits] .: svtools/source

[Libreoffice Gerrit user]

 svtools/source/table/tablecontrol_impl.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 712c1c41721bc50a8106fa3b5892a617b3ee542a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Sep 3 16:11:42 2012 -0500

    gridfixes: impl_ni_relayout: update the child window position/size last
    
    it relies on the other calculations (in particular calculation of the
    column widths) being finished
    
    Change-Id: I599aa5b2938e2aa810980c00ac8f598b4f4fcfcb
    Reviewed-on: https://gerrit.libreoffice.org/551
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index df6bbbc..aca789e 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -1237,9 +1237,6 @@ namespace svt { namespace table
             }
         }
 
-        // show or hide the scrollbars as needed
-        impl_ni_positionChildWindows( aDataCellPlayground, bNeedVerticalScrollbar, bNeedHorizontalScrollbar );
-
         // the initial call to impl_ni_calculateColumnWidths assumed that we need a vertical scrollbar. If, by now,
         // we know that this is not the case, re-calculate the column widths.
         if ( !bNeedVerticalScrollbar )
@@ -1293,6 +1290,9 @@ namespace svt { namespace table
                 colPos->move( offsetPixel );
             }
         }
+
+        // show or hide the scrollbars as needed, and position the data window
+        impl_ni_positionChildWindows( aDataCellPlayground, bNeedVerticalScrollbar, bNeedHorizontalScrollbar );
     }
 
     //------------------------------------------------------------------------------------------------------------------