[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 3 commits - connectivity/source sfx2/source vcl/source

[Caolán McNamara]

 connectivity/source/drivers/firebird/ResultSet.cxx |   12 ++++++++----
 sfx2/source/dialog/dinfdlg.cxx                     |    4 ++--
 vcl/source/control/lstbox.cxx                      |    2 ++
 3 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 4dd0b8632512e47e68234640221266456878d554
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jul 16 21:58:31 2016 +0100

    Resolves: tdf#100910 yes/no doesn't clear bg
    
    Change-Id: If6a31cefe7137d338a57b5a28dfda63809957190
    (cherry picked from commit 997c7accd393bc665538403a5738ce1a626d9665)
    Reviewed-on: https://gerrit.libreoffice.org/27260
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit bd6d7374df93cc173967a95f1deae2d667c6d963)

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index c104060..b3ce83a 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1249,10 +1249,10 @@ CustomPropertiesYesNoButton::CustomPropertiesYesNoButton( vcl::Window* pParent,
     m_aNoButton ( VclPtr<RadioButton>::Create(this, ResId( RB_PROPERTY_NO, *rResId.GetResMgr() )) )
 {
     FreeResource();
-    Wallpaper aWall( Color( COL_TRANSPARENT ) );
-    SetBackground( aWall );
+    SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetFieldColor() ) );
     SetBorderStyle( WindowBorderStyle::MONO  );
     CheckNo();
+    Wallpaper aWall( Color( COL_TRANSPARENT ) );
     m_aYesButton->SetBackground( aWall );
     m_aNoButton->SetBackground( aWall );
 }
commit 379c847556b6bcdd768d46469dfd8fc05cdef317
Author: Wastack <btomi96 at gmail.com>
Date:   Mon Jul 11 17:25:58 2016 +0200

    tdf#91324 GSoC adapt struct tm correctly
    
    Change-Id: I645ebe888186e550b95dd072e063260bc69aa178
    Reviewed-on: https://gerrit.libreoffice.org/27120
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>
    (cherry picked from commit 88346f606a16865bcf7492f67a7207d0078787a1)
    Reviewed-on: https://gerrit.libreoffice.org/27235
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit f9393f84d539814574b594e173367335fe0c42e8)

diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index 764f561..7de2a46 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -480,10 +480,14 @@ DateTime OResultSet::retrieveValue(const sal_Int32 nColumnIndex, const ISC_SHORT
         struct tm aCTime;
         isc_decode_timestamp(&aISCTimestamp, &aCTime);
 
-        // first field is nanoseconds -- not supported in firebird or struct tm.
-        // last field denotes UTC (true) or unknown (false)
-        return DateTime(0, aCTime.tm_sec, aCTime.tm_min, aCTime.tm_hour, aCTime.tm_mday,
-                    aCTime.tm_mon, aCTime.tm_year, false);
+        return DateTime(0, //nanoseconds, not supported
+                        aCTime.tm_sec,
+                        aCTime.tm_min,
+                        aCTime.tm_hour,
+                        aCTime.tm_mday,
+                        aCTime.tm_mon + 1, // tm is from 0 to 11
+                        aCTime.tm_year + 1900, //tm_year is the years since 1900
+                        false); // denotes UTC (true), or unknown (false)
     }
     else
     {
commit 7f50a2253fec328b6bd2dbdae8be6c2d4dc9928f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 13 16:32:43 2016 +0100

    Related: rhbz#1343766 a11y queries during dispose trigger listbox crashes
    
    though not able to reproduce, I have an in-house complaint similar to
    
    commit f120abb446bf3f5230ed06a3b148654dde36bb94
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Wed Jun 8 11:35:15 2016 +0100
    
        Resolves: rhbz#1343766 a11y queries during dispose trigger combobox crashes
    
    except with a listbox in the bt
    
    (cherry picked from commit c615943bda57eadfa73c14a7314938aabe0bd16f)
    
    Change-Id: Id31561e009a1f0ec9272a0e7216296e4017e5688
    Reviewed-on: https://gerrit.libreoffice.org/27189
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    (cherry picked from commit 583207377705dea2bfe09db3e33d7947c473d862)

diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index e15d09e..121e2c0 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -1208,6 +1208,8 @@ void ListBox::EnableMultiSelection( bool bMulti, bool bStackSelection )
 
 bool ListBox::IsMultiSelectionEnabled() const
 {
+    if (!mpImplLB)
+        return false;
     return mpImplLB->IsMultiSelectionEnabled();
 }