[Libreoffice-commits] .: sc/source

Noel Power noelp at kemper.freedesktop.org
Thu Jun 7 10:14:21 PDT 2012


 sc/source/filter/oox/worksheethelper.cxx |   14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 1cdfe7519a94d35f3fb47eed3331397cc11129b5
Author: Noel Power <noel.power at novell.com>
Date:   Thu Jun 7 18:13:09 2012 +0100

    get rid of unecessary loop and change comment
    
    followup to 764752f5d85cb7c86ad21340dfdda4b62754790c
    
    Change-Id: Ib35b57b01ccf752c4696d6e7849629bd22a9e91a

diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 48dc7d6..8563048 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -1223,17 +1223,9 @@ void WorksheetGlobals::convertRows( OutlineLevelVec& orRowLevels,
     sal_Int32 nHeight = getUnitConverter().scaleToMm100( fHeight, UNIT_POINT );
     if( nHeight > 0 )
     {
-        /*  Get all rows that have custom height inside the passed row model.
-            If the model has the custom height flag set, all its rows have
-            custom height, otherwise get all rows specified in the class member
-            maManualRowHeights that are inside the passed row model. */
-        ValueRangeVector aManualRows;
-        aManualRows.push_back( rRowRange );
-        for( ValueRangeVector::const_iterator aIt = aManualRows.begin(), aEnd = aManualRows.end(); aIt != aEnd; ++aIt )
-        {
-            PropertySet aPropSet( getRows( *aIt ) );
-            aPropSet.setProperty( PROP_Height, nHeight );
-        }
+        /* always import the row height, ensures better layout */
+        PropertySet aPropSet( getRows( rRowRange ) );
+        aPropSet.setProperty( PROP_Height, nHeight );
     }
 
     // hidden rows: TODO: #108683# hide rows later?


More information about the Libreoffice-commits mailing list