[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Kohei Yoshida]

 sc/source/ui/unoobj/docuno.cxx |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 34314ec5eaf7d7ac42f902b91e334fae22300c8b
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu Jul 12 00:09:03 2012 -0400

    fdo#51852: Temporary, band-aid fix.
    
    Eventually, once we re-work ODS's style import to get it to populate
    ScDocument directly, we don't need this IsImportingXML() ugly-hack.
    
    Until then, we'll need this.
    
    Change-Id: Ic2abf7c375d6c49a286544551e45734bef2dc03a

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 2220e2d..41f10ea 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -3222,8 +3222,16 @@ void SAL_CALL ScTableRowsObj::setPropertyValue(
     {
         sal_Int32 nNewHeight = 0;
         if ( aValue >>= nNewHeight )
-            rFunc.SetWidthOrHeight( false, 1, nRowArr, nTab, SC_SIZE_ORIGINAL,
-                                    (sal_uInt16)HMMToTwips(nNewHeight), sal_True, sal_True );
+        {
+            if (pDoc->IsImportingXML())
+                // TODO: This is a band-aid fix.  Eventually we need to
+                // re-work ods' style import to get it to set styles to
+                // ScDocument directly.
+                pDoc->SetRowHeightOnly( nStartRow, nEndRow, nTab, (sal_uInt16)HMMToTwips(nNewHeight) );
+            else
+                rFunc.SetWidthOrHeight( false, 1, nRowArr, nTab, SC_SIZE_ORIGINAL,
+                                        (sal_uInt16)HMMToTwips(nNewHeight), sal_True, sal_True );
+        }
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_CELLVIS ) )
     {