summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2012-01-13 18:04:09 +0100
committerCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2012-01-13 18:04:45 +0100
commitd83488f9795740857830aaf005e06e30d4e7d70c (patch)
treea4d8d52a33a988309f542f6b4afa3220854b367b
parent2ad876ae4dac2ffa6d388fc8bc9d1f4e5e276cc7 (diff)
fdo#40438: force calculating layout before Activate to avoid crashes and loops
-rw-r--r--sw/source/ui/uiview/view1.cxx4
1 files changed, 4 insertions, 0 deletions
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