Revert "sorted_vector: turn Find parameter into template"

This reverts commit 3e3acee762fac71f7356ed1305a64e0278278081.

It was a nice idea, but C++ is not yet ready for it; with the travesty
of parametric polymorphism in C++ the find_unique inside the definition
of find_unique actually refers to find_unique<Value, Compare>, so there
is no way to actually refer to template<Value, Compare> find_unique
inside its definition.  Thanks to Luboš Luňák for explaining
the problem to me.  Somehow this does work in GCC 4.7 even with
-std=c++98, likely by accident.

4 files changed, 7 insertions, 5 deletions

diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 4f9b9af9d2ce..7c9f92884694 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -145,7 +145,7 @@ struct CompareSwRedlineTbl
 };
 class _SwRedlineTbl
     : public o3tl::sorted_vector<SwRedline*, CompareSwRedlineTbl,
-                o3tl::find_partialorder_ptrequals>
+        o3tl::find_partialorder_ptrequals<SwRedline*, CompareSwRedlineTbl> >
 {
 public:
     ~_SwRedlineTbl();
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index 773bb1f4bfaa..154c95763740 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -76,14 +76,14 @@ struct CompareSwpHtStart
     bool operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const;
 };
 class SwpHtStart : public o3tl::sorted_vector<SwTxtAttr*, CompareSwpHtStart,
-    o3tl::find_partialorder_ptrequals> {};
+    o3tl::find_partialorder_ptrequals<SwTxtAttr*, CompareSwpHtStart> > {};
 
 struct CompareSwpHtEnd
 {
     bool operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const;
 };
 class SwpHtEnd : public o3tl::sorted_vector<SwTxtAttr*, CompareSwpHtEnd,
-    o3tl::find_partialorder_ptrequals> {};
+    o3tl::find_partialorder_ptrequals<SwTxtAttr*, CompareSwpHtEnd> > {};
 
 // Class SwpHintsArr
 
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index 8184d5cd140b..19b14e09153a 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -130,7 +130,8 @@ public:
 class SwHTMLPosFlyFrms
     : public o3tl::sorted_vector<SwHTMLPosFlyFrm*,
                 o3tl::less_ptr_to<SwHTMLPosFlyFrm>,
-                o3tl::find_partialorder_ptrequals>
+                o3tl::find_partialorder_ptrequals<SwHTMLPosFlyFrm*,
+                    o3tl::less_ptr_to<SwHTMLPosFlyFrm> > >
 {};
 
 #endif
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 9330f46519ba..f150239206db 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -106,7 +106,8 @@ using namespace ::com::sun::star::container;
 
 class SwContentArr
     : public o3tl::sorted_vector<SwContent*, o3tl::less_ptr_to<SwContent>,
-                o3tl::find_partialorder_ptrequals>
+                o3tl::find_partialorder_ptrequals<SwContent*,
+                    o3tl::less_ptr_to<SwContent> > >
 {
 public:
     ~SwContentArr() { DeleteAndDestroyAll(); }