diff options
Diffstat (limited to 'sw/source/filter/ww8/ww8par.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 33ff69accc43..0990ec498bb5 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -497,9 +497,19 @@ SdrObject* SwMSDffManager::ImportOLE( sal_uInt32 nOLEId, else { ErrCode nError = ERRCODE_NONE; - pRet = CreateSdrOLEFromStorage( sStorageName, xSrcStg, xDstStg, - rGrf, rBoundRect, rVisArea, pStData, nError, - nSvxMSDffOLEConvFlags, css::embed::Aspects::MSOLE_CONTENT, rReader.GetBaseURL()); + pRet = CreateSdrOLEFromStorage( + *pSdrModel, + sStorageName, + xSrcStg, + xDstStg, + rGrf, + rBoundRect, + rVisArea, + pStData, + nError, + nSvxMSDffOLEConvFlags, + css::embed::Aspects::MSOLE_CONTENT, + rReader.GetBaseURL()); } } return pRet; @@ -733,7 +743,10 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, if (bIsSimpleDrawingTextBox) { SdrObject::Free( pObj ); - pObj = new SdrRectObj(OBJ_TEXT, rTextRect); + pObj = new SdrRectObj( + *pSdrModel, + OBJ_TEXT, + rTextRect); } // The vertical paragraph justification are contained within the @@ -857,7 +870,6 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, if (pObj != nullptr) { pObj->SetMergedItemSet(aSet); - pObj->SetModel(pSdrModel); if (bVerticalText) { @@ -923,8 +935,10 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, // simple rectangular objects are ignored by ImportObj() :-( // this is OK for Draw but not for Calc and Writer // cause here these objects have a default border - pObj = new SdrRectObj(rTextRect); - pObj->SetModel( pSdrModel ); + pObj = new SdrRectObj( + *pSdrModel, + rTextRect); + SfxItemSet aSet( pSdrModel->GetItemPool() ); ApplyAttributes( rSt, aSet, rObjData ); |