summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-08-01 12:52:09 +0200
committerMichael Stahl <mstahl@redhat.com>2012-08-01 12:54:06 +0200
commit3e3acee762fac71f7356ed1305a64e0278278081 (patch)
treed7478f0c065a577b85b6a2be64cb749b49501754 /sw
parent77165efb4eb4d9735f8dd4f8c99044a36d60a611 (diff)
sorted_vector: turn Find parameter into template
Enforces same type parameters for sorted_vector and Find, and makes it easier to use. Change-Id: Ide456a48f015cb0a9dea7a0bf2bcf2ccad527fd1
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/docary.hxx2
-rw-r--r--sw/inc/ndhints.hxx4
-rw-r--r--sw/source/filter/html/htmlfly.hxx3
-rw-r--r--sw/source/ui/utlui/content.cxx3
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(); }