[Libreoffice-commits] core.git: sw/source

[Stephan Bergmann]

 sw/source/filter/inc/wrtswtbl.hxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit a3886c529cefdc0cb3db8ca27b3ea02f456c0470
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Nov 15 12:06:34 2013 +0100

    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

diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index f4b7d50..6c25b8a 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(); }
 };