[Libreoffice-commits] core.git: 2 commits - sal/osl sc/source

[Caolán McNamara (via logerrit)]

 sal/osl/all/log.cxx           |    2 ++
 sc/source/ui/view/preview.cxx |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 880bab042b73113aa52ab61b8669fdc0dccb1573
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 10 14:59:23 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Aug 10 17:14:21 2019 +0200

    cid#1401328 Uncaught exception
    
    Change-Id: I6e0c7090fc1548d7d2fa41e8c65225c64c6398d3
    Reviewed-on: https://gerrit.libreoffice.org/77243
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index fab83e4f7249..bb64f05e03f9 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -1307,8 +1307,7 @@ void ScPreview::MouseMove( const MouseEvent& rMEvt )
     {
         ScPrintOptions aOptions = SC_MOD()->GetPrintOptions();
 
-        std::unique_ptr<ScPrintFunc> pPrintFunc;
-
+        std::unique_ptr<ScPrintFunc, o3tl::default_delete<ScPrintFunc>> pPrintFunc;
         if (bStateValid)
             pPrintFunc.reset(new ScPrintFunc( this, pDocShell, aState, &aOptions ));
         else
commit 212437469b4fdb1604cf93add9ff9e79ead0f62f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 10 14:56:06 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Aug 10 17:14:10 2019 +0200

    cid#1452268 Uninitialized scalar variable
    
    Change-Id: I8b9d8f80bbf3d7d9c060d2da4675ae832966c085
    Reviewed-on: https://gerrit.libreoffice.org/77242
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index ae89b0802e92..94aef6b17d24 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -218,8 +218,10 @@ void maybeOutputTimestamp(std::ostringstream &s) {
         tm.tm_min = dateTime.Minutes;
         tm.tm_hour = dateTime.Hours;
         tm.tm_mday = dateTime.Day;
+        tm.tm_wday = dateTime.DayOfWeek;
         tm.tm_mon = dateTime.Month - 1;
         tm.tm_year = dateTime.Year - 1900;
+        tm.tm_yday = 0;
         strftime(ts, sizeof(ts), "%Y-%m-%d:%H:%M:%S", &tm);
         char milliSecs[11];
         snprintf(milliSecs, sizeof(milliSecs), "%03u",