diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-21 22:56:59 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-21 23:30:59 +0200 |
| commit | 6cc508aec4e30c72c00eac9e77fb6dd10cc093e9 (patch) | |
| tree | 7e812b5dede4b386e0d60859130d415cac1d6494 /writerperfect/source/writer | |
| parent | b13c8de265a6454c4677f52fd9a3440ac3279c51 (diff) | |
Remove comphelper::ComponentContext
Change-Id: Idc5974e5a2ec68e8f1b2312a88fab15092c82788
Diffstat (limited to 'writerperfect/source/writer')
| -rw-r--r-- | writerperfect/source/writer/MSWorksImportFilter.cxx | 7 | ||||
| -rw-r--r-- | writerperfect/source/writer/MWAWImportFilter.cxx | 7 | ||||
| -rw-r--r-- | writerperfect/source/writer/WordPerfectImportFilter.cxx | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index 4a4500eef60d..f37b808e9d66 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.cxx +++ b/writerperfect/source/writer/MSWorksImportFilter.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/uno/Reference.h> -#include <comphelper/componentcontext.hxx> #include <xmloff/attrlist.hxx> #include <ucbhelper/content.hxx> @@ -75,8 +74,10 @@ throw (RuntimeException) } // An XML import service: what we push sax messages to.. - OUString sXMLImportService ( "com.sun.star.comp.Writer.XMLOasisImporter" ); - Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY ); + Reference < XDocumentHandler > xInternalHandler( + mxContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.comp.Writer.XMLOasisImporter", mxContext), + css::uno::UNO_QUERY_THROW); // The XImporter sets up an empty target document for XDocumentHandler to write to.. Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY); diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx index 8e33dffb4435..50f5e11dfce3 100644 --- a/writerperfect/source/writer/MWAWImportFilter.cxx +++ b/writerperfect/source/writer/MWAWImportFilter.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/uno/Reference.h> -#include <comphelper/componentcontext.hxx> #include <xmloff/attrlist.hxx> #include <ucbhelper/content.hxx> @@ -847,8 +846,10 @@ throw (RuntimeException) } // An XML import service: what we push sax messages to.. - OUString sXMLImportService ( "com.sun.star.comp.Writer.XMLOasisImporter" ); - Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY ); + Reference < XDocumentHandler > xInternalHandler( + mxContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.comp.Writer.XMLOasisImporter", mxContext), + css::uno::UNO_QUERY_THROW); // The XImporter sets up an empty target document for XDocumentHandler to write to.. Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY); diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index a79e1aacec43..3141b452d12a 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.cxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#include <comphelper/componentcontext.hxx> #include <xmloff/attrlist.hxx> #include <sfx2/passwd.hxx> #include <ucbhelper/content.hxx> @@ -128,8 +127,10 @@ throw (RuntimeException) } // An XML import service: what we push sax messages to.. - OUString sXMLImportService ( "com.sun.star.comp.Writer.XMLOasisImporter" ); - Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY ); + Reference < XDocumentHandler > xInternalHandler( + mxContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.comp.Writer.XMLOasisImporter", mxContext), + css::uno::UNO_QUERY_THROW); // The XImporter sets up an empty target document for XDocumentHandler to write to.. Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY); |