diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-01-01 19:58:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-02 16:14:36 +0000 |
| commit | fd1372ba8b1c3eb3c7fad6d9c623176c8071f31b (patch) | |
| tree | 448f0d04f780007b3eeeb76b7c4c8c54cbfd6d9b /editeng | |
| parent | c48b928acab9f226ad5ad816fe773c21051431e8 (diff) | |
boost::unordered_map->std::unordered_map
you can get debug stl this way
Change-Id: Ia70a3e7c7c452390e8bee34975d296c9318e4a19
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/inc/pch/precompiled_editeng.hxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit4.cxx | 6 | ||||
| -rw-r--r-- | editeng/source/misc/svxacorr.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/uno/unoipset.cxx | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index 30fed2f37736..b7da7d29304b 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -26,8 +26,8 @@ #include <boost/ref.hpp> #include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> #include <cassert> +#include <unordered_map> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index f75d85c7ad49..63932c9a811a 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -76,10 +76,10 @@ #include <svtools/rtfkeywd.hxx> #include <editeng/edtdlg.hxx> -#include <vector> #include <boost/scoped_ptr.hpp> #include <boost/make_shared.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> +#include <vector> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -454,7 +454,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) rOutput.WriteChar( '}' ); rOutput << endl; - boost::unordered_map<SfxStyleSheetBase*, sal_uInt32> aStyleSheetToIdMap; + std::unordered_map<SfxStyleSheetBase*, sal_uInt32> aStyleSheetToIdMap; // StyleSheets... if ( GetStyleSheetPool() ) { diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 0003029c4f4a..a2754c48c7d1 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -64,6 +64,8 @@ #include <com/sun/star/ucb/NameClash.hpp> #include <xmloff/xmltoken.hxx> #include <vcl/help.hxx> +#include <set> +#include <unordered_map> using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::uno; @@ -2697,7 +2699,7 @@ struct CompareSvxAutocorrWordList namespace { typedef std::set<SvxAutocorrWord*, CompareSvxAutocorrWordList> AutocorrWordSetType; -typedef boost::unordered_map<OUString, SvxAutocorrWord*, OUStringHash> AutocorrWordHashType; +typedef std::unordered_map<OUString, SvxAutocorrWord*, OUStringHash> AutocorrWordHashType; } diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 070000054569..59f08cdb5144 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <svl/eitem.hxx> -#include <boost/unordered_map.hpp> #include <svl/itemprop.hxx> #include <editeng/unoipset.hxx> |