diff options
| author | Noel Power <noel.power@novell.com> | 2012-06-07 18:10:17 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2012-06-07 18:10:44 +0100 |
| commit | b659c92b156e95269613f0bac5d53d9e87ccd1e8 (patch) | |
| tree | a7f19e01db1607e9b27b86f2e218e6fd4e7a4dc8 /sc | |
| parent | f50f057aeebb517c566874d982aaf64e592a347a (diff) | |
Revert "get rid of unecessary loop and change comment"
This reverts commit a95b5d3256a0a01a94b9fa18c5ab986d91273268.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/oox/worksheethelper.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index f7f46ac95e58..48dc7d6c19d8 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -1223,9 +1223,17 @@ void WorksheetGlobals::convertRows( OutlineLevelVec& orRowLevels, sal_Int32 nHeight = getUnitConverter().scaleToMm100( fHeight, UNIT_POINT ); if( nHeight > 0 ) { - /* always import the row height, ensures better layout */ - PropertySet aPropSet( getRows( *aIt ) ); - aPropSet.setProperty( PROP_Height, nHeight ); + /* 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 ); + } } // hidden rows: TODO: #108683# hide rows later? |