Resolves: rhbz#968976 fix dropdown list autosizing

0001-autosize-the-frame-direction-listbox.patch

@@ -0,0 +1,29 @@
+From 30adf73871cacede1ade5615acc54288b07cd0be Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Fri, 31 May 2013 12:29:43 +0100
+Subject: [PATCH] autosize the frame direction listbox
+
+Change-Id: I440ca0255a6079c28b2314b12511c6c41d6a05f5
+(cherry picked from commit c799a1e5522971405fa45d3df7ebf259229df63e)
+---
+ svx/source/dialog/frmdirlbox.cxx | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx
+index 7de9437..ad1697d 100644
+--- a/svx/source/dialog/frmdirlbox.cxx
++++ b/svx/source/dialog/frmdirlbox.cxx
+@@ -56,7 +56,9 @@ FrameDirectionListBox::~FrameDirectionListBox()
+ 
+ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFrameDirectionListBox(Window *pParent, VclBuilder::stringmap &)
+ {
+-    return new FrameDirectionListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP);
++    FrameDirectionListBox* pListBox = new FrameDirectionListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP);
++    pListBox->EnableAutoSize(true);
++    return pListBox;
+ }
+ 
+ 
+-- 
+1.8.1.4
+

0001-setting-max-line-count-should-allow-extra-values-to-.patch

@@ -0,0 +1,42 @@
+From ce418f314f4674d9eb9954cc553cc0674ed4a82a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Wed, 22 May 2013 16:50:18 +0100
+Subject: [PATCH] setting max line count should allow extra values to be added
+ later
+
+Change-Id: Ia693c83b8d27cacbd257f81b5eae2936fc5f8a6f
+(cherry picked from commit c19c9dfc69b73ae7dbd7d4b9e68ec0a7c7891913)
+---
+ vcl/source/control/combobox.cxx | 2 +-
+ vcl/source/control/lstbox.cxx   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
+index 5234a52..e89bc53 100644
+--- a/vcl/source/control/combobox.cxx
++++ b/vcl/source/control/combobox.cxx
+@@ -569,7 +569,7 @@ void ComboBox::SetDropDownLineCount( sal_uInt16 nLines )
+ void ComboBox::AdaptDropDownLineCountToMaximum()
+ {
+     // adapt to maximum allowed number
+-    SetDropDownLineCount(std::min(GetEntryCount(), GetSettings().GetStyleSettings().GetListBoxMaximumLineCount()));
++    SetDropDownLineCount(GetSettings().GetStyleSettings().GetListBoxMaximumLineCount());
+ }
+ 
+ // -----------------------------------------------------------------------
+diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
+index 741558e..31dfde2 100644
+--- a/vcl/source/control/lstbox.cxx
++++ b/vcl/source/control/lstbox.cxx
+@@ -593,7 +593,7 @@ void ListBox::SetDropDownLineCount( sal_uInt16 nLines )
+ void ListBox::AdaptDropDownLineCountToMaximum()
+ {
+     // adapt to maximum allowed number
+-    SetDropDownLineCount(std::min(GetEntryCount(), GetSettings().GetStyleSettings().GetListBoxMaximumLineCount()));
++    SetDropDownLineCount(GetSettings().GetStyleSettings().GetListBoxMaximumLineCount());
+ }
+ 
+ // -----------------------------------------------------------------------
+-- 
+1.8.1.4
+

libreoffice.spec

@@ -43,7 +43,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.0
-Release:        3%{?libo_prerelease}%{?dist}
+Release:        4%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -250,6 +250,8 @@ Patch17: 0001-do-not-build-LibreOffice_Test.patch
 Patch18: 0001-disable-failing-perf-test.patch
 Patch19: 0001-fix-syntax-errors-in-python-wizards.patch
 Patch20: 0001-don-t-run-autogen.sh-if-building-from-tarballs.patch
+Patch21: 0001-autosize-the-frame-direction-listbox.patch
+Patch22: 0001-setting-max-line-count-should-allow-extra-values-to-.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -989,6 +991,8 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch18 -p1 -b .disable-failing-perf-test.patch
 %patch19 -p1 -b .fix-syntax-errors-in-python-wizards.patch
 %patch20 -p1 -b .don-t-run-autogen.sh-if-building-from-tarballs.patch
+%patch21 -p1 -b .autosize-the-frame-direction-listbox.patch
+%patch22 -p1 -b .setting-max-line-count-should-allow-extra-values-to-.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2052,6 +2056,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Fri May 31 2013 Caolán McNamara <caolanm@redhat.com> - 1:4.1.0.0-4.beta1
+- Resolves: rhbz#968976 fix dropdown list autosizing
+
 * Thu May 30 2013 David Tardon <dtardon@redhat.com> - 1:4.1.0.0-3.beta1
 - build fix for s390