diff options
| -rw-r--r-- | include/svx/xmleohlp.hxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlwrap.cxx | 4 | ||||
| -rw-r--r-- | sd/source/filter/xml/sdxmlwrp.cxx | 5 | ||||
| -rw-r--r-- | svx/source/xml/xmleohlp.cxx | 5 | ||||
| -rw-r--r-- | sw/source/filter/xml/swxml.cxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 3 |
6 files changed, 8 insertions, 15 deletions
diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index cb8183fb20a6..51227dbb8b0d 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -102,8 +102,7 @@ public: static SvXMLEmbeddedObjectHelper* Create( const css::uno::Reference < css::embed::XStorage >&, ::comphelper::IEmbeddedHelper& rDocPersist, - SvXMLEmbeddedObjectHelperMode eCreateMode, - bool bDirect = true ); + SvXMLEmbeddedObjectHelperMode eCreateMode ); static SvXMLEmbeddedObjectHelper* Create( ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode ); diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 979c3cda75c1..538bdcd60ebe 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -443,7 +443,7 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, ErrCode& rError ) pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, SvXMLGraphicHelperMode::Read ); xGrfContainer = pGraphicHelper; - pObjectHelper = SvXMLEmbeddedObjectHelper::Create(xStorage, mrDocShell, SvXMLEmbeddedObjectHelperMode::Read, false); + pObjectHelper = SvXMLEmbeddedObjectHelper::Create(xStorage, mrDocShell, SvXMLEmbeddedObjectHelperMode::Read); xObjectResolver = pObjectHelper; } uno::Sequence<uno::Any> aStylesArgs(4); @@ -874,7 +874,7 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly) if( pObjSh ) { - pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *pObjSh, SvXMLEmbeddedObjectHelperMode::Write, false ); + pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *pObjSh, SvXMLEmbeddedObjectHelperMode::Write ); xObjectResolver = pObjectHelper; } diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 01cba586eb44..38ef1d3f6341 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -555,8 +555,7 @@ bool SdXMLFilter::Import( ErrCode& nError ) xGraphicResolver = pGraphicHelper; pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *pDoc->GetPersist(), - SvXMLEmbeddedObjectHelperMode::Read, - false ); + SvXMLEmbeddedObjectHelperMode::Read ); xObjectResolver = pObjectHelper; } @@ -868,7 +867,7 @@ bool SdXMLFilter::Export() // create helper for graphic and ole export if we have a storage if( xStorage.is() ) { - pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *mrDocShell.GetDoc()->GetPersist(), SvXMLEmbeddedObjectHelperMode::Write, false ); + pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *mrDocShell.GetDoc()->GetPersist(), SvXMLEmbeddedObjectHelperMode::Write ); xObjectResolver = pObjectHelper; pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, SvXMLGraphicHelperMode::Write, false ); diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 3b6af7b87fa4..c21fe6c11e51 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -548,11 +548,8 @@ void SvXMLEmbeddedObjectHelper::Init( SvXMLEmbeddedObjectHelper* SvXMLEmbeddedObjectHelper::Create( const uno::Reference < embed::XStorage >& rRootStorage, ::comphelper::IEmbeddedHelper& rDocPersist, - SvXMLEmbeddedObjectHelperMode eCreateMode, - bool bDirect ) + SvXMLEmbeddedObjectHelperMode eCreateMode ) { - (void)bDirect; - SvXMLEmbeddedObjectHelper* pThis = new SvXMLEmbeddedObjectHelper; pThis->acquire(); diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 61bd0949f002..1f891c9cc002 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -498,8 +498,7 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con { pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *pPersist, - SvXMLEmbeddedObjectHelperMode::Read, - false ); + SvXMLEmbeddedObjectHelperMode::Read ); xObjectResolver = pObjectHelper; } diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index d7690b57cae9..61a7cddece3a 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -94,8 +94,7 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS { pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStg, *pPersist, - SvXMLEmbeddedObjectHelperMode::Write, - false ); + SvXMLEmbeddedObjectHelperMode::Write ); xObjectResolver = pObjectHelper; } |