diff options
author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2012-01-13 16:04:09 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-01-17 22:20:48 +0100 |
commit | 74255f5e0b89d60102e0b482ed894c64de57b42c (patch) | |
tree | 0f2dd0164bc169a7a77b4c60747ede7a31a05cb5 | |
parent | 69ba498b4cfd2b25ddc1c84f83d376d11c321fce (diff) |
fdo#40438: force calculating layout before Activate to avoid crashes and loops
(cherry picked from commit d83488f9795740857830aaf005e06e30d4e7d70c)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r-- | sw/source/ui/uiview/view1.cxx | 4 |
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 |