/[packages]/cauldron/libreoffice/current/SOURCES/0001-table-not-resizing-when-rows-columns-added-to-it.patch
ViewVC logotype

Contents of /cauldron/libreoffice/current/SOURCES/0001-table-not-resizing-when-rows-columns-added-to-it.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 618518 - (show annotations) (download)
Sun Apr 27 21:53:48 2014 UTC (9 years, 11 months ago) by tv
File size: 2447 byte(s)
- 4.2.4 rc1
- sync patches with FC
- install man pages
1 From bbcfb0a054efbe3aa106bff62938e218fea91d29 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
3 Date: Tue, 22 Apr 2014 12:05:48 +0100
4 Subject: [PATCH] table not resizing when rows/columns added to it
5
6 I happened across a presentation whose table didn't resize when extra rows and
7 columns were added to it. It worked on a higher resolution machine, but not on
8 a 1024x768 one
9
10 Change-Id: I98a7a04bee0b0175174e6376e9ebc046b9eff2dc
11 (cherry picked from commit 88c3b4bbf005299203370efecbc09dd9d9d26a72)
12 ---
13 svx/source/table/svdotable.cxx | 10 +++++++++-
14 1 file changed, 9 insertions(+), 1 deletion(-)
15
16 diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
17 index d59c166..45c6a30 100644
18 --- a/svx/source/table/svdotable.cxx
19 +++ b/svx/source/table/svdotable.cxx
20 @@ -248,6 +248,8 @@ private:
21 static bool lastLayoutFitWidth;
22 static bool lastLayoutFitHeight;
23 static WritingMode lastLayoutMode;
24 + static sal_Int32 lastRowCount;
25 + static sal_Int32 lastColCount;
26 };
27
28 SdrTableObjImpl* SdrTableObjImpl::lastLayoutTable = NULL;
29 @@ -255,6 +257,8 @@ Rectangle SdrTableObjImpl::lastLayoutRectangle;
30 bool SdrTableObjImpl::lastLayoutFitWidth;
31 bool SdrTableObjImpl::lastLayoutFitHeight;
32 WritingMode SdrTableObjImpl::lastLayoutMode;
33 +sal_Int32 SdrTableObjImpl::lastRowCount;
34 +sal_Int32 SdrTableObjImpl::lastColCount;
35
36 // -----------------------------------------------------------------------------
37
38 @@ -696,13 +700,17 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHe
39 WritingMode writingMode = mpTableObj->GetWritingMode();
40 if( lastLayoutTable != this || lastLayoutRectangle != rArea
41 || lastLayoutFitWidth != bFitWidth || lastLayoutFitHeight != bFitHeight
42 - || lastLayoutMode != writingMode )
43 + || lastLayoutMode != writingMode
44 + || lastRowCount != getRowCount()
45 + || lastColCount != getColumnCount() )
46 {
47 lastLayoutTable = this;
48 lastLayoutRectangle = rArea;
49 lastLayoutFitWidth = bFitWidth;
50 lastLayoutFitHeight = bFitHeight;
51 lastLayoutMode = writingMode;
52 + lastRowCount = getRowCount();
53 + lastColCount = getColumnCount();
54 TableModelNotifyGuard aGuard( mxTable.get() );
55 mpLayouter->LayoutTable( rArea, bFitWidth, bFitHeight );
56 }
57 --
58 1.9.0
59

  ViewVC Help
Powered by ViewVC 1.1.30