3 files changed, 8 insertions, 10 deletions
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 1589c8e3ff12..dadeeac23c6d 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -55,7 +55,6 @@
 
 #include <map>
 #include <algorithm>
-#include <functional>
 #include "tools/urlobj.hxx"
 #include "osl/file.hxx"
 #include "toolkit/controls/dialogcontrol.hxx"
@@ -98,7 +97,7 @@ namespace
 
 
 // functor for disposing a control model
-struct DisposeControlModel : public ::std::unary_function< Reference< XControlModel >, void >
+struct DisposeControlModel
 {
     void operator()( Reference< XControlModel >& _rxModel )
     {
@@ -115,7 +114,7 @@ struct DisposeControlModel : public ::std::unary_function< Reference< XControlMo
 
 
 // functor for searching control model by name
-struct FindControlModel : public ::std::unary_function< ControlModelContainerBase::UnoControlModelHolder, bool >
+struct FindControlModel
 {
 private:
     const OUString& m_rName;
@@ -131,7 +130,7 @@ public:
 
 
 // functor for cloning a control model, and insertion into a target list
-struct CloneControlModel : public ::std::unary_function< ControlModelContainerBase::UnoControlModelHolder, void >
+struct CloneControlModel
 {
 private:
     ControlModelContainerBase::UnoControlModelHolderList&   m_rTargetList;
@@ -154,7 +153,7 @@ public:
 
 
 // functor for comparing a XControlModel with a given reference
-struct CompareControlModel : public ::std::unary_function< ControlModelContainerBase::UnoControlModelHolder, bool >
+struct CompareControlModel
 {
 private:
     Reference< XControlModel > m_xReference;
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 5cd187c2fd42..e7824d416f5c 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -501,7 +501,7 @@
     };
 
 
-    struct PropertyNameEqual : public ::std::unary_function< Property, bool >
+    struct PropertyNameEqual
     {
         const OUString&  m_rCompare;
         explicit PropertyNameEqual( const OUString& _rCompare ) : m_rCompare( _rCompare ) { }
@@ -584,7 +584,7 @@
     }
 
 
-    struct Int32Equal : public ::std::unary_function< sal_Int32, bool >
+    struct Int32Equal
     {
         sal_Int32   m_nCompare;
         explicit Int32Equal( sal_Int32 _nCompare ) : m_nCompare( _nCompare ) { }
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index bf131832726e..a173d18afb39 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -59,7 +59,6 @@
 #include <tools/time.hxx>
 
 #include <algorithm>
-#include <functional>
 
 #include "helper/imagealign.hxx"
 #include "helper/unopropertyarrayhelper.hxx"
@@ -2067,7 +2066,7 @@ struct ListItem
 
 typedef beans::Pair< OUString, OUString > UnoListItem;
 
-struct StripItemData : public ::std::unary_function< ListItem, UnoListItem >
+struct StripItemData
 {
     UnoListItem operator()( const ListItem& i_rItem )
     {
@@ -2221,7 +2220,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlListBoxModel::getPropertySet
 
 namespace
 {
-    struct CreateListItem : public ::std::unary_function< OUString, ListItem >
+    struct CreateListItem
     {
         ListItem operator()( const OUString& i_rItemText )
         {