[Libreoffice-commits] .: 2 commits - basic/source desktop/source

[Caolán McNamara]

 basic/source/runtime/methods.cxx           |   33 -----------------------------
 desktop/source/deployment/misc/dp_misc.cxx |   12 +++-------
 2 files changed, 4 insertions(+), 41 deletions(-)

New commits:
commit 00fc5f794ca9d037718d6c50c16a6b8744419b94
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 25 08:53:52 2011 +0100

    add salhelper::LinkResolver

diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index a0c2a20..78696a4 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;
 }
 
commit c27af1241e366326e81d6db68358fd760fc1576c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 24 21:44:03 2011 +0100

    getDirectoryPath is unused, see comphelper::LinkResolver if restored

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index b120088..af9163e 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2443,39 +2443,6 @@ RTLFUNC(IsMissing)
         rPar.Get( 0 )->PutBool( rPar.Get(1)->IsErr() );
 }
 
-// Dir( [Maske] [,Attrs] )
-// ToDo: Library-globaler Datenbereich fuer Dir-Objekt und Flags
-
-
-String getDirectoryPath( String aPathStr )
-{
-    String aRetStr;
-
-    DirectoryItem aItem;
-    FileBase::RC nRet = DirectoryItem::get( aPathStr, aItem );
-    if( nRet == FileBase::E_None )
-    {
-        FileStatus aFileStatus( osl_FileStatus_Mask_Type );
-        nRet = aItem.getFileStatus( aFileStatus );
-        if( nRet == FileBase::E_None )
-        {
-            FileStatus::Type aType = aFileStatus.getFileType();
-            if( isFolder( aType ) )
-            {
-                aRetStr = aPathStr;
-            }
-            else if( aType == FileStatus::Link )
-            {
-                FileStatus aFileStatus2( osl_FileStatus_Mask_LinkTargetURL );
-                nRet = aItem.getFileStatus( aFileStatus2 );
-                if( nRet == FileBase::E_None )
-                    aRetStr = getDirectoryPath( aFileStatus2.getLinkTargetURL() );
-            }
-        }
-    }
-    return aRetStr;
-}
-
 // Function looks for wildcards, removes them and always returns the pure path
 String implSetupWildcard( const String& rFileParam, SbiRTLData* pRTLData )
 {