From e35a381f72980cf370dcfa8e859dc854cf153a02 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Thu, 4 Jun 2009 15:06:14 +0000 Subject: CWS-TOOLING: integrate CWS vcl102 pl: resync to m49 pl: #i102082# correct index access pl: #i102082# correct index access pl: merge tag pl: #i101674# update selection background markers for toolbars and menus pl: fix debug compile pl: #i101461# improve xdg functionality (thanks oblin) pl: #i100501# get IsAddStream from configuration setting in direct export case pl: #i100725# check for null ptr pl: #i100617# fix got lost in merge --- shell/source/backends/gconfbe/gconflayer.cxx | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'shell') diff --git a/shell/source/backends/gconfbe/gconflayer.cxx b/shell/source/backends/gconfbe/gconflayer.cxx index 4436f87f8b83..9d7ac2e8e47b 100644 --- a/shell/source/backends/gconfbe/gconflayer.cxx +++ b/shell/source/backends/gconfbe/gconflayer.cxx @@ -396,16 +396,11 @@ sal_Bool SAL_CALL isDependencySatisfied( const ConfigurationValue aValue ) case SETTING_WORK_DIRECTORY: { - osl::Security aSecurity; - rtl::OUString aDocumentsDirURL; - if ( aSecurity.getHomeDir( aDocumentsDirURL ) ) - { - aDocumentsDirURL += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/Documents" ) ); - osl::Directory aDocumentsDir( aDocumentsDirURL ); + rtl::OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS"); + osl::Directory aDocumentsDir( aDocumentsDirURL ); - if( osl::FileBase::E_None == aDocumentsDir.open() ) - return sal_True; - } + if( osl::FileBase::E_None == aDocumentsDir.open() ) + return sal_True; } break; -- cgit