[Libreoffice-commits] core.git: configmgr/qa desktop/source dtrans/source embedserv/source extensions/source forms/source fpicker/source hwpfilter/qa io/test scripting/source sc/source sdext/source sfx2/source stoc/test sw/qa ucbhelper/source ucb/source xmlhelp/source xmlsecurity/source
Noel Grandin
noelgrandin at gmail.com
Sun Nov 1 07:26:07 PST 2015
configmgr/qa/unit/test.cxx | 6 ++----
desktop/source/app/check_ext_deps.cxx | 2 +-
dtrans/source/win32/workbench/test_wincb.cxx | 3 +--
embedserv/source/embed/docholder.cxx | 4 +---
extensions/source/abpilot/admininvokationimpl.cxx | 2 +-
forms/source/component/Edit.cxx | 4 ++--
fpicker/source/win32/filepicker/workbench/Test_fps.cxx | 2 +-
fpicker/source/win32/folderpicker/workbench/Test_fops.cxx | 2 +-
hwpfilter/qa/cppunit/test_hwpfilter.cxx | 6 ++----
io/test/stm/datatest.cxx | 3 +--
sc/source/core/data/dpobject.cxx | 7 +++----
sc/source/ui/docshell/dbdocimp.cxx | 7 +++----
sc/source/ui/docshell/docsh8.cxx | 6 ++----
scripting/source/inc/util/MiscUtils.hxx | 10 +++-------
sdext/source/minimizer/unodialog.cxx | 4 ++--
sfx2/source/appl/imestatuswindow.cxx | 6 ++----
sfx2/source/dialog/mailmodel.cxx | 8 +++-----
sfx2/source/doc/docfac.cxx | 2 +-
sfx2/source/view/viewsh.cxx | 5 ++---
stoc/test/testproxyfac.cxx | 4 +---
sw/qa/core/filters-test.cxx | 3 +--
sw/qa/core/layout-test.cxx | 3 +--
sw/qa/core/macros-test.cxx | 3 +--
ucb/source/ucp/hierarchy/hierarchydata.cxx | 10 +++++-----
ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx | 5 +----
ucbhelper/source/client/proxydecider.cxx | 5 ++---
xmlhelp/source/cxxhelp/provider/databases.cxx | 6 ++----
xmlsecurity/source/helper/xsecsign.cxx | 3 +--
xmlsecurity/source/helper/xsecverify.cxx | 3 +--
29 files changed, 50 insertions(+), 84 deletions(-)
New commits:
commit b5db48ada113206ac090e4a08f2ae211859103ed
Author: Noel Grandin <noelgrandin at gmail.com>
Date: Sat Oct 31 15:13:58 2015 +0200
no need to use OUString constructor in call to createInstance
Change-Id: Iaf3d83ba1490cb1d97a5bd4d1f7cd6943d4a7296
Reviewed-on: https://gerrit.libreoffice.org/19704
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index 82c9b1e..b2a5a21 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -470,8 +470,7 @@ css::uno::Reference< css::uno::XInterface > Test::createViewAccess(
OUString("nodepath"),
css::uno::makeAny(path))));
return provider_->createInstanceWithArguments(
- OUString(
- "com.sun.star.configuration.ConfigurationAccess"),
+ "com.sun.star.configuration.ConfigurationAccess",
css::uno::Sequence< css::uno::Any >(&arg, 1));
}
@@ -484,8 +483,7 @@ css::uno::Reference< css::uno::XInterface > Test::createUpdateAccess(
OUString("nodepath"),
css::uno::makeAny(path))));
return provider_->createInstanceWithArguments(
- OUString(
- "com.sun.star.configuration.ConfigurationUpdateAccess"),
+ "com.sun.star.configuration.ConfigurationUpdateAccess",
css::uno::Sequence< css::uno::Any >(&arg, 1));
}
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 359ee1c..520a9c2 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -363,7 +363,7 @@ static bool impl_needsCompatCheck()
makeAny( OUString("org.openoffice.Setup/Office") ) );
theArgs[0] <<= v;
Reference< beans::XPropertySet > pset(
- theConfigProvider->createInstanceWithArguments( OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW );
+ theConfigProvider->createInstanceWithArguments( aAccessSrvc, theArgs ), UNO_QUERY_THROW );
Any result = pset->getPropertyValue("LastCompatibilityCheckID");
diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/dtrans/source/win32/workbench/test_wincb.cxx
index 551b798..c40bc19 100644
--- a/dtrans/source/win32/workbench/test_wincb.cxx
+++ b/dtrans/source/win32/workbench/test_wincb.cxx
@@ -231,8 +231,7 @@ int SAL_CALL main( int nArgc, char* Argv[] )
Reference< XTransferable > rXTransf( static_cast< XTransferable* >( new CTransferable ) );
- Reference< XClipboard >
- xClipboard( g_xFactory->createInstance( OUString( WINCLIPBOARD_SERVICE_NAME ) ), UNO_QUERY );
+ Reference< XClipboard >xClipboard( g_xFactory->createInstance( WINCLIPBOARD_SERVICE_NAME ), UNO_QUERY );
if ( !xClipboard.is( ) )
{
OSL_FAIL( "Error creating Clipboard Service" );
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 7ee8825..4850a75 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -955,9 +955,7 @@ void DocumentHolder::setTitle(const OUString& aDocumentName)
if(aFilterName.getLength())
{
uno::Reference<container::XNameAccess> xNameAccess(
- m_xFactory->createInstance(
- OUString(
- "com.sun.star.document.FilterFactory")),
+ m_xFactory->createInstance("com.sun.star.document.FilterFactory"),
uno::UNO_QUERY);
try {
if(xNameAccess.is() &&
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index 0dd7782..b179739 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -87,7 +87,7 @@ namespace abp
// creating the dialog service is potentially expensive (if all the libraries invoked need to be loaded)
// so we display a wait cursor
WaitObject aWaitCursor(m_pMessageParent);
- Reference<XInterface> x = m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(OUString(s_sDataSourceTypeChangeDialog), aArguments, m_xContext);
+ Reference<XInterface> x = m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(s_sDataSourceTypeChangeDialog, aArguments, m_xContext);
xDialog = Reference< XExecutableDialog >( x, UNO_QUERY );
// just for a smoother UI: What the dialog does upon execution, is (amongst other things) creating
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index f635158..e9fac0f 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -491,7 +491,7 @@ void OEditModel::writeAggregate( const Reference< XObjectOutputStream >& _rxOutS
// but for compatibility, we need to use an "old" aggregate for writing and reading
Reference< XPropertySet > xFakedAggregate(
- getContext()->getServiceManager()->createInstanceWithContext( OUString(VCL_CONTROLMODEL_EDIT), getContext() ),
+ getContext()->getServiceManager()->createInstanceWithContext( VCL_CONTROLMODEL_EDIT, getContext() ),
UNO_QUERY
);
OSL_ENSURE( xFakedAggregate.is(), "OEditModel::writeAggregate: could not create an old EditControlModel!" );
@@ -513,7 +513,7 @@ void OEditModel::readAggregate( const Reference< XObjectInputStream >& _rxInStre
// but for compatibility, we need to use an "old" aggregate for writing and reading
Reference< XPropertySet > xFakedAggregate(
- getContext()->getServiceManager()->createInstanceWithContext( OUString(VCL_CONTROLMODEL_EDIT), getContext() ),
+ getContext()->getServiceManager()->createInstanceWithContext( VCL_CONTROLMODEL_EDIT, getContext() ),
UNO_QUERY
);
Reference< XPersistObject > xFakedPersist( xFakedAggregate, UNO_QUERY );
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index a2ba8fe..98b737c 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -262,7 +262,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[] )
Reference< XFilePicker > xFilePicker = Reference< XFilePicker >(
g_xFactory->createInstanceWithArguments(
- OUString( FILE_PICKER_SERVICE_NAME ), arguments ), UNO_QUERY );
+ FILE_PICKER_SERVICE_NAME, arguments ), UNO_QUERY );
// install a FilePicker notifier
Reference< XFilePickerListener > xFPListener(
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index 84097f0..7c4a54e 100644
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -94,7 +94,7 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/ )
Reference< XFolderPicker2 > xFolderPicker;
xFolderPicker = Reference< XFolderPicker2 >(
- g_xFactory->createInstance( OUString( FOLDER_PICKER_SERVICE_NAME ) ), UNO_QUERY );
+ g_xFactory->createInstance( FOLDER_PICKER_SERVICE_NAME), UNO_QUERY );
if ( xFolderPicker.is() == sal_False )
{
diff --git a/hwpfilter/qa/cppunit/test_hwpfilter.cxx b/hwpfilter/qa/cppunit/test_hwpfilter.cxx
index 65cc9ac..6fde479 100644
--- a/hwpfilter/qa/cppunit/test_hwpfilter.cxx
+++ b/hwpfilter/qa/cppunit/test_hwpfilter.cxx
@@ -43,10 +43,8 @@ namespace
{
test::BootstrapFixture::setUp();
- m_xFilter = uno::Reference< document::XFilter >(m_xSFactory->createInstance(
- OUString(
- "com.sun.comp.hwpimport.HwpImportFilter")),
- uno::UNO_QUERY_THROW);
+ m_xFilter.set(m_xSFactory->createInstance("com.sun.comp.hwpimport.HwpImportFilter"),
+ uno::UNO_QUERY_THROW);
}
bool HwpFilterTest::load(const OUString &,
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 657bc57..fb26008 100644
--- a/io/test/stm/datatest.cxx
+++ b/io/test/stm/datatest.cxx
@@ -735,8 +735,7 @@ sal_Int32 OObjectStreamTest::test( const OUString& TestName,
Reference <XInputStream > markableInput( x , UNO_QUERY );
Reference <XActiveDataSink> markableSink( x , UNO_QUERY );
- x = m_rFactory->createInstance( OUString(
- "com.sun.star.io.MarkableOutputStream" ) );
+ x = m_rFactory->createInstance( "com.sun.star.io.MarkableOutputStream" );
Reference <XOutputStream > markableOutput( x , UNO_QUERY );
Reference <XActiveDataSource > markableSource( x , UNO_QUERY );
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 0ba7b27..e3fd4da 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -3162,10 +3162,9 @@ uno::Reference<sdbc::XRowSet> ScDPCollection::DBCaches::createRowSet(
uno::Reference<sdbc::XRowSet> xRowSet;
try
{
- xRowSet = uno::Reference<sdbc::XRowSet>(
- comphelper::getProcessServiceFactory()->createInstance(
- OUString(SC_SERVICE_ROWSET)),
- UNO_QUERY);
+ xRowSet.set(comphelper::getProcessServiceFactory()->createInstance(
+ SC_SERVICE_ROWSET),
+ UNO_QUERY);
uno::Reference<beans::XPropertySet> xRowProp(xRowSet, UNO_QUERY);
OSL_ENSURE( xRowProp.is(), "can't get RowSet" );
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index b168270..f2f9dce 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -201,10 +201,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
if ( !xRowSet.is() )
{
bDispose = true;
- xRowSet = uno::Reference<sdbc::XRowSet>(
- comphelper::getProcessServiceFactory()->createInstance(
- OUString( SC_SERVICE_ROWSET ) ),
- uno::UNO_QUERY);
+ xRowSet.set(comphelper::getProcessServiceFactory()->createInstance(
+ SC_SERVICE_ROWSET ),
+ uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY );
OSL_ENSURE( xRowProp.is(), "can't get RowSet" );
if ( xRowProp.is() )
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 3d877f6..317cbf2 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -318,8 +318,7 @@ sal_uLong ScDocShell::DBaseImport( const OUString& rFullFileName, rtl_TextEncodi
ScProgress aProgress( this, ScGlobal::GetRscString( STR_LOAD_DOC ), 0 );
uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory();
- uno::Reference<sdbc::XRowSet> xRowSet( xFactory->createInstance(
- OUString( SC_SERVICE_ROWSET ) ),
+ uno::Reference<sdbc::XRowSet> xRowSet( xFactory->createInstance(SC_SERVICE_ROWSET),
uno::UNO_QUERY);
::utl::DisposableComponent aRowSetHelper(xRowSet);
uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY );
@@ -924,8 +923,7 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncodi
// get row set for writing
uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory();
- uno::Reference<sdbc::XRowSet> xRowSet( xFactory->createInstance(
- OUString( SC_SERVICE_ROWSET ) ),
+ uno::Reference<sdbc::XRowSet> xRowSet( xFactory->createInstance(SC_SERVICE_ROWSET),
uno::UNO_QUERY);
::utl::DisposableComponent aRowSetHelper(xRowSet);
uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY );
diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx
index 74ea6ce..c00b486 100644
--- a/scripting/source/inc/util/MiscUtils.hxx
+++ b/scripting/source/inc/util/MiscUtils.hxx
@@ -72,14 +72,10 @@ static OUString xModelToTdocUrl( const css::uno::Reference< css::frame::XModel >
css::frame::XTransientDocumentsDocumentContentFactory > xDocFac;
try
{
- xDocFac =
- css::uno::Reference<
- css::frame::XTransientDocumentsDocumentContentFactory >(
- xMCF->createInstanceWithContext(
- OUString(
- "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ),
+ xDocFac.set(xMCF->createInstanceWithContext(
+ "com.sun.star.frame.TransientDocumentsDocumentContentFactory",
xContext ),
- css::uno::UNO_QUERY );
+ css::uno::UNO_QUERY );
}
catch ( css::uno::Exception const & )
{
diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx
index b213a27..b2bd979 100644
--- a/sdext/source/minimizer/unodialog.cxx
+++ b/sdext/source/minimizer/unodialog.cxx
@@ -46,8 +46,8 @@ using namespace ::com::sun::star::script;
UnoDialog::UnoDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame ) :
mxContext( rxContext ),
mxController( rxFrame->getController() ),
- mxDialogModel( mxContext->getServiceManager()->createInstanceWithContext( OUString(
- "com.sun.star.awt.UnoControlDialogModel" ), mxContext ), UNO_QUERY_THROW ),
+ mxDialogModel( mxContext->getServiceManager()->createInstanceWithContext(
+ "com.sun.star.awt.UnoControlDialogModel", mxContext ), UNO_QUERY_THROW ),
mxDialogModelMultiPropertySet( mxDialogModel, UNO_QUERY_THROW ),
mxDialogModelPropertySet( mxDialogModel, UNO_QUERY_THROW ),
mxDialogModelMSF( mxDialogModel, UNO_QUERY_THROW ),
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index 8b49136..6163ccc 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -197,8 +197,7 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig()
throw css::lang::DisposedException();
if (!m_xContext.is())
throw css::uno::RuntimeException(
- OUString(
- "null comphelper::getProcessServiceFactory"),
+ OUString("null comphelper::getProcessServiceFactory"),
0);
css::uno::Reference< css::lang::XMultiServiceFactory > xProvider =
css::configuration::theDefaultProvider::get( m_xContext );
@@ -213,8 +212,7 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig()
m_xConfig
= css::uno::Reference< css::beans::XPropertySet >(
xProvider->createInstanceWithArguments(
- OUString(
- "com.sun.star.configuration.ConfigurationUpdateAccess"),
+ "com.sun.star.configuration.ConfigurationUpdateAccess",
aArgs),
css::uno::UNO_QUERY);
if (!m_xConfig.is())
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index a31b8ac..352babf 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -324,9 +324,8 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
OUString aExtension;
css::uno::Reference< css::container::XContainerQuery > xContainerQuery(
- xSMGR->createInstance( OUString(
- "com.sun.star.document.FilterFactory" )),
- css::uno::UNO_QUERY );
+ xSMGR->createInstance( "com.sun.star.document.FilterFactory" ),
+ css::uno::UNO_QUERY );
if ( bStoreTo )
{
@@ -428,8 +427,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
else
{
css::uno::Reference< container::XNameAccess > xTypeDetection(
- xSMGR->createInstance( OUString(
- "com.sun.star.document.TypeDetection" )),
+ xSMGR->createInstance( "com.sun.star.document.TypeDetection" ),
css::uno::UNO_QUERY );
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 4243181..4630a83 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -269,7 +269,7 @@ void SfxObjectFactory::SetSystemTemplate( const OUString& rServiceName, const OU
aArgs[2].Name = "URL";
aArgs[2].Value <<= OUString( rTemplateName );
- uno::Reference< frame::XLoadable > xLoadable( xFactory->createInstance( OUString( rServiceName ) ), uno::UNO_QUERY );
+ uno::Reference< frame::XLoadable > xLoadable( xFactory->createInstance( rServiceName ), uno::UNO_QUERY );
xLoadable->load( aArgs );
aArgs.realloc( 2 );
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index d2061e3..18d0bb5 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -673,9 +673,8 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
bool bHasLocation = !aLocation.isEmpty() && !bPrivateProtocol;
css::uno::Reference< css::container::XContainerQuery > xContainerQuery(
- xSMGR->createInstance( OUString(
- "com.sun.star.document.FilterFactory" )),
- css::uno::UNO_QUERY_THROW );
+ xSMGR->createInstance( "com.sun.star.document.FilterFactory" ),
+ css::uno::UNO_QUERY_THROW );
// Retrieve filter from type
sal_Int32 nFilterFlags = FILTERFLAG_EXPORT;
diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx
index b171dda..9505d7c 100644
--- a/stoc/test/testproxyfac.cxx
+++ b/stoc/test/testproxyfac.cxx
@@ -263,9 +263,7 @@ SAL_IMPLEMENT_MAIN()
aLibName, Reference< registry::XSimpleRegistry >() );
Reference< reflection::XProxyFactory > xProxyFac(
- xMgr->createInstance(
- OUString(
- "com.sun.star.reflection.ProxyFactory") ),
+ xMgr->createInstance("com.sun.star.reflection.ProxyFactory"),
UNO_QUERY_THROW );
Reference< XAggregation > x(
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index 0b9d1ae..03db7a9 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -213,8 +213,7 @@ void SwFiltersTest::setUp()
//This is a bit of a fudge, we do this to ensure that SwGlobals::ensure,
//which is a private symbol to us, gets called
m_xWriterComponent =
- getMultiServiceFactory()->createInstance(OUString(
- "com.sun.star.comp.Writer.TextDocument"));
+ getMultiServiceFactory()->createInstance("com.sun.star.comp.Writer.TextDocument");
CPPUNIT_ASSERT_MESSAGE("no writer component!", m_xWriterComponent.is());
}
diff --git a/sw/qa/core/layout-test.cxx b/sw/qa/core/layout-test.cxx
index 7539713..6261e3f 100644
--- a/sw/qa/core/layout-test.cxx
+++ b/sw/qa/core/layout-test.cxx
@@ -84,8 +84,7 @@ void SwLayoutTest::setUp()
// This is a bit of a fudge, we do this to ensure that SwGlobals::ensure,
// which is a private symbol to us, gets called
m_xWriterComponent =
- getMultiServiceFactory()->createInstance(OUString(
- "com.sun.star.comp.Writer.TextDocument"));
+ getMultiServiceFactory()->createInstance("com.sun.star.comp.Writer.TextDocument");
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xWriterComponent.is());
mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) );
}
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 4aed8dc..89b9f0f 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -502,8 +502,7 @@ void SwMacrosTest::setUp()
// This is a bit of a fudge, we do this to ensure that SwGlobals::ensure,
// which is a private symbol to us, gets called
m_xWriterComponent =
- getMultiServiceFactory()->createInstance(OUString(
- "com.sun.star.comp.Writer.TextDocument"));
+ getMultiServiceFactory()->createInstance("com.sun.star.comp.Writer.TextDocument");
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xWriterComponent.is());
mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) );
}
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index 2e73447..366bd2d 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -298,7 +298,7 @@ bool HierarchyEntry::setData(
uno::Reference< util::XChangesBatch > xBatch(
m_xConfigProvider->createInstanceWithArguments(
- OUString( READWRITE_SERVICE_NAME ),
+ READWRITE_SERVICE_NAME,
aArguments ),
uno::UNO_QUERY );
@@ -562,7 +562,7 @@ bool HierarchyEntry::move(
xOldParentBatch = uno::Reference< util::XChangesBatch >(
m_xConfigProvider->createInstanceWithArguments(
- OUString( READWRITE_SERVICE_NAME ),
+ READWRITE_SERVICE_NAME,
aArguments ),
uno::UNO_QUERY );
@@ -586,7 +586,7 @@ bool HierarchyEntry::move(
xNewParentBatch = uno::Reference< util::XChangesBatch >(
m_xConfigProvider->createInstanceWithArguments(
- OUString( READWRITE_SERVICE_NAME ),
+ READWRITE_SERVICE_NAME,
aArguments ),
uno::UNO_QUERY );
@@ -823,7 +823,7 @@ bool HierarchyEntry::remove()
uno::Reference< util::XChangesBatch > xBatch(
m_xConfigProvider->createInstanceWithArguments(
- OUString( READWRITE_SERVICE_NAME ),
+ READWRITE_SERVICE_NAME,
aArguments ),
uno::UNO_QUERY );
@@ -1065,7 +1065,7 @@ HierarchyEntry::getRootReadAccess()
m_xRootReadAccess
= uno::Reference< container::XHierarchicalNameAccess >(
m_xConfigProvider->createInstanceWithArguments(
- OUString( READ_SERVICE_NAME ),
+ READ_SERVICE_NAME,
aArguments ),
uno::UNO_QUERY );
}
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
index 2318d3a..cef7495 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
@@ -117,10 +117,7 @@ DocumentContentFactory::createDocumentContent(
{
xDocFac
= uno::Reference< frame::XTransientDocumentsDocumentContentFactory >(
- m_xSMgr->createInstance(
- OUString(
- "com.sun.star.ucb.TransientDocumentsContentProvider" )
- ),
+ m_xSMgr->createInstance("com.sun.star.ucb.TransientDocumentsContentProvider"),
uno::UNO_QUERY );
}
catch ( uno::Exception const & )
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index eb200c8..49fa8ed 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -313,9 +313,8 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl(
uno::Reference< uno::XInterface > xInterface(
xConfigProv->createInstanceWithArguments(
- OUString(
- "com.sun.star.configuration.ConfigurationAccess" ),
- aArguments ) );
+ "com.sun.star.configuration.ConfigurationAccess",
+ aArguments ) );
OSL_ENSURE( xInterface.is(),
"InternetProxyDecider - No config access!" );
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 4cd6c02..e9e2e36 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -875,8 +875,7 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const OUString& jar,
Reference< XInterface > xIfc
= m_xSMgr->createInstanceWithArgumentsAndContext(
- OUString(
- "com.sun.star.packages.comp.ZipPackage" ),
+ "com.sun.star.packages.comp.ZipPackage",
aArguments, m_xContext );
if ( xIfc.is() )
@@ -1675,8 +1674,7 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
Reference< XMultiComponentFactory >xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
Reference< XInterface > xIfc
= xSMgr->createInstanceWithArgumentsAndContext(
- OUString(
- "com.sun.star.packages.comp.ZipPackage" ),
+ "com.sun.star.packages.comp.ZipPackage",
aArguments, m_xContext );
if ( xIfc.is() )
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index 70149ce..e37836f 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -75,8 +75,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
*/
cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
xReferenceResolvedListener = cssu::Reference< cssxc::sax::XReferenceResolvedListener >(
- xMCF->createInstanceWithContext(
- OUString(SIGNATURECREATOR_COMPONENT), mxCtx),
+ xMCF->createInstanceWithContext(SIGNATURECREATOR_COMPONENT, mxCtx),
cssu::UNO_QUERY);
cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index 1489635..8666389 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -61,8 +61,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
*/
cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
xReferenceResolvedListener = cssu::Reference< cssxc::sax::XReferenceResolvedListener >(
- xMCF->createInstanceWithContext(
- OUString( SIGNATUREVERIFIER_COMPONENT ), mxCtx),
+ xMCF->createInstanceWithContext(SIGNATUREVERIFIER_COMPONENT, mxCtx),
cssu::UNO_QUERY);
cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
More information about the Libreoffice-commits
mailing list