diff options
| author | Noel Grandin <noel@peralex.com> | 2012-10-03 13:30:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-04 16:29:53 +0200 |
| commit | a20f9a410fdd3f776f870434bc39219d5fc64b40 (patch) | |
| tree | 079278e5859c5782fbe9bfcc34302d09bd8dfadd /filter/source/xsltdialog | |
| parent | bd6b41bce491ac5a5f562652b7e32045cc22c35c (diff) | |
fdo#46808, Adapt xml::sax::XParser UNO service to new style
The xml.sax.Parser service already existed, it just did not have
a new-style service to create it.
Change-Id: I6f145a7504ff9e149c802f723991954a2801cbc9
Diffstat (limited to 'filter/source/xsltdialog')
| -rw-r--r-- | filter/source/xsltdialog/typedetectionimport.cxx | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx index ab0046ca8aa9..daf6f32d2bba 100644 --- a/filter/source/xsltdialog/typedetectionimport.cxx +++ b/filter/source/xsltdialog/typedetectionimport.cxx @@ -18,10 +18,11 @@ */ #include <com/sun/star/xml/sax/InputSource.hpp> -#include <com/sun/star/xml/sax/XParser.hpp> +#include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/beans/PropertyValue.hpp> +#include <comphelper/processfactory.hxx> #include "typedetectionimport.hxx" #include "xmlfiltersettingsdialog.hxx" @@ -61,21 +62,19 @@ void TypeDetectionImporter::doImport( Reference< XMultiServiceFactory >& xMSF, R { try { - Reference< XParser > xParser( xMSF->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" )) ), UNO_QUERY ); - if( xParser.is() ) - { - TypeDetectionImporter* pImporter = new TypeDetectionImporter( xMSF ); - Reference < XDocumentHandler > xDocHandler( pImporter ); - xParser->setDocumentHandler( xDocHandler ); + Reference< XParser > xParser = xml::sax::Parser::create( comphelper::getComponentContext(xMSF) ); - InputSource source; - source.aInputStream = xIS; + TypeDetectionImporter* pImporter = new TypeDetectionImporter( xMSF ); + Reference < XDocumentHandler > xDocHandler( pImporter ); + xParser->setDocumentHandler( xDocHandler ); - // start parsing - xParser->parseStream( source ); + InputSource source; + source.aInputStream = xIS; - pImporter->fillFilterVector( rFilters ); - } + // start parsing + xParser->parseStream( source ); + + pImporter->fillFilterVector( rFilters ); } catch( const Exception& /* e */ ) { |