[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx

Mark Wielaard mark at klomp.org
Wed Jun 5 03:07:14 PDT 2013


 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 99afbfdad1d53d65f22a4ea22a5cee43f98a44b9
Author: Mark Wielaard <mark at klomp.org>
Date:   Tue Jun 4 22:00:45 2013 +0200

    Fix memory leak in SalGtkFilePicker::SalGtkFilePicker.
    
    The result of gtk_widget_create_pango_layout should be unrefed when done.
    
    Change-Id: I46c220a933a2dac42ec21e9e2904938bc4649dbd
    Reviewed-on: https://gerrit.libreoffice.org/4157
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 4450d6bbd10fbf57f18912095f58c4a79b20bcb7)

diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 88cb3de..50ec20c 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -301,6 +301,8 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
     PangoRectangle row_height;
     pango_layout_set_markup (layout, "All Files", -1);
     pango_layout_get_pixel_extents (layout, NULL, &row_height);
+    g_object_unref (layout);
+
     g_object_get (cell, "ypad", &ypad, (char *)NULL);
     guint height = (row_height.height + 2*ypad) * 5;
     gtk_widget_set_size_request (m_pFilterView, -1, height);


More information about the Libreoffice-commits mailing list