mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#46808, Convert some bits to new-style UNO

Browse Source 
Change-Id: I505910ae117588d54b79e72c12368224b4632fb9
This commit is contained in:
Noel Grandin
2013-01-09 13:33:51 +02:00
parent b8d4b8656f
commit 1a92a885d6
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
toolkit/source/controls/unocontrols.cxx
View File

@@ -85,9 +85,7 @@ ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( uno::Reference< graphic:
{ {
// graphic manager uniqueid // graphic manager uniqueid
rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 ); rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 );
// get the DefaultContext xOutGraphicObj = graphic::GraphicObject::createWithId( ::comphelper::getProcessComponentContext(), sID );
::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
xOutGraphicObj = graphic::GraphicObject::createWithId( aContext.getUNOContext(), sID );
} }
else // linked else // linked
xOutGraphicObj = NULL; // release the GraphicObject xOutGraphicObj = NULL; // release the GraphicObject

8
ucb/source/ucp/webdav/webdavresponseparser.cxx
View File

@@ -20,7 +20,7 @@
#include <webdavresponseparser.hxx> #include <webdavresponseparser.hxx>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <cppuhelper/implbase2.hxx> #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 <com/sun/star/xml/sax/InputSource.hpp>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <comphelper/seqstream.hxx> #include <comphelper/seqstream.hxx>
@@ -819,10 +819,8 @@ namespace
myInputSource.aInputStream = xInputStream; myInputSource.aInputStream = xInputStream;
// get parser // get parser
uno::Reference< xml::sax::XParser > xParser( uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(
comphelper::getProcessServiceFactory()->createInstance( comphelper::getProcessComponentContext() );
rtl::OUString::createFromAscii("com.sun.star.xml.sax.Parser") ),
uno::UNO_QUERY_THROW );
// create parser; connect parser and filter // create parser; connect parser and filter
WebDAVResponseParser* pWebDAVResponseParser = new WebDAVResponseParser(eWebDAVResponseParserMode); WebDAVResponseParser* pWebDAVResponseParser = new WebDAVResponseParser(eWebDAVResponseParserMode);