summaryrefslogtreecommitdiffstats
path: root/comphelper/source/container
diff options
context:
space:
mode:
Diffstat (limited to 'comphelper/source/container')
-rw-r--r--comphelper/source/container/IndexedPropertyValuesContainer.cxx1
-rw-r--r--comphelper/source/container/NamedPropertyValuesContainer.cxx1
-rw-r--r--comphelper/source/container/enumerablemap.cxx12
3 files changed, 7 insertions, 7 deletions
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
index 0de5913a42c2..1df9a1e9e778 100644
--- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
@@ -18,6 +18,7 @@
*/
#include "comphelper_module.hxx"
+#include "comphelper_services.hxx"
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/uno/Sequence.h>
diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx
index fd95d7ec7fae..c94efa68a002 100644
--- a/comphelper/source/container/NamedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx
@@ -19,6 +19,7 @@
#include "comphelper_module.hxx"
+#include "comphelper_services.hxx"
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/uno/Sequence.h>
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index e4273c508f67..4c225574e73b 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -19,6 +19,7 @@
#include "comphelper_module.hxx"
+#include "comphelper_services.hxx"
#include "comphelper/anytostring.hxx"
#include "comphelper/anycompare.hxx"
#include "comphelper/componentbase.hxx"
@@ -38,6 +39,7 @@
#include <typelib/typedescription.hxx>
#include <map>
+#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
@@ -111,7 +113,7 @@ namespace comphelper
{
}
private:
- MapData& operator=( const MapData& _source ); // not implemented
+ MapData& operator=( const MapData& _source ) SAL_DELETED_FUNCTION;
};
@@ -252,7 +254,8 @@ namespace comphelper
//= MapEnumerator
- class MapEnumerator : public IMapModificationListener
+ class MapEnumerator:
+ public IMapModificationListener, private boost::noncopyable
{
public:
MapEnumerator( ::cppu::OWeakObject& _rParent, MapData& _mapData, const EnumerationType _type )
@@ -292,11 +295,6 @@ namespace comphelper
const EnumerationType m_eType;
KeyedValues::const_iterator m_mapPos;
bool m_disposed;
-
- private:
- MapEnumerator(); // not implemented
- MapEnumerator( const MapEnumerator& ); // not implemented
- MapEnumerator& operator=( const MapEnumerator& ); // not implemented
};