Kaydet (Commit) ff0e6c53 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Fix the order of template arguments.

Change-Id: Ibcc54168a6ca36cc57dd1b838e002f9a10ff29f3
üst cbc44df6
...@@ -48,7 +48,7 @@ using ::formula::FormulaGrammar; ...@@ -48,7 +48,7 @@ using ::formula::FormulaGrammar;
namespace { namespace {
template<typename T> template<typename T>
class FindEnclosingRange : public ::std::unary_function<bool, ScRange*> class FindEnclosingRange : public ::std::unary_function<ScRange*, bool>
{ {
public: public:
FindEnclosingRange(const T& rTest) : mrTest(rTest) {} FindEnclosingRange(const T& rTest) : mrTest(rTest) {}
...@@ -62,7 +62,7 @@ private: ...@@ -62,7 +62,7 @@ private:
}; };
template<typename T> template<typename T>
class FindRangeIn : public ::std::unary_function<bool, ScRange*> class FindRangeIn : public ::std::unary_function<ScRange*, bool>
{ {
public: public:
FindRangeIn(const T& rTest) : mrTest(rTest) {} FindRangeIn(const T& rTest) : mrTest(rTest) {}
...@@ -76,7 +76,7 @@ private: ...@@ -76,7 +76,7 @@ private:
}; };
template<typename T> template<typename T>
class FindIntersectingRange : public ::std::unary_function<bool, ScRange*> class FindIntersectingRange : public ::std::unary_function<ScRange*, bool>
{ {
public: public:
FindIntersectingRange(const T& rTest) : mrTest(rTest) {} FindIntersectingRange(const T& rTest) : mrTest(rTest) {}
...@@ -89,7 +89,7 @@ private: ...@@ -89,7 +89,7 @@ private:
const T& mrTest; const T& mrTest;
}; };
class AppendToList : public ::std::unary_function<void, const ScRange*> class AppendToList : public ::std::unary_function<const ScRange*, void>
{ {
public: public:
AppendToList(vector<ScRange*>& rRanges) : mrRanges(rRanges) {} AppendToList(vector<ScRange*>& rRanges) : mrRanges(rRanges) {}
...@@ -102,7 +102,7 @@ private: ...@@ -102,7 +102,7 @@ private:
vector<ScRange*>& mrRanges; vector<ScRange*>& mrRanges;
}; };
class CountCells : public ::std::unary_function<void, const ScRange*> class CountCells : public ::std::unary_function<const ScRange*, void>
{ {
public: public:
CountCells() : mnCellCount(0) {} CountCells() : mnCellCount(0) {}
...@@ -122,7 +122,7 @@ private: ...@@ -122,7 +122,7 @@ private:
size_t mnCellCount; size_t mnCellCount;
}; };
class FormatString : public ::std::unary_function<void, const ScRange*> class FormatString : public ::std::unary_function<const ScRange*, void>
{ {
public: public:
FormatString(String& rStr, sal_uInt16 nFlags, ScDocument* pDoc, FormulaGrammar::AddressConvention eConv, sal_Unicode cDelim) : FormatString(String& rStr, sal_uInt16 nFlags, ScDocument* pDoc, FormulaGrammar::AddressConvention eConv, sal_Unicode cDelim) :
...@@ -160,15 +160,15 @@ private: ...@@ -160,15 +160,15 @@ private:
bool mbFirst; bool mbFirst;
}; };
class FindDeletedRange : public ::std::unary_function<bool, const ScRange*> class FindDeletedRange : public ::std::unary_function<const ScRange*, bool>
{ {
public: public:
FindDeletedRange( SCsCOL nDx, SCsROW nDy): mnDx(nDx), mnDy(nDy) {} FindDeletedRange( SCsCOL nDx, SCsROW nDy): mnDx(nDx), mnDy(nDy) {}
FindDeletedRange( const FindDeletedRange& r) : mnDx(r.mnDx), mnDy(r.mnDy) {} FindDeletedRange( const FindDeletedRange& r) : mnDx(r.mnDx), mnDy(r.mnDy) {}
bool operator() (const ScRange* p) bool operator() (const ScRange* p)
{ {
ScAddress rStart = p->aStart; const ScAddress& rStart = p->aStart;
ScAddress rEnd = p->aEnd; const ScAddress& rEnd = p->aEnd;
if( rEnd.Col() +mnDx < rStart.Col() ) if( rEnd.Col() +mnDx < rStart.Col() )
return true; return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment