summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/inc/xmlxtexp.hxx4
-rw-r--r--svx/source/inc/xmlxtimp.hxx4
-rw-r--r--svx/source/unodraw/unomod.cxx2
-rw-r--r--svx/source/xml/xmleohlp.cxx1
-rw-r--r--svx/source/xml/xmlexport.cxx16
-rw-r--r--svx/source/xml/xmlgrhlp.cxx3
-rw-r--r--svx/source/xml/xmlxtexp.cxx10
-rw-r--r--svx/source/xml/xmlxtimp.cxx12
8 files changed, 25 insertions, 27 deletions
diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx
index b48e26b17e8d..fe8cb0e98351 100644
--- a/svx/source/inc/xmlxtexp.hxx
+++ b/svx/source/inc/xmlxtexp.hxx
@@ -27,7 +27,7 @@ namespace com { namespace sun { namespace star {
namespace uno { template<class X> class Reference; }
namespace uno { class XInterface; }
namespace container { class XNameContainer; }
- namespace document { class XGraphicObjectResolver; }
+ namespace document { class XGraphicStorageHandler; }
namespace xml { namespace sax { class XDocumentHandler; } }
} } }
@@ -39,7 +39,7 @@ public:
const OUString& rFileName,
const css::uno::Reference< css::xml::sax::XDocumentHandler > & xHandler,
const css::uno::Reference< css::container::XNameContainer > & xTable,
- css::uno::Reference< css::document::XGraphicObjectResolver > const & xGrfResolver);
+ css::uno::Reference<css::document::XGraphicStorageHandler> const & xGraphicStorageHandler);
virtual ~SvxXMLXTableExportComponent() override;
diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx
index ba4563efa21b..600b32f23adc 100644
--- a/svx/source/inc/xmlxtimp.hxx
+++ b/svx/source/inc/xmlxtimp.hxx
@@ -25,7 +25,7 @@
namespace com { namespace sun { namespace star {
namespace uno { template<class X> class Reference; }
namespace uno { class XInterface; }
- namespace document { class XGraphicObjectResolver; }
+ namespace document { class XGraphicStorageHandler; }
namespace container { class XNameContainer; }
} } }
@@ -36,7 +36,7 @@ public:
SvxXMLXTableImport(
const css::uno::Reference< css::uno::XComponentContext >& rContext,
const css::uno::Reference< css::container::XNameContainer > & rTable,
- css::uno::Reference< css::document::XGraphicObjectResolver > const & rGrfResolver);
+ css::uno::Reference<css::document::XGraphicStorageHandler> const & rxGraphicStorageHandler);
virtual ~SvxXMLXTableImport() throw () override;
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 83f621ab6e8e..5de4c56b49c4 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -180,7 +180,7 @@ css::uno::Reference<css::uno::XInterface> create(
return uno::Reference< uno::XInterface >( static_cast<drawing::XShape*>(SvxDrawPage::CreateShapeByTypeAndInventor( nT, nI, nullptr, nullptr, referer )) );
}
}
- else if ( rServiceSpecifier == "com.sun.star.document.ImportGraphicObjectResolver" )
+ else if (rServiceSpecifier == "com.sun.star.document.ImportGraphicStorageHandler")
{
rtl::Reference<SvXMLGraphicHelper> pGraphicHelper = SvXMLGraphicHelper::Create( SvXMLGraphicHelperMode::Read );
uno::Reference< uno::XInterface> xRet( static_cast< ::cppu::OWeakObject* >( pGraphicHelper.get() ) );
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index f13352549638..c3f61476440e 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -551,7 +551,6 @@ rtl::Reference<SvXMLEmbeddedObjectHelper> SvXMLEmbeddedObjectHelper::Create(
return pThis;
}
-// XGraphicObjectResolver: alien objects!
OUString SAL_CALL SvXMLEmbeddedObjectHelper::resolveEmbeddedObjectURL(const OUString& rURL)
{
MutexGuard aGuard( maMutex );
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index 5e542ac665f5..4c65a19491c8 100644
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -53,7 +53,7 @@ bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputSt
{
bool bDocRet = xOut.is();
- Reference< document::XGraphicObjectResolver > xGraphicResolver;
+ uno::Reference<document::XGraphicStorageHandler> xGraphicStorageHandler;
rtl::Reference<SvXMLGraphicHelper> xGraphicHelper;
Reference< document::XEmbeddedObjectResolver > xObjectResolver;
@@ -82,7 +82,7 @@ bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputSt
}
xGraphicHelper = SvXMLGraphicHelper::Create( SvXMLGraphicHelperMode::Write );
- xGraphicResolver = xGraphicHelper.get();
+ xGraphicStorageHandler = xGraphicHelper.get();
uno::Reference<xml::sax::XDocumentHandler> xHandler( xWriter, uno::UNO_QUERY );
@@ -92,7 +92,7 @@ bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputSt
uno::Sequence< uno::Any > aArgs( xObjectResolver.is() ? 3 : 2 );
aArgs[0] <<= xHandler;
- aArgs[1] <<= xGraphicResolver;
+ aArgs[1] <<= xGraphicStorageHandler;
if( xObjectResolver.is() )
aArgs[2] <<= xObjectResolver;
@@ -125,7 +125,7 @@ bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputSt
if( xGraphicHelper )
xGraphicHelper->dispose();
xGraphicHelper.clear();
- xGraphicResolver = nullptr;
+ xGraphicStorageHandler = nullptr;
if( xObjectHelper.is() )
xObjectHelper->dispose();
@@ -150,7 +150,7 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr
{
bool bRet = true;
- Reference< document::XGraphicObjectResolver > xGraphicResolver;
+ uno::Reference<document::XGraphicStorageHandler> xGraphicStorageHandler;
rtl::Reference<SvXMLGraphicHelper> xGraphicHelper;
Reference< document::XEmbeddedObjectResolver > xObjectResolver;
@@ -175,7 +175,7 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr
xGraphicHelper = SvXMLGraphicHelper::Create( SvXMLGraphicHelperMode::Read );
- xGraphicResolver = xGraphicHelper.get();
+ xGraphicStorageHandler = xGraphicHelper.get();
::comphelper::IEmbeddedHelper *pPersist = pModel->GetPersist();
if( pPersist )
@@ -197,7 +197,7 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr
// prepare filter arguments
Sequence<Any> aFilterArgs( 2 );
Any *pArgs = aFilterArgs.getArray();
- *pArgs++ <<= xGraphicResolver;
+ *pArgs++ <<= xGraphicStorageHandler;
*pArgs++ <<= xObjectResolver;
// get filter
@@ -233,7 +233,7 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr
if( xGraphicHelper )
xGraphicHelper->dispose();
xGraphicHelper.clear();
- xGraphicResolver = nullptr;
+ xGraphicStorageHandler = nullptr;
if( xObjectHelper.is() )
xObjectHelper->dispose();
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 971402aea6b0..a0f01b8671ac 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -561,8 +561,7 @@ void splitUserDataFromURL(OUString const & rWholeURL, OUString & rJustURL, OUStr
// XGraphicObjectResolver
OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const OUString& /*rURL*/ )
{
- osl::MutexGuard aGuard( maMutex );
- return OUString();
+ throw uno::RuntimeException("XGraphicObjectResolver has been removed in LibreOffice 6.1");
}
// XGraphicStorageHandler
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 4db4101dc2c3..16598f7c37c7 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -139,7 +139,7 @@ SvxXMLXTableExportComponent::SvxXMLXTableExportComponent(
const OUString& rFileName,
const uno::Reference<xml::sax::XDocumentHandler> & rHandler,
const uno::Reference<container::XNameContainer >& xTable,
- uno::Reference<document::XGraphicObjectResolver > const & xGrfResolver )
+ uno::Reference<document::XGraphicStorageHandler> const & xGraphicStorageHandler)
: SvXMLExport(rContext, "", rFileName, rHandler, nullptr, FUNIT_100TH_MM, SvXMLExportFlags::NONE),
mxTable( xTable )
{
@@ -149,7 +149,7 @@ SvxXMLXTableExportComponent::SvxXMLXTableExportComponent(
GetNamespaceMap_().Add( GetXMLToken(XML_NP_DRAW), GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW );
GetNamespaceMap_().Add( GetXMLToken(XML_NP_XLINK), GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK );
GetNamespaceMap_().Add( GetXMLToken(XML_NP_SVG), GetXMLToken(XML_N_SVG), XML_NAMESPACE_SVG );
- SetGraphicResolver( xGrfResolver );
+ SetGraphicStorageHandler(xGraphicStorageHandler);
}
SvxXMLXTableExportComponent::~SvxXMLXTableExportComponent()
@@ -218,7 +218,7 @@ bool SvxXMLXTableExportComponent::save(
uno::Reference < io::XStream > xStream;
uno::Reference < io::XOutputStream > xOut;
uno::Reference<embed::XStorage > xSubStorage;
- uno::Reference< XGraphicObjectResolver > xGrfResolver;
+ uno::Reference<XGraphicStorageHandler> xGraphicStorageHandler;
uno::Reference<xml::sax::XDocumentHandler> xHandler( xWriter, uno::UNO_QUERY );
@@ -279,11 +279,11 @@ bool SvxXMLXTableExportComponent::save(
uno::Reference<io::XActiveDataSource> xMetaSrc( xWriter, uno::UNO_QUERY );
xMetaSrc->setOutputStream( xOut );
if( xGraphicHelper.is() )
- xGrfResolver = xGraphicHelper.get();
+ xGraphicStorageHandler = xGraphicHelper.get();
// Finally do the export
const OUString aName;
- rtl::Reference< SvxXMLXTableExportComponent > xExporter( new SvxXMLXTableExportComponent( xContext, aName, xHandler, xTable, xGrfResolver ) );
+ rtl::Reference< SvxXMLXTableExportComponent > xExporter( new SvxXMLXTableExportComponent( xContext, aName, xHandler, xTable, xGraphicStorageHandler ) );
bRet = xExporter->exportTable();
if( xGraphicHelper )
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index af5215c99582..f41eda3854d3 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -18,7 +18,7 @@
*/
#include <tools/urlobj.hxx>
-#include <com/sun/star/document/XGraphicObjectResolver.hpp>
+#include <com/sun/star/document/XGraphicStorageHandler.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/io/XActiveDataControl.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
@@ -296,11 +296,11 @@ void SvxXMLTableImportContext::importBitmap( const uno::Reference< XAttributeLis
SvxXMLXTableImport::SvxXMLXTableImport(
const css::uno::Reference< css::uno::XComponentContext >& rContext,
const uno::Reference< XNameContainer > & rTable,
- uno::Reference< XGraphicObjectResolver > const & xGrfResolver )
+ uno::Reference<XGraphicStorageHandler> const & xGraphicStorageHandler)
: SvXMLImport(rContext, "", SvXMLImportFlags::NONE),
mrTable( rTable )
{
- SetGraphicResolver( xGrfResolver );
+ SetGraphicStorageHandler(xGraphicStorageHandler);
GetNamespaceMap().Add( "__ooo", GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO );
GetNamespaceMap().Add( "__office", GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE );
@@ -394,9 +394,9 @@ bool SvxXMLXTableImport::load( const OUString &rPath, const OUString &rReferer,
*bOptLoadedFromStorage = true;
}
- uno::Reference< XGraphicObjectResolver > xGrfResolver;
+ uno::Reference<XGraphicStorageHandler> xGraphicStorageHandler;
if (xGraphicHelper.is())
- xGrfResolver = xGraphicHelper.get();
+ xGraphicStorageHandler = xGraphicHelper.get();
try
{
@@ -407,7 +407,7 @@ bool SvxXMLXTableImport::load( const OUString &rPath, const OUString &rReferer,
{
}
- uno::Reference< XDocumentHandler > xHandler( new SvxXMLXTableImport( xContext, xTable, xGrfResolver ) );
+ uno::Reference<XDocumentHandler> xHandler(new SvxXMLXTableImport(xContext, xTable, xGraphicStorageHandler));
xParser->setDocumentHandler( xHandler );
xParser->parseStream( aParserInput );
generated by cgit (git 2.34.1) at 2025-01-26 03:37:23 +0000