[Libreoffice-commits] core.git: shell/source

[Michael Stahl]

 shell/source/backends/desktopbe/desktopbackend.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit c13d130024c52598ef687a4cb189f6d77804de1d
Author: Michael Stahl <mst...@redhat.com>
Date:   Fri Jul 22 12:33:08 2016 +0200

    shell: loplugin:nullptr / staticanonymous / stringconstant
    
    Change-Id: I67458301fb13601c5bf8d83c689fd861694ee460

diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx 
b/shell/source/backends/desktopbe/desktopbackend.cxx
index f4a2169..550e87a 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,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits