From c13d130024c52598ef687a4cb189f6d77804de1d Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 22 Jul 2016 12:33:08 +0200 Subject: shell: loplugin:nullptr / staticanonymous / stringconstant Change-Id: I67458301fb13601c5bf8d83c689fd861694ee460 --- shell/source/backends/desktopbe/desktopbackend.cxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'shell') diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index f4a21699f094..550e87a49d34 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -151,7 +151,9 @@ void Default::setPropertyValue(OUString const &, css::uno::Any const &) static_cast< cppu::OWeakObject * >(this), -1); } -static OUString xdg_user_dir_lookup (const char *type) +namespace { + +OUString xdg_user_dir_lookup (const char *type) { char *config_home; char *p; @@ -166,12 +168,12 @@ static OUString xdg_user_dir_lookup (const char *type) if (!aSecurity.getHomeDir( aHomeDirURL ) ) { - osl::FileBase::getFileURLFromSystemPath(OUString("/tmp"), aDocumentsDirURL); + osl::FileBase::getFileURLFromSystemPath("/tmp", aDocumentsDirURL); return aDocumentsDirURL; } config_home = getenv ("XDG_CONFIG_HOME"); - if (config_home == NULL || config_home[0] == 0) + if (config_home == nullptr || config_home[0] == 0) { aConfigFileURL = aHomeDirURL + "/.config/user-dirs.dirs"; } @@ -250,6 +252,8 @@ static OUString xdg_user_dir_lookup (const char *type) return aHomeDirURL + "/" + OUString::createFromAscii(type); } +} // namespace + css::uno::Any Default::getPropertyValue(OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, -- cgit