sw/source/core/doc/list.cxx | 4 ++-- vcl/inc/unx/gtk/gtkgdi.hxx | 1 + vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 16 +++++++++++++++- 3 files changed, 18 insertions(+), 3 deletions(-)
New commits: commit 1d094369dced5f84991b95aa965ade12e68f69c5 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Sep 4 11:19:57 2017 +0100 Resolves: tdf#111864 render progress bar for Ambiance theme properly Change-Id: I8ce43e4516413ea3779a128b374a931b080ae970 Reviewed-on: https://gerrit.libreoffice.org/41879 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 4b0a670763da..345f7282fc1e 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -70,6 +70,7 @@ enum class GtkControlPart ScrollbarHorizontalSlider, ScrollbarHorizontalButton, ProgressBar, + ProgressBarTrough, ProgressBarProgress, Notebook, NotebookHeader, diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx index f0d57e34069b..898df4499adc 100644 --- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx @@ -1588,6 +1588,13 @@ GtkStyleContext* GtkSalGraphics::createNewContext(GtkControlPart ePart, gtk_widg gtk_widget_path_iter_add_class(path, -1, GTK_STYLE_CLASS_HORIZONTAL); return makeContext(path, nullptr); } + case GtkControlPart::ProgressBarTrough: + { + GtkWidgetPath *path = gtk_widget_path_copy(gtk_style_context_get_path(mpProgressBarStyle)); + gtk_widget_path_append_type(path, GTK_TYPE_PROGRESS_BAR); + set_object_name(path, -1, "trough"); + return makeContext(path, mpProgressBarStyle); + } case GtkControlPart::ProgressBarProgress: { GtkWidgetPath *path = gtk_widget_path_copy(gtk_style_context_get_path(mpProgressBarTroughStyle)); @@ -1921,6 +1928,13 @@ GtkStyleContext* GtkSalGraphics::createOldContext(GtkControlPart ePart) gtk_widget_path_iter_add_class(path, -1, GTK_STYLE_CLASS_HORIZONTAL); return makeContext(path, nullptr); } + case GtkControlPart::ProgressBarTrough: + { + GtkWidgetPath *path = gtk_widget_path_copy(gtk_style_context_get_path(mpProgressBarStyle)); + gtk_widget_path_append_type(path, GTK_TYPE_PROGRESS_BAR); + gtk_widget_path_iter_add_class(path, -1, GTK_STYLE_CLASS_TROUGH); + return makeContext(path, mpProgressBarStyle); + } case GtkControlPart::ProgressBarProgress: { GtkWidgetPath *path = gtk_widget_path_copy(gtk_style_context_get_path(mpProgressBarTroughStyle)); @@ -3496,7 +3510,7 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow ) /* Progress Bar */ mpProgressBarStyle = createStyleContext(set_object_name, GtkControlPart::ProgressBar); - mpProgressBarTroughStyle = createStyleContext(set_object_name, GtkControlPart::ProgressBar); + mpProgressBarTroughStyle = createStyleContext(set_object_name, GtkControlPart::ProgressBarTrough); mpProgressBarProgressStyle = createStyleContext(set_object_name, GtkControlPart::ProgressBarProgress); gtk_widget_show_all(gDumbContainer); commit 96654770b311825226c122cf60a624f0f155a3a2 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Sep 4 09:08:13 2017 +0100 coverity#1399392 Uncaught exception Change-Id: Ic9eb2233d4e88ed9923bdabcf09b2a92ad24c0bf Reviewed-on: https://gerrit.libreoffice.org/41880 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx index 753965a799ce..711ebbfd1804 100644 --- a/sw/source/core/doc/list.cxx +++ b/sw/source/core/doc/list.cxx @@ -33,7 +33,7 @@ class SwListImpl SwListImpl( const OUString& sListId, SwNumRule& rDefaultListStyle, const SwNodes& rNodes ); - ~SwListImpl(); + ~SwListImpl() COVERITY_NOEXCEPT_FALSE; const OUString& GetListId() const { return msListId;} @@ -96,7 +96,7 @@ SwListImpl::SwListImpl( const OUString& sListId, while ( pNode != &rNodes.GetEndOfContent() ); } -SwListImpl::~SwListImpl() +SwListImpl::~SwListImpl() COVERITY_NOEXCEPT_FALSE { tListTrees::iterator aNumberTreeIter; for ( aNumberTreeIter = maListTrees.begin();
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits