From 16d5b5195c2550aaec856376b7016d723f6950b6 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 22 Aug 2016 17:36:15 +0200 Subject: tdf#101661: Report XDG_{DOCUMENTS,TEMPLATES}_DIR only when it exists ...as had been done in the GConf-based backend prior to 3cf557c12d27f1b2250e69a543136da098112d80 "drop gconf integration as per ESC decision". Change-Id: I56f256aaec542e0a62fc30a37d5c982e93e77812 (cherry picked from commit 4278cac8935339dddfa5473490124d11061a0b38) Reviewed-on: https://gerrit.libreoffice.org/28344 Reviewed-by: Eike Rathke Reviewed-by: Michael Stahl Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier --- shell/source/backends/desktopbe/desktopbackend.cxx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 550e87a49d34..fdbe4d4e9d61 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -252,6 +252,14 @@ OUString xdg_user_dir_lookup (const char *type) return aHomeDirURL + "/" + OUString::createFromAscii(type); } +css::uno::Any xdgDirectoryIfExists(char const * type) { + auto url = xdg_user_dir_lookup(type); + return css::uno::Any( + osl::Directory(url).open() == osl::FileBase::E_None + ? css::beans::Optional(true, css::uno::Any(url)) + : css::beans::Optional(false, css::uno::Any())); +} + } // namespace css::uno::Any Default::getPropertyValue(OUString const & PropertyName) @@ -261,16 +269,12 @@ css::uno::Any Default::getPropertyValue(OUString const & PropertyName) { if (PropertyName == "TemplatePathVariable") { - OUString aDirURL = xdg_user_dir_lookup("Templates"); - css::uno::Any aValue(aDirURL); - return css::uno::makeAny(css::beans::Optional(true, aValue)); + return xdgDirectoryIfExists("Templates"); } if (PropertyName == "WorkPathVariable") { - OUString aDirURL = xdg_user_dir_lookup("Documents"); - css::uno::Any aValue(aDirURL); - return css::uno::makeAny(css::beans::Optional(true, aValue)); + return xdgDirectoryIfExists("Documents"); } if ( PropertyName == "EnableATToolSupport" || -- cgit v1.2.3