diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-07-26 23:00:58 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2012-07-27 11:15:41 +0200 |
| commit | eb84b4678a16cc48f1fdb21098b1fc978800a83e (patch) | |
| tree | 3451af2c1687949f290c6c9fabfb94044c721e98 | |
| parent | c8b15d9db2c9ebca2251eb28efb304be8032e371 (diff) | |
mark manual row heights correctly during import, fdo#52393
Change-Id: Id8a1658dbe6d9a89c89d1a0633392b0fa1104c4e
Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
| -rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 41f10ea731af..c43047cb157d 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 ); |