From fe1fd7c40caaa83fe2b86c9884dc1693d58741e7 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 12 Sep 2012 10:24:08 +0200
Subject: Improvement on previous commit

Change-Id: I51226f78ca60c32ebb908bcf4f74d38d0750eb00
---
 starmath/source/mathmlimport.cxx | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'starmath')

diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index d5343770d83e..a57b83b51899 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -37,9 +37,7 @@ one go*/
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/uno/Any.h>
-#include <com/sun/star/xml/dom/SAXDocumentBuilder.hpp>
 
-#include <comphelper/componentcontext.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/servicehelper.hxx>
@@ -1856,8 +1854,7 @@ class SmXMLFlatDocContext_Impl
 public:
     SmXMLFlatDocContext_Impl( SmXMLImport& i_rImport,
         sal_uInt16 i_nPrefix, const OUString & i_rLName,
-        const uno::Reference<document::XDocumentProperties>& i_xDocProps,
-        const uno::Reference<xml::sax::XDocumentHandler>& i_xDocBuilder);
+        const uno::Reference<document::XDocumentProperties>& i_xDocProps);
 
     virtual ~SmXMLFlatDocContext_Impl();
 
@@ -1866,12 +1863,11 @@ public:
 
 SmXMLFlatDocContext_Impl::SmXMLFlatDocContext_Impl( SmXMLImport& i_rImport,
         sal_uInt16 i_nPrefix, const OUString & i_rLName,
-        const uno::Reference<document::XDocumentProperties>& i_xDocProps,
-        const uno::Reference<xml::sax::XDocumentHandler>& i_xDocBuilder) :
+        const uno::Reference<document::XDocumentProperties>& i_xDocProps) :
     SvXMLImportContext(i_rImport, i_nPrefix, i_rLName),
     SmXMLOfficeContext_Impl(i_rImport, i_nPrefix, i_rLName),
     SvXMLMetaDocumentContext(i_rImport, i_nPrefix, i_rLName,
-        i_xDocProps, i_xDocBuilder)
+        i_xDocProps)
 {
 }
 
@@ -2658,18 +2654,15 @@ SvXMLImportContext *SmXMLImport::CreateContext(sal_uInt16 nPrefix,
         if ( (IsXMLToken(rLocalName, XML_DOCUMENT) ||
               IsXMLToken(rLocalName, XML_DOCUMENT_META)))
         {
-            uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
-                xml::dom::SAXDocumentBuilder::create(comphelper::ComponentContext(mxServiceFactory).getUNOContext()),
-                    uno::UNO_QUERY_THROW);
             uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
                 GetModel(), uno::UNO_QUERY_THROW);
             return IsXMLToken(rLocalName, XML_DOCUMENT_META)
                 ? new SvXMLMetaDocumentContext(*this,
                         XML_NAMESPACE_OFFICE, rLocalName,
-                        xDPS->getDocumentProperties(), xDocBuilder)
+                        xDPS->getDocumentProperties())
                 // flat OpenDocument file format -- this has not been tested...
                 : new SmXMLFlatDocContext_Impl( *this, nPrefix, rLocalName,
-                            xDPS->getDocumentProperties(), xDocBuilder);
+                            xDPS->getDocumentProperties());
         }
         else
         {
-- 
cgit