diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:49:48 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:49:48 +0200 |
| commit | ba66efa784c5dfaa58e3f3179ecbae06a11a0a1e (patch) | |
| tree | 15f09eb63d7ed6ec93feab69554bea9b02678c31 /desktop/source | |
| parent | 9aad9cf77f93f6a689731972d97f2acc04527422 (diff) | |
| parent | ecbd796ee8157047b1738ac12c98a6ef4d3c18ff (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-core
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/deployment/misc/dp_misc.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index a0c2a20424..78696a4b3d 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -52,6 +52,7 @@ #include "boost/scoped_array.hpp" #include "boost/shared_ptr.hpp" #include <comphelper/processfactory.hxx> +#include <salhelper/linkhelper.hxx> #ifdef WNT #define UNICODE @@ -145,18 +146,13 @@ bool existsOfficePipe() //get modification time static bool getModifyTimeTargetFile(const OUString &rFileURL, TimeValue &rTime) { - ::osl::DirectoryItem item; - if (::osl::DirectoryItem::get(rFileURL, item) != ::osl::File::E_None) - return false; + salhelper::LinkResolver aResolver(osl_FileStatus_Mask_ModifyTime); - ::osl::FileStatus stat(osl_FileStatus_Mask_ModifyTime|osl_FileStatus_Mask_Type|osl_FileStatus_Mask_LinkTargetURL); - if (item.getFileStatus(stat) != ::osl::File::E_None) + if (aResolver.fetchFileStatus(rFileURL) != osl::FileBase::E_None) return false; - if( stat.getFileType() == ::osl::FileStatus::Link ) - return getModifyTimeTargetFile(stat.getLinkTargetURL(), rTime); + rTime = aResolver.m_aStatus.getModifyTime(); - rTime = stat.getModifyTime(); return true; } |