diff options
Diffstat (limited to 'xmlscript/source')
4 files changed, 4 insertions, 11 deletions
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx index 9c0e71610112..fec77d042c9c 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/table/CellRangeAddress.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> -#include <com/sun/star/document/XGraphicObjectResolver.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <o3tl/any.hxx> diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx index b4174a5da6ac..ae6340cd9848 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx @@ -63,7 +63,7 @@ #include <com/sun/star/table/CellAddress.hpp> #include <com/sun/star/table/CellRangeAddress.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> -#include <com/sun/star/document/GraphicObjectResolver.hpp> +#include <com/sun/star/document/GraphicStorageHandler.hpp> #include <com/sun/star/document/XGraphicStorageHandler.hpp> #include <com/sun/star/graphic/XGraphic.hpp> @@ -731,10 +731,8 @@ void ElementDescriptor::readImageOrGraphicAttr(OUString const & rAttrName) if ( xDocStorage.is() ) { Reference<XComponentContext> xContext = ::comphelper::getProcessComponentContext(); - uno::Reference<document::XGraphicObjectResolver> xGraphicResolver; - xGraphicResolver.set(document::GraphicObjectResolver::createWithStorage(xContext, xDocStorage->getDocumentStorage())); uno::Reference<document::XGraphicStorageHandler> xGraphicStorageHandler; - xGraphicStorageHandler.set(xGraphicResolver, uno::UNO_QUERY); + xGraphicStorageHandler.set(document::GraphicStorageHandler::createWithStorage(xContext, xDocStorage->getDocumentStorage())); if (xGraphicStorageHandler.is()) { sURL = xGraphicStorageHandler->saveGraphic(xGraphic); diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx index 5b1996259a9c..d78e9a55579e 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> -#include <com/sun/star/document/XGraphicObjectResolver.hpp> #include <com/sun/star/xml/sax/SAXException.hpp> #include <sal/log.hxx> diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index c8c7442b20b8..b2c55a45ef35 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -53,7 +53,6 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/table/CellAddress.hpp> #include <com/sun/star/table/CellRangeAddress.hpp> -#include <com/sun/star/document/XGraphicObjectResolver.hpp> #include <com/sun/star/document/XGraphicStorageHandler.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <com/sun/star/graphic/XGraphic.hpp> @@ -853,16 +852,14 @@ bool ImportContext::importGraphicOrImageProperty( uno::Reference<graphic::XGraphic> xGraphic; - uno::Reference< document::XGraphicObjectResolver > xGraphicResolver; + uno::Reference<document::XGraphicStorageHandler> xGraphicStorageHandler; if ( xDocStorage.is() ) { uno::Sequence< Any > aArgs( 1 ); aArgs[ 0 ] <<= xDocStorage->getDocumentStorage(); - xGraphicResolver.set( + xGraphicStorageHandler.set( _pImport->getComponentContext()->getServiceManager()->createInstanceWithArgumentsAndContext( "com.sun.star.comp.Svx.GraphicImportHelper" , aArgs, _pImport->getComponentContext() ), UNO_QUERY ); - uno::Reference<document::XGraphicStorageHandler> xGraphicStorageHandler; - xGraphicStorageHandler.set(xGraphicResolver, uno::UNO_QUERY); if (xGraphicStorageHandler.is()) { try |