diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-02-04 21:51:57 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-02-05 00:29:19 -0500 |
| commit | fc16069d1a8db45b7ecaa01c3ee1af0e904062c2 (patch) | |
| tree | e87356f68b73003c8f849470e3e3aabce7846385 /sc/source/ui/view | |
| parent | b8a863a219ae3efaa050e5f213d5ae3a91459c06 (diff) | |
Reimplement ScMarkData::GetMarkedRowSpans() to use flat_segment_tree directly.
Change-Id: I90a1d4b3ae2e6aff9a7926b5842bc85ac172683d
Diffstat (limited to 'sc/source/ui/view')
| -rw-r--r-- | sc/source/ui/view/viewfun2.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 2a0b118179b7..00e0462c0436 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -109,12 +109,13 @@ sal_Bool ScViewFunc::AdjustBlockHeight( sal_Bool bPaint, ScMarkData* pMarkData ) pMarkData = &GetViewData()->GetMarkData(); ScDocument* pDoc = pDocSh->GetDocument(); - std::vector<sc::RowSpan> aMarkedRows; - pMarkData->GetMarkedRowSpans(GetViewData()->GetTabNo(), aMarkedRows); + std::vector<sc::ColRowSpan> aMarkedRows = + pMarkData->GetMarkedRowSpans(GetViewData()->GetTabNo()); + if (aMarkedRows.empty()) { SCROW nCurRow = GetViewData()->GetCurY(); - aMarkedRows.push_back(sc::RowSpan(nCurRow, nCurRow)); + aMarkedRows.push_back(sc::ColRowSpan(nCurRow, nCurRow)); } double nPPTX = GetViewData()->GetPPTX(); @@ -138,11 +139,11 @@ sal_Bool ScViewFunc::AdjustBlockHeight( sal_Bool bPaint, ScMarkData* pMarkData ) SCTAB nTab = *itr; bool bChanged = false; SCROW nPaintY = 0; - std::vector<sc::RowSpan>::const_iterator itRows = aMarkedRows.begin(), itRowsEnd = aMarkedRows.end(); + std::vector<sc::ColRowSpan>::const_iterator itRows = aMarkedRows.begin(), itRowsEnd = aMarkedRows.end(); for (; itRows != itRowsEnd; ++itRows) { - SCROW nStartNo = itRows->mnRow1; - SCROW nEndNo = itRows->mnRow2; + SCROW nStartNo = itRows->mnStart; + SCROW nEndNo = itRows->mnEnd; if (pDoc->SetOptimalHeight(aCxt, nStartNo, nEndNo, nTab)) { if (!bChanged) |