diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 17:02:58 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 17:02:58 +0000 |
| commit | 1c34e554ca6dde1741906dc180aa354976f8bdab (patch) | |
| tree | 075a8e5e06c863039f363eeb045ca129c03d2937 /sw/source/ui/utlui | |
| parent | 4acc1c887fbdf996186fccc107b749a4903ee129 (diff) | |
INTEGRATION: CWS writercorehandoff (1.34.446); FILE MERGED
2006/07/27 15:09:07 fme 1.34.446.7: RESYNC: (1.38-1.39); FILE MERGED
2006/04/05 13:35:06 tra 1.34.446.6: RESYNC: (1.36-1.38); FILE MERGED
2005/12/20 15:45:32 tra 1.34.446.5: RESYNC: (1.35-1.36); FILE MERGED
2005/11/18 14:53:39 fme 1.34.446.4: #i50348# Make SwDoc accessible via interfaces
2005/09/13 18:46:03 tra 1.34.446.3: RESYNC: (1.34-1.35); FILE MERGED
2005/06/07 14:16:10 fme 1.34.446.2: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.
2005/06/06 09:30:16 tra 1.34.446.1: Unnecessary includes removed #i50348#
Diffstat (limited to 'sw/source/ui/utlui')
| -rw-r--r-- | sw/source/ui/utlui/content.cxx | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 757768708950..cd9882804afb 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -4,9 +4,9 @@ * * $RCSfile: content.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: hr $ $Date: 2006-06-19 12:44:33 $ + * last change: $Author: hr $ $Date: 2006-08-14 18:02:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,7 +32,6 @@ * MA 02111-1307 USA * ************************************************************************/ - #pragma hdrstop #ifndef _SVSTDARR_HXX @@ -106,9 +105,6 @@ #ifndef _SECTION_HXX #include <section.hxx> #endif -#ifndef _NUMRULE_HXX -#include <numrule.hxx> -#endif #ifndef _TOX_HXX #include <tox.hxx> #endif @@ -122,9 +118,6 @@ #ifndef _NAVICFG_HXX #include <navicfg.hxx> #endif -#ifndef _SWCONT_HXX -#include <swcont.hxx> -#endif #ifndef _EDTWIN_HXX #include <edtwin.hxx> #endif @@ -134,13 +127,9 @@ #ifndef _UNOTOOLS_HXX #include <unotools.hxx> #endif -#ifndef _HINTS_HXX -#include <hints.hxx> -#endif #ifndef _CRSSKIP_HXX #include <crsskip.hxx> #endif - #ifndef _CMDID_H #include <cmdid.h> #endif @@ -183,7 +172,6 @@ #ifndef _COM_SUN_STAR_TEXT_XTEXTFRAMESSUPPLIER_HPP_ #include <com/sun/star/text/XTextFramesSupplier.hpp> #endif - #ifndef _DCONTACT_HXX #include <dcontact.hxx> #endif @@ -550,7 +538,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) { sTypeToken = aEmptyStr; nMemberCount = 0; - SdrModel* pModel = pWrtShell->GetDoc()->GetDrawModel(); + SdrModel* pModel = pWrtShell->getIDocumentDrawModelAccess()->GetDrawModel(); if(pModel) { SdrPage* pPage = pModel->GetPage(0); @@ -892,7 +880,8 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) else if(pMember->Count()) pMember->DeleteAndDestroy(0, pMember->Count()); - SdrModel* pModel = pWrtShell->GetDoc()->GetDrawModel(); + IDocumentDrawModelAccess* pIDDMA = pWrtShell->getIDocumentDrawModelAccess(); + SdrModel* pModel = pIDDMA->GetDrawModel(); if(pModel) { SdrPage* pPage = pModel->GetPage(0); @@ -914,7 +903,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) this, pTemp->GetName(), nYPos); - if(!pContact->GetFmt()->GetDoc()->IsVisibleLayerId(pTemp->GetLayer())) + if(!pIDDMA->IsVisibleLayerId(pTemp->GetLayer())) pCnt->SetInvisible(); pMember->Insert(pCnt); nMemberCount++; @@ -3085,7 +3074,7 @@ void SwContentTree::GotoContent(SwContent* pCnt) { pDrawView->EndTextEdit(); pDrawView->UnmarkAll(); - SdrModel* pModel = pActiveShell->GetDoc()->GetDrawModel(); + SdrModel* pModel = pActiveShell->getIDocumentDrawModelAccess()->GetDrawModel(); SdrPage* pPage = pModel->GetPage(0); sal_uInt32 nCount = pPage->GetObjCount(); for( sal_uInt32 i=0; i< nCount; i++ ) |