diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-03-09 14:21:16 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-03-09 14:31:13 +0100 |
| commit | e1c281c6c1a2bd55d99e1af2023444c960cf02a3 (patch) | |
| tree | eb3b0d8888de6abd9ad32315191bb9672310f3c6 | |
| parent | a18d1a107e49525efd1561f396f6b2be28ab5224 (diff) | |
use direct calls to set row height, fdo#61721
Change-Id: I3c19e00b8ad2bc649b8e499cc869e3a4c488c343
| -rw-r--r-- | sc/source/filter/oox/worksheethelper.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index c56b4783287c..b744f07b480b 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -1219,20 +1219,23 @@ void WorksheetGlobals::convertRows( OutlineLevelVec& orRowLevels, // row height: convert points to row height in 1/100 mm double fHeight = (rModel.mfHeight >= 0.0) ? rModel.mfHeight : fDefHeight; sal_Int32 nHeight = getUnitConverter().scaleToMm100( fHeight, UNIT_POINT ); + SCROW nStartRow = rRowRange.mnFirst; + SCROW nEndRow = rRowRange.mnLast; + SCTAB nTab = getSheetIndex(); if( nHeight > 0 ) { /* always import the row height, ensures better layout */ - PropertySet aPropSet( getRows( rRowRange ) ); - aPropSet.setProperty( PROP_Height, nHeight ); + ScDocument& rDoc = getScDocument(); + rDoc.SetRowHeightOnly( nStartRow, nEndRow, nTab, (sal_uInt16)sc::HMMToTwips(nHeight) ); + if(rModel.mbCustomHeight) + rDoc.SetManualHeight( nStartRow, nEndRow, nTab, true ); } // hidden rows: TODO: #108683# hide rows later? if( rModel.mbHidden ) { - PropertySet aPropSet( getRows( rRowRange ) ); - // #i116460# Use VisibleFlag instead of IsVisible: directly set the flag, - // without drawing layer update etc. (only possible before shapes are inserted) - aPropSet.setProperty( PROP_VisibleFlag, false ); + ScDocument& rDoc = getScDocument(); + rDoc.SetRowHidden( nStartRow, nEndRow, nTab, true ); } // outline settings for this row range |