sc/source/core/data/segmenttree.cxx | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
New commits:
commit 29c8aff538d89d7aaeb12447cef1cee363cc6849
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Thu Oct 24 11:54:07 2013 +0200
avoid temporary variables
Change-Id: I5eff10913c31d05e71105ed391a8bef4333ced4f
diff --git a/sc/source/core/data/segmenttree.cxx
b/sc/source/core/data/segmenttree.cxx
index b02f164..3af5c64 100644
--- a/sc/source/core/data/segmenttree.cxx
+++ b/sc/source/core/data/segmenttree.cxx
@@ -153,39 +153,29 @@ bool ScFlatSegmentsImpl<_ValueType,
_ExtValueType>::getRangeData(SCCOLROW nPos,
if (!mbTreeSearchEnabled)
return getRangeDataLeaf(nPos, rData);
- ValueType nValue;
- SCCOLROW nPos1, nPos2;
-
if (!maSegments.is_tree_valid())
maSegments.build_tree();
- if (!maSegments.search_tree(nPos, nValue, &nPos1, &nPos2).second)
+ if (!maSegments.search_tree(nPos, rData.mnValue, &rData.mnPos1,
&rData.mnPos2).second)
return false;
- rData.mnPos1 = nPos1;
- rData.mnPos2 = nPos2-1; // end point is not inclusive.
- rData.mnValue = nValue;
+ rData.mnPos2 = rData.mnPos2-1; // end point is not inclusive.
return true;
}
template<typename _ValueType, typename _ExtValueType>
bool ScFlatSegmentsImpl<_ValueType, _ExtValueType>::getRangeDataLeaf(SCCOLROW
nPos, RangeData& rData)
{
- ValueType nValue;
- SCCOLROW nPos1, nPos2;
-
// Conduct leaf-node only search. Faster when searching between range
insertion.
- ::std::pair<typename fst_type::const_iterator, bool> ret =
- maSegments.search(maItr, nPos, nValue, &nPos1, &nPos2);
+ const ::std::pair<typename fst_type::const_iterator, bool> &ret =
+ maSegments.search(maItr, nPos, rData.mnValue, &rData.mnPos1,
&rData.mnPos2);
if (!ret.second)
return false;
maItr = ret.first;
- rData.mnPos1 = nPos1;
- rData.mnPos2 = nPos2-1; // end point is not inclusive.
- rData.mnValue = nValue;
+ rData.mnPos2 = rData.mnPos2-1; // end point is not inclusive.
return true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
