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 /vbahelper/source | |
| parent | c48b928acab9f226ad5ad816fe773c21051431e8 (diff) | |
boost::unordered_map->std::unordered_map
you can get debug stl this way
Change-Id: Ia70a3e7c7c452390e8bee34975d296c9318e4a19
Diffstat (limited to 'vbahelper/source')
| -rw-r--r-- | vbahelper/source/msforms/vbacontrols.cxx | 6 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbaapplicationbase.cxx | 5 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbadocumentsbase.cxx | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index effbe48dc133..85a7bd421e6d 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -32,7 +32,7 @@ #include "vbacontrol.hxx" #include <cppuhelper/implbase2.hxx> #include <ooo/vba/XControlProvider.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> using namespace com::sun::star; using namespace ooo::vba; @@ -40,8 +40,8 @@ using namespace ooo::vba; typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > ArrayWrapImpl; -typedef boost::unordered_map< OUString, sal_Int32, OUStringHash, - ::std::equal_to< OUString > > ControlIndexMap; +typedef std::unordered_map< OUString, sal_Int32, OUStringHash, + std::equal_to< OUString > > ControlIndexMap; typedef std::vector< uno::Reference< awt::XControl > > ControlVec; class ControlArrayWrapper : public ArrayWrapImpl diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 8dfe505fb47d..80ecc53f73f2 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -34,7 +34,6 @@ #include <com/sun/star/awt/XWindow2.hpp> #include <boost/noncopyable.hpp> -#include <boost/unordered_map.hpp> #include <filter/msfilter/msvbahelper.hxx> #include <tools/datetime.hxx> @@ -47,6 +46,8 @@ #include "vbacommandbars.hxx" +#include <unordered_map> + using namespace ::com::sun::star; using namespace ::ooo::vba; @@ -144,7 +145,7 @@ struct VbaTimerInfoHash }; // ====VbaTimerHashMap================================== -typedef ::boost::unordered_map< VbaTimerInfo, VbaTimer*, VbaTimerInfoHash, ::std::equal_to< VbaTimerInfo > > VbaTimerHashMap; +typedef std::unordered_map< VbaTimerInfo, VbaTimer*, VbaTimerInfoHash, std::equal_to< VbaTimerInfo > > VbaTimerHashMap; // ====VbaApplicationBase_Impl================================== struct VbaApplicationBase_Impl diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index 1c82657dcdb9..8c66d5bc029a 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -45,8 +45,8 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <sfx2/objsh.hxx> #include <tools/urlobj.hxx> -#include <boost/unordered_map.hpp> #include <osl/file.hxx> +#include <unordered_map> #include "vbahelper/vbahelper.hxx" #include "vbahelper/vbaapplicationbase.hxx" @@ -58,7 +58,7 @@ using namespace ::com::sun::star; static const char aSpreadsheetDocument[] = "com.sun.star.sheet.SpreadsheetDocument"; static const char aTextDocument[] = "com.sun.star.text.TextDocument"; -typedef boost::unordered_map< OUString, +typedef std::unordered_map< OUString, sal_Int32, OUStringHash, ::std::equal_to< OUString > > NameIndexHash; |