include/sal/log-areas.dox | 1 + ucb/source/ucp/file/shell.cxx | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-)
New commits: commit 94c9206399954d018aae8a1bd4e4b33354b9cdaf Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Feb 23 10:31:21 2015 +0100 file UCP: Ensure myLocalTime is initialized When a file's time is epoch (1970-01-01 00:00:00, i.e., TimeValue temp is all zero) and the TZ is UTC or westward, osl_getLocalTimeFromSystemTime returns false and leaves myLocalTime uninitialized. That e.g. confuses getModuleByUrl (scripting/source/pyprov/pythonscript.py), potentially re-loading a Python script with epoch time (as happens e.g. for the share/Scripts/python/ files in an xdg-app installation of LO) every time it is accessed, falsely assuming it has changed on disk since last load. Change-Id: I8d4228feb28e2697a7021e3488ae2c09e8439ed8 diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 2c7b898..657374b 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -351,6 +351,7 @@ certain functionality. @li @c ucb.ucp @li @c ucb.ucp.cmis @li @c ucb.ucp.ext +@li @c ucb.ucp.file @li @c ucb.ucp.ftp @li @c ucb.ucp.gio @li @c ucb.ucp.gvfs diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index c07e97d..36eb82d 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -2440,7 +2440,14 @@ shell::commit( const shell::ContentMap::iterator& it, // Convert system time to local time (for EA) TimeValue myLocalTime; - osl_getLocalTimeFromSystemTime( &temp, &myLocalTime ); + if (!osl_getLocalTimeFromSystemTime( &temp, &myLocalTime )) + { + SAL_WARN( + "ucb.ucp.file", + "cannot convert (" << temp.Seconds << ", " << temp.Nanosec + << ") to local time"); + myLocalTime = temp; + } oslDateTime myDateTime; osl_getDateTimeFromTimeValue( &myLocalTime, &myDateTime ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits