diff options
author | Noel Grandin <noel@peralex.com> | 2013-05-21 16:05:16 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-05-22 15:19:59 +0200 |
commit | 8c249489120c9ef0a25436d16c38cbe3756adff1 (patch) | |
tree | 0f02d108dde3289e29f29b36058e2598b0edefb3 /filter/source/xsltfilter | |
parent | fe9f937f46773b6978a8774ba40c971ea7acc500 (diff) |
fdo#46808, Convert XMultiServiceFactory to XComponentContext
Change-Id: I24c21e5e3fede7de003cddeef39457ee88b885e9
Diffstat (limited to 'filter/source/xsltfilter')
-rw-r--r-- | filter/source/xsltfilter/LibXSLTTransformer.cxx | 6 | ||||
-rw-r--r-- | filter/source/xsltfilter/LibXSLTTransformer.hxx | 10 | ||||
-rw-r--r-- | filter/source/xsltfilter/OleHandler.cxx | 13 | ||||
-rw-r--r-- | filter/source/xsltfilter/OleHandler.hxx | 6 | ||||
-rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 2 |
5 files changed, 19 insertions, 18 deletions
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index b98d71ca7609..65d3725814ca 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -307,7 +307,7 @@ namespace XSLT xsltSetGenericDebugFunc(stderr, NULL); xsltDebugDumpExtensions(NULL); #endif - OleHandler* oh = new OleHandler(m_transformer->getServiceFactory()); + OleHandler* oh = new OleHandler(m_transformer->getComponentContext()); if (styleSheet) { tcontext = xsltNewTransformContext(styleSheet, doc); @@ -368,8 +368,8 @@ namespace XSLT } LibXSLTTransformer::LibXSLTTransformer( - const css::uno::Reference<XMultiServiceFactory> &r) : - m_rServiceFactory(r) + const css::uno::Reference<XComponentContext> & rxContext) : + m_xContext(rxContext) { } diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx index 2479c5b1f6d2..024262648811 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.hxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx @@ -77,7 +77,7 @@ namespace XSLT static const char* const PARAM_DOCTYPE_PUBLIC; // the UNO ServiceFactory - com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> m_rServiceFactory; + com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> m_xContext; com::sun::star::uno::Reference<XInputStream> m_rInputStream; @@ -104,7 +104,7 @@ namespace XSLT public: // ctor... - LibXSLTTransformer(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> &r); + LibXSLTTransformer(const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> &r); // XActiveDataSink virtual void SAL_CALL @@ -144,9 +144,9 @@ namespace XSLT ::std::map<const char*, OString> SAL_CALL getParameters(); - virtual com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> SAL_CALL - getServiceFactory() { - return m_rServiceFactory; + com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> SAL_CALL + getComponentContext() { + return m_xContext; } }; diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index e16d1565dc09..382ab687dc9c 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -52,9 +52,7 @@ using namespace ::rtl; namespace XSLT { Reference<XStream> SAL_CALL OleHandler::createTempFile() { - Reference<XStream> tempFile( - TempFile::create(comphelper::getComponentContext(m_msf)), - UNO_QUERY); + Reference<XStream> tempFile( TempFile::create(m_xContext), UNO_QUERY); OSL_ASSERT(tempFile.is()); return tempFile; } @@ -66,9 +64,10 @@ namespace XSLT m_rootStream = createTempFile(); Sequence<Any> args(1); args[0] <<= m_rootStream->getInputStream(); - OUString serviceName("com.sun.star.embed.OLESimpleStorage"); - Reference<XNameContainer> cont(m_msf->createInstanceWithArguments(serviceName, args), UNO_QUERY); + Reference<XNameContainer> cont( + Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) + ->createInstanceWithArguments("com.sun.star.embed.OLESimpleStorage", args), UNO_QUERY); m_storage = cont; } } @@ -89,7 +88,9 @@ namespace XSLT //create an com.sun.star.embed.OLESimpleStorage from the temp stream Sequence<Any> args(1); args[0] <<= xSeek; - Reference<XNameContainer> cont(m_msf->createInstanceWithArguments(OUString( "com.sun.star.embed.OLESimpleStorage" ), args), UNO_QUERY); + Reference<XNameContainer> cont( + Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) + ->createInstanceWithArguments("com.sun.star.embed.OLESimpleStorage", args), UNO_QUERY); m_storage = cont; } diff --git a/filter/source/xsltfilter/OleHandler.hxx b/filter/source/xsltfilter/OleHandler.hxx index e7e0f4c268cc..afd707651050 100644 --- a/filter/source/xsltfilter/OleHandler.hxx +++ b/filter/source/xsltfilter/OleHandler.hxx @@ -61,8 +61,8 @@ namespace XSLT class OleHandler { public: - OleHandler(const com::sun::star::uno::Reference<XMultiServiceFactory>& msf){ - m_msf =msf; + OleHandler(const com::sun::star::uno::Reference<XComponentContext>& rxContext){ + m_xContext = rxContext; } void SAL_CALL insertByName(const OUString& streamName, const OString& content); @@ -70,7 +70,7 @@ namespace XSLT getByName(const OUString& streamName); private: - com::sun::star::uno::Reference<XMultiServiceFactory> m_msf; + com::sun::star::uno::Reference<XComponentContext> m_xContext; com::sun::star::uno::Reference<XNameContainer> m_storage; com::sun::star::uno::Reference<XStream> m_rootStream; void SAL_CALL diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 9eea215f9f2d..41f7ac95a39a 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -561,7 +561,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) static css::uno::Reference<XInterface> SAL_CALL CreateTransformerInstance(const css::uno::Reference<XMultiServiceFactory> &r) { - return css::uno::Reference<XInterface> ((OWeakObject *) new LibXSLTTransformer(r)); + return css::uno::Reference<XInterface> ((OWeakObject *) new LibXSLTTransformer( comphelper::getComponentContext(r) )); } static css::uno::Reference<XInterface> SAL_CALL |