Modified: openoffice/trunk/main/sw/source/ui/utlui/content.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/utlui/content.cxx?rev=1600568&r1=1600567&r2=1600568&view=diff ============================================================================== --- openoffice/trunk/main/sw/source/ui/utlui/content.cxx (original) +++ openoffice/trunk/main/sw/source/ui/utlui/content.cxx Thu Jun 5 08:44:38 2014 @@ -19,8 +19,6 @@ * *************************************************************/ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" @@ -85,21 +83,15 @@ #include <numrule.hxx> #include <swundo.hxx> #include <ndtxt.hxx> -//#include <ndgrf.hxx> #include <fmtcntnt.hxx> #include <PostItMgr.hxx> -//#include <../../core/inc/flyfrm.hxx> -//#include <../../core/inc/cntfrm.hxx> -//#include <ndnotxt.hxx> -//#include <postit.hxx> #include <postithelper.hxx> #include <redline.hxx> #include <docary.hxx> - #include "swabstdlg.hxx" #include "globals.hrc" #include <unomid.h> - +#include <drawdoc.hxx> #define CTYPE_CNT 0 #define CTYPE_CTT 1 @@ -445,7 +437,7 @@ void SwContentType::Init(sal_Bool* pbInv { sTypeToken = aEmptyStr; nMemberCount = 0; - SdrModel* pModel = pWrtShell->getIDocumentDrawModelAccess()->GetDrawModel(); + SwDrawModel* pModel = pWrtShell->getIDocumentDrawModelAccess()->GetDrawModel(); if(pModel) { SdrPage* pPage = pModel->GetPage(0); @@ -813,7 +805,7 @@ void SwContentType::FillMemberList(sal_B pMember->DeleteAndDestroy(0, pMember->Count()); IDocumentDrawModelAccess* pIDDMA = pWrtShell->getIDocumentDrawModelAccess(); - SdrModel* pModel = pIDDMA->GetDrawModel(); + SwDrawModel* pModel = pIDDMA->GetDrawModel(); if(pModel) { SdrPage* pPage = pModel->GetPage(0); @@ -953,7 +945,7 @@ String SwContentTree::GetEntryAltText( S SdrView* pDrawView = pActiveShell->GetDrawView(); if (pDrawView) { - SdrModel* pDrawModel = pActiveShell->GetDoc()->GetDrawModel(); + SwDrawModel* pDrawModel = pActiveShell->GetDoc()->GetDrawModel(); SdrPage* pPage = pDrawModel->GetPage(0); const sal_uInt32 nCount = pPage->GetObjCount(); for( sal_uInt32 i=0; i< nCount; i++ ) @@ -1046,7 +1038,7 @@ String SwContentTree::GetEntryLongDescri SdrView* pDrawView = pActiveShell->GetDrawView(); if (pDrawView) { - SdrModel* pDrawModel = pActiveShell->GetDoc()->GetDrawModel(); + SwDrawModel* pDrawModel = pActiveShell->GetDoc()->GetDrawModel(); SdrPage* pPage = pDrawModel->GetPage(0); sal_uInt32 nCount = pPage->GetObjCount(); for( sal_uInt32 i=0; i< nCount; i++ ) @@ -1432,7 +1424,7 @@ SdrObject* SwContentTree::GetDrawingObje SdrView* pDrawView = pActiveShell->GetDrawView(); if (pDrawView) { - SdrModel* pDrawModel = pActiveShell->GetDoc()->GetDrawModel(); + SwDrawModel* pDrawModel = pActiveShell->GetDoc()->GetDrawModel(); SdrPage* pPage = pDrawModel->GetPage(0); sal_uInt32 nCount = pPage->GetObjCount(); @@ -2713,7 +2705,7 @@ void SwContentTree::KeyInput(const KeyE { pDrawView->SdrEndTextEdit();//Change from "EndTextEdit" to "SdrEndTextEdit" for acc migration - SdrModel* pDrawModel = pActiveShell->GetDoc()->GetDrawModel(); + SwDrawModel* pDrawModel = pActiveShell->GetDoc()->GetDrawModel(); SdrPage* pPage = pDrawModel->GetPage(0); sal_uInt32 nCount = pPage->GetObjCount(); sal_Bool hasObjectMarked = sal_False; @@ -3428,7 +3420,7 @@ void SwContentTree::GotoContent(SwConten { pDrawView->SdrEndTextEdit(); pDrawView->UnmarkAll(); - SdrModel* _pModel = pActiveShell->getIDocumentDrawModelAccess()->GetDrawModel(); + SwDrawModel* _pModel = pActiveShell->getIDocumentDrawModelAccess()->GetDrawModel(); SdrPage* pPage = _pModel->GetPage(0); sal_uInt32 nCount = pPage->GetObjCount(); for( sal_uInt32 i=0; i< nCount; i++ )
