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

Stephan Bergmann sbergman at redhat.com
Fri Oct 14 12:55:26 UTC 2016


 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1f8f140601bd654f97d0c1e6e05b3bef949ddfaf
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 14 14:51:48 2016 +0200

    loplugin:nullptr
    
    Change-Id: Id9f702b2772a23c52a9b829093d10c83a5ab3acd

diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 8fa32ab..0a9eddf 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -694,7 +694,7 @@ Rectangle GtkSalGraphics::NWGetComboBoxButtonRect( ControlType nType,
     gint nArrowWidth;
     gtk_style_context_get(mpComboboxButtonArrowStyle,
         gtk_style_context_get_state(mpComboboxButtonArrowStyle),
-        "min-width", &nArrowWidth, NULL);
+        "min-width", &nArrowWidth, nullptr);
 
     gint nButtonWidth = nArrowWidth + padding.left + padding.right;
     if( nPart == ControlPart::ButtonDown )
@@ -755,13 +755,13 @@ void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, cairo_t *cr,
     {
         gtk_style_context_get(mpComboboxButtonArrowStyle,
             gtk_style_context_get_state(mpComboboxButtonArrowStyle),
-            "min-width", &arrow_width, "min-height", &arrow_height, NULL);
+            "min-width", &arrow_width, "min-height", &arrow_height, nullptr);
     }
     else if (nType == ControlType::Listbox)
     {
         gtk_style_context_get(mpListboxButtonArrowStyle,
             gtk_style_context_get_state(mpListboxButtonArrowStyle),
-            "min-width", &arrow_width, "min-height", &arrow_height, NULL);
+            "min-width", &arrow_width, "min-height", &arrow_height, nullptr);
     }
 
     arrowRect.SetSize(Size(arrow_width, arrow_height));


More information about the Libreoffice-commits mailing list