diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-30 08:40:11 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-30 08:59:59 +0000 |
commit | 3bc5df7f32501075149e4b41f6e98ea8dd2cfcbd (patch) | |
tree | 6e7f5d288cf65935b3ed1f0b88200d32d2f016f0 /sdext | |
parent | 2e528df76b168a221c6d251d9b076bce5ba051a3 (diff) |
UNO: no need to use OUString constructor when calling createInstance
Change-Id: I37da28539b94706574116d0fff5f008aabfb5526
Reviewed-on: https://gerrit.libreoffice.org/19682
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sdext')
-rw-r--r-- | sdext/source/minimizer/fileopendialog.cxx | 4 | ||||
-rw-r--r-- | sdext/source/pdfimport/pdfiadaptor.cxx | 2 | ||||
-rw-r--r-- | sdext/source/pdfimport/wrapper/wrapper.cxx | 10 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterButton.cxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterPane.cxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterPaneBorderManager.cxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterPaneBorderPainter.cxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterPaneContainer.cxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterScrollBar.cxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterSlidePreview.cxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterSlideShowView.cxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterSlideSorter.cxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterSpritePane.cxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterTheme.cxx | 2 |
14 files changed, 18 insertions, 20 deletions
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx index 0cf2b82cf538..7ea16bd28257 100644 --- a/sdext/source/minimizer/fileopendialog.cxx +++ b/sdext/source/minimizer/fileopendialog.cxx @@ -71,7 +71,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext // collecting a list of impress filters Reference< XNameAccess > xFilters( rxContext->getServiceManager()->createInstanceWithContext( - OUString( "com.sun.star.document.FilterFactory" ), rxContext ), UNO_QUERY_THROW ); + "com.sun.star.document.FilterFactory", rxContext ), UNO_QUERY_THROW ); Sequence< OUString > aFilterList( xFilters->getElementNames() ); for ( int i = 0; i < aFilterList.getLength(); i++ ) { @@ -116,7 +116,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext } Reference< XNameAccess > xTypes( rxContext->getServiceManager()->createInstanceWithContext( - OUString( "com.sun.star.document.TypeDetection" ), rxContext ), UNO_QUERY_THROW ); + "com.sun.star.document.TypeDetection", rxContext ), UNO_QUERY_THROW ); for( std::vector< FilterEntry >::const_iterator aIter(aFilterEntryList.begin()), aEnd(aFilterEntryList.end()); aIter != aEnd; ++aIter ) { diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index 90722f87c3c6..bbcfad5e1fd2 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -148,7 +148,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert try { xSubFilter = uno::Reference<document::XFilter>( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - OUString( "com.sun.star.document.OwnSubFilter" ), + "com.sun.star.document.OwnSubFilter", aArgs, m_xContext ), uno::UNO_QUERY ); diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 0716e7def2b4..74baf25b2a5e 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -623,9 +623,7 @@ void Parser::readFont() { uno::Reference< beans::XMaterialHolder > xMat( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - OUString( "com.sun.star.awt.FontIdentificator" ), - aArgs, - m_xContext ), + "com.sun.star.awt.FontIdentificator", aArgs, m_xContext ), uno::UNO_QUERY ); if( xMat.is() ) { @@ -708,9 +706,9 @@ uno::Sequence<beans::PropertyValue> Parser::readImageImpl() uno::Reference< uno::XComponentContext > xContext( m_xContext, uno::UNO_SET_THROW ); uno::Reference< lang::XMultiComponentFactory > xFactory( xContext->getServiceManager(), uno::UNO_SET_THROW ); - uno::Reference< io::XInputStream > xDataStream( xFactory->createInstanceWithArgumentsAndContext( - OUString( "com.sun.star.io.SequenceInputStream" ), - aStreamCreationArgs, m_xContext ), uno::UNO_QUERY_THROW ); + uno::Reference< io::XInputStream > xDataStream( + xFactory->createInstanceWithArgumentsAndContext( "com.sun.star.io.SequenceInputStream", aStreamCreationArgs, m_xContext ), + uno::UNO_QUERY_THROW ); uno::Sequence<beans::PropertyValue> aSequence(3); aSequence[0] = beans::PropertyValue( OUString("URL"), diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index 789597314720..e96b6c065c2f 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -115,7 +115,7 @@ PresenterButton::PresenterButton ( mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString("com.sun.star.comp.Draw.PresenterHelper"), + "com.sun.star.comp.Draw.PresenterHelper", rxComponentContext), UNO_QUERY_THROW); diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index 6c1ccd37744c..85b1a2ec9eaa 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -44,7 +44,7 @@ PresenterPane::PresenterPane ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString("com.sun.star.comp.Draw.PresenterHelper"), + "com.sun.star.comp.Draw.PresenterHelper", mxComponentContext), UNO_QUERY_THROW); } diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index 852e6c53d908..e29be336aa26 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -84,7 +84,7 @@ PresenterPaneBorderManager::PresenterPaneBorderManager ( mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString("com.sun.star.comp.Draw.PresenterHelper"), + "com.sun.star.comp.Draw.PresenterHelper", rxContext), UNO_QUERY_THROW); } diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 249a57cb985b..866dcfbe631c 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -409,7 +409,7 @@ PresenterPaneBorderPainter::Renderer::Renderer ( { mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString("com.sun.star.comp.Draw.PresenterHelper"), + "com.sun.star.comp.Draw.PresenterHelper", rxContext), UNO_QUERY_THROW); } diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index 5eb4e16607ec..2f5de98f753d 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -41,7 +41,7 @@ PresenterPaneContainer::PresenterPaneContainer ( { mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString("com.sun.star.comp.Draw.PresenterHelper"), + "com.sun.star.comp.Draw.PresenterHelper", rxContext), UNO_QUERY_THROW); } diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index b0dec0aa77be..49177324829c 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -109,7 +109,7 @@ PresenterScrollBar::PresenterScrollBar ( mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString("com.sun.star.comp.Draw.PresenterHelper"), + "com.sun.star.comp.Draw.PresenterHelper", rxComponentContext), UNO_QUERY_THROW); diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index fda57526fea5..d95c582ed852 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -94,7 +94,7 @@ PresenterSlidePreview::PresenterSlidePreview ( if (xFactory.is()) mxPreviewRenderer = Reference<drawing::XSlideRenderer>( xFactory->createInstanceWithContext( - OUString("com.sun.star.drawing.SlideRenderer"), + "com.sun.star.drawing.SlideRenderer", rxContext), UNO_QUERY); mpBitmaps.reset(new PresenterBitmapContainer( diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index c15a9e9b6e11..aaab9bcba700 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -102,7 +102,7 @@ void PresenterSlideShowView::LateInit() Reference<lang::XMultiComponentFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); mxPresenterHelper.set (xFactory->createInstanceWithContext( - OUString("com.sun.star.comp.Draw.PresenterHelper"), + "com.sun.star.comp.Draw.PresenterHelper", mxComponentContext), UNO_QUERY_THROW); diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index ef45c7d97c4a..ba534a88e543 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -330,7 +330,7 @@ PresenterSlideSorter::PresenterSlideSorter ( // Create the preview cache. mxPreviewCache = Reference<drawing::XSlidePreviewCache>( xFactory->createInstanceWithContext( - OUString("com.sun.star.drawing.PresenterPreviewCache"), + "com.sun.star.drawing.PresenterPreviewCache", mxComponentContext), UNO_QUERY_THROW); Reference<container::XIndexAccess> xSlides (mxSlideShowController, UNO_QUERY); diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index a0282ae02309..ec6104421f2a 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -42,7 +42,7 @@ PresenterSpritePane::PresenterSpritePane (const Reference<XComponentContext>& rx mxComponentContext->getServiceManager(), UNO_QUERY_THROW); mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString("com.sun.star.comp.Draw.PresenterHelper"), + "com.sun.star.comp.Draw.PresenterHelper", mxComponentContext), UNO_QUERY_THROW); } diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 015fdfdb65d8..a7a68d7ce116 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -707,7 +707,7 @@ ReadContext::ReadContext ( { mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString("com.sun.star.comp.Draw.PresenterHelper"), + "com.sun.star.comp.Draw.PresenterHelper", rxContext), UNO_QUERY_THROW); } |