[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - 2 commits - sc/source vcl/inc vcl/unx

[Caolán McNamara (via logerrit)]

 sc/source/core/data/dpcache.cxx |    4 ++--
 vcl/inc/unx/gtk/gtkframe.hxx    |    2 +-
 vcl/unx/gtk3/gtk3gtkframe.cxx   |   13 +++++--------
 3 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit 696084d9dc0f6681a9a5e0fd1ed5143dc90fbdf1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jun 11 09:44:40 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jun 11 21:47:34 2019 +0200

    Resolves: tdf#125808 empty labels in pivot table from registered data source
    
    since...
    
    commit 238cadd315901cbacfd9304bb1205e9f53f13eae
    Date:   Wed Apr 10 04:30:25 2019 +0530
    
        dpcache : use case-insensitive normalization of...
    
    Change-Id: I19057bde268ec07561da323bc694536dcad03a95
    Reviewed-on: https://gerrit.libreoffice.org/73820
    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/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 6222ab6ec6b4..3f096f380ad2 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -367,8 +367,8 @@ std::vector<OUString> normalizeLabels(const std::vector<InitColumnData>& rColDat
 
 std::vector<OUString> normalizeLabels(const ScDPCache::DBConnector& rDB, const sal_Int32 nLabelCount)
 {
-    std::vector<OUString> aLabels(nLabelCount+1);
-    aLabels.push_back(ScResId(STR_PIVOT_DATA));
+    std::vector<OUString> aLabels(1u, ScResId(STR_PIVOT_DATA));
+    aLabels.reserve(nLabelCount + 1);
 
     LabelSet aExistingNames;
 
commit d440db8b3abb8577d810fb1d8f6b2b71a1ab19be
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jun 11 17:10:25 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jun 11 21:47:15 2019 +0200

    Resolves: rhbz#1719378 wrong signature for GtkGestureLongPress::pressed
    
    Change-Id: Ib4c47189d5c9c89433f0c7de194ebb9777dc7bac
    Reviewed-on: https://gerrit.libreoffice.org/73830
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index f0d2bd96bc08..084339f96d70 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -269,7 +269,7 @@ class GtkSalFrame : public SalFrame
                                           guint time, gpointer frame);
 
     static void         gestureSwipe(GtkGestureSwipe* gesture, gdouble velocity_x, gdouble velocity_y, gpointer frame);
-    static void         gestureLongPress(GtkGestureLongPress* gesture, gpointer frame);
+    static void         gestureLongPress(GtkGestureLongPress* gesture, gdouble x, gdouble y, gpointer frame);
 #else
     static gboolean     signalExpose( GtkWidget*, GdkEventExpose*, gpointer );
     void askForXEmbedFocus( sal_Int32 nTimecode );
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index c180c077bd19..888a7fb9aeb4 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2739,17 +2739,14 @@ void GtkSalFrame::gestureSwipe(GtkGestureSwipe* gesture, gdouble velocity_x, gdo
     }
 }
 
-void GtkSalFrame::gestureLongPress(GtkGestureLongPress* gesture, gpointer frame)
+void GtkSalFrame::gestureLongPress(GtkGestureLongPress* gesture, gdouble x, gdouble y, gpointer frame)
 {
-    GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame);
-
-    if(pThis)
+    GdkEventSequence *sequence = gtk_gesture_single_get_current_sequence(GTK_GESTURE_SINGLE(gesture));
+    if (gtk_gesture_get_point(GTK_GESTURE(gesture), sequence, &x, &y))
     {
-        SalLongPressEvent aEvent;
+        GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame);
 
-        gdouble x, y;
-        GdkEventSequence *sequence = gtk_gesture_single_get_current_sequence(GTK_GESTURE_SINGLE(gesture));
-        gtk_gesture_get_point(GTK_GESTURE(gesture), sequence, &x, &y);
+        SalLongPressEvent aEvent;
         aEvent.mnX = x;
         aEvent.mnY = y;