[libreoffice] sometimes tables in impress don't resize when adding rows

[Caolán McNamara]

commit a38f5559bc0dea3a9d6c9f549684e0f3acc2dd40
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 22 12:10:47 2014 +0100

    sometimes tables in impress don't resize when adding rows

 ...ot-resizing-when-rows-columns-added-to-it.patch |   59 ++++++++++++++++++++
 libreoffice.spec                                   |    6 ++-
 2 files changed, 64 insertions(+), 1 deletions(-)
---
diff --git a/0001-table-not-resizing-when-rows-columns-added-to-it.patch b/0001-table-not-resizing-when-rows-columns-added-to-it.patch
new file mode 100644
index 0000000..d72c4e7
--- /dev/null
+++ b/0001-table-not-resizing-when-rows-columns-added-to-it.patch
@@ -0,0 +1,59 @@
+From bbcfb0a054efbe3aa106bff62938e218fea91d29 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Tue, 22 Apr 2014 12:05:48 +0100
+Subject: [PATCH] table not resizing when rows/columns added to it
+
+I happened across a presentation whose table didn't resize when extra rows and
+columns were added to it. It worked on a higher resolution machine, but not on
+a 1024x768 one
+
+Change-Id: I98a7a04bee0b0175174e6376e9ebc046b9eff2dc
+(cherry picked from commit 88c3b4bbf005299203370efecbc09dd9d9d26a72)
+---
+ svx/source/table/svdotable.cxx | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
+index d59c166..45c6a30 100644
+--- a/svx/source/table/svdotable.cxx
++++ b/svx/source/table/svdotable.cxx
+@@ -248,6 +248,8 @@ private:
+     static bool lastLayoutFitWidth;
+     static bool lastLayoutFitHeight;
+     static WritingMode lastLayoutMode;
++    static sal_Int32 lastRowCount;
++    static sal_Int32 lastColCount;
+ };
+ 
+ SdrTableObjImpl* SdrTableObjImpl::lastLayoutTable = NULL;
+@@ -255,6 +257,8 @@ Rectangle SdrTableObjImpl::lastLayoutRectangle;
+ bool SdrTableObjImpl::lastLayoutFitWidth;
+ bool SdrTableObjImpl::lastLayoutFitHeight;
+ WritingMode SdrTableObjImpl::lastLayoutMode;
++sal_Int32 SdrTableObjImpl::lastRowCount;
++sal_Int32 SdrTableObjImpl::lastColCount;
+ 
+ // -----------------------------------------------------------------------------
+ 
+@@ -696,13 +700,17 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHe
+         WritingMode writingMode = mpTableObj->GetWritingMode();
+         if( lastLayoutTable != this || lastLayoutRectangle != rArea
+             || lastLayoutFitWidth != bFitWidth || lastLayoutFitHeight != bFitHeight
+-            || lastLayoutMode != writingMode )
++            || lastLayoutMode != writingMode
++            || lastRowCount != getRowCount()
++            || lastColCount != getColumnCount() )
+         {
+             lastLayoutTable = this;
+             lastLayoutRectangle = rArea;
+             lastLayoutFitWidth = bFitWidth;
+             lastLayoutFitHeight = bFitHeight;
+             lastLayoutMode = writingMode;
++            lastRowCount = getRowCount();
++            lastColCount = getColumnCount();
+             TableModelNotifyGuard aGuard( mxTable.get() );
+             mpLayouter->LayoutTable( rArea, bFitWidth, bFitHeight );
+         }
+-- 
+1.9.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index fb0fd3f..d50a4f3 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -43,7 +43,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.1
-Release:        2%{?libo_prerelease}%{?dist}
+Release:        3%{?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.libreoffice.org/default/
@@ -297,6 +297,7 @@ Patch30: 0001-Related-fdo-36815-print-the-text-highlight-range-as-.patch
 Patch31: 0001-Resolves-rhbz-1086714-overlarge-pixmap.patch
 Patch32: 0001-every-even-numbered-print-job-is-reported-as-failed.patch
 Patch33: 0001-Related-rhbz-1088625-PresenterPaintManager-seen-as-N.patch
+Patch34: 0001-table-not-resizing-when-rows-columns-added-to-it.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2288,6 +2289,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Tue Apr 22 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.4.1-3
+- sometimes tables in impress don't resize when adding rows
+
 * Fri Apr 18 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.4.1-2
 - every 2nd print job is incorrectly flagged as failed
 - Related: rhbz#1088625 PresenterPaintManager seen as NULL