[Libreoffice-commits] core.git: 2 commits - download.lst svx/source

[Caolán McNamara]

 download.lst                   |    2 +-
 svx/source/table/svdotable.cxx |   10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 88c3b4bbf005299203370efecbc09dd9d9d26a72
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 22 12:05:48 2014 +0100

    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

diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 5e22fba..369b5a2 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;
 
 SdrTableObjImpl::SdrTableObjImpl()
 : mpTableObj( 0 )
@@ -694,13 +698,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 );
         }
commit 432d735a1d4dbfd1558b95cc18edab1e677c7f71
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 22 10:16:21 2014 +0100

    update narrow liberation-fonts-ttf to 1.07.4
    
    Change-Id: Ie58abbb5b0b4aec574367bf1b8f7a9d8012450ae

diff --git a/download.lst b/download.lst
index b3b48fa..2a16e7e 100644
--- a/download.lst
+++ b/download.lst
@@ -59,7 +59,7 @@ export FONT_CALADEA_TARBALL := 368f114c078f94214a308a74c7e991bc-crosextrafonts-2
 export FONT_CARLITO_TARBALL := c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
 export FONT_DEJAVU_TARBALL := a4e565e220b5de082c23995e256e3c12-dejavu-fonts-ttf-2.34.zip
 export FONT_GENTIUM_TARBALL := 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
-export FONT_LIBERATION_NARROW_TARBALL := b3174b11c2b6a341f5c99b31088bd67b-liberation-fonts-ttf-1.07.3.tar.gz
+export FONT_LIBERATION_NARROW_TARBALL := 134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz
 export FONT_LIBERATION_TARBALL := 5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz
 export FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz