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

[Thorsten Behrens]

 sc/source/ui/unoobj/docuno.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit eb84b4678a16cc48f1fdb21098b1fc978800a83e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Jul 26 23:00:58 2012 +0200

    mark manual row heights correctly during import, fdo#52393
    
    Change-Id: Id8a1658dbe6d9a89c89d1a0633392b0fa1104c4e
    Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>
    Signed-off-by: Petr Mladek <pmladek at suse.cz>
    Signed-off-by: Thorsten Behrens <tbehrens at suse.com>

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 41f10ea..c43047c 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -3224,10 +3224,13 @@ void SAL_CALL ScTableRowsObj::setPropertyValue(
         if ( aValue >>= nNewHeight )
         {
             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) );
+                pDoc->SetManualHeight( nStartRow, nEndRow, nTab, true );
+            }
             else
                 rFunc.SetWidthOrHeight( false, 1, nRowArr, nTab, SC_SIZE_ORIGINAL,
                                         (sal_uInt16)HMMToTwips(nNewHeight), sal_True, sal_True );