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

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

    fdo#40438: force calculating layout before Activate to avoid crashes and 
loops

diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx
index 23d80f9..79ec899 100644
--- a/sw/source/ui/uiview/view1.cxx
+++ b/sw/source/ui/uiview/view1.cxx
@@ -53,6 +53,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
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to