Handle properly exception that can be thrown by to_local8bit

[lyx.git] / src / support / lyxtime.cpp

diff --git a/src/support/lyxtime.cpp b/src/support/lyxtime.cpp
index 9bdde9cb3af6696b68125cecd14ae4070b4012e3..5415ac4eeb034057234b363d3931d7d004ca40ba 100644 (file)
--- a/src/support/lyxtime.cpp
+++ b/src/support/lyxtime.cpp
@@ -40,7 +40,19 @@ string const formatted_time(time_t t, string const & fmt)
 }
 
 
-time_t from_ctime(string t)
+docstring formatted_datetime(time_t t, string const & fmt)
+{
+       QString qres;
+       if (fmt.empty())
+               qres = QLocale().toString(QDateTime::fromTime_t(t),
+                                         QLocale::ShortFormat);
+       else
+               qres = QLocale().toString(QDateTime::fromTime_t(t), toqstr(fmt));
+       return qstring_to_ucs4(qres);
+}
+
+
+time_t from_asctime_utc(string t)
 {
        // Example for the format: "Sun Nov  6 10:39:39 2011\n"
        // Generously remove trailing '\n' (and other whitespace if needed)
@@ -57,6 +69,7 @@ time_t from_ctime(string t)
                                << "´ (invalid format)");
                return static_cast<time_t>(-1);
        }
+       loc_dt.setTimeSpec(Qt::UTC);
        return loc_dt.toTime_t();
 }