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

[Caolán McNamara]

 sw/source/core/layout/flowfrm.cxx |    5 +++--
 vcl/unx/gtk3/gtk3gtkframe.cxx     |   11 ++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit f27c5f598feb8692788bca7085343eb0cc7707b8
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed Jan 27 15:50:01 2016 +0000

    gtk_drag_begin_with_coordinates is too new for tinderbox
    
    Change-Id: I759b8d1421860501243039c66d17fb82ac66dd47

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index d98b3be..de86fbc 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3962,7 +3962,7 @@ void GtkSalFrame::startDrag(gint nButton, gint 
nDragOriginX, gint nDragOriginY,
     GdkDeviceManager* pDeviceManager = 
gdk_display_get_device_manager(getGdkDisplay());
     aFakeEvent.button.device = 
gdk_device_manager_get_client_pointer(pDeviceManager);
 
-
+#if GTK_CHECK_VERSION(3,10,0)
     GdkDragContext *pContext = 
gtk_drag_begin_with_coordinates(getMouseEventWidget(),
                                                                pTargetList,
                                                                sourceActions,
@@ -3970,6 +3970,15 @@ void GtkSalFrame::startDrag(gint nButton, gint 
nDragOriginX, gint nDragOriginY,
                                                                &aFakeEvent,
                                                                nDragOriginX,
                                                                nDragOriginY);
+#else
+    GdkDragContext *pContext = gtk_drag_begin(getMouseEventWidget(),
+                                              pTargetList,
+                                              sourceActions,
+                                              nButton,
+                                              &aFakeEvent);
+    (void)nDragOriginX;
+    (void)nDragOriginY;
+#endif
 
     if (!pContext)
         m_pDragSource->dragFailed();
commit b7ffd2564e9e410c4ab995dd15a8aa0bddb7d06b
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed Jan 27 15:28:37 2016 +0000

    Related: rhbz#1293210 crash in SwFlowFrm::BwdMoveNecessary
    
    Change-Id: I3b902b7fbd02b32f5d13dc47854445558e93b341

diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index 44c1254..becbfff 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -287,10 +287,11 @@ sal_uInt8 SwFlowFrame::BwdMoveNecessary( const 
SwPageFrame *pPage, const SwRect
             nRet = 1;
         pTmp = pTmp->GetFollow();
     } while ( !nRet && pTmp );
-    if ( pPage->GetSortedObjs() )
+    const SwSortedObjs *pObjs = pPage ? pPage->GetSortedObjs() : nullptr;
+    if (pObjs)
     {
         // #i28701# - new type <SwSortedObjs>
-        const SwSortedObjs &rObjs = *pPage->GetSortedObjs();
+        const SwSortedObjs &rObjs = *pObjs;
         sal_uLong nIndex = ULONG_MAX;
         for ( size_t i = 0; nRet < 3 && i < rObjs.size(); ++i )
         {

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits