sw/source/core/access/accmap.cxx | 64 +++++++++++++++++++++++++++++++--------
1 file changed, 51 insertions(+), 13 deletions(-)
New commits:
commit 2ec556b0726e51010aebaa4849195444fda4aa1d
Author: Juan Picca <jumap...@gmail.com>
Date: Thu Nov 13 08:03:21 2014 -0200
fdo#75757: remove inheritance to std::map
Change-Id: I26ec60868c7854517b81ade3aec6b7ab29b0aa89
Reviewed-on: https://gerrit.libreoffice.org/12401
Reviewed-by: Takeshi Abe <t...@fixedpoint.jp>
Tested-by: Takeshi Abe <t...@fixedpoint.jp>
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 6a153ff..92e75a4 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -86,11 +86,18 @@ struct SwFrmFunc
}
};
-typedef ::std::map < const SwFrm *, uno::WeakReference < XAccessible >,
SwFrmFunc > _SwAccessibleContextMap_Impl;
-
-class SwAccessibleContextMap_Impl: public _SwAccessibleContextMap_Impl
+class SwAccessibleContextMap_Impl
{
public:
+ typedef const SwFrm *
key_type;
+ typedef uno::WeakReference < XAccessible >
mapped_type;
+ typedef std::pair<const key_type,mapped_type>
value_type;
+ typedef SwFrmFunc
key_compare;
+ typedef std::map<key_type,mapped_type,key_compare>::iterator
iterator;
+ typedef std::map<key_type,mapped_type,key_compare>::const_iterator
const_iterator;
+private:
+ std::map <key_type,mapped_type,key_compare> maMap;
+public:
#if OSL_DEBUG_LEVEL > 0
bool mbLocked;
@@ -102,6 +109,13 @@ public:
#endif
{}
+ iterator begin() { return maMap.begin(); }
+ iterator end() { return maMap.end(); }
+ bool empty() const { return maMap.empty(); }
+ void clear() { maMap.clear(); }
+ iterator find(const key_type& key) { return maMap.find(key); }
+ std::pair<iterator,bool> insert(const value_type& value ) { return
maMap.insert(value); }
+ iterator erase(const_iterator pos) { return maMap.erase(pos); }
};
class SwDrawModellListener_Impl : public SfxListener,
@@ -579,11 +593,23 @@ struct SwAccessibleChildFunc
}
};
-typedef ::std::map < SwAccessibleChild, SwAccessibleEventList_Impl::iterator,
- SwAccessibleChildFunc > _SwAccessibleEventMap_Impl;
-
-class SwAccessibleEventMap_Impl: public _SwAccessibleEventMap_Impl
+class SwAccessibleEventMap_Impl
{
+public:
+ typedef SwAccessibleChild
key_type;
+ typedef SwAccessibleEventList_Impl::iterator
mapped_type;
+ typedef std::pair<const key_type,mapped_type>
value_type;
+ typedef SwAccessibleChildFunc
key_compare;
+ typedef std::map<key_type,mapped_type,key_compare>::iterator
iterator;
+ typedef std::map<key_type,mapped_type,key_compare>::const_iterator
const_iterator;
+private:
+ std::map <key_type,mapped_type,key_compare> maMap;
+public:
+ iterator begin() { return maMap.begin(); }
+ iterator end() { return maMap.end(); }
+ iterator find(const key_type& key) { return maMap.find(key); }
+ std::pair<iterator,bool> insert(const value_type& value ) { return
maMap.insert(value); }
+ iterator erase(const_iterator pos) { return maMap.erase(pos); }
};
struct SwAccessibleParaSelection
@@ -607,12 +633,24 @@ struct SwXAccWeakRefComp
}
};
-typedef ::std::map< uno::WeakReference < XAccessible >,
- SwAccessibleParaSelection,
- SwXAccWeakRefComp > _SwAccessibleSelectedParas_Impl;
-
-class SwAccessibleSelectedParas_Impl: public _SwAccessibleSelectedParas_Impl
-{};
+class SwAccessibleSelectedParas_Impl
+{
+public:
+ typedef uno::WeakReference < XAccessible >
key_type;
+ typedef SwAccessibleParaSelection
mapped_type;
+ typedef std::pair<const key_type,mapped_type>
value_type;
+ typedef SwXAccWeakRefComp
key_compare;
+ typedef std::map<key_type,mapped_type,key_compare>::iterator
iterator;
+ typedef std::map<key_type,mapped_type,key_compare>::const_iterator
const_iterator;
+private:
+ std::map<key_type,mapped_type,key_compare> maMap;
+public:
+ iterator begin() { return maMap.begin(); }
+ iterator end() { return maMap.end(); }
+ iterator find(const key_type& key) { return maMap.find(key); }
+ std::pair<iterator,bool> insert(const value_type& value ) { return
maMap.insert(value); }
+ iterator erase(const_iterator pos) { return maMap.erase(pos); }
+};
// helper class that stores preview data
class SwAccPreviewData
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
