summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-11-15 12:06:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-11-15 12:06:34 +0100
commita3886c529cefdc0cb3db8ca27b3ea02f456c0470 (patch)
treea6a77fccfe6d8fadd510abc4098a5612273a36d8
parent66bd352d3a5516404cfc16f9a760655744a39949 (diff)
o3tl::sorted_vector Compare needs to be a strict weak ordering
No idea what the odd COLFUZZY SwWriteTableCol::operator == and < are supposed to be good for, so leave them alone for now. Change-Id: I52528a097f18ff12fac9725d802a3988c9dfa7e2
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index f4b7d50b1baa..6c25b8a4e82e 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -219,8 +219,13 @@ inline int SwWriteTableCol::operator<( const SwWriteTableCol& rCol ) const
return nPos < rCol.nPos - COLFUZZY;
}
+struct SwWriteTableColLess {
+ bool operator()(SwWriteTableCol const * lhs, SwWriteTableCol const * rhs) {
+ return lhs->GetPos() < rhs->GetPos();
+ }
+};
-class SwWriteTableCols : public o3tl::sorted_vector<SwWriteTableCol*, o3tl::less_ptr_to<SwWriteTableCol> > {
+class SwWriteTableCols : public o3tl::sorted_vector<SwWriteTableCol*, SwWriteTableColLess> {
public:
~SwWriteTableCols() { DeleteAndDestroyAll(); }
};