Revert "Revert "sorted_vector: turn Find parameter into template""

This reverts commit 8291d41667b1a63d35bf818aaf9d75529e1f12f0.

Un-revert that, with a tweak: with the bizarre name lookup semantics
in C++, the proper way to refer to a template (as opposed to a template
instance) is by prefixing the name with its namespace, which does seem
to work with MSVC2008 & GCC 4.7; thanks to Stephan Bergmann for the hint.

Change-Id: Id9cccbe68fb3ce2dd070c4b3dbd21782c92170ca

4 files changed, 5 insertions, 7 deletions

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