diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-05-06 10:27:55 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-05-09 13:34:33 -0400 |
| commit | 6cbca6fc0ceee4370a962d67db362f3e22270e18 (patch) | |
| tree | 995920538d06f7ff60ebe3fe2447b752bfdd159e /sc | |
| parent | With the removal of CELLTYPE_NOTE, IsBlank() is now always false. (diff) | |
| download | core-6cbca6fc0ceee4370a962d67db362f3e22270e18.tar.gz core-6cbca6fc0ceee4370a962d67db362f3e22270e18.zip | |
Adjust for API change in mdds 0.8.0.
The return value of search_tree() in flat_segment_tree has changed.
Change-Id: I51d8676bd0621bd43b3f8a8f6be4bf4056d45904
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/dpfilteredcache.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/segmenttree.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/colrowst.cxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/xml/XMLStylesExportHelper.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx index 47adbbeb9316..51bf57116391 100644 --- a/sc/source/core/data/dpfilteredcache.cxx +++ b/sc/source/core/data/dpfilteredcache.cxx @@ -172,7 +172,7 @@ void ScDPFilteredCache::fillTable( { if (nRow > nEndSegment) { - if (!maShowByFilter.search_tree(nRow, bShow, NULL, &nEndSegment)) + if (!maShowByFilter.search_tree(nRow, bShow, NULL, &nEndSegment).second) { OSL_FAIL("Tree search failed!"); continue; diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx index e74b0fd8b765..b02f16470013 100644 --- a/sc/source/core/data/segmenttree.cxx +++ b/sc/source/core/data/segmenttree.cxx @@ -159,7 +159,7 @@ bool ScFlatSegmentsImpl<_ValueType, _ExtValueType>::getRangeData(SCCOLROW nPos, if (!maSegments.is_tree_valid()) maSegments.build_tree(); - if (!maSegments.search_tree(nPos, nValue, &nPos1, &nPos2)) + if (!maSegments.search_tree(nPos, nValue, &nPos1, &nPos2).second) return false; rData.mnPos1 = nPos1; diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx index 53aa04b678a1..bc43a1e1984e 100644 --- a/sc/source/filter/excel/colrowst.cxx +++ b/sc/source/filter/excel/colrowst.cxx @@ -208,7 +208,7 @@ void XclImpColRowSettings::Convert( SCTAB nScTab ) if (GetColFlag(nCol, EXC_COLROW_USED)) { sal_uInt16 nTmp; - if (maColWidths.search_tree(nCol, nTmp)) + if (maColWidths.search_tree(nCol, nTmp).second) nWidth = nTmp; } @@ -258,7 +258,7 @@ void XclImpColRowSettings::Convert( SCTAB nScTab ) for (SCROW i = nPrevRow; i <= nRow - 1; ++i) { SCROW nLast; - if (!maRowHeights.search_tree(i, nHeight, NULL, &nLast)) + if (!maRowHeights.search_tree(i, nHeight, NULL, &nLast).second) { // search failed for some reason return; diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index b791e8195330..9020d384e95d 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -1280,7 +1280,7 @@ sal_Int32 ScRowStyles::GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 r.build_tree(); sal_Int32 nStyle; sal_Int32 nStart, nEnd; - if (r.search_tree(nField, nStyle, &nStart, &nEnd)) + if (r.search_tree(nField, nStyle, &nStart, &nEnd).second) { // Cache this value for better performance. maCache.mnTable = nTable; |