diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:31:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:32 +0100 |
| commit | 7f09f384b2712faef29c6874821084be34c413a7 (patch) | |
| tree | cc7270e01602753af80cb3ab86b6c6e2dd7ae4a8 | |
| parent | 70e56ffe13fb00ff044a43074e99eb70275883b3 (diff) | |
shell: Use appropriate OUString functions on string constants
Change-Id: I3b2c0a4200fa953162f40eff49289052962e73d2
| -rw-r--r-- | shell/source/backends/localebe/localebackend.cxx | 4 | ||||
| -rw-r--r-- | shell/source/backends/macbe/macbackend.mm | 2 | ||||
| -rw-r--r-- | shell/source/unix/exec/shellexec.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 99b9e99aa9b9..1a8da7bf2fcd 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -284,12 +284,12 @@ css::uno::Any LocaleBackend::getPropertyValue( return css::uno::makeAny( css::beans::Optional< css::uno::Any >( true, css::uno::makeAny(getLocale()))); - } else if (PropertyName.equals("SystemLocale")) + } else if (PropertyName == "SystemLocale") { return css::uno::makeAny( css::beans::Optional< css::uno::Any >( true, css::uno::makeAny(getSystemLocale()))); - } else if (PropertyName.equals("UILocale")) + } else if (PropertyName == "UILocale") { return css::uno::makeAny( css::beans::Optional< css::uno::Any >( diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm index fb0af6a9bb9e..cd1466575d3e 100644 --- a/shell/source/backends/macbe/macbackend.mm +++ b/shell/source/backends/macbe/macbackend.mm @@ -452,7 +452,7 @@ rtl::OUString SAL_CALL MacOSXBackend::getImplementationName(void) uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getBackendServiceNames(void) { uno::Sequence<rtl::OUString> aServiceNameList(1); - aServiceNameList[0] = rtl::OUString( "com.sun.star.configuration.backend.MacOSXBackend"); + aServiceNameList[0] = "com.sun.star.configuration.backend.MacOSXBackend"; return aServiceNameList; } diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index c56e45b02c46..34bef4081f24 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -134,7 +134,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar if ( aURL.isEmpty() && !aCommand.isEmpty() ) { throw RuntimeException( - OUString("Cannot translate URI reference to external format: ") + "Cannot translate URI reference to external format: " + aCommand, static_cast< cppu::OWeakObject * >(this)); } @@ -224,8 +224,8 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar } else if ((nFlags & css::system::SystemShellExecuteFlags::URIS_ONLY) != 0) { throw css::lang::IllegalArgumentException( - OUString("XSystemShellExecute.execute URIS_ONLY with non-absolute" - " URI reference ") + "XSystemShellExecute.execute URIS_ONLY with non-absolute" + " URI reference " + aCommand, static_cast< cppu::OWeakObject * >(this), 0); } else { |