[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa

[Michael Stahl]

 sw/qa/extras/inc/swmodeltestbase.hxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 81b397ebbd33e4a279a4112de3f1a3b5878c05d4
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue May 6 22:31:59 2014 +0200

    sw: call SwEditShell::CalcLayout to avoid crashes
    
    (i.e. similar to 83c0018dba00ae0c0cf5b179cfc7a47ce08ff2b7 on master)
    
    Change-Id: Ia24c7cadd382b89d43bc2e1081ef85751cb6eca6
    Reviewed-on: https://gerrit.libreoffice.org/9262
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index 316cb9c..dc5a750 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -30,6 +30,7 @@
 #include <docsh.hxx>
 #include <doc.hxx>
 #include <rootfrm.hxx>
+#include <editsh.hxx>
 
 #include <libxml/xmlwriter.h>
 #include <libxml/xpath.h>
@@ -211,7 +212,7 @@ private:
     {
         SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
         SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
-        pDoc->GetCurrentViewShell()->CalcLayout();
+        dynamic_cast<SwEditShell*>(pDoc->GetCurrentViewShell())->CalcLayout();
     }