diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 11:17:43 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 11:17:43 +0000 |
commit | 45052a64a0df2fe1dfc7ac54dc9a3049295fe4ee (patch) | |
tree | 769a75c7daf463547dd63d73a7183acf0a6f4feb /sc/source/ui/view/tabview.cxx | |
parent | 6640139d22430e295192c7db8d17d5a21f111e80 (diff) |
INTEGRATION: CWS dr37 (1.25.34); FILE MERGED
2005/04/27 18:16:10 nn 1.25.34.1: #i46796# RepeatResize: call UpdateShow before UpdateFixX/UpdateFixY
Diffstat (limited to 'sc/source/ui/view/tabview.cxx')
-rw-r--r-- | sc/source/ui/view/tabview.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 379f09a4000c..5d7015534e30 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tabview.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: rt $ $Date: 2005-09-08 23:07:15 $ + * last change: $Author: hr $ $Date: 2005-09-28 12:17:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -918,9 +918,18 @@ void ScTabView::RepeatResize( BOOL bUpdateFix ) { if ( bUpdateFix ) { - if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX ) + ScSplitMode eHSplit = aViewData.GetHSplitMode(); + ScSplitMode eVSplit = aViewData.GetVSplitMode(); + + // #i46796# UpdateFixX / UpdateFixY uses GetGridOffset, which requires the + // outline windows to be available. So UpdateShow has to be called before + // (also called from DoResize). + if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) + UpdateShow(); + + if ( eHSplit == SC_SPLIT_FIX ) aViewData.UpdateFixX(); - if ( aViewData.GetVSplitMode() == SC_SPLIT_FIX ) + if ( eVSplit == SC_SPLIT_FIX ) aViewData.UpdateFixY(); } |