[libreoffice/f20] adapt patches

[Caolán McNamara]

commit f085233b738d9bc57b39783ae3b80bfb6a8c09e3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 19 14:26:04 2014 +0000

    adapt patches

 ...ress-tables-are-not-interactively-growing.patch |   29 ++++---------------
 ...able-layout-cache-returns-wrong-rectangle.patch |   12 ++++----
 2 files changed, 12 insertions(+), 29 deletions(-)
---
diff --git a/0001-impress-tables-are-not-interactively-growing.patch b/0001-impress-tables-are-not-interactively-growing.patch
index 26cb866..989eaed 100644
--- a/0001-impress-tables-are-not-interactively-growing.patch
+++ b/0001-impress-tables-are-not-interactively-growing.patch
@@ -1,7 +1,7 @@
-From 5a958aa9d95f0c14e4980f6909550e657d87a3a9 Mon Sep 17 00:00:00 2001
+From 15b6a83447d55c4b429757d20377763d59f37832 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
 Date: Thu, 13 Nov 2014 14:31:09 +0000
-Subject: [PATCH] impress tables are not interactively growing
+Subject: [PATCH 2/2] impress tables are not interactively growing
 
 the optimization here stops tables growing as their text
 contents change in editing mode
@@ -13,22 +13,14 @@ being interactively edited, which leaves the original
 Change-Id: I894acf47d34ec8b68aaf9076b5a0cb7e29c38a17
 (cherry picked from commit 22ef69b25fa60f4543dc72cb7a8d2f88b789ce43)
 ---
- svx/source/table/svdotable.cxx | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
+ svx/source/table/svdotable.cxx | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
-index fbd532a..856a9e5 100644
+index e3a2a47..3120333 100644
 --- a/svx/source/table/svdotable.cxx
 +++ b/svx/source/table/svdotable.cxx
-@@ -689,16 +689,17 @@ sal_Int32 SdrTableObjImpl::getRowCount() const
-     return mxTable.is() ? mxTable->getRowCount() : 0;
- }
- 
--
--
- void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHeight )
- {
-     if( mpLayouter && mpTableObj->GetModel() )
+@@ -699,8 +699,11 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHe
      {
          // Optimization: SdrTableObj::SetChanged() can call this very often, repeatedly
          // with the same settings, noticeably increasing load time. Skip if already done.
@@ -41,15 +33,6 @@ index fbd532a..856a9e5 100644
              || lastLayoutFitWidth != bFitWidth || lastLayoutFitHeight != bFitHeight
              || lastLayoutMode != writingMode
              || lastRowCount != getRowCount()
-@@ -722,8 +723,6 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHe
-     }
- }
- 
--
--
- void SdrTableObjImpl::UpdateCells( Rectangle& rArea )
- {
-     if( mpLayouter && mxTable.is() )
 -- 
 1.9.3
 
diff --git a/0001-table-layout-cache-returns-wrong-rectangle.patch b/0001-table-layout-cache-returns-wrong-rectangle.patch
index 628baec..15f47b3 100644
--- a/0001-table-layout-cache-returns-wrong-rectangle.patch
+++ b/0001-table-layout-cache-returns-wrong-rectangle.patch
@@ -1,7 +1,7 @@
-From f79f3d1322b396f5f45ccd7742015749e93ac57b Mon Sep 17 00:00:00 2001
+From b5a90399a502498c28779706b3f518b4ea224b4d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
 Date: Thu, 13 Nov 2014 13:32:35 +0000
-Subject: [PATCH] table layout cache returns wrong rectangle
+Subject: [PATCH 1/2] table layout cache returns wrong rectangle
 
 the layouter can modify its input rectangle to grow
 it to the necessary size to contain the layout
@@ -22,11 +22,11 @@ Change-Id: I4f09594d82c1597204afbd059e175af9bf8e2527
  1 file changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
-index d49cfb3..fbd532a 100644
+index 45c6a30..e3a2a47 100644
 --- a/svx/source/table/svdotable.cxx
 +++ b/svx/source/table/svdotable.cxx
 @@ -244,7 +244,8 @@ public:
-     virtual bool isInUse() SAL_OVERRIDE;
+     virtual bool isInUse();
  private:
      static SdrTableObjImpl* lastLayoutTable;
 -    static Rectangle lastLayoutRectangle;
@@ -45,7 +45,7 @@ index d49cfb3..fbd532a 100644
  bool SdrTableObjImpl::lastLayoutFitWidth;
  bool SdrTableObjImpl::lastLayoutFitHeight;
  WritingMode SdrTableObjImpl::lastLayoutMode;
-@@ -696,14 +698,14 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHe
+@@ -698,14 +700,14 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHe
          // Optimization: SdrTableObj::SetChanged() can call this very often, repeatedly
          // with the same settings, noticeably increasing load time. Skip if already done.
          WritingMode writingMode = mpTableObj->GetWritingMode();
@@ -62,7 +62,7 @@ index d49cfb3..fbd532a 100644
              lastLayoutFitWidth = bFitWidth;
              lastLayoutFitHeight = bFitHeight;
              lastLayoutMode = writingMode;
-@@ -711,6 +713,11 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHe
+@@ -713,6 +715,11 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHe
              lastColCount = getColumnCount();
              TableModelNotifyGuard aGuard( mxTable.get() );
              mpLayouter->LayoutTable( rArea, bFitWidth, bFitHeight );