4 files changed, 7 insertions, 7 deletions
diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx
index 8ec38eef3471..21c7c80e8043 100644
--- a/filter/source/svg/svgimport.cxx
+++ b/filter/source/svg/svgimport.cxx
@@ -70,7 +70,7 @@ sal_Bool SVGFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
     uno::Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
     xImporter->setTargetDocument(mxDstDoc);
 
-    SVGReader aReader(uno::Reference<lang::XMultiServiceFactory>(mxContext->getServiceManager(), uno::UNO_QUERY_THROW), xInputStream, xInternalHandler);
+    SVGReader aReader(mxContext, xInputStream, xInternalHandler);
     return aReader.parseAndConvert();
 }
 
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index b85a2ad6ed8d..5fb959b6b4b3 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1878,10 +1878,10 @@ static void dumpTree( const uno::Reference<xml::dom::XElement> xElem )
 #endif
 
 
-SVGReader::SVGReader(const uno::Reference<lang::XMultiServiceFactory>&     xServiceFactory,
+SVGReader::SVGReader(const uno::Reference<uno::XComponentContext>&     xContext,
                      const uno::Reference<io::XInputStream>&           xInputStream,
                      const uno::Reference<xml::sax::XDocumentHandler>& xDocumentHandler) :
-    m_xServiceFactory( xServiceFactory ),
+    m_xContext( xContext ),
     m_xInputStream( xInputStream ),
     m_xDocumentHandler( xDocumentHandler )
 {
@@ -1889,7 +1889,7 @@ SVGReader::SVGReader(const uno::Reference<lang::XMultiServiceFactory>&     xServ
 
 sal_Bool SVGReader::parseAndConvert()
 {
-    uno::Reference<xml::dom::XDocumentBuilder> xDomBuilder(xml::dom::DocumentBuilder::create(comphelper::getComponentContext(m_xServiceFactory)));
+    uno::Reference<xml::dom::XDocumentBuilder> xDomBuilder = xml::dom::DocumentBuilder::create(m_xContext);
 
     uno::Reference<xml::dom::XDocument> xDom(
         xDomBuilder->parse(m_xInputStream),
diff --git a/filter/source/svg/svgreader.hxx b/filter/source/svg/svgreader.hxx
index baf3304be7f2..d7c4d3a58f90 100644
--- a/filter/source/svg/svgreader.hxx
+++ b/filter/source/svg/svgreader.hxx
@@ -24,12 +24,12 @@ namespace svgi
 
 class SVGReader
 {
-    const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >      m_xServiceFactory;
+    const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >        m_xContext;
     const ::com::sun::star::uno::Reference< com::sun::star::io::XInputStream >              m_xInputStream;
     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >  m_xDocumentHandler;
 
 public:
-    FILTER_DLLPUBLIC SVGReader( const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>&           xServiceFactory,
+    FILTER_DLLPUBLIC SVGReader( const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>&  xContext,
                const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >&               xInputStream,
                const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler );
 
diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx
index 83952bd40fcb..1aaf4e118ba9 100644
--- a/filter/source/svg/test/svg2odf.cxx
+++ b/filter/source/svg/test/svg2odf.cxx
@@ -115,7 +115,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         return 1;
     }
 
-    svgi::SVGReader aReader(xFactory,
+    svgi::SVGReader aReader(xCtx,
                             uno::Reference<io::XInputStream>(
                                 new comphelper::OSLInputStreamWrapper(aInputFile)),
                             svgi::createSerializer(new OutputWrap(aDstURL)));