vcl/source/control/field2.cxx | 2 +- vcl/unx/gtk/a11y/atkfactory.cxx | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-)
New commits: commit 82913e694a4169f9ddeef399e659aec78cc9c8d6 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 21 12:18:36 2016 +0100 Resolves: tdf#100558 last 'section' of date field not incremented presumably a regression from... commit 3cad6c806e5247ce20b78eb688551aa5d872b934 Author: Chr. Rossmanith <chrrossman...@gmx.de> Date: Fri Mar 1 21:47:10 2013 +0100 Replace (Xub)String with OUString in vcl(field) where UniString::Search returned a max short on not-found while OUString::indexOf returns a -1 Change-Id: Ia3ef80dd318375ccdb3bdcee9bed7b70bf67cae1 diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 27b6b41..6076074 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -1351,7 +1351,7 @@ void DateField::ImplDateSpinArea( bool bUp ) for ( sal_Int8 i = 1; i <= 3; i++ ) { nPos = aText.indexOf( aDateSep, nPos ); - if ( nPos >= (sal_Int32)aSelection.Max() ) + if (nPos < 0 || nPos >= (sal_Int32)aSelection.Max()) { nDateArea = i; break; commit 27328034f5e2644b4a0287532e762e87ea36c4a0 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 21 11:55:13 2016 +0100 gtk3-a11y: our eventbox is inside a grid now Change-Id: Icb49d6274b09fb426ab6c0f9f67b7c71c4ef9a31 diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx index bca68a6..2f51f14 100644 --- a/vcl/unx/gtk/a11y/atkfactory.cxx +++ b/vcl/unx/gtk/a11y/atkfactory.cxx @@ -109,7 +109,11 @@ wrapper_factory_create_accessible( GObject *obj ) if (!pEventBox) return atk_noop_object_wrapper_new(); - GtkWidget* pTopLevel = gtk_widget_get_parent(pEventBox); + GtkWidget* pTopLevelGrid = gtk_widget_get_parent(pEventBox); + if (!pTopLevelGrid) + return atk_noop_object_wrapper_new(); + + GtkWidget* pTopLevel = gtk_widget_get_parent(pTopLevelGrid); if (!pTopLevel) return atk_noop_object_wrapper_new(); #else
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits