From d83488f9795740857830aaf005e06e30d4e7d70c Mon Sep 17 00:00:00 2001 From: Cédric Bosdonnat Date: Fri, 13 Jan 2012 18:04:09 +0100 Subject: fdo#40438: force calculating layout before Activate to avoid crashes and loops --- sw/source/ui/uiview/view1.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx index 23d80f9e928f..79ec8998d2dc 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 -- cgit v1.2.3