diff options
| author | Valentin Kettner <vakevk+libreoffice@gmail.com> | 2014-06-01 22:21:38 +0200 |
|---|---|---|
| committer | Valentin Kettner <vakevk+libreoffice@gmail.com> | 2014-06-03 19:12:05 +0200 |
| commit | 86075a3f0f095cde29c6460d7e5dd4069ed89d00 (patch) | |
| tree | bb4cc053f51e3f2bef38b44d1ce28dce3e1613e8 /sw/source/filter/xml/xmltexti.cxx | |
| parent | 4269e3a7435b45cbbcd45d959e1e8c8e761a94a0 (diff) | |
Split out IDocumentDrawModelAccess from SwDoc.
To the new class DocumentDrawModelManager.
All moved methods and members have the same in thew new class.
Change-Id: I89ad0e0c4a42885d5810e834983ea8e8e6c0a2d2
Diffstat (limited to 'sw/source/filter/xml/xmltexti.cxx')
| -rw-r--r-- | sw/source/filter/xml/xmltexti.cxx | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index e367b358f288..faed2f2de98a 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -39,6 +39,7 @@ #include "TextCursorHelper.hxx" #include "unoframe.hxx" #include "doc.hxx" +#include <IDocumentDrawModelAccess.hxx> #include "unocoll.hxx" #include <fmtfsize.hxx> #include <fmtanchr.hxx> @@ -357,7 +358,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( SwXFrame *pXFrame = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE ); xPropSet = pXFrame; - if( pDoc->GetDrawModel() ) + if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() ) SwXFrame::GetOrCreateSdrObject(* static_cast<SwFlyFrmFmt*>( pXFrame->GetFrmFmt() ) ); // req for z-order if( !rTblName.isEmpty() ) @@ -595,8 +596,13 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink( SwXFrame *pXFrame = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE ); xPropSet = pXFrame; +<<<<<<< HEAD if( pDoc->GetDrawModel() ) SwXFrame::GetOrCreateSdrObject(* +======= + if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() ) + SwXFrame::GetOrCreateSdrObject( +>>>>>>> Split out IDocumentDrawModelAccess from SwDoc. static_cast<SwFlyFrmFmt*>( pXFrame->GetFrmFmt() ) ); // req for z-order } } @@ -652,8 +658,13 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet( NULL); SwXFrame *pXFrame = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE ); xPropSet = pXFrame; +<<<<<<< HEAD if( pDoc->GetDrawModel() ) SwXFrame::GetOrCreateSdrObject(* +======= + if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() ) + SwXFrame::GetOrCreateSdrObject( +>>>>>>> Split out IDocumentDrawModelAccess from SwDoc. static_cast<SwFlyFrmFmt*>( pXFrame->GetFrmFmt() ) ); // req for z-order return xPropSet; @@ -725,8 +736,13 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin( NULL); SwXFrame *pXFrame = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE ); xPropSet = pXFrame; +<<<<<<< HEAD if( pDoc->GetDrawModel() ) SwXFrame::GetOrCreateSdrObject(* +======= + if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() ) + SwXFrame::GetOrCreateSdrObject( +>>>>>>> Split out IDocumentDrawModelAccess from SwDoc. static_cast<SwFlyFrmFmt*>( pXFrame->GetFrmFmt() ) ); // req for z-order } } @@ -876,8 +892,13 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra NULL); SwXFrame *pXFrame = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE ); xPropSet = pXFrame; +<<<<<<< HEAD if( pDoc->GetDrawModel() ) SwXFrame::GetOrCreateSdrObject(* +======= + if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() ) + SwXFrame::GetOrCreateSdrObject( +>>>>>>> Split out IDocumentDrawModelAccess from SwDoc. static_cast<SwFlyFrmFmt*>( pXFrame->GetFrmFmt() ) ); // req for z-order } } |