[Libreoffice-commits] .: sw/qa

[Libreoffice Gerrit user]

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

New commits:
commit 40411d73bb00f5bc1e65dc1d13727e55d0335fd6
Author: Pierre-Eric Pelloux-Prayer <pierre-eric at lanedo.com>
Date:   Wed Jan 16 11:11:52 2013 +0100

    sw unit test: force layout compute after loading document
    
    Change-Id: I35173bbc2a4e33dfee555aa71f053e219ef01d1e

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index 2bb2369..d045780 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -88,7 +88,6 @@ private:
         // create the dump
         SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
         SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
-        pDoc->GetCurrentViewShell()->CalcLayout();
         SwRootFrm* pLayout = pDoc->GetCurrentLayout();
         pLayout->dumpAsXml(pXmlWriter);
 
@@ -97,6 +96,13 @@ private:
         xmlFreeTextWriter(pXmlWriter);
     }
 
+    void calcLayout()
+    {
+        SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+        SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+        pDoc->GetCurrentViewShell()->CalcLayout();
+    }
+
 
 protected:
     /// Get the length of the whole document.
@@ -238,6 +244,7 @@ protected:
         fprintf(stderr, "%s,", pName);
         m_nStartTime = osl_getGlobalTimer();
         mxComponent = loadFromDesktop(getURLFromSrc(pDir) + OUString::createFromAscii(pName));
+        calcLayout();
     }
     
     void reload(OUString aFilter)
@@ -257,6 +264,7 @@ protected:
             xmlBufferFree(mpXmlBuffer);
             mpXmlBuffer = 0;
         }
+        calcLayout();
     }
 
     void finish()