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

fd0#46808, convert some getProcessServiceFactory

Browse Source 
... to getProcessComponentContext

Change-Id: I8d5c2be0186db963ba8aac31e1b527145b8bca2b
This commit is contained in:
Noel Grandin
2013-01-09 15:50:03 +02:00
parent 49cf14a3ca
commit 09cf6fe83a
3 changed files with 98 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
avmedia/source/viewer/mediawindowbase_impl.cxx
View File

@@ -46,7 +46,6 @@ MediaWindowBaseImpl::MediaWindowBaseImpl( MediaWindow* pMediaWindow )
MediaWindowBaseImpl::~MediaWindowBaseImpl() MediaWindowBaseImpl::~MediaWindowBaseImpl()
{ {
uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@@ -54,10 +53,8 @@ MediaWindowBaseImpl::~MediaWindowBaseImpl()
uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl::OUString& rURL ) uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl::OUString& rURL )
{ {
uno::Reference< media::XPlayer > xPlayer; uno::Reference< media::XPlayer > xPlayer;
uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
if( xFactory.is() )
{
static const char * aServiceManagers[] = { static const char * aServiceManagers[] = {
AVMEDIA_MANAGER_SERVICE_NAME, AVMEDIA_MANAGER_SERVICE_NAME,
// a fallback path just for gstreamer which has // a fallback path just for gstreamer which has
@@ -73,11 +70,10 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl:
strlen( aServiceManagers[ i ] ), strlen( aServiceManagers[ i ] ),
RTL_TEXTENCODING_ASCII_US ); RTL_TEXTENCODING_ASCII_US );
uno::Reference< ::com::sun::star::media::XManager > xManager;
try { try {
xManager = uno::Reference< ::com::sun::star::media::XManager >( uno::Reference< media::XManager > xManager (
xFactory->createInstance( aServiceName ), uno::UNO_QUERY ); xContext->getServiceManager()->createInstanceWithContext(aServiceName, xContext),
uno::UNO_QUERY );
if( xManager.is() ) if( xManager.is() )
xPlayer = uno::Reference< media::XPlayer >( xManager->createPlayer( rURL ), xPlayer = uno::Reference< media::XPlayer >( xManager->createPlayer( rURL ),
uno::UNO_QUERY ); uno::UNO_QUERY );
@@ -85,13 +81,11 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl:
SAL_WARN( "avmedia", SAL_WARN( "avmedia",
"failed to create media player service " << aServiceName ); "failed to create media player service " << aServiceName );
} catch ( const uno::Exception &e ) { } catch ( const uno::Exception &e ) {
SAL_WARN( SAL_WARN( "avmedia",
"avmedia",
"couldn't create media player " AVMEDIA_MANAGER_SERVICE_NAME "couldn't create media player " AVMEDIA_MANAGER_SERVICE_NAME
", exception '" << e.Message << '\''); ", exception '" << e.Message << '\'');
} }
} }
}
return xPlayer; return xPlayer;
} }
@@ -233,7 +227,7 @@ bool MediaWindowBaseImpl::setZoom( ::com::sun::star::media::ZoomLevel eLevel )
::com::sun::star::media::ZoomLevel MediaWindowBaseImpl::getZoom() const ::com::sun::star::media::ZoomLevel MediaWindowBaseImpl::getZoom() const
{ {
return( mxPlayerWindow.is() ? mxPlayerWindow->getZoomLevel() : ::com::sun::star::media::ZoomLevel_NOT_AVAILABLE ); return( mxPlayerWindow.is() ? mxPlayerWindow->getZoomLevel() : media::ZoomLevel_NOT_AVAILABLE );
} }
// --------------------------------------------------------------------- // ---------------------------------------------------------------------

9
drawinglayer/source/primitive2d/controlprimitive2d.cxx
View File

@@ -62,11 +62,9 @@ namespace drawinglayer
{ {
if(!aUnoControlTypeName.isEmpty()) if(!aUnoControlTypeName.isEmpty())
{ {
uno::Reference< lang::XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() ); uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
uno::Reference< awt::XControl > xXControl(
if(xFactory.is()) xContext->getServiceManager()->createInstanceWithContext(aUnoControlTypeName, xContext), uno::UNO_QUERY);
{
uno::Reference< awt::XControl > xXControl(xFactory->createInstance(aUnoControlTypeName), uno::UNO_QUERY);
if(xXControl.is()) if(xXControl.is())
{ {
@@ -80,7 +78,6 @@ namespace drawinglayer
} }
} }
} }
}
Primitive2DReference ControlPrimitive2D::createBitmapDecomposition(const geometry::ViewInformation2D& rViewInformation) const Primitive2DReference ControlPrimitive2D::createBitmapDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{ {

9
drawinglayer/source/primitive2d/textbreakuphelper.cxx
View File

@@ -19,7 +19,7 @@
#include <drawinglayer/primitive2d/textbreakuphelper.hxx> #include <drawinglayer/primitive2d/textbreakuphelper.hxx>
#include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx> #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>
#include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/BreakIterator.hpp>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <com/sun/star/i18n/CharacterIteratorMode.hdl> #include <com/sun/star/i18n/CharacterIteratorMode.hdl>
#include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/i18n/WordType.hpp>
@@ -193,12 +193,10 @@ namespace drawinglayer
if(!xBreakIterator.is()) if(!xBreakIterator.is())
{ {
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF(::comphelper::getProcessServiceFactory()); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
xBreakIterator.set(xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator")), ::com::sun::star::uno::UNO_QUERY); xBreakIterator = ::com::sun::star::i18n::BreakIterator::create(xContext);
} }
if(xBreakIterator.is())
{
const rtl::OUString& rTxt = mrSource.getText(); const rtl::OUString& rTxt = mrSource.getText();
const sal_Int32 nTextLength(mrSource.getTextLength()); const sal_Int32 nTextLength(mrSource.getTextLength());
const ::com::sun::star::lang::Locale& rLocale = mrSource.getLocale(); const ::com::sun::star::lang::Locale& rLocale = mrSource.getLocale();
@@ -281,7 +279,6 @@ namespace drawinglayer
break; break;
} }
} }
}
mxResult = Primitive2DVectorToPrimitive2DSequence(aTempResult); mxResult = Primitive2DVectorToPrimitive2DSequence(aTempResult);
} }