diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-04 08:29:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-04 14:10:44 +0200 |
| commit | 59b072e22b0610abc7ffdbc75873ef5cbba58de7 (patch) | |
| tree | 663c2d01a983508f9b22ec87fae29b16ab5a1683 /shell | |
| parent | baa411b59c3840a4dddf5447a0b4583eb5edea74 (diff) | |
yyyyy
Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/backends/desktopbe/desktopbackend.cxx | 4 | ||||
| -rw-r--r-- | shell/source/cmdmail/cmdmailentry.cxx | 6 | ||||
| -rw-r--r-- | shell/source/unix/exec/shellexec.cxx | 6 | ||||
| -rw-r--r-- | shell/source/unix/exec/shellexecentry.cxx | 6 |
4 files changed, 7 insertions, 15 deletions
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index bd40fc4826a3..146360220998 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -204,9 +204,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( css::uno::Reference< css::uno::XCurrentContext > current( css::uno::getCurrentContext()); if (current.is()) { - current->getValueByName( - OUString("system.desktop-environment")) >>= - desktop; + current->getValueByName("system.desktop-environment") >>= desktop; } // Fall back to the default if the specific backend is not available: diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 626c4cf0e3d1..71cdb6b1b650 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -61,12 +61,10 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL cmdmail_component_getFactory( if (0 == ::rtl_str_compare( pImplName, COMP_IMPL_NAME )) { - OUString serviceName(COMP_SERVICE_NAME); - xFactory = ::cppu::createSingleComponentFactory( createInstance, - OUString( COMP_IMPL_NAME ), - Sequence< OUString >( &serviceName, 1 ) ); + COMP_IMPL_NAME, + Sequence< OUString > { COMP_SERVICE_NAME } ); } if (xFactory.is()) diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 91da763b1b46..127acd85b527 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -90,8 +90,7 @@ ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) : if (xCurrentContext.is()) { - Any aValue = xCurrentContext->getValueByName( - OUString( "system.desktop-environment" ) ); + Any aValue = xCurrentContext->getValueByName( "system.desktop-environment" ); OUString aDesktopEnvironment; if (aValue >>= aDesktopEnvironment) @@ -162,8 +161,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar css::uno::Reference< css::util::XMacroExpander > exp = css::util::theMacroExpander::get(m_xContext); OUString aProgramURL; try { - aProgramURL = exp->expandMacros( - OUString( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/")); + aProgramURL = exp->expandMacros( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/"); } catch (css::lang::IllegalArgumentException &) { throw SystemShellExecuteException( diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index 299413079668..6a26ef0b25e3 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -59,12 +59,10 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( if (0 == ::rtl_str_compare( pImplName, SHELLEXEC_IMPL_NAME )) { - OUString serviceName( SHELLEXEC_SERVICE_NAME ); - xFactory = ::cppu::createSingleComponentFactory( createInstance, - OUString( SHELLEXEC_IMPL_NAME ), - Sequence< OUString >( &serviceName, 1 ) ); + SHELLEXEC_IMPL_NAME, + Sequence< OUString > { SHELLEXEC_SERVICE_NAME } ); } |