diff options
121 files changed, 189 insertions, 227 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index c4165e8cb432..a522472d6089 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -253,9 +253,8 @@ SbUnoObject* createOLEObject_Impl( const OUString& aType ) { Reference<XMultiComponentFactory> xSMgr = xContext->getServiceManager(); xOLEFactory.set( - xSMgr->createInstanceWithContext( - OUString( "com.sun.star.bridge.OleObjectFactory"), - xContext ), UNO_QUERY ); + xSMgr->createInstanceWithContext( "com.sun.star.bridge.OleObjectFactory", xContext ), + UNO_QUERY ); } } @@ -4548,7 +4547,7 @@ Reference< XInterface > createComListener( const Any& aControlAny, const OUStrin try { xRet = xServiceMgr->createInstanceWithArgumentsAndContext( - OUString( "com.sun.star.custom.UnoComListener"), + "com.sun.star.custom.UnoComListener", args, xContext ); } catch( const Exception& ) @@ -4661,8 +4660,7 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP Reference< XMultiComponentFactory > xServiceMgr( xContext->getServiceManager() ); Reference< XSingleServiceFactory > xComImplementsFactory ( - xServiceMgr->createInstanceWithContext( - OUString( "com.sun.star.custom.ComImplementsFactory"), xContext ), + xServiceMgr->createInstanceWithContext( "com.sun.star.custom.ComImplementsFactory", xContext ), UNO_QUERY ); if( !xComImplementsFactory.is() ) diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index f4aa67f972ac..9766d74d1141 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -131,7 +131,7 @@ bool writeOasis2OOoLibraryElement( Reference< xml::sax::XDocumentHandler > xHandler( xSMgr->createInstanceWithArgumentsAndContext( - OUString("com.sun.star.comp.Oasis2OOoTransformer" ) , + "com.sun.star.comp.Oasis2OOoTransformer", aArgs, xContext ), UNO_QUERY ); diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx index 3cfd75f0c6b2..ed327eeceecc 100644 --- a/bridges/test/java_uno/equals/testequals.cxx +++ b/bridges/test/java_uno/equals/testequals.cxx @@ -105,7 +105,7 @@ void Service::connect(OUString const & rConnection, css::connection::Connector::create(m_xContext)->connect(rConnection)); css::uno::Reference< css::bridge::XBridgeFactory > xBridgeFactory( m_xContext->getServiceManager()->createInstanceWithContext( - OUString( "com.sun.star.bridge.BridgeFactory" ), + "com.sun.star.bridge.BridgeFactory", m_xContext), css::uno::UNO_QUERY); m_xBridge = xBridgeFactory->createBridge(OUString(), rProtocol, diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx index 005197b569a3..32835e024078 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx @@ -81,7 +81,7 @@ sal_Int32 Client::run(css::uno::Sequence< OUString > const &) try { relay.set( factory->createInstanceWithContext( - OUString( "test.javauno.nativethreadpool.Relay" ), + "test.javauno.nativethreadpool.Relay", context), css::uno::UNO_QUERY_THROW); } catch (css::uno::RuntimeException &) { diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx index f07760eaf0f7..78918ecdf952 100644 --- a/bridges/test/testcomp.cxx +++ b/bridges/test/testcomp.cxx @@ -91,8 +91,7 @@ Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeExce // Tries to get the PerformanceTestObject if( sObjectName == "TestRemoteObject" ) { - return m_rSMgr->createInstance( - OUString("com.sun.star.test.performance.PerformanceTestObject") ); + return m_rSMgr->createInstance("com.sun.star.test.performance.PerformanceTestObject"); } return Reference < XInterface > ( (::cppu::OWeakObject * ) new OTestFactory() ); } @@ -713,8 +712,7 @@ Reference <XInterface > createComponent( const OUString &sService , { // erst registrieren Reference < XImplementationRegistration > rReg ( - rSMgr->createInstance( - OUString( "com.sun.star.registry.ImplementationRegistration" )), + rSMgr->createInstance("com.sun.star.registry.ImplementationRegistration"), UNO_QUERY ); OSL_ASSERT( rReg.is() ); diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 30f2782f57dc..5ef726acc079 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -139,7 +139,7 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) : m_xCanvasConfigNameAccess.set( xConfigProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationAccess"), + "com.sun.star.configuration.ConfigurationAccess", Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW ); @@ -151,7 +151,7 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) : Reference<container::XNameAccess> xNameAccess( xConfigProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationAccess"), + "com.sun.star.configuration.ConfigurationAccess", Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW ); Reference<container::XHierarchicalNameAccess> xHierarchicalNameAccess( xNameAccess, UNO_QUERY_THROW); diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index c1a96e694dce..9feace203404 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -3514,10 +3514,10 @@ void ServiceType::dumpHxxFile( << indent() << "the_instance = ::css::uno::Reference< " << scopedBaseName << (" >(the_context->getServiceManager()->" - "createInstanceWithContext(::rtl::OUString(" + "createInstanceWithContext(" " \"") << name_ - << "\" ), the_context), ::css::uno::UNO_QUERY);\n#endif\n"; + << "\", the_context), ::css::uno::UNO_QUERY);\n#endif\n"; dec(); o << indent() << "} catch (const ::css::uno::RuntimeException &) {\n"; @@ -3663,9 +3663,9 @@ void ServiceType::dumpHxxFile( << indent() << "the_instance = ::css::uno::Reference< " << scopedBaseName << (" >(the_context->getServiceManager()->" - "createInstanceWithArgumentsAndContext(::rtl::OUString(" + "createInstanceWithArgumentsAndContext(" " \"") - << name_ << "\" ), "; + << name_ << "\", "; if (rest) { o << codemaker::cpp::translateUnoToCppIdentifier( u2b(i->parameters.back().name), "param", diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 8c8b56ed6cac..6140d5c294e4 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -366,7 +366,7 @@ ImplEventAttacherManager::ImplEventAttacherManager( const Reference< XIntrospect if ( rContext.is() ) { Reference< XInterface > xIFace( rContext->getServiceManager()->createInstanceWithContext( - OUString( "com.sun.star.script.EventAttacher" ), rContext) ); + "com.sun.star.script.EventAttacher", rContext) ); if ( xIFace.is() ) { xAttacher = Reference< XEventAttacher2 >::query( xIFace ); diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx index 1cf5baebc4fd..d802ea137f3a 100644 --- a/comphelper/source/misc/configurationhelper.cxx +++ b/comphelper/source/misc/configurationhelper.cxx @@ -65,11 +65,11 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons bool bReadOnly = ((eMode & ConfigurationHelper::E_READONLY)==ConfigurationHelper::E_READONLY); if (bReadOnly) xCFG = xConfigProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationAccess"), + "com.sun.star.configuration.ConfigurationAccess", comphelper::containerToSequence(lParams)); else xCFG = xConfigProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationUpdateAccess"), + "com.sun.star.configuration.ConfigurationUpdateAccess", comphelper::containerToSequence(lParams)); return xCFG; diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index e6ba4d33d3b0..d17d650a8e5c 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.cxx @@ -134,7 +134,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetConfigurati xConfig = uno::Reference< container::XNameAccess >( m_xConfigProvider->createInstanceWithArguments( - OUString( "com.sun.star.configuration.ConfigurationAccess" ), + "com.sun.star.configuration.ConfigurationAccess", aArgs ), uno::UNO_QUERY ); } diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx index 462b59cd6f20..bb58209209da 100644 --- a/comphelper/source/misc/officerestartmanager.cxx +++ b/comphelper/source/misc/officerestartmanager.cxx @@ -95,7 +95,7 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task: uno::Reference< awt::XRequestCallback > xRequestCallback( xFactory->createInstanceWithContext( - OUString( "com.sun.star.awt.AsyncCallback" ), + "com.sun.star.awt.AsyncCallback", m_xContext ), uno::UNO_QUERY_THROW ); diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index b0798bcd5ea3..1c9637a32a69 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -335,7 +335,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu makeAny(_rPath))); Reference< XInterface > xInterface( _rxConfProvider->createInstanceWithArguments( - OUString( "com.sun.star.configuration.ConfigurationAccess"), + "com.sun.star.configuration.ConfigurationAccess", args)); OSL_ENSURE( xInterface.is(), diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 81459eb07992..6ca1953449e9 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -848,7 +848,7 @@ namespace connectivity // create the access Reference< XPropertySet > xNode( xConfigProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationAccess"), + "com.sun.star.configuration.ConfigurationAccess", aArguments ), UNO_QUERY ); OSL_ENSURE( xNode.is(), "lcl_getSystemLocale: invalid access returned (should throw an exception instead)!" ); diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx index 2a00ed417094..bf7531b9c520 100644 --- a/connectivity/source/drivers/kab/KDriver.cxx +++ b/connectivity/source/drivers/kab/KDriver.cxx @@ -280,7 +280,7 @@ bool KabImplModule::impl_doAllowNewKDEVersion() makeAny( KabDriver::impl_getConfigurationSettingsPath() ), PropertyState_DIRECT_VALUE ); Reference< XPropertySet > xSettings( xConfigProvider->createInstanceWithArguments( - OUString( "com.sun.star.configuration.ConfigurationAccess" ), + "com.sun.star.configuration.ConfigurationAccess", aCreationArgs ), UNO_QUERY_THROW ); diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index c375671c72f9..672d0ee974b2 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -99,7 +99,7 @@ Reference< XConnection > Driver::connect( seq[1] <<= info; return Reference< XConnection> ( m_smgr->createInstanceWithArgumentsAndContext( - OUString("org.openoffice.comp.connectivity.pq.Connection.noext" ), + "org.openoffice.comp.connectivity.pq.Connection.noext", seq, m_ctx ), UNO_QUERY ); } diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 0065db174704..5578f45fd3d8 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -480,7 +480,7 @@ CanvasSettings::CanvasSettings() : mxForceFlagNameAccess.set( xConfigProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationUpdateAccess"), + "com.sun.star.configuration.ConfigurationUpdateAccess", Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW ); @@ -491,7 +491,7 @@ CanvasSettings::CanvasSettings() : Reference<XNameAccess> xNameAccess( xConfigProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationAccess"), + "com.sun.star.configuration.ConfigurationAccess", Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW ); Reference<XHierarchicalNameAccess> xHierarchicalNameAccess( xNameAccess, UNO_QUERY_THROW); diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index c46e713fe1ed..a37d5e3263e5 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -204,7 +204,7 @@ SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet) aArgumentList[0] = makeAny( aProperty ); m_xConfigurationUpdateAccess = xConfigurationProvider->createInstanceWithArguments( - OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ), + "com.sun.star.configuration.ConfigurationUpdateAccess", aArgumentList ); } diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index 081e7d51d581..ca7ef2df077f 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -198,7 +198,7 @@ namespace dbaui Sequence< Sequence< PropertyValue> > aHistory = SvtHistoryOptions().GetList( ePICKLIST ); Reference< XNameAccess > xFilterFactory; xFilterFactory.set(::comphelper::getProcessServiceFactory()->createInstance( - OUString( "com.sun.star.document.FilterFactory" ) ), css::uno::UNO_QUERY); + "com.sun.star.document.FilterFactory" ), css::uno::UNO_QUERY); sal_uInt32 nCount = aHistory.getLength(); for ( sal_uInt32 nItem = 0; nItem < nCount; ++nItem ) diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 6a448bff1c2e..38b7d2135ade 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -332,7 +332,7 @@ static void impl_setNeedsCompatCheck() makeAny( OUString("org.openoffice.Setup/Office") ) ); theArgs[0] <<= v; Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >( - theConfigProvider->createInstanceWithArguments( OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW ); + theConfigProvider->createInstanceWithArguments( aAccessSrvc, theArgs ), UNO_QUERY_THROW ); Any value = makeAny( OUString("never") ); diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index d04c3569d3ca..3689b6f2cd77 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -67,7 +67,7 @@ TheExtensionManager::TheExtensionManager( const uno::Reference< awt::XWindow > & beans::PropertyState_DIRECT_VALUE ); args[0] <<= aValue; m_xNameAccessNodes = uno::Reference< container::XNameAccess >( - xConfig->createInstanceWithArguments( OUString("com.sun.star.configuration.ConfigurationAccess"), + xConfig->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", uno::Sequence< uno::Any >( args, 1 )), uno::UNO_QUERY_THROW); // get the 'get more extensions here' url @@ -76,7 +76,7 @@ TheExtensionManager::TheExtensionManager( const uno::Reference< awt::XWindow > & beans::PropertyState_DIRECT_VALUE ); args[0] <<= aValue2; xNameAccessRepositories = uno::Reference< container::XNameAccess > ( - xConfig->createInstanceWithArguments( OUString("com.sun.star.configuration.ConfigurationAccess"), + xConfig->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", uno::Sequence< uno::Any >( args, 1 )), uno::UNO_QUERY_THROW); try { //throws css::container::NoSuchElementException, css::lang::WrappedTargetException diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx index 5bc87e329e46..2787f93feb2a 100644 --- a/dtrans/source/test/test_dtrans.cxx +++ b/dtrans/source/test/test_dtrans.cxx @@ -290,7 +290,7 @@ int SAL_CALL main( int argc, const char* argv[] ) arguments[0] = makeAny( OUString("generic") ); Reference< XClipboard > xClipboard( xServiceManager->createInstanceWithArguments( - OUString("com.sun.star.datatransfer.clipboard.GenericClipboard"), + "com.sun.star.datatransfer.clipboard.GenericClipboard", arguments ), UNO_QUERY ); ENSURE( xClipboard.is(), "*** ERROR *** generic clipboard service could not be created." ); @@ -365,7 +365,7 @@ int SAL_CALL main( int argc, const char* argv[] ) // create an instance of ClipboardManager service Reference< XClipboardManager > xClipboardManager( xServiceManager->createInstance( - OUString("com.sun.star.datatransfer.clipboard.ClipboardManager") ), UNO_QUERY ); + "com.sun.star.datatransfer.clipboard.ClipboardManager" ), UNO_QUERY ); ENSURE( xClipboardManager.is(), "*** ERROR *** clipboard manager service could not be created." ); diff --git a/dtrans/test/win32/dnd/atlwindow.cxx b/dtrans/test/win32/dnd/atlwindow.cxx index e7039e204d1d..4981e0aacf47 100644 --- a/dtrans/test/win32/dnd/atlwindow.cxx +++ b/dtrans/test/win32/dnd/atlwindow.cxx @@ -96,7 +96,7 @@ LRESULT AWindow::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandle ::SendMessageA(m_hwndEdit, WM_SETTEXT, 0, (LPARAM) szSTAWin); // create the DragSource - Reference< XInterface> xint= MultiServiceFactory->createInstance(OUString(L"com.sun.star.datatransfer.dnd.OleDragSource")); + Reference< XInterface> xint= MultiServiceFactory->createInstance("com.sun.star.datatransfer.dnd.OleDragSource"); m_xDragSource= Reference<XDragSource>( xint, UNO_QUERY); Reference<XInitialization> xInit( xint, UNO_QUERY); @@ -105,7 +105,7 @@ LRESULT AWindow::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandle xInit->initialize( Sequence<Any>( ar, 2) ); //create the DropTarget - Reference< XInterface> xintTarget= MultiServiceFactory->createInstance(OUString(L"com.sun.star.datatransfer.dnd.OleDropTarget")); + Reference< XInterface> xintTarget= MultiServiceFactory->createInstance("com.sun.star.datatransfer.dnd.OleDropTarget"); m_xDropTarget= Reference<XDropTarget>( xintTarget, UNO_QUERY); Reference<XInitialization> xInitTarget( xintTarget, UNO_QUERY); diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index cfe9c450fb65..b7f016824dd3 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -1396,8 +1396,7 @@ void OleComponent::OnViewChange_Impl( sal_uInt32 dwAspect ) if ( xLockObject.is() ) { uno::Reference < awt::XRequestCallback > xRequestCallback( - m_xFactory->createInstance( - OUString("com.sun.star.awt.AsyncCallback")), + m_xFactory->createInstance("com.sun.star.awt.AsyncCallback"), uno::UNO_QUERY ); xRequestCallback->addCallback( new MainThreadNotificationRequest( xLockObject, OLECOMP_ONVIEWCHANGE, dwAspect ), uno::Any() ); } @@ -1417,8 +1416,7 @@ void OleComponent::OnClose_Impl() if ( xLockObject.is() ) { uno::Reference < awt::XRequestCallback > xRequestCallback( - m_xFactory->createInstance( - OUString("com.sun.star.awt.AsyncCallback")), + m_xFactory->createInstance("com.sun.star.awt.AsyncCallback"), uno::UNO_QUERY ); xRequestCallback->addCallback( new MainThreadNotificationRequest( xLockObject, OLECOMP_ONCLOSE ), uno::Any() ); } diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index bafa09698547..2e19372f1060 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -709,7 +709,7 @@ namespace aArgs[1] <<= true; // do not create copy uno::Reference< container::XNameContainer > xNameContainer( xFactory->createInstanceWithArguments( - OUString("com.sun.star.embed.OLESimpleStorage"), + "com.sun.star.embed.OLESimpleStorage", aArgs ), uno::UNO_QUERY_THROW ); uno::Reference< io::XStream > xCONTENTS; diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 4c9e7d6dac1f..3a9429c28c05 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -382,7 +382,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea uno::Reference< container::XNameContainer > xNameContainer( m_xFactory->createInstanceWithArguments( - OUString( "com.sun.star.embed.OLESimpleStorage" ), + "com.sun.star.embed.OLESimpleStorage", aArgs ), uno::UNO_QUERY ); @@ -531,7 +531,7 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea aArgs[1] <<= true; // do not create copy uno::Reference< container::XNameContainer > xNameContainer( m_xFactory->createInstanceWithArguments( - OUString( "com.sun.star.embed.OLESimpleStorage" ), + "com.sun.star.embed.OLESimpleStorage", aArgs ), uno::UNO_QUERY ); @@ -599,7 +599,7 @@ bool OleEmbeddedObject::HasVisReplInStream() aArgs[1] <<= true; // do not create copy uno::Reference< container::XNameContainer > xNameContainer( m_xFactory->createInstanceWithArguments( - OUString( "com.sun.star.embed.OLESimpleStorage" ), + "com.sun.star.embed.OLESimpleStorage", aArgs ), uno::UNO_QUERY ); @@ -645,7 +645,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres { xNameContainer = uno::Reference< container::XNameContainer >( m_xFactory->createInstanceWithArguments( - OUString( "com.sun.star.embed.OLESimpleStorage" ), + "com.sun.star.embed.OLESimpleStorage", aArgs ), uno::UNO_QUERY ); } diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index 0114244783ed..9d9946103203 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -412,7 +412,7 @@ void OwnView_Impl::CreateNative() aArgs[0] <<= xInStream; uno::Reference< container::XNameAccess > xNameAccess( m_xFactory->createInstanceWithArguments( - OUString( "com.sun.star.embed.OLESimpleStorage" ), + "com.sun.star.embed.OLESimpleStorage", aArgs ), uno::UNO_QUERY_THROW ); diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx index 66efdfc51c73..218b71267393 100644 --- a/extensions/source/logging/loggerconfig.cxx +++ b/extensions/source/logging/loggerconfig.cxx @@ -252,7 +252,7 @@ namespace logging makeAny( OUString( "/org.openoffice.Office.Logging/Settings" ) ) ); Reference< XNameContainer > xAllSettings( xConfigProvider->createInstanceWithArguments( - OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ), + "com.sun.star.configuration.ConfigurationUpdateAccess", aArguments ), UNO_QUERY_THROW ); diff --git a/extensions/test/ole/OleClient/funcs.cxx b/extensions/test/ole/OleClient/funcs.cxx index 584f958dff51..d20eabde3053 100644 --- a/extensions/test/ole/OleClient/funcs.cxx +++ b/extensions/test/ole/OleClient/funcs.cxx @@ -69,7 +69,7 @@ Reference<XInvocation> getComObject( OUString progId) if( ! objectFactory.is()) { Reference<XMultiServiceFactory> mgr= getMultiServiceFactory(); Reference<XInterface> xInt= mgr->createInstance( - OUString(L"com.sun.star.bridge.oleautomation.Factory")); + "com.sun.star.bridge.oleautomation.Factory"); objectFactory= Reference<XMultiServiceFactory>::query( xInt); } @@ -88,7 +88,7 @@ Reference<XInvocation> getComObject( OUString progId) Reference<XInvocation> convertComObject( IUnknown* pUnk) { Reference< XMultiServiceFactory > mgr= getMultiServiceFactory(); - Reference< XInterface > xIntSupplier= mgr->createInstance(OUString(L"com.sun.star.bridge.OleBridgeSupplier2")); + Reference< XInterface > xIntSupplier= mgr->createInstance("com.sun.star.bridge.OleBridgeSupplier2"); Reference< XBridgeSupplier2 > xSuppl( xIntSupplier, UNO_QUERY); Any any; diff --git a/extensions/test/ole/OleConverterVar1/convTest.cxx b/extensions/test/ole/OleConverterVar1/convTest.cxx index 1b949cee8e08..00cbcc3e276a 100644 --- a/extensions/test/ole/OleConverterVar1/convTest.cxx +++ b/extensions/test/ole/OleConverterVar1/convTest.cxx @@ -121,10 +121,10 @@ HRESULT doTest() Reference< XMultiComponentFactory > mgr = xContext->getServiceManager();//createRegistryServiceFactory( OUString(L"services.rdb")); Reference< XInterface > xIntSupplier= mgr->createInstanceWithContext( - OUString(L"com.sun.star.bridge.OleBridgeSupplierVar1"), xContext); + "com.sun.star.bridge.OleBridgeSupplierVar1", xContext); Reference< XBridgeSupplier2 > xSuppl( xIntSupplier, UNO_QUERY); Reference <XInterface> xOletest= mgr->createInstanceWithContext( - OUString(L"oletest.OleTest"), xContext); + "oletest.OleTest", xContext); Any any; any <<= xOletest; sal_uInt8 arId[16]; diff --git a/extensions/test/ole/unloading/unloadTest.cxx b/extensions/test/ole/unloading/unloadTest.cxx index 1f8b491f8545..b6825fad21e0 100644 --- a/extensions/test/ole/unloading/unloadTest.cxx +++ b/extensions/test/ole/unloading/unloadTest.cxx @@ -100,7 +100,7 @@ sal_Bool test2() Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg); Reference<XMultiComponentFactory> fac= context->getServiceManager(); - OUString sService2("com.sun.star.bridge.OleBridgeSupplierVar1"); + OUString sService2("com.sun.star.bridge.OleBridgeSupplierVar1"); Reference<XInterface> xint= fac->createInstanceWithContext( sService2, context); OUString sModule("oleautobridge.uno" SAL_DLLEXTENSION); diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index 803acbc2be1f..91bc33f6de65 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -244,7 +244,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p if ( xMultiServiceFactory.is() ) { xPropSet = Reference< XPropertySet >( xMultiServiceFactory->createInstance( - OUString( "com.sun.star.ui.ActionTrigger" ) ), + "com.sun.star.ui.ActionTrigger" ), UNO_QUERY ); Any a; @@ -289,7 +289,7 @@ Reference< XPropertySet > CreateActionTriggerSeparator( const Reference< XIndexC if ( xMultiServiceFactory.is() ) { return Reference< XPropertySet >( xMultiServiceFactory->createInstance( - OUString( "com.sun.star.ui.ActionTriggerSeparator" ) ), + "com.sun.star.ui.ActionTriggerSeparator" ), UNO_QUERY ); } @@ -302,7 +302,7 @@ Reference< XIndexContainer > CreateActionTriggerContainer( const Reference< XInd if ( xMultiServiceFactory.is() ) { return Reference< XIndexContainer >( xMultiServiceFactory->createInstance( - OUString( "com.sun.star.ui.ActionTriggerContainer" ) ), + "com.sun.star.ui.ActionTriggerContainer" ), UNO_QUERY ); } diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index a48f6e4655c9..78008ee842fe 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -983,7 +983,7 @@ DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(Runti aArgs[0] <<= aPath; Reference<XInterface> xInterface = xConfigProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationAccess"), aArgs); + "com.sun.star.configuration.ConfigurationAccess", aArgs); xHierarchicalNameAccess.set(xInterface, UNO_QUERY); diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx index d3fac1edeaf2..07be1222fb28 100644 --- a/i18npool/source/textconversion/textconversion_ko.cxx +++ b/i18npool/source/textconversion/textconversion_ko.cxx @@ -46,7 +46,7 @@ TextConversion_ko::TextConversion_ko( const Reference < XComponentContext >& xCo Reference < XInterface > xI; xI = xContext->getServiceManager()->createInstanceWithContext( - OUString("com.sun.star.i18n.ConversionDictionary_ko"), xContext); + "com.sun.star.i18n.ConversionDictionary_ko", xContext); if ( xI.is() ) xCD.set( xI, UNO_QUERY ); diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index a06b4d565ff8..657bc570d139 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -164,21 +164,21 @@ sal_Int32 ODataStreamTest::test( Reference < XInterface > x = m_rFactory->createInstance( - OUString( "com.sun.star.io.Pipe" )); + "com.sun.star.io.Pipe" ); Reference < XInputStream > rPipeInput( x , UNO_QUERY ); Reference < XOutputStream > rPipeOutput( x , UNO_QUERY ); if( ! rSink.is() ) { x = m_rFactory->createInstance( - OUString( "com.sun.star.io.DataInputStream") ); + "com.sun.star.io.DataInputStream" ); rInput = Reference < XDataInputStream > ( x , UNO_QUERY); rSink = Reference< XActiveDataSink > ( x , UNO_QUERY ); } else if ( !rSource.is() ) { x = m_rFactory->createInstance( - OUString( "com.sun.star.io.DataOutputStream" ) ); + "com.sun.star.io.DataOutputStream" ); rOutput = Reference< XDataOutputStream > ( x , UNO_QUERY ); rSource = Reference< XActiveDataSource > ( x, UNO_QUERY ); } @@ -724,13 +724,13 @@ sal_Int32 OObjectStreamTest::test( const OUString& TestName, Reference < XInterface > x = m_rFactory->createInstance( - OUString( "com.sun.star.io.Pipe" ) ); + "com.sun.star.io.Pipe" ); Reference <XInputStream > rPipeInput( x , UNO_QUERY ); Reference <XOutputStream > rPipeOutput( x , UNO_QUERY ); x = m_rFactory->createInstance( - OUString( "com.sun.star.io.MarkableInputStream" ) ); + "com.sun.star.io.MarkableInputStream" ); Reference <XInputStream > markableInput( x , UNO_QUERY ); Reference <XActiveDataSink> markableSink( x , UNO_QUERY ); @@ -750,13 +750,13 @@ sal_Int32 OObjectStreamTest::test( const OUString& TestName, if( ! rSink.is() ) { x = m_rFactory->createInstance( - OUString( "com.sun.star.io.ObjectInputStream" )); + "com.sun.star.io.ObjectInputStream" ); rInput = Reference < XObjectInputStream > ( x , UNO_QUERY ); rSink = Reference < XActiveDataSink > ( x , UNO_QUERY ); } else if ( !rSource.is() ) { x = m_rFactory->createInstance( - OUString( "com.sun.star.io.ObjectOutputStream" )); + "com.sun.star.io.ObjectOutputStream" ); rOutput = Reference <XObjectOutputStream > ( x , UNO_QUERY ); rSource = Reference <XActiveDataSource>( x, UNO_QUERY ); } @@ -924,7 +924,7 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream > { Reference < XInterface > x = m_rFactory->createInstance( - OUString( "test.com.sun.star.io.PersistTest")); + "test.com.sun.star.io.PersistTest"); Reference< XPersistObject > persistRef( x , UNO_QUERY ); ERROR_ASSERT( persistRef.is() , "couldn't instantiate PersistTest object" ); diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx index c4b83d5c653e..465cf908ce20 100644 --- a/io/test/stm/pumptest.cxx +++ b/io/test/stm/pumptest.cxx @@ -311,7 +311,7 @@ private: Reference< XOutputStream > createPipe() { Reference< XOutputStream > rOut( m_rSmgr->createInstance( - OUString("com.sun.star.io.Pipe")),UNO_QUERY); + "com.sun.star.io.Pipe"),UNO_QUERY); return rOut; } }; @@ -403,9 +403,9 @@ void OPumpTest::testWrongUsage( const Reference< XInterface > &r ) Reference< XActiveDataControl > rControl( r, UNO_QUERY ); Reference< XInputStream > rIn( m_rSmgr->createInstance( - OUString("com.sun.star.io.DataInputStream")),UNO_QUERY); + "com.sun.star.io.DataInputStream"),UNO_QUERY); Reference< XOutputStream > rOut( m_rSmgr->createInstance( - OUString("com.sun.star.io.DataOutputStream")),UNO_QUERY); + "com.sun.star.io.DataOutputStream"),UNO_QUERY); rSink->setInputStream( rIn ); rSource->setOutputStream( rOut ); diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx index f5b626f9de2c..58b4f6876a68 100644 --- a/io/test/testcomponent.cxx +++ b/io/test/testcomponent.cxx @@ -60,7 +60,7 @@ int main (int argc, char **argv) { // Create registration service Reference < XInterface > x = xSMgr->createInstance( - OUString("com.sun.star.registry.ImplementationRegistration") ); + "com.sun.star.registry.ImplementationRegistration" ); xReg = Reference< XImplementationRegistration > ( x , UNO_QUERY ); } catch( Exception & ) { diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx index 2e60af472d2d..ae42cf5f1c62 100644 --- a/io/test/testconnection.cxx +++ b/io/test/testconnection.cxx @@ -185,12 +185,10 @@ int SAL_CALL main( int argc, char * argv[] ) OUString("com.sun.star.loader.SharedLibrary"), aLibName, Reference< XSimpleRegistry >() ); Reference < XAcceptor > rAcceptor( - xMgr->createInstance( - OUString("com.sun.star.connection.Acceptor") ) , UNO_QUERY ); + xMgr->createInstance( "com.sun.star.connection.Acceptor" ) , UNO_QUERY ); Reference < XAcceptor > rAcceptorPipe( - xMgr->createInstance( - OUString("com.sun.star.connection.Acceptor") ) , UNO_QUERY ); + xMgr->createInstance( "com.sun.star.connection.Acceptor" ) , UNO_QUERY ); Reference < XConnector > rConnector( xMgr->createInstance("com.sun.star.connection.Connector") , UNO_QUERY ); diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx index ba2f4cf9c839..cccec06fc619 100644 --- a/javaunohelper/source/vm.cxx +++ b/javaunohelper/source/vm.cxx @@ -77,7 +77,7 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith OUString( "UnoVirtualMachine" ), css::uno::makeAny( handle ) ) ) ); return xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - OUString("com.sun.star.java.JavaVirtualMachine"), + "com.sun.star.java.JavaVirtualMachine", css::uno::Sequence< css::uno::Any >( &arg, 1 ), xContext ); } @@ -86,7 +86,7 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith throw (css::uno::Exception, std::exception) { return xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - OUString("com.sun.star.java.JavaVirtualMachine"), + "com.sun.star.java.JavaVirtualMachine", args, xContext ); } diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index fa975f7b9577..e0b0425871ce 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -644,7 +644,7 @@ rtl::OUString OConnection::transFormPreparedStatement(const rtl::OUString& _sSQL Reference< XConnection> xCon = this; aArgs[0] <<= NamedValue(rtl::OUString("ActiveConnection"), makeAny(xCon)); - m_xParameterSubstitution.set(m_rDriver.getFactory()->createInstanceWithArguments(rtl::OUString("org.openoffice.comp.helper.ParameterSubstitution"),aArgs),UNO_QUERY); + m_xParameterSubstitution.set(m_rDriver.getFactory()->createInstanceWithArguments("org.openoffice.comp.helper.ParameterSubstitution",aArgs),UNO_QUERY); } catch(const Exception&) {} } if ( m_xParameterSubstitution.is() ) { diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index fdb73d679410..39abb7f0829e 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -1295,7 +1295,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( Reference< XResultSet > xResultSet(getOwnConnection(). getDriver().getFactory()->createInstance( - rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); + "org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; std::string cat(catalog.hasValue()? rtl::OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx index 0dc302a5eb80..819da9dd6179 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx @@ -162,7 +162,7 @@ sal_Bool XFlatXml::importer( // create SAX parser that will read the document file // and provide events to xHandler passed to this call Reference < XParser > xSaxParser( m_rServiceFactory->createInstance( - OUString("com.sun.star.xml.sax.Parser")), UNO_QUERY ); + "com.sun.star.xml.sax.Parser"), UNO_QUERY ); OSL_ASSERT(xSaxParser.is()); if(!xSaxParser.is())return sal_False; @@ -212,9 +212,8 @@ sal_Bool XFlatXml::exporter( if (!m_rDocumentHandler.is()) { // get the document writer m_rDocumentHandler = Reference<XExtendedDocumentHandler>( - m_rServiceFactory->createInstance( - OUString("com.sun.star.xml.sax.Writer")), - UNO_QUERY); + m_rServiceFactory->createInstance("com.sun.star.xml.sax.Writer"), + UNO_QUERY); OSL_ASSERT(m_rDocumentHandler.is()); if (!m_rDocumentHandler.is()) return sal_False; } diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx index fab8b8d9d1f4..c51ca17f8f6c 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx +++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx @@ -64,7 +64,7 @@ SAL_IMPLEMENT_MAIN() // instantiate a sample service with the servicemanager. Reference< XInterface > rInstance = rServiceManager->createInstanceWithContext( - OUString("com.sun.star.bridge.UnoUrlResolver"), + "com.sun.star.bridge.UnoUrlResolver", rComponentContext ); // Query for the XUnoUrlResolver interface diff --git a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx index 6e95f202b672..4606f0b4d1be 100644 --- a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx +++ b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx @@ -95,7 +95,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) */ Reference< XInterface > xInterface = xMultiComponentFactoryClient->createInstanceWithContext( - OUString("com.sun.star.bridge.UnoUrlResolver"), + "com.sun.star.bridge.UnoUrlResolver", xComponentContext ); Reference< XUnoUrlResolver > resolver( xInterface, UNO_QUERY ); diff --git a/odk/examples/cpp/counter/countermain.cxx b/odk/examples/cpp/counter/countermain.cxx index f917a4fe8da5..a00e22143605 100644 --- a/odk/examples/cpp/counter/countermain.cxx +++ b/odk/examples/cpp/counter/countermain.cxx @@ -71,8 +71,7 @@ SAL_IMPLEMENT_MAIN() Reference< XMultiComponentFactory > xMgr = xContext->getServiceManager(); OSL_ENSURE( xMgr.is(), "### cannot get initial service manager!" ); - Reference< XInterface > xx = xMgr->createInstanceWithContext( - OUString("foo.Counter"), xContext); + Reference< XInterface > xx = xMgr->createInstanceWithContext( "foo.Counter", xContext); OSL_ENSURE( xx.is(), "### cannot get service instance of \"foo.Counter\"!" ); diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index c7728bbd1e20..d530701564dd 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1201,7 +1201,7 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase& rFilterBase ) Reference < graphic::XGraphic > xGraphic( aGraphic.GetXGraphic() ); Reference < lang::XMultiServiceFactory > xServiceFact( rFilterBase.getModel(), UNO_QUERY_THROW ); - xShape = Reference < XShape > ( xServiceFact->createInstance( OUString( "com.sun.star.drawing.GraphicObjectShape" ) ), UNO_QUERY_THROW ); + xShape = Reference < XShape > ( xServiceFact->createInstance( "com.sun.star.drawing.GraphicObjectShape" ), UNO_QUERY_THROW ); Reference < XPropertySet > xPropSet( xShape, UNO_QUERY_THROW ); xPropSet->setPropertyValue( OUString( "Graphic" ), Any( xGraphic ) ); xPropSet->setPropertyValue( OUString( "MoveProtect" ), Any( sal_True ) ); diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 580aad0df777..476691592728 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -266,7 +266,7 @@ PyRef stRuntimeImpl::create( const Reference< XComponentContext > &ctx ) c->xContext = ctx; c->xInvocation = Reference< XSingleServiceFactory > ( ctx->getServiceManager()->createInstanceWithContext( - OUString( "com.sun.star.script.Invocation" ), + "com.sun.star.script.Invocation", ctx ), UNO_QUERY ); if( ! c->xInvocation.is() ) diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx index 3a570cdeed92..17ccc5922fb0 100644 --- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx +++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx @@ -124,9 +124,7 @@ Reference< XInterface > ResolverImpl::resolve( const OUString & rUnoUrl ) } Reference< XConnector > xConnector( - _xSMgr->createInstanceWithContext( - OUString("com.sun.star.connection.Connector"), - _xCtx ), + _xSMgr->createInstanceWithContext( "com.sun.star.connection.Connector", _xCtx ), UNO_QUERY ); if (! xConnector.is()) diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index bb9a5d85ed73..0b67219316bc 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1272,7 +1272,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< rptui::OXUndoEnvironment::OUndoEnvLock aLock(rEnv); { uno::Reference< document::XFilter > xFilter( - m_aProps->m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(OUString("com.sun.star.comp.report.OReportFilter"),aDelegatorArguments,m_aProps->m_xContext), + m_aProps->m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext("com.sun.star.comp.report.OReportFilter",aDelegatorArguments,m_aProps->m_xContext), uno::UNO_QUERY_THROW ); uno::Reference< document::XImporter> xImporter(xFilter,uno::UNO_QUERY_THROW); diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index f75a5bddf096..559448854003 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -504,7 +504,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) uno::Reference< lang::XMultiServiceFactory > xReportServiceFactory( m_xReportDefinition, uno::UNO_QUERY); aArgs[0] <<= beans::NamedValue(OUString("Storage"),uno::makeAny(xStorage)); - xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments(OUString("com.sun.star.document.ImportEmbeddedObjectResolver"),aArgs) , uno::UNO_QUERY); + xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments("com.sun.star.document.ImportEmbeddedObjectResolver",aArgs) , uno::UNO_QUERY); static const char s_sOld[] = "OldFormat"; static comphelper::PropertyMapEntry const pMap[] = diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 6f7fb265b0cb..3659ce67c1f6 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -511,8 +511,8 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex uno::Reference< ui::dialogs::XExecutableDialog > xDialog( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog"),aSeq - , m_xContext), uno::UNO_QUERY); + "org.openoffice.comp.form.ui.MasterDetailLinkDialog", aSeq, m_xContext), + uno::UNO_QUERY); _rClearBeforeDialog.clear(); return ( xDialog->execute() != 0 ); @@ -531,8 +531,8 @@ bool DataProviderHandler::impl_dialogChartType_nothrow( ::osl::ClearableMutexGua uno::Reference< ui::dialogs::XExecutableDialog > xDialog( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - OUString("com.sun.star.comp.chart2.ChartTypeDialog"),aSeq - , m_xContext), uno::UNO_QUERY); + "com.sun.star.comp.chart2.ChartTypeDialog", aSeq, m_xContext), + uno::UNO_QUERY); _rClearBeforeDialog.clear(); return ( xDialog->execute() != 0 ); diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx index cc881ebb1bcc..9da50fa40922 100644 --- a/sax/test/saxdemo.cxx +++ b/sax/test/saxdemo.cxx @@ -499,8 +499,7 @@ int main (int argc, char **argv) try { // Create registration service - Reference < XInterface > x = xSMgr->createInstance( - OUString("com.sun.star.registry.ImplementationRegistration") ); + Reference < XInterface > x = xSMgr->createInstance( "com.sun.star.registry.ImplementationRegistration" ); xReg = Reference< XImplementationRegistration > ( x , UNO_QUERY ); } catch( Exception & ) { @@ -530,8 +529,7 @@ int main (int argc, char **argv) // parser demo // read xml from a file and count elements - Reference< XInterface > x = xSMgr->createInstance( - OUString("com.sun.star.xml.sax.Parser") ); + Reference< XInterface > x = xSMgr->createInstance( "com.sun.star.xml.sax.Parser" ); if( x.is() ) { Reference< XParser > rParser( x , UNO_QUERY ); diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx index d34776789f8a..e498b2290908 100644 --- a/sax/test/testcomponent.cxx +++ b/sax/test/testcomponent.cxx @@ -68,8 +68,7 @@ int main (int argc, char **argv) try { // Create registration service - Reference < XInterface > x = xSMgr->createInstance( - OUString("com.sun.star.registry.ImplementationRegistration") ); + Reference < XInterface > x = xSMgr->createInstance( "com.sun.star.registry.ImplementationRegistration" ); xReg = Reference< XImplementationRegistration > ( x , UNO_QUERY ); } catch (const Exception&) diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index b7902b3e900d..579b6b8e3583 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -2873,8 +2873,7 @@ void ScXMLImport::SetStyleToRanges() uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>( - xMultiServiceFactory->createInstance( - OUString("com.sun.star.sheet.SheetCellRanges")), + xMultiServiceFactory->createInstance("com.sun.star.sheet.SheetCellRanges"), uno::UNO_QUERY)); } OSL_ENSURE(xSheetCellRanges.is(), "didn't get SheetCellRanges"); diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 7aad2937845d..f79472cbb53c 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -658,7 +658,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV { uno::Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - OUString("com.sun.star.comp.chart2.WizardDialog") + "com.sun.star.comp.chart2.WizardDialog" , xContext), uno::UNO_QUERY); uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY ); if( xChartModel.is() && xInit.is() ) diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 3562d3c50531..bc3e83dc1510 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -613,7 +613,7 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance( { uno::Sequence< uno::Any > aArgs(1); aArgs[ 0 ] <<= pDocShell->GetModel(); - xRet = ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( OUString( "ooo.vba.excel.Globals" ), aArgs ); + xRet = ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( "ooo.vba.excel.Globals", aArgs ); pDocShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", uno::Any( xRet ) ); BasicManager* pAppMgr = SfxApplication::GetBasicManager(); if ( pAppMgr ) diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index 7b98034c9815..3b7f90e04e2f 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -217,7 +217,7 @@ ScVbaGlobals::getDebug() throw (uno::RuntimeException, std::exception) { uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< uno::XInterface > xVBADebug = xServiceManager->createInstanceWithContext( - OUString( "ooo.vba.Debug" ), mxContext ); + "ooo.vba.Debug", mxContext ); return uno::Any( xVBADebug ); } catch( uno::Exception& ) diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx index 3635a198809f..8314107b1213 100644 --- a/sc/source/ui/vba/vbawsfunction.cxx +++ b/sc/source/ui/vba/vbawsfunction.cxx @@ -179,7 +179,7 @@ ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno:: { uno::Reference< lang::XMultiComponentFactory > xSMgr( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XFunctionAccess > xFunctionAccess( xSMgr->createInstanceWithContext( - OUString( "com.sun.star.sheet.FunctionAccess" ), mxContext ), + "com.sun.star.sheet.FunctionAccess", mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropSet( xFunctionAccess, uno::UNO_QUERY_THROW ); xPropSet->setPropertyValue("IsArrayFunction", uno::Any( bAsArray ) ); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 20e8fd72e0f2..718b33cf8d14 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1730,8 +1730,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - OUString("com.sun.star.linguistic2.ChineseTranslationDialog") - , xContext), UNO_QUERY); + "com.sun.star.linguistic2.ChineseTranslationDialog" + , xContext), + UNO_QUERY); Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY ); if( xInit.is() ) { diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx index 8dfa86a2e622..1eb20b76b4c5 100644 --- a/scripting/source/dlgprov/dlgevtatt.cxx +++ b/scripting/source/dlgprov/dlgevtatt.cxx @@ -111,7 +111,7 @@ namespace dlgprov if ( xSMgr.is() ) { args[0] <<= xModel; - mxListener = Reference< XScriptListener >( xSMgr->createInstanceWithArgumentsAndContext( OUString( "ooo.vba.EventListener" ), args, m_xContext ), UNO_QUERY ); + mxListener = Reference< XScriptListener >( xSMgr->createInstanceWithArgumentsAndContext( "ooo.vba.EventListener", args, m_xContext ), UNO_QUERY ); } if ( rxControl.is() ) { @@ -342,7 +342,7 @@ namespace dlgprov if ( xSMgr.is() ) { m_xEventAttacher = Reference< XEventAttacher >( xSMgr->createInstanceWithContext( - OUString( "com.sun.star.script.EventAttacher" ), m_xContext ), UNO_QUERY ); + "com.sun.star.script.EventAttacher", m_xContext ), UNO_QUERY ); if ( !m_xEventAttacher.is() ) throw ServiceNotRegisteredException(); 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); } diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 0bbe797de1a7..9e95bf66f541 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -809,7 +809,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( bHyperlinkUsed && !aFileName.isEmpty() && aFileName[0] != '#' ) { Reference< css::document::XTypeDetection > xTypeDetection( ::comphelper::getProcessServiceFactory()->createInstance( - OUString("com.sun.star.document.TypeDetection")), + "com.sun.star.document.TypeDetection"), UNO_QUERY ); if ( xTypeDetection.is() ) { diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 1c41d4235dc4..438a086e5d1a 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -346,9 +346,8 @@ OUString impl_getFilter( const OUString& _rURL ) try { css::uno::Reference< css::document::XTypeDetection > xTypeDetection( - ::comphelper::getProcessServiceFactory()->createInstance( - OUString("com.sun.star.document.TypeDetection") ), - css::uno::UNO_QUERY ); + ::comphelper::getProcessServiceFactory()->createInstance( "com.sun.star.document.TypeDetection" ), + css::uno::UNO_QUERY ); if ( xTypeDetection.is() ) { utl::MediaDescriptor aDescr; diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index fd309faf2e62..a31b8ac13158 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -143,8 +143,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( { uno::Sequence < beans::PropertyValue > aProps; css::uno::Reference< css::container::XNameAccess > xFilterCFG( - xSMGR->createInstance( - OUString("com.sun.star.document.FilterFactory") ), uno::UNO_QUERY ); + xSMGR->createInstance( "com.sun.star.document.FilterFactory" ), uno::UNO_QUERY ); css::uno::Reference< css::util::XModifiable > xModifiable( xModel, css::uno::UNO_QUERY ); if ( !xFilterCFG.is() ) diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 204b4740f54e..3a40a3145786 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -1809,7 +1809,7 @@ bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, uno::Reference< container::XNameAccess > xSOFConfig( xConfigProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationAccess"), + "com.sun.star.configuration.ConfigurationAccess", aArgs ), uno::UNO_QUERY_THROW ); diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index f8727533895e..153c320cb891 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -207,8 +207,7 @@ public: { uno::Reference< lang::XMultiServiceFactory > xDocSettingsSupplier( xModel, uno::UNO_QUERY_THROW ); m_xDocumentSettings.set( - xDocSettingsSupplier->createInstance( - OUString( "com.sun.star.document.Settings" ) ), + xDocSettingsSupplier->createInstance( "com.sun.star.document.Settings" ), uno::UNO_QUERY_THROW ); OUString aLoadReadonlyString( "LoadReadonly" ); diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 82e919e52b34..9cfb22ca805f 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -277,8 +277,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument const Reference<frame:: XTransientDocumentsDocumentContentFactory> xTDDCF( xMsf->createInstanceWithContext( - OUString("com.sun.star.frame." - "TransientDocumentsDocumentContentFactory"), + "com.sun.star.frame.TransientDocumentsDocumentContentFactory", xContext), UNO_QUERY_THROW); const Reference<ucb::XContent> xContent( diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index 8d6a35be198b..56019e76b3e6 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -190,7 +190,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM Reference< XNameAccess > xNameAccess = Reference< XNameAccess > ( m_xConfigurationProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationAccess"), + "com.sun.star.configuration.ConfigurationAccess", aArgumentList ), UNO_QUERY ); diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index a7e540c8842e..8614cfd9642e 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -615,7 +615,7 @@ SlideShowImpl::SlideShowImpl( // #i82460# try to retrieve special transition factory mxOptionalTransitionFactory.set( xFactory->createInstanceWithContext( - OUString("com.sun.star.presentation.TransitionFactory" ), + "com.sun.star.presentation.TransitionFactory", mxComponentContext ), uno::UNO_QUERY ); } @@ -1461,7 +1461,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult { //create the PolyLineShape uno::Reference< uno::XInterface > polyshape(xDocFactory->createInstance( - OUString("com.sun.star.drawing.PolyLineShape") ) ); + "com.sun.star.drawing.PolyLineShape" ) ); uno::Reference< drawing::XShape > rPolyShape(polyshape, uno::UNO_QUERY); //Add the shape to the slide diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx index 53ff9b6f1a99..ecd04950c5a8 100644 --- a/sot/source/unoolestorage/xolesimplestorage.cxx +++ b/sot/source/unoolestorage/xolesimplestorage.cxx @@ -481,7 +481,7 @@ uno::Any SAL_CALL OLESimpleStorage::getByName( const OUString& aName ) uno::Reference< container::XNameContainer > xResultNameContainer( m_xFactory->createInstanceWithArguments( - OUString("com.sun.star.embed.OLESimpleStorage"), + "com.sun.star.embed.OLESimpleStorage", aArgs ), uno::UNO_QUERY_THROW ); diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 2f893e6246a4..42657baa9f5c 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -1115,9 +1115,7 @@ InvocationService::InvocationService( const Reference<XComponentContext> & xCtx , xCoreReflection( css::reflection::theCoreReflection::get(mxCtx) ) { xTypeConverter = Reference<XTypeConverter>( - mxSMgr->createInstanceWithContext( - OUString("com.sun.star.script.Converter"), - xCtx ), + mxSMgr->createInstanceWithContext( "com.sun.star.script.Converter", xCtx ), UNO_QUERY ); xIntrospection = theIntrospection::get(xCtx); } diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 2b953e9a6199..2702b6aa24af 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -700,7 +700,7 @@ FactoryImpl::FactoryImpl( Reference< XComponentContext > const & xContext ) // type converter Reference< script::XTypeConverter > xConverter( xContext->getServiceManager()->createInstanceWithContext( - OUString("com.sun.star.script.Converter"), + "com.sun.star.script.Converter", xContext ), UNO_QUERY_THROW ); m_pConverter = static_cast<uno_Interface *>(m_aCpp2Uno.mapInterface( diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 30755663a8c2..c3ec2516c932 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -272,7 +272,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, const css::uno::Reference<css::uno::XComponentContext> &xCtx ) throw (css::uno::Exception) { css::uno::Reference<css::uno::XInterface> xConfRegistry = xSMgr->createInstanceWithContext( - OUString("com.sun.star.configuration.ConfigurationRegistry"), + "com.sun.star.configuration.ConfigurationRegistry", xCtx ); if(!xConfRegistry.is()) throw css::uno::RuntimeException("javavm.cxx: couldn't get ConfigurationRegistry", 0); @@ -362,8 +362,7 @@ void getDefaultLocaleFromConfig( const css::uno::Reference<css::uno::XComponentContext> &xCtx ) throw(css::uno::Exception) { css::uno::Reference<css::uno::XInterface> xConfRegistry = - xSMgr->createInstanceWithContext( - OUString("com.sun.star.configuration.ConfigurationRegistry"), xCtx ); + xSMgr->createInstanceWithContext( "com.sun.star.configuration.ConfigurationRegistry", xCtx ); if(!xConfRegistry.is()) throw css::uno::RuntimeException( OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); @@ -417,7 +416,7 @@ void getJavaPropsFromSafetySettings( { css::uno::Reference<css::uno::XInterface> xConfRegistry = xSMgr->createInstanceWithContext( - OUString("com.sun.star.configuration.ConfigurationRegistry"), + "com.sun.star.configuration.ConfigurationRegistry", xCtx); if(!xConfRegistry.is()) throw css::uno::RuntimeException( @@ -1353,7 +1352,7 @@ void JavaVirtualMachine::registerConfigChangesListener() m_xInetConfiguration = css::uno::Reference< css::container::XContainer >( xConfigProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationAccess"), + "com.sun.star.configuration.ConfigurationAccess", aArguments), css::uno::UNO_QUERY); @@ -1377,7 +1376,7 @@ void JavaVirtualMachine::registerConfigChangesListener() m_xJavaConfiguration = css::uno::Reference< css::container::XContainer >( xConfigProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationAccess"), + "com.sun.star.configuration.ConfigurationAccess", aArguments2), css::uno::UNO_QUERY); diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index 92589f967284..4d10bd44e99d 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -1410,7 +1410,7 @@ Reference<XRegistryKey > ORegistryServiceManager::getRootKey() m_xRegistry.set( createInstanceWithContext( - OUString("com.sun.star.registry.DefaultRegistry"), + "com.sun.star.registry.DefaultRegistry", m_xContext ), UNO_QUERY ); } diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx index e62b80b9128c..f6fd89843b19 100644 --- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx +++ b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx @@ -127,7 +127,7 @@ sal_Int32 Service::run(css::uno::Sequence< OUString > const &) OUString("Registry")); css::uno::Reference< css::container::XHierarchicalNameAccess > provider( factory->createInstanceWithArgumentsAndContext( - OUString( "com.sun.star.comp.stoc.RegistryTypeDescriptionProvider"), + "com.sun.star.comp.stoc.RegistryTypeDescriptionProvider", args, m_context), css::uno::UNO_QUERY_THROW); diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx index 434d6fe52ff4..e466904b4314 100644 --- a/stoc/test/tdmanager/testtdmanager.cxx +++ b/stoc/test/tdmanager/testtdmanager.cxx @@ -141,15 +141,14 @@ sal_Int32 Service::run(css::uno::Sequence< OUString > const & arguments) css::uno::Reference<css::registry::XSimpleRegistry> xReg( m_context->getServiceManager()->createInstanceWithContext( - OUString( "com.sun.star.registry.SimpleRegistry" ), + "com.sun.star.registry.SimpleRegistry", m_context ), css::uno::UNO_QUERY_THROW ); xReg->open( url, true /* read-only */, false /* ! create */ ); css::uno::Any arg( css::uno::makeAny(xReg) ); css::uno::Reference<css::container::XHierarchicalNameAccess> xTDprov( m_context->getServiceManager()-> createInstanceWithArgumentsAndContext( - OUString( "com.sun.star.comp.stoc." - "RegistryTypeDescriptionProvider" ), + "com.sun.star.comp.stoc.RegistryTypeDescriptionProvider", css::uno::Sequence<css::uno::Any>( &arg, 1 ), m_context ), css::uno::UNO_QUERY_THROW ); try { diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx index 950a9129f59b..786e8d35966c 100644 --- a/stoc/test/testconv.cxx +++ b/stoc/test/testconv.cxx @@ -606,8 +606,7 @@ static void test_Conversion( const Reference< XMultiServiceFactory > & xMgr ) { printf( "test_Conversion(): start...\n" ); - Reference< XTypeConverter > xConverter( xMgr->createInstance( - OUString("com.sun.star.script.Converter") ), UNO_QUERY ); + Reference< XTypeConverter > xConverter( xMgr->createInstance( "com.sun.star.script.Converter" ), UNO_QUERY ); ConvBlock * pTestBlocks = new ConvBlock[256]; sal_Int32 nPos = initBlocks( pTestBlocks ); diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx index a540a6b3dd32..3452e68bc393 100644 --- a/stoc/test/testiadapter.cxx +++ b/stoc/test/testiadapter.cxx @@ -1004,8 +1004,7 @@ SAL_IMPLEMENT_MAIN() try { Reference< XImplementationRegistration > xImplReg( - xMgr->createInstance( - OUString( "com.sun.star.registry.ImplementationRegistration" ) ), + xMgr->createInstance( "com.sun.star.registry.ImplementationRegistration" ), UNO_QUERY ); OSL_ENSURE( xImplReg.is(), "### no impl reg!" ); diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx index 1b0735968def..2aedac97cf5f 100644 --- a/stoc/test/testintrosp.cxx +++ b/stoc/test/testintrosp.cxx @@ -71,7 +71,7 @@ Reference<XIdlClass> TypeToIdlClass( const Type& rType, const Reference< XMultiS if( !xRefl.is() ) { xRefl = Reference< XIdlReflection >( xMgr->createInstance( - OUString("com.sun.star.reflection.CoreReflection") ), UNO_QUERY ); + "com.sun.star.reflection.CoreReflection" ), UNO_QUERY ); OSL_ENSURE( xRefl.is(), "### no corereflection!" ); } xRetClass = xRefl->forName( sOWName ); diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx index 20fb2597e7b2..b171dda44a9b 100644 --- a/stoc/test/testproxyfac.cxx +++ b/stoc/test/testproxyfac.cxx @@ -252,9 +252,7 @@ SAL_IMPLEMENT_MAIN() try { Reference< registry::XImplementationRegistration > xImplReg( - xMgr->createInstance( - OUString( "com.sun.star.registry.ImplementationRegistration" - ) ), + xMgr->createInstance( "com.sun.star.registry.ImplementationRegistration" ), UNO_QUERY ); OSL_ENSURE( xImplReg.is(), "### no impl reg!" ); diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx index f31a060a9529..6b5848ec628a 100644 --- a/svtools/source/uno/fpicker.cxx +++ b/svtools/source/uno/fpicker.cxx @@ -88,7 +88,7 @@ Reference< css::uno::XInterface > FilePicker_CreateInstance ( { // Always fall back to OfficeFilePicker. xResult = xFactory->createInstanceWithContext ( - OUString( "com.sun.star.ui.dialogs.OfficeFilePicker"), + "com.sun.star.ui.dialogs.OfficeFilePicker", context); } if (xResult.is()) @@ -158,7 +158,7 @@ Reference< css::uno::XInterface > FolderPicker_CreateInstance ( { // Always fall back to OfficeFolderPicker. xResult = xFactory->createInstanceWithContext ( - OUString( "com.sun.star.ui.dialogs.OfficeFolderPicker"), + "com.sun.star.ui.dialogs.OfficeFolderPicker", context); } if (xResult.is()) diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index c1ef963cd915..910cd7f4064c 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -512,7 +512,7 @@ void SvxSearchDialog::Construct_Impl() aArgs[0] <<= sPath; uno::Reference< uno::XInterface > xIFace = xConfigurationProvider->createInstanceWithArguments( - OUString( "com.sun.star.configuration.ConfigurationUpdateAccess"), + "com.sun.star.configuration.ConfigurationUpdateAccess", aArgs); uno::Reference< container::XNameAccess> xDirectAccess(xIFace, uno::UNO_QUERY); if(xDirectAccess.is()) diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 60a382e2925c..0d47121e8125 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -430,8 +430,8 @@ GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, Gallery* pGallery ) : m_xTransformer.set( m_xContext->getServiceManager()->createInstanceWithContext( - OUString( "com.sun.star.util.URLTransformer" ), m_xContext ), - css::uno::UNO_QUERY ); + "com.sun.star.util.URLTransformer", m_xContext ), + css::uno::UNO_QUERY ); Image aDummyImage; vcl::Font aInfoFont( maInfoBar->GetControlFont() ); diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 92711544504a..4a639efa38cc 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -360,8 +360,7 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) : uno::Reference< lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); - uno::Reference< awt::XProgressMonitor > xMonitor( xMgr->createInstance( - OUString("com.sun.star.awt.XProgressMonitor") ), + uno::Reference< awt::XProgressMonitor > xMonitor( xMgr->createInstance( "com.sun.star.awt.XProgressMonitor" ), uno::UNO_QUERY ); if ( xMonitor.is() ) diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx index 6db48a1e3880..1adad492ba0b 100644 --- a/sw/qa/tiledrendering/tiledrendering.cxx +++ b/sw/qa/tiledrendering/tiledrendering.cxx @@ -179,7 +179,7 @@ void TiledRenderingApp::Init() // plain createInstance w/o args directly to obtain an instance): ::ucb::UniversalContentBroker::create(comphelper::getProcessComponentContext() ); - xDesktop.set(xFactory->createInstanceWithContext(OUString("com.sun.star.frame.Desktop"), xContext)); + xDesktop.set(xFactory->createInstanceWithContext("com.sun.star.frame.Desktop", xContext)); xLoader.set(frame::Desktop::create(xContext)); } diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 84e9b8f3f681..b0775197dfce 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -891,9 +891,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( if( !rServiceFactory.is() ) return xShape; - uno::Reference< XInterface > xCreate = - rServiceFactory ->createInstance( - OUString("com.sun.star.drawing.ControlShape")); + uno::Reference< XInterface > xCreate = rServiceFactory->createInstance( "com.sun.star.drawing.ControlShape" ); if( !xCreate.is() ) return xShape; @@ -1326,7 +1324,7 @@ void SwHTMLParser::NewForm( bool bAppend ) return; uno::Reference< XInterface > xInt = rSrvcMgr->createInstance( - OUString("com.sun.star.form.component.Form") ); + "com.sun.star.form.component.Form" ); if( !xInt.is() ) return; @@ -2014,7 +2012,7 @@ void SwHTMLParser::NewTextArea() return; } uno::Reference< uno::XInterface > xInt = rSrvcMgr->createInstance( - OUString("com.sun.star.form.component.TextField") ); + "com.sun.star.form.component.TextField" ); if( !xInt.is() ) { FinishTextArea(); @@ -2282,7 +2280,7 @@ void SwHTMLParser::NewSelect() return; } uno::Reference< uno::XInterface > xInt = rSrvcMgr->createInstance( - OUString("com.sun.star.form.component.ListBox") ); + "com.sun.star.form.component.ListBox" ); if( !xInt.is() ) { FinishTextArea(); diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index d18d611ca3e1..5f68f0c57b73 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -1253,8 +1253,8 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) { Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - OUString("com.sun.star.linguistic2.ChineseTranslationDialog") - , xContext), UNO_QUERY); + "com.sun.star.linguistic2.ChineseTranslationDialog", xContext), + UNO_QUERY); Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY ); if( xInit.is() ) { diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx index 1515a85c53ab..c28c18675c45 100644 --- a/sw/source/uibase/table/chartins.cxx +++ b/sw/source/uibase/table/chartins.cxx @@ -176,8 +176,8 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings ) { uno::Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - OUString("com.sun.star.comp.chart2.WizardDialog") - , xContext), uno::UNO_QUERY); + "com.sun.star.comp.chart2.WizardDialog", xContext), + uno::UNO_QUERY); uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY ); if( xInit.is() ) { diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 2d760419cc53..25a626d99c38 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -121,8 +121,8 @@ void SwView::ExecLingu(SfxRequest &rReq) { Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - OUString("com.sun.star.linguistic2.ChineseTranslationDialog") - , xContext), UNO_QUERY); + "com.sun.star.linguistic2.ChineseTranslationDialog", xContext), + UNO_QUERY); Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY ); if( xInit.is() ) { diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index 54c7365d2305..0bd9b9266aa9 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -900,7 +900,7 @@ bool UniversalContentBroker::getContentProviderData( uno::Reference< uno::XInterface > xInterface( xConfigProv->createInstanceWithArguments( - OUString( "com.sun.star.configuration.ConfigurationAccess" ), + "com.sun.star.configuration.ConfigurationAccess", aArguments ) ); if ( !m_xNotifier.is() ) diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index f63b480749d2..318c1b14e1f6 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -987,7 +987,7 @@ Reference< XInterface > PropertySetRegistry::getRootConfigReadAccess() m_pImpl->m_xRootReadAccess = m_pImpl->m_xConfigProvider->createInstanceWithArguments( - OUString( "com.sun.star.configuration.ConfigurationAccess" ), + "com.sun.star.configuration.ConfigurationAccess", aArguments ); if ( m_pImpl->m_xRootReadAccess.is() ) @@ -1049,7 +1049,7 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess( m_pImpl->m_xRootWriteAccess = m_pImpl->m_xConfigProvider->createInstanceWithArguments( - OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ), + "com.sun.star.configuration.ConfigurationUpdateAccess", aArguments ); OSL_ENSURE( m_pImpl->m_xRootWriteAccess.is(), diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 115810c7942a..217aaabb8e31 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -496,7 +496,7 @@ HierarchyDataSource::createInstanceWithArguments( { // Create configuration read-only access object. xConfigAccess = xProv->createInstanceWithArguments( - OUString( "com.sun.star.configuration.ConfigurationAccess" ), + "com.sun.star.configuration.ConfigurationAccess", aNewArgs ); } else @@ -515,7 +515,7 @@ HierarchyDataSource::createInstanceWithArguments( // Create configuration read-write access object. xConfigAccess = xProv->createInstanceWithArguments( - OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ), + "com.sun.star.configuration.ConfigurationUpdateAccess", aNewArgs ); } } diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index 18dd8f0bcd98..241ea551348c 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -249,7 +249,7 @@ HierarchyContentProvider::getRootConfigReadNameAccess( (*it).second.xRootReadAccess = uno::Reference< container::XHierarchicalNameAccess >( xConfigProv->createInstanceWithArguments( - OUString( "com.sun.star.ucb.HierarchyDataReadAccess" ), + "com.sun.star.ucb.HierarchyDataReadAccess", aArguments ), uno::UNO_QUERY ); } diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 870cc8d31beb..356a21d6df33 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -77,7 +77,7 @@ OUString getConfigurationString(OUString const & module, OUString const & path) return css::uno::Reference< css::container::XHierarchicalNameAccess >( getConfigurationProvider()->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationAccess"), + "com.sun.star.configuration.ConfigurationAccess", args), css::uno::UNO_QUERY_THROW)-> getByHierarchicalName(path).get< OUString >(); @@ -157,7 +157,7 @@ utl::ConfigManager::acquireTree(utl::ConfigItem & item) { } return css::uno::Reference< css::container::XHierarchicalNameAccess >( getConfigurationProvider()->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationUpdateAccess"), + "com.sun.star.configuration.ConfigurationUpdateAccess", args), css::uno::UNO_QUERY_THROW); } diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index 8053d9513d4c..df4e45597c55 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -115,7 +115,7 @@ DefaultFontConfiguration::DefaultFontConfiguration() aArgs.getArray()[0] <<= aVal; m_xConfigAccess = Reference< XNameAccess >( - m_xConfigProvider->createInstanceWithArguments( OUString( "com.sun.star.configuration.ConfigurationAccess" ), + m_xConfigProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", aArgs ), UNO_QUERY ); if( m_xConfigAccess.is() ) @@ -376,7 +376,7 @@ FontSubstConfiguration::FontSubstConfiguration() : aArgs.getArray()[0] <<= aVal; m_xConfigAccess = Reference< XNameAccess >( - m_xConfigProvider->createInstanceWithArguments( OUString( "com.sun.star.configuration.ConfigurationAccess" ), + m_xConfigProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", aArgs ), UNO_QUERY ); if( m_xConfigAccess.is() ) diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 39e3877d4de2..5249ac567a89 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -1078,7 +1078,7 @@ uno::Reference< util::XChangesBatch > SvtLinguConfig::GetMainUpdateAccess() cons aProps[0] <<= aValue; m_xMainUpdateAccess = uno::Reference< util::XChangesBatch >( xConfigurationProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationUpdateAccess"), aProps), + "com.sun.star.configuration.ConfigurationUpdateAccess", aProps), uno::UNO_QUERY_THROW ); } catch (uno::Exception &) diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx index 44439934db69..a01e59eb95b1 100644 --- a/unoxml/qa/unit/domtest.cxx +++ b/unoxml/qa/unit/domtest.cxx @@ -199,7 +199,7 @@ struct BasicTest : public test::BootstrapFixture test::BootstrapFixture::setUp(); mxErrHandler.set( new ErrorHandler() ); - uno::Reference<XDocumentBuilder> xDB( getMultiServiceFactory()->createInstance(OUString("com.sun.star.xml.dom.DocumentBuilder")), uno::UNO_QUERY_THROW ); + uno::Reference<XDocumentBuilder> xDB( getMultiServiceFactory()->createInstance("com.sun.star.xml.dom.DocumentBuilder"), uno::UNO_QUERY_THROW ); mxDomBuilder.set( xDB ); mxValidInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(validTestFile), SAL_N_ELEMENTS(validTestFile))) ); mxWarningInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(warningTestFile), SAL_N_ELEMENTS(warningTestFile))) ); @@ -273,7 +273,7 @@ struct SerializerTest : public test::BootstrapFixture test::BootstrapFixture::setUp(); mxErrHandler.set( new ErrorHandler() ); - uno::Reference<XDocumentBuilder> xDB( getMultiServiceFactory()->createInstance(OUString("com.sun.star.xml.dom.DocumentBuilder")), uno::UNO_QUERY_THROW ); + uno::Reference<XDocumentBuilder> xDB( getMultiServiceFactory()->createInstance("com.sun.star.xml.dom.DocumentBuilder"), uno::UNO_QUERY_THROW ); mxDomBuilder.set( xDB ); mxInStream.set( new SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8 const *>(validTestFile), SAL_N_ELEMENTS(validTestFile))) ); mxDomBuilder->setErrorHandler(mxErrHandler.get()); diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx index 7f959196653a..0e1e6c9837c0 100644 --- a/uui/source/iahndl-filter.cxx +++ b/uui/source/iahndl-filter.cxx @@ -98,7 +98,7 @@ handleNoSuchFilterRequest_( try { xFilterContainer.set( xContext->getServiceManager()->createInstanceWithContext( - OUString( "com.sun.star.document.FilterFactory"), xContext ), + "com.sun.star.document.FilterFactory", xContext ), uno::UNO_QUERY ); } catch ( uno::Exception const & ) @@ -199,7 +199,7 @@ handleFilterOptionsRequest_( try { xFilterCFG.set( xContext->getServiceManager()->createInstanceWithContext( - OUString( "com.sun.star.document.FilterFactory" ), xContext ), + "com.sun.star.document.FilterFactory", xContext ), uno::UNO_QUERY ); } catch ( uno::Exception const & ) diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index 8df7bfb7edab..e50dcabc725a 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -140,8 +140,7 @@ Reference< XInterface > openConfig(const char* sPackage) lParams[0] = makeAny(aParam); // get access to file - xCfg = xConfigProvider->createInstanceWithArguments( - OUString( "com.sun.star.configuration.ConfigurationAccess" ), lParams); + xCfg = xConfigProvider->createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess", lParams); } catch(const RuntimeException&) { throw; } diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx index 119485971445..34ad8af03eda 100644 --- a/vcl/source/filter/FilterConfigItem.cxx +++ b/vcl/source/filter/FilterConfigItem.cxx @@ -69,7 +69,7 @@ static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, co try { xReadAccess = rXCfgProv->createInstanceWithArguments( - OUString( "com.sun.star.configuration.ConfigurationAccess" ), + "com.sun.star.configuration.ConfigurationAccess", aArguments ); } catch (const ::com::sun::star::uno::Exception&) @@ -134,7 +134,7 @@ void FilterConfigItem::ImpInitTree( const OUString& rSubTree ) try { xUpdatableView = xCfgProv->createInstanceWithArguments( - OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ), + "com.sun.star.configuration.ConfigurationUpdateAccess", aArguments ); if ( xUpdatableView.is() ) xPropSet = Reference< XPropertySet >( xUpdatableView, UNO_QUERY ); diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 02c190c21426..0732483b3915 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -159,7 +159,7 @@ bool PrinterOptions::ReadFromConfig( bool i_bFile ) aArgs.getArray()[0] <<= aVal; xConfigAccess = Reference< XNameAccess >( xConfigProvider->createInstanceWithArguments( - OUString( "com.sun.star.configuration.ConfigurationAccess" ), aArgs ), + "com.sun.star.configuration.ConfigurationAccess", aArgs ), UNO_QUERY ); if( xConfigAccess.is() ) { diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 5f2d0b991f66..4cd6c02aed88 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -218,7 +218,7 @@ OString Databases::getImageTheme() // open it uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationAccess"), + "com.sun.star.configuration.ConfigurationAccess", lParams) ); uno::Reference< container::XHierarchicalNameAccess > xAccess(xCFG, uno::UNO_QUERY_THROW); diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index 95b1c6de4d7b..5b16fe055032 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -310,7 +310,7 @@ void ContentProvider::init() // open it uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationAccess"), + "com.sun.star.configuration.ConfigurationAccess", lParams) ); uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY); diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index d2b7e58655b7..4cb3e405f30d 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -652,7 +652,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext ) // open it uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationAccess"), + "com.sun.star.configuration.ConfigurationAccess", lParams) ); uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY); diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index 40a4608d8704..2f7a58607b42 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -487,7 +487,7 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries( { xResult.set( xContext->getServiceManager()->createInstanceWithContext( - OUString( "com.sun.star.chart2.DataSeries" ), + "com.sun.star.chart2.DataSeries", xContext ), uno::UNO_QUERY_THROW ); } if( xResult.is() ) diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 705fd4f3835a..97760c855911 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -1337,16 +1337,14 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) if( !mxGraphicResolver.is() ) { mxGraphicResolver = Reference< XGraphicObjectResolver >::query( - xFactory->createInstance( - OUString( "com.sun.star.document.ExportGraphicObjectResolver"))); + xFactory->createInstance( "com.sun.star.document.ExportGraphicObjectResolver" )); bOwnGraphicResolver = mxGraphicResolver.is(); } if( !mxEmbeddedResolver.is() ) { mxEmbeddedResolver = Reference< XEmbeddedObjectResolver >::query( - xFactory->createInstance( - OUString( "com.sun.star.document.ExportEmbeddedObjectResolver"))); + xFactory->createInstance( "com.sun.star.document.ExportEmbeddedObjectResolver" )); bOwnEmbeddedResolver = mxEmbeddedResolver.is(); } } diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 60b7d90142ab..678109e099d1 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -383,8 +383,7 @@ void SdXMLGenericPageContext::SetStyle( OUString& rStyleName ) if(xServiceFact.is()) { xBackgroundSet = Reference< beans::XPropertySet >::query( - xServiceFact->createInstance( - OUString("com.sun.star.drawing.Background"))); + xServiceFact->createInstance("com.sun.star.drawing.Background")); } } diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index eea9debfefce..08385cdbea35 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -317,8 +317,7 @@ void PageStyleContext::SetDefaults( ) Reference < XMultiServiceFactory > xFactory ( GetImport().GetModel(), UNO_QUERY); if (xFactory.is()) { - Reference < XInterface > xInt = xFactory->createInstance ( - OUString ( "com.sun.star.text.Defaults" ) ); + Reference < XInterface > xInt = xFactory->createInstance( "com.sun.star.text.Defaults" ); Reference < beans::XPropertySet > xProperties ( xInt, UNO_QUERY ); if ( xProperties.is() ) FillPropertySet ( xProperties ); diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 9779fe61700a..3a34c29224ee 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -259,8 +259,7 @@ void XMLTextStyleContext::SetDefaults( ) Reference < XMultiServiceFactory > xFactory ( GetImport().GetModel(), UNO_QUERY); if (xFactory.is()) { - Reference < XInterface > xInt = xFactory->createInstance ( - OUString ( "com.sun.star.text.Defaults" ) ); + Reference < XInterface > xInt = xFactory->createInstance( "com.sun.star.text.Defaults" ); Reference < XPropertySet > xProperties ( xInt, UNO_QUERY ); if ( xProperties.is() ) FillPropertySet ( xProperties ); |