Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-core

3 files changed, 14 insertions, 10 deletions

diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index ae20039bf218..367985ffd577 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;
 }
 
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 4436ae7b2835..9ff95533e6b1 100755
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -1003,12 +1003,16 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
 
             switch (child_get_exit_code (info)) {
             case 79: // re-start with just -env: parameters
-                fprintf (stderr, "FIXME: re-start with just -env: params !\n");
+#if OSL_DEBUG_LEVEL > 0
+                fprintf (stderr, "oosplash: re-start with just -env: params !\n");
+#endif
                 bRestart = sal_True;
                 bAllArgs = sal_False;
                 break;
             case 81: // re-start with all arguments
-                fprintf (stderr, "FIXME: re-start with all params !\n");
+#if OSL_DEBUG_LEVEL > 0
+                fprintf (stderr, "oosplash: re-start with all params !\n");
+#endif
                 bRestart = sal_True;
                 bAllArgs = sal_True;
                 break;
diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx
index 3a200dd1e927..ca2b2099be63 100644
--- a/desktop/unx/splash/unxsplash.cxx
+++ b/desktop/unx/splash/unxsplash.cxx
@@ -77,6 +77,8 @@ void SAL_CALL UnxSplashScreen::end()
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "UnxSplashScreen::end()\n" );
 #endif
+    if( !m_pOutFd )
+        return;
 
     fprintf( m_pOutFd, "end\n" );
     fflush( m_pOutFd );
@@ -88,6 +90,8 @@ void SAL_CALL UnxSplashScreen::reset()
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "UnxSplashScreen::reset()\n" );
 #endif
+    if( !m_pOutFd )
+        return;
 
     fprintf( m_pOutFd, "restart\n" );
     fflush( m_pOutFd );