From 5494954b269267f6ee3bdd5ac73e7513fa69978f Mon Sep 17 00:00:00 2001
From: Valentin Kettner <vakevk+libreoffice@gmail.com>
Date: Wed, 6 Aug 2014 16:21:14 +0200
Subject: Refactored IDocumentLayoutAccess out of SwDoc.

Into the new class DocumentLayoutManager.

Change-Id: I02d0cfcc63633d0bdab380508b2ef563187fd269
---
 sw/source/core/tox/ToxTextGenerator.cxx | 5 +++--
 sw/source/core/tox/txmsrt.cxx           | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'sw/source/core/tox')

diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx
index 9c83b4abc56e..af71b04b4abb 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -23,6 +23,7 @@
 #include "cntfrm.hxx"
 #include "fchrfmt.hxx"
 #include "doc.hxx"
+#include <IDocumentLayoutAccess.hxx>
 #include "fmtinfmt.hxx"
 #include "ndtxt.hxx"
 #include "pagedesc.hxx"
@@ -115,7 +116,7 @@ ToxTextGenerator::HandleChapterToken(const SwTOXSortTabBase& rBase, const SwForm
     }
 
     // #i53420#
-    const SwCntntFrm* contentFrame = contentNode->getLayoutFrm(pDoc->GetCurrentLayout());
+    const SwCntntFrm* contentFrame = contentNode->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout());
     if (!contentFrame) {
         return OUString();
     }
@@ -203,7 +204,7 @@ ToxTextGenerator::GenerateText(SwDoc* pDoc, const std::vector<SwTOXSortTabBase*>
 
             case TOKEN_TAB_STOP: {
                 ToxTabStopTokenHandler::HandledTabStopToken htst =
-                        mTabStopTokenHandler->HandleTabStopToken(aToken, *pTOXNd, pDoc->GetCurrentLayout());
+                        mTabStopTokenHandler->HandleTabStopToken(aToken, *pTOXNd, pDoc->getIDocumentLayoutAccess().GetCurrentLayout());
                 rTxt += htst.text;
                 aTStops.Insert(htst.tabStop);
                 break;
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 8818fe2d0b36..325b38977913 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -23,6 +23,7 @@
 #include <editeng/unolingu.hxx>
 #include <txtfld.hxx>
 #include <doc.hxx>
+#include <IDocumentLayoutAccess.hxx>
 #include <docary.hxx>
 #include <cntfrm.hxx>
 #include <node.hxx>
@@ -157,7 +158,7 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd,
             {
                 // Then get the 'anchor' (body) position
                 Point aPt;
-                const SwCntntFrm* pFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), &aPt, 0, false );
+                const SwCntntFrm* pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
                 if( pFrm )
                 {
                     SwPosition aPos( *pNd );
-- 
cgit v1.2.3