[Libreoffice-commits] core.git: 2 commits - sc/source vcl/unx

[Caolán McNamara]

 sc/source/ui/unoobj/chart2uno.cxx         |    7 ++++++-
 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |    5 -----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 42adbfea50385d5af68040bf67149d0007a1e7bf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 7 20:55:51 2016 +0100

    don't need gComboBoxEntryWidget anymore
    
    Change-Id: Ia48817eb1476ef6479c3b8e53666e63198cc9310

diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 131ab4d..caaa767 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -285,7 +285,6 @@ static GtkWidget* gSpinBox;
 static GtkWidget* gEntryBox;
 static GtkWidget* gComboBox;
 static GtkWidget* gComboBoxButtonWidget;
-static GtkWidget* gComboBoxEntryWidget;
 static GtkWidget* gListBox;
 static GtkWidget* gListBoxButtonWidget;
 static GtkWidget* gMenuBarWidget;
@@ -2322,10 +2321,6 @@ static void get_combo_box_entry_inner_widgets(GtkWidget *widget, gpointer)
     {
         gComboBoxButtonWidget = widget;
     }
-    else if (GTK_IS_ENTRY(widget))
-    {
-        gComboBoxEntryWidget = widget;
-    }
 }
 
 void get_combo_box_inner_button(GtkWidget *widget, gpointer)
commit dfa05574ea01eca00f69822f872146f0da5d0303
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 7 16:48:45 2016 +0100

    coverity#1358119 Uninitialized scalar field
    
    arguably a false positive seeing as coverity ignores implicit default ctors but
    not explicit ones
    
    Change-Id: Id01f6a2728c197239563081c92275d44869b5d96

diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index d331f2c..84bbe70 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -148,7 +148,12 @@ struct TokenTable
     TokenTable(const TokenTable&) = delete;
     const TokenTable& operator=(const TokenTable&) = delete;
 
-    TokenTable() = default;
+    TokenTable()
+        : mnRowCount(0)
+        , mnColCount(0)
+    {
+    }
+
     void init( SCCOL nColCount, SCROW nRowCount )
     {
         mnColCount = nColCount;