diff options
| author | Valentin Kettner <vakevk+libreoffice@gmail.com> | 2014-08-06 16:21:14 +0200 |
|---|---|---|
| committer | Valentin Kettner <vakevk+libreoffice@gmail.com> | 2014-08-12 23:26:38 +0200 |
| commit | 5494954b269267f6ee3bdd5ac73e7513fa69978f (patch) | |
| tree | bd6569e5b82a7c771062b2e2e5f6db7666913597 /sw/qa | |
| parent | 64e13a1456c44ef3461c2941bb3be15c3eaf478e (diff) | |
Refactored IDocumentLayoutAccess out of SwDoc.
Into the new class DocumentLayoutManager.
Change-Id: I02d0cfcc63633d0bdab380508b2ef563187fd269
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/core/macros-test.cxx | 3 | ||||
| -rw-r--r-- | sw/qa/extras/inc/swmodeltestbase.hxx | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index 15a8085f6caa..e2194e59f616 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -42,6 +42,7 @@ #include <unotools/tempfile.hxx> #include <doc.hxx> +#include <IDocumentLayoutAccess.hxx> #include "docsh.hxx" typedef tools::SvRef<SwDocShell> SwDocShellRef; @@ -166,7 +167,7 @@ void SwMacrosTest::testFdo55289() SwDocShellRef pDocShell = new SwDocShell(pDoc, SFX_CREATE_MODE_EMBEDDED); // this needs to run with no layout to tickle the bugs in the special // cases in SwXShape re-anchoring - assert(!pDoc->GetCurrentLayout()); + assert(!pDoc->getIDocumentLayoutAccess().GetCurrentLayout()); uno::Reference<frame::XModel> const xModel(pDocShell->GetModel()); uno::Reference<drawing::XDrawPageSupplier> const xDPS(xModel, UNO_QUERY); diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index e7d77f143ceb..dfd885c14e83 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -38,6 +38,7 @@ #include <unotxdoc.hxx> #include <docsh.hxx> #include <doc.hxx> +#include <IDocumentLayoutAccess.hxx> #include <rootfrm.hxx> using namespace css; @@ -296,7 +297,7 @@ private: SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get()); CPPUNIT_ASSERT(pTxtDoc); SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc(); - SwRootFrm* pLayout = pDoc->GetCurrentLayout(); + SwRootFrm* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout(); pLayout->dumpAsXml(pXmlWriter); // delete xml writer @@ -309,7 +310,7 @@ private: SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get()); CPPUNIT_ASSERT(pTxtDoc); SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc(); - pDoc->GetCurrentViewShell()->CalcLayout(); + pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout(); } protected: |