diff options
author | Noel Power <noel.power@novell.com> | 2012-05-24 12:44:19 +0100 |
---|---|---|
committer | Noel Power <noel.power@novell.com> | 2012-05-24 12:50:07 +0100 |
commit | 9746c6de3a05fe9284d6d6bb2f636bfe912733cd (patch) | |
tree | 055874b896ec04cce935675cc9dd92d70d9269fa /sc | |
parent | f0f8576596e104549e66e62d15a262acfd70dcec (diff) |
fix excel row height export problems ( I hope ) fdo#50304
Change-Id: I43ddb32ecba36107f5973fa5dcf2499cd1330668
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/filter/excel/xetable.cxx | 53 |
1 files changed, 38 insertions, 15 deletions
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index e56942690757..5656b716199d 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -2029,22 +2029,41 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt XclExpDefaultRowData aMaxDefData; size_t nMaxDefCount = 0; // only look for default format in existing rows, if there are more than unused - for (itr = itrBeg; itr != itrEnd; ++itr) + bool bSearchExisting = ( maRowMap.size() >= ( GetMaxPos().Row() - maRowMap.size() ) ); + if ( bSearchExisting ) { - const RowRef& rRow = itr->second; - if (rRow->IsDefaultable()) + for (itr = itrBeg; itr != itrEnd; ++itr) { - XclExpDefaultRowData aDefData( *rRow ); - size_t& rnDefCount = aDefRowMap[ aDefData ]; - ++rnDefCount; - if( rnDefCount > nMaxDefCount ) + const RowRef& rRow = itr->second; + if (rRow->IsDefaultable()) { - nMaxDefCount = rnDefCount; - aMaxDefData = aDefData; + XclExpDefaultRowData aDefData( *rRow ); + size_t& rnDefCount = aDefRowMap[ aDefData ]; + ++rnDefCount; + if( rnDefCount > nMaxDefCount ) + { + nMaxDefCount = rnDefCount; + aMaxDefData = aDefData; + } + } + } + } + else + { + // find a suitable unused row to get the default height from, + // searching backwards from max row + for ( SCROW nRow = GetMaxPos().Row(); nRow >= 0; --nRow ) + { + if ( maRowMap.find( nRow ) == maRowMap.end() ) + { + // use first encountered unused row height as default + // I wonder should we do this always ( and abandon the search + // of exising rows ) + aMaxDefData.mnHeight = GetDoc().GetRowHeight(nRow, GetCurrScTab(), false); + break; } } } - // return the default row format to caller rDefRowData = aMaxDefData; @@ -2146,13 +2165,17 @@ XclExpDimensions* XclExpRowBuffer::GetDimensions() XclExpRow& XclExpRowBuffer::GetOrCreateRow( sal_uInt32 nXclRow, bool bRowAlwaysEmpty ) { - RowMap::iterator itr = maRowMap.find(nXclRow); - if (itr == maRowMap.end()) + RowMap::iterator itr = maRowMap.begin(); + for ( size_t nFrom = maRowMap.size(); nFrom <= nXclRow; ++nFrom ) { - RowRef p(new XclExpRow(GetRoot(), nXclRow, maOutlineBfr, bRowAlwaysEmpty)); - ::std::pair<RowMap::iterator, bool> r = maRowMap.insert(RowMap::value_type(nXclRow, p)); - itr = r.first; + itr = maRowMap.find(nFrom); + if ( itr == maRowMap.end() ) + { + RowRef p(new XclExpRow(GetRoot(), nFrom, maOutlineBfr, bRowAlwaysEmpty)); + maRowMap.insert(RowMap::value_type(nFrom, p)); + } } + itr = maRowMap.find(nXclRow); return *itr->second; } |