[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source

[Markus Mohrhard]

 sc/source/filter/oox/worksheethelper.cxx |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 146352a3dcb65c99ec1b1b83f7be04231a32b21d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Mar 9 14:21:16 2013 +0100

    use direct calls to set row height, fdo#61721
    
    Change-Id: I3c19e00b8ad2bc649b8e499cc869e3a4c488c343
    (cherry picked from commit e1c281c6c1a2bd55d99e1af2023444c960cf02a3)
    Reviewed-on: https://gerrit.libreoffice.org/2615
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 4d29ad3..f736393 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -1216,20 +1216,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