diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-12-15 14:18:06 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-12-15 19:55:56 +0100 |
| commit | 332651107d73b085458fa90906922d004354eb26 (patch) | |
| tree | cd17243afe8bd082b6720474231c61c8a8f08db6 /sw | |
| parent | 59cc30be18c06dbcb78a0e98130c086bc34ef2a9 (diff) | |
filter: add BaseURL parameter to SvxMSDffManager::ImportOLE()
... mainly for the (unlikely) case of ODF embedded objects in MSO binary
files, which can be created by toggling the
Tools->Options->Load/Save->Microsoft Office export settings.
Change-Id: I270f1516b70b20ec0b60cfbd17c2c327c3d9efd0
(cherry picked from commit 36a0abed4ab27abd77b502070d4e17e70e6afe7b)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/wrtww8gr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par4.cxx | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 476ab4fcef90..54d1306335b7 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -141,7 +141,7 @@ bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet, if ( pOLENd ) nAspect = pOLENd->GetAspect(); SdrOle2Obj *pRet = SvxMSDffManager::CreateSdrOLEFromStorage( - rStorageName,xObjStg,m_pDoc->GetDocStorage(),aGraph,aRect,aVisArea,nullptr,nErr,0,nAspect); + rStorageName,xObjStg,m_pDoc->GetDocStorage(),aGraph,aRect,aVisArea,nullptr,nErr,0,nAspect, m_pWriter->GetBaseURL()); if (pRet) { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 84512a5297ad..95e6424f3c4f 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -589,7 +589,8 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId, { ErrCode nError = ERRCODE_NONE; pRet = CreateSdrOLEFromStorage( sStorageName, xSrcStg, xDstStg, - rGrf, rBoundRect, rVisArea, pStData, nError, nSvxMSDffOLEConvFlags, nAspect ); + rGrf, rBoundRect, rVisArea, pStData, nError, + nSvxMSDffOLEConvFlags, nAspect, rReader.GetBaseURL()); } } return pRet; diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index ff437e345eec..56a0b76b4413 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -437,7 +437,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, ErrCode nError = ERRCODE_NONE; pRet = SvxMSDffManager::CreateSdrOLEFromStorage( aSrcStgName, xSrc0, m_pDocShell->GetStorage(), rGraph, aRect, aVisArea, pTmpData, nError, - SwMSDffManager::GetFilterFlags(), nAspect ); + SwMSDffManager::GetFilterFlags(), nAspect, GetBaseURL()); m_pDataStream->Seek( nOldPos ); } } |