summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2012-09-13 23:03:38 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2012-09-13 23:05:01 -0400
commitff0e6c53782196fe1fc223ae08964a34eb20f740 (patch)
tree069f0c47f4155a4555f833566fc7b07db2b5ffbf /sc
parentcbc44df67cfd13849f3de85edcdd39b5fec8b06c (diff)
Fix the order of template arguments.
Change-Id: Ibcc54168a6ca36cc57dd1b838e002f9a10ff29f3
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/rangelst.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index f9e57b720599..7ad721203e34 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -48,7 +48,7 @@ using ::formula::FormulaGrammar;
namespace {
template<typename T>
-class FindEnclosingRange : public ::std::unary_function<bool, ScRange*>
+class FindEnclosingRange : public ::std::unary_function<ScRange*, bool>
{
public:
FindEnclosingRange(const T& rTest) : mrTest(rTest) {}
@@ -62,7 +62,7 @@ private:
};
template<typename T>
-class FindRangeIn : public ::std::unary_function<bool, ScRange*>
+class FindRangeIn : public ::std::unary_function<ScRange*, bool>
{
public:
FindRangeIn(const T& rTest) : mrTest(rTest) {}
@@ -76,7 +76,7 @@ private:
};
template<typename T>
-class FindIntersectingRange : public ::std::unary_function<bool, ScRange*>
+class FindIntersectingRange : public ::std::unary_function<ScRange*, bool>
{
public:
FindIntersectingRange(const T& rTest) : mrTest(rTest) {}
@@ -89,7 +89,7 @@ private:
const T& mrTest;
};
-class AppendToList : public ::std::unary_function<void, const ScRange*>
+class AppendToList : public ::std::unary_function<const ScRange*, void>
{
public:
AppendToList(vector<ScRange*>& rRanges) : mrRanges(rRanges) {}
@@ -102,7 +102,7 @@ private:
vector<ScRange*>& mrRanges;
};
-class CountCells : public ::std::unary_function<void, const ScRange*>
+class CountCells : public ::std::unary_function<const ScRange*, void>
{
public:
CountCells() : mnCellCount(0) {}
@@ -122,7 +122,7 @@ private:
size_t mnCellCount;
};
-class FormatString : public ::std::unary_function<void, const ScRange*>
+class FormatString : public ::std::unary_function<const ScRange*, void>
{
public:
FormatString(String& rStr, sal_uInt16 nFlags, ScDocument* pDoc, FormulaGrammar::AddressConvention eConv, sal_Unicode cDelim) :
@@ -160,15 +160,15 @@ private:
bool mbFirst;
};
-class FindDeletedRange : public ::std::unary_function<bool, const ScRange*>
+class FindDeletedRange : public ::std::unary_function<const ScRange*, bool>
{
public:
FindDeletedRange( SCsCOL nDx, SCsROW nDy): mnDx(nDx), mnDy(nDy) {}
FindDeletedRange( const FindDeletedRange& r) : mnDx(r.mnDx), mnDy(r.mnDy) {}
bool operator() (const ScRange* p)
{
- ScAddress rStart = p->aStart;
- ScAddress rEnd = p->aEnd;
+ const ScAddress& rStart = p->aStart;
+ const ScAddress& rEnd = p->aEnd;
if( rEnd.Col() +mnDx < rStart.Col() )
return true;