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

Arnaud Versini arnaud.versini at libreoffice.org
Tue Sep 17 05:17:21 PDT 2013


 vcl/unx/gtk/gdi/salprn-gtk.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit f8f5c9eaab6cd3675358064feec68c7481a38154
Author: Arnaud Versini <arnaud.versini at libreoffice.org>
Date:   Sun Sep 15 17:54:06 2013 +0200

    Fix fdo#69381 by skipping empty option groups
    
    Change-Id: Idaf0f0a3f5430a5aea6f77a003e205116a87cc67
    Reviewed-on: https://gerrit.libreoffice.org/5949
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/5972

diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 228413b..b94397d 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -483,6 +483,11 @@ GtkPrintDialog::impl_initCustomTab()
         GtkWidget* pGroup = NULL;
         bool bGtkInternal = false;
 
+        //Fix fdo#69381
+        //Next options if this one is empty
+        if ( aOptProp.getLength() == 0)
+            continue;
+
         for (int n = 0; n != aOptProp.getLength(); n++)
         {
             const beans::PropertyValue& rEntry(aOptProp[ n ]);


More information about the Libreoffice-commits mailing list