diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-12 10:24:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-12 10:24:55 +0200 |
| commit | fe1fd7c40caaa83fe2b86c9884dc1693d58741e7 (patch) | |
| tree | fba9430a3b2c244eae076c03f11f5ecf16559c92 /sc | |
| parent | 372f9801687cad620924b7ac6e4fe488ff998334 (diff) | |
Improvement on previous commit
Change-Id: I51226f78ca60c32ebb908bcf4f74d38d0750eb00
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 3df0818c5de4..872c967f9a88 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -71,7 +71,6 @@ #include "rangeutl.hxx" #include "postit.hxx" #include "formulaparserpool.hxx" -#include <comphelper/componentcontext.hxx> #include <comphelper/extract.hxx> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> @@ -91,7 +90,6 @@ #include <com/sun/star/sheet/XLabelRanges.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/xml/dom/SAXDocumentBuilder.hpp> #include <memory> @@ -296,8 +294,7 @@ public: ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport, sal_uInt16 i_nPrefix, const OUString & i_rLName, const uno::Reference<xml::sax::XAttributeList>& i_xAttrList, - const uno::Reference<document::XDocumentProperties>& i_xDocProps, - const uno::Reference<xml::sax::XDocumentHandler>& i_xDocBuilder); + const uno::Reference<document::XDocumentProperties>& i_xDocProps); virtual ~ScXMLFlatDocContext_Impl(); @@ -309,12 +306,11 @@ public: ScXMLFlatDocContext_Impl::ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport, sal_uInt16 i_nPrefix, const OUString & i_rLName, const uno::Reference<xml::sax::XAttributeList>& i_xAttrList, - 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), ScXMLDocContext_Impl(i_rImport, i_nPrefix, i_rLName, i_xAttrList), SvXMLMetaDocumentContext(i_rImport, i_nPrefix, i_rLName, - i_xDocProps, i_xDocBuilder) + i_xDocProps) { } @@ -1832,14 +1828,11 @@ SvXMLImportContext *ScXMLImport::CreateContext( sal_uInt16 nPrefix, pContext = CreateMetaContext(rLocalName); } else if ( (XML_NAMESPACE_OFFICE == nPrefix) && ( IsXMLToken(rLocalName, XML_DOCUMENT)) ) { - 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); // flat OpenDocument file format pContext = new ScXMLFlatDocContext_Impl( *this, nPrefix, rLocalName, - xAttrList, xDPS->getDocumentProperties(), xDocBuilder); + xAttrList, xDPS->getDocumentProperties()); } else pContext = SvXMLImport::CreateContext( nPrefix, rLocalName, xAttrList ); @@ -2127,14 +2120,11 @@ SvXMLImportContext *ScXMLImport::CreateMetaContext( if( !IsStylesOnlyMode() && (getImportFlags() & IMPORT_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); pContext = new SvXMLMetaDocumentContext(*this, XML_NAMESPACE_OFFICE, rLocalName, - xDPS->getDocumentProperties(), xDocBuilder); + xDPS->getDocumentProperties()); } if( !pContext ) |