diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-30 16:38:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-31 08:56:20 +0000 |
| commit | 1c3e84d8192218befebcddae2ed9842d081dc6c7 (patch) | |
| tree | f4fc5cddd181d6d49bf55f74e6d3d107b8ae8d18 /desktop | |
| parent | e1e6cdbb1e9ff37f0bb740a70045c66953bec50c (diff) | |
teach lolugin:stringconstant about calling constructors
so we can remove unnecessary calls to the OUString(literal) constructor
when calling constructors like this:
Foo(OUString("xxx"), 1)
Change-Id: I1de60ef561437c86b27dc9cb095a5deb2e103b36
Reviewed-on: https://gerrit.libreoffice.org/33698
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/check_ext_deps.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/lib/init.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_app.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index f7798d8a55cb..3c18b93a463f 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -320,7 +320,7 @@ static void impl_setNeedsCompatCheck() comphelper::getProcessComponentContext() ) ); Sequence< Any > theArgs(1); - beans::NamedValue v( OUString("nodepath"), + beans::NamedValue v( "nodepath", makeAny( OUString("org.openoffice.Setup/Office") ) ); theArgs[0] <<= v; Reference< beans::XPropertySet > pset( @@ -351,7 +351,7 @@ static bool impl_needsCompatCheck() comphelper::getProcessComponentContext() ) ); Sequence< Any > theArgs(1); - beans::NamedValue v( OUString("nodepath"), + beans::NamedValue v( "nodepath", makeAny( OUString("org.openoffice.Setup/Office") ) ); theArgs[0] <<= v; Reference< beans::XPropertySet > pset( diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index c2daf59e0227..257dfb0c6a6c 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -63,7 +63,7 @@ TheExtensionManager::TheExtensionManager( const uno::Reference< awt::XWindow > & uno::Reference< lang::XMultiServiceFactory > xConfig( configuration::theDefaultProvider::get(xContext)); uno::Any args[1]; - beans::PropertyValue aValue( OUString("nodepath"), 0, uno::Any( OUString("/org.openoffice.Office.OptionsDialog/Nodes") ), + beans::PropertyValue aValue( "nodepath", 0, uno::Any( OUString("/org.openoffice.Office.OptionsDialog/Nodes") ), beans::PropertyState_DIRECT_VALUE ); args[0] <<= aValue; m_xNameAccessNodes.set( @@ -73,7 +73,7 @@ TheExtensionManager::TheExtensionManager( const uno::Reference< awt::XWindow > & // get the 'get more extensions here' url uno::Reference< container::XNameAccess > xNameAccessRepositories; - beans::PropertyValue aValue2( OUString("nodepath"), 0, uno::Any( OUString("/org.openoffice.Office.ExtensionManager/ExtensionRepositories") ), + beans::PropertyValue aValue2( "nodepath", 0, uno::Any( OUString("/org.openoffice.Office.ExtensionManager/ExtensionRepositories") ), beans::PropertyState_DIRECT_VALUE ); args[0] <<= aValue2; xNameAccessRepositories.set( diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index b0de4b9ae2c2..2dcd59f90495 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1145,7 +1145,7 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis, try { uno::Sequence<css::beans::PropertyValue> aFilterOptions(2); - aFilterOptions[0] = css::beans::PropertyValue( OUString("FilterOptions"), + aFilterOptions[0] = css::beans::PropertyValue( "FilterOptions", 0, uno::makeAny(OUString::createFromAscii(pOptions)), beans::PropertyState_DIRECT_VALUE); diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index f18188349b79..2749da057d6a 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -365,7 +365,7 @@ extern "C" int unopkg_main() if (subcmd_add) { beans::NamedValue nvSuppress( - OUString("SUPPRESS_LICENSE"), option_suppressLicense ? + "SUPPRESS_LICENSE", option_suppressLicense ? makeAny(OUString("1")):makeAny(OUString("0"))); xExtensionManager->addExtension( cmdPackage, Sequence<beans::NamedValue>(&nvSuppress, 1), |