css.xml.sax service ctor clean-up

Change-Id: I556904861e93a145cfe65f61218926851e4e8eb0

2 files changed, 19 insertions, 45 deletions

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index a50f449bd83c..2d192ad2441a 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -22,6 +22,7 @@
 #include <set>
 #include <comphelper/servicehelper.hxx>
 #include <com/sun/star/drawing/XShapes.hpp>
+#include <com/sun/star/xml/sax/FastShapeContextHandler.hpp>
 #include <resourcemodel/QNameToString.hxx>
 #include <resourcemodel/XPathLogger.hxx>
 #include <resourcemodel/util.hxx>
@@ -56,7 +57,6 @@ static const sal_uInt8 cFieldEnd = 0x15;
 namespace writerfilter {
 namespace ooxml
 {
-using ::com::sun::star::lang::XMultiComponentFactory;
 using namespace ::com::sun::star;
 using namespace ::std;
 
@@ -2033,47 +2033,26 @@ OOXMLFastContextHandlerShape::OOXMLFastContextHandlerShape
 : OOXMLFastContextHandlerProperties(pContext), m_bShapeSent( false ),
     m_bShapeStarted(false)
 {
-    uno::Reference<uno::XComponentContext> xContext(getComponentContext());
-    if (xContext.is())
+    mrShapeContext.set( getDocument( )->getShapeContext( ) );
+    if ( !mrShapeContext.is( ) )
     {
-        uno::Reference<XMultiComponentFactory> rServiceManager
-            (xContext->getServiceManager());
-
-        mrShapeContext.set( getDocument( )->getShapeContext( ) );
-        if ( !mrShapeContext.is( ) )
-        {
-            // Define the shape context for the whole document
-            mrShapeContext.set
-                (rServiceManager->
-                  createInstanceWithContext
-                  ("com.sun.star.xml.sax.FastShapeContextHandler", xContext),
-                  uno::UNO_QUERY);
-            getDocument()->setShapeContext( mrShapeContext );
-        }
+        // Define the shape context for the whole document
+        mrShapeContext = css::xml::sax::FastShapeContextHandler::create(
+            getComponentContext());
+        getDocument()->setShapeContext( mrShapeContext );
+    }
 
-        if (mrShapeContext.is())
-        {
-            mrShapeContext->setModel(getDocument()->getModel());
-            mrShapeContext->setDrawPage(getDocument()->getDrawPage());
-            mrShapeContext->setInputStream(getDocument()->getStorageStream());
+    mrShapeContext->setModel(getDocument()->getModel());
+    mrShapeContext->setDrawPage(getDocument()->getDrawPage());
+    mrShapeContext->setInputStream(getDocument()->getStorageStream());
 
 #ifdef DEBUG_ELEMENT
-            debug_logger->startElement("setRelationFragmentPath");
-            debug_logger->attribute("path", mpParserState->getTarget());
-            debug_logger->endElement();
-#endif
-            mrShapeContext->setRelationFragmentPath
-                (mpParserState->getTarget());
-        }
-#ifdef DEBUG_CONTEXT_STACK
-        else
-        {
-            debug_logger->startElement("error");
-            debug_logger->chars(std::string("failed to get shape handler"));
-            debug_logger->endElement();
-        }
+    debug_logger->startElement("setRelationFragmentPath");
+    debug_logger->attribute("path", mpParserState->getTarget());
+    debug_logger->endElement();
 #endif
-    }
+    mrShapeContext->setRelationFragmentPath
+        (mpParserState->getTarget());
 }
 
 OOXMLFastContextHandlerShape::~OOXMLFastContextHandlerShape()
diff --git a/writerfilter/source/ooxml/factoryimpl.xsl b/writerfilter/source/ooxml/factoryimpl.xsl
index 07571b0d03cc..f9c486e6f853 100644
--- a/writerfilter/source/ooxml/factoryimpl.xsl
+++ b/writerfilter/source/ooxml/factoryimpl.xsl
@@ -321,13 +321,7 @@ uno::Reference &lt; xml::sax::XFastParser &gt; OOXMLStreamImpl::getFastParser()
 {
     if (! mxFastParser.is())
     {
-        uno::Reference &lt; lang::XMultiComponentFactory &gt; xFactory = 
-            uno::Reference &lt; lang::XMultiComponentFactory &gt;
-            (mxContext->getServiceManager());
-
-        mxFastParser.set(xFactory->createInstanceWithContext
-            ( "com.sun.star.xml.sax.FastParser", 
-                    mxContext ), uno::UNO_QUERY_THROW);
+        mxFastParser = css::xml::sax::FastParser::create(mxContext);
 </xsl:text>
 <xsl:for-each select="//namespace-alias">
   <xsl:text>
@@ -346,7 +340,8 @@ uno::Reference &lt; xml::sax::XFastParser &gt; OOXMLStreamImpl::getFastParser()
 </xsl:template>
 
   <xsl:template match="/">
-    <xsl:text>    
+    <xsl:text>
+#include &lt;com/sun/star/xml/sax/FastParser.hpp&gt;
 #include "ooxml/OOXMLFactory.hxx"
 #include "ooxml/OOXMLFastHelper.hxx"
 #include "ooxml/OOXMLStreamImpl.hxx"