diff options
author | Noel Grandin <noel@peralex.com> | 2013-01-09 13:33:51 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-01-28 08:22:27 +0200 |
commit | 1a92a885d65860b4b09b426bb4b10f7a6a336571 (patch) | |
tree | 6b35af947a311a01df4a152d1d9dc155f82afa91 | |
parent | b8d4b8656f1f4e4782ba7460070e99babc8a499e (diff) |
fdo#46808, Convert some bits to new-style UNO
Change-Id: I505910ae117588d54b79e72c12368224b4632fb9
-rw-r--r-- | toolkit/source/controls/unocontrols.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/webdavresponseparser.cxx | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index aa48fba639bb..162087113538 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -85,9 +85,7 @@ ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( uno::Reference< graphic: { // graphic manager uniqueid rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 ); - // get the DefaultContext - ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() ); - xOutGraphicObj = graphic::GraphicObject::createWithId( aContext.getUNOContext(), sID ); + xOutGraphicObj = graphic::GraphicObject::createWithId( ::comphelper::getProcessComponentContext(), sID ); } else // linked xOutGraphicObj = NULL; // release the GraphicObject diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index 88b51da2cef4..01240d495179 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -20,7 +20,7 @@ #include <webdavresponseparser.hxx> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <cppuhelper/implbase2.hxx> -#include <com/sun/star/xml/sax/XParser.hpp> +#include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/seqstream.hxx> @@ -819,10 +819,8 @@ namespace myInputSource.aInputStream = xInputStream; // get parser - uno::Reference< xml::sax::XParser > xParser( - comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), - uno::UNO_QUERY_THROW ); + uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( + comphelper::getProcessComponentContext() ); // create parser; connect parser and filter WebDAVResponseParser* pWebDAVResponseParser = new WebDAVResponseParser(eWebDAVResponseParserMode); |