diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-04-23 12:43:54 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-04-26 18:19:32 +0200 |
| commit | 45f20a893a457a40604207382611afd2f8e4b635 (patch) | |
| tree | 0604a60593c9b9037c8a8e8e3cd3573070dc394b /sw/source/filter/xml/wrtxml.cxx | |
| parent | e87ea03a0d595ed478f281a723a6889228babeb2 (diff) | |
[API CHANGE] deprecate XGraphicObjectResolver
XGraphicObjectResolver was used to get the GraphicObject URL from
an storage (package) URL. This isn't possible anymore in LO 6.1
since creating GraphicObject from uniqueID was removed for its
lifecycle issues. XGraphicObjectResolver is now deprecated and
when the "resolveGraphicObjectURL" is called, it throws a
RuntimeExeption.
In places where XGraphicObjectResolver was used, we now use the
XGraphicStorageHandler as the alternative. Both share a common
implementation so previously we could cast one to the other at
any time. Now only XGraphicStorageHandler is used.
GraphicObjectResolver was removed and replaced by the alternative
GraphicStorageHandler for instance creation - where needed.
Change-Id: I5d3f759c6f95b7dbe2d93688d99c8aa4899ffa84
Reviewed-on: https://gerrit.libreoffice.org/53279
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sw/source/filter/xml/wrtxml.cxx')
| -rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 0a462cafb9e2..4700a5ce86d1 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -81,7 +81,7 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS // Get data sink ... tools::SvRef<SotStorageStream> xDocStream; - uno::Reference< document::XGraphicObjectResolver > xGraphicResolver; + uno::Reference<document::XGraphicStorageHandler> xGraphicStorageHandler; rtl::Reference<SvXMLGraphicHelper> xGraphicHelper ; uno::Reference< document::XEmbeddedObjectResolver > xObjectResolver; rtl::Reference<SvXMLEmbeddedObjectHelper> xObjectHelper; @@ -89,7 +89,7 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS OSL_ENSURE( xStg.is(), "Where is my storage?" ); xGraphicHelper = SvXMLGraphicHelper::Create( xStg, SvXMLGraphicHelperMode::Write ); - xGraphicResolver = xGraphicHelper.get(); + xGraphicStorageHandler = xGraphicHelper.get(); SfxObjectShell *pPersist = m_pDoc->GetPersist(); if( pPersist ) @@ -228,7 +228,7 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS if( xStatusIndicator.is() ) *pArgs++ <<= xStatusIndicator; - if( xGraphicResolver.is() ) + if( xGraphicStorageHandler.is() ) nArgs++; if( xObjectResolver.is() ) nArgs++; @@ -236,8 +236,8 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS Sequence < Any > aFilterArgs( nArgs ); pArgs = aFilterArgs.getArray(); *pArgs++ <<= xInfoSet; - if( xGraphicResolver.is() ) - *pArgs++ <<= xGraphicResolver; + if( xGraphicStorageHandler.is() ) + *pArgs++ <<= xGraphicStorageHandler; if( xObjectResolver.is() ) *pArgs++ <<= xObjectResolver; if( xStatusIndicator.is() ) @@ -392,7 +392,7 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS if( xGraphicHelper ) xGraphicHelper->dispose(); xGraphicHelper.clear(); - xGraphicResolver = nullptr; + xGraphicStorageHandler = nullptr; if( xObjectHelper ) xObjectHelper->dispose(); |