summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-04-22 12:05:48 +0100
committerDavid Tardon <dtardon@redhat.com>2014-04-24 10:21:22 +0000
commitc93a3a9f3310d8b6092238a0d81b9195fcb659ee (patch)
tree907e3d77bb882dfef4cf68937428b5c5a97bae78 /svx
parent29bd6393380637cb1a319f2ff568bd06726cc69c (diff)
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) Reviewed-on: https://gerrit.libreoffice.org/9122 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/table/svdotable.cxx10
1 files changed, 9 insertions, 1 deletions
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index d59c166ad70f..45c6a30b0127 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 );
}