[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sw/source

[Michael Stahl]

 sw/source/ui/uiview/view1.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit ec59889a80e9fd91fc94943a56173e27427ec4a5
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Fri Jan 13 18:04:09 2012 +0100

    fdo#40438: force calculating layout before Activate to avoid crashes and loops
    
    (cherry picked from commit d83488f9795740857830aaf005e06e30d4e7d70c)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx
index d1fdb5f..5f2b7a4 100644
--- a/sw/source/ui/uiview/view1.cxx
+++ b/sw/source/ui/uiview/view1.cxx
@@ -55,6 +55,10 @@ extern int bDocSzUpdated;
 
 void SwView::Activate(sal_Bool bMDIActivate)
 {
+    // fdo#40438 Update the layout to make sure everything is correct before showing the content
+    pWrtShell->StartAction();
+    pWrtShell->EndAction( sal_True );
+
     // aktuelle View anmelden an der DocShell
     // die View bleibt solange an der DocShell
     // aktiv bis Sie zerstoert wird oder durch Activate eine