diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-01-02 16:22:46 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-03 21:11:20 +0000 |
| commit | 79f115b91e5ad4d9038e127bf0b57843e157eac9 (patch) | |
| tree | 704dee023dca3144f78613c41ba528ed65b1d80f /sc/source/ui/vba | |
| parent | 05dcb073d60579a142e3074fb1b137f36840ee9e (diff) | |
boost::unordered_map->std::unordered_map
Change-Id: I2c65709cda6f10810452dfb8aa1a247cb3a5564f
Diffstat (limited to 'sc/source/ui/vba')
| -rw-r--r-- | sc/source/ui/vba/vbachartobjects.hxx | 7 | ||||
| -rw-r--r-- | sc/source/ui/vba/vbawindow.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/vba/vbawindows.cxx | 7 | ||||
| -rw-r--r-- | sc/source/ui/vba/vbaworkbooks.cxx | 1 |
4 files changed, 6 insertions, 13 deletions
diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx index 4ca84fba85d9..810d6474a1a3 100644 --- a/sc/source/ui/vba/vbachartobjects.hxx +++ b/sc/source/ui/vba/vbachartobjects.hxx @@ -29,15 +29,8 @@ #include <com/sun/star/container/XEnumerationAccess.hpp> #include <vbahelper/vbacollectionimpl.hxx> #include "excelvbahelper.hxx" -#include <boost/unordered_map.hpp> typedef CollTestImplHelper< ov::excel::XChartObjects > ChartObjects_BASE; -/* #TODO see if this hash table is 'really' necessary -typedef ::boost::unordered_map< OUString, -css::uno::Reference< ov::excel::XChartObject >, - OUStringHash, - ::std::equal_to< OUString > > aHashTable; -*/ class ScVbaChartObjects : public ChartObjects_BASE { diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 53942a7c5746..8f0168e93e66 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -38,17 +38,17 @@ #include <tabvwsh.hxx> #include <docuno.hxx> #include <sc.hrc> -#include <boost/unordered_map.hpp> #include <sfx2/viewfrm.hxx> #include <vcl/wrkwin.hxx> #include "unonames.hxx" #include "markdata.hxx" +#include <unordered_map> using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel::XlWindowState; -typedef boost::unordered_map< OUString, +typedef std::unordered_map< OUString, SCTAB, OUStringHash, ::std::equal_to< OUString > > NameIndexHash; diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index 25928acfea89..e70809a51f88 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -18,7 +18,6 @@ */ #include "vbawindows.hxx" -#include <boost/unordered_map.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/frame/Desktop.hpp> @@ -27,12 +26,14 @@ #include "vbawindow.hxx" #include "vbaglobals.hxx" +#include <unordered_map> + using namespace ::com::sun::star; using namespace ::ooo::vba; -typedef boost::unordered_map< OUString, +typedef std::unordered_map< OUString, sal_Int32, OUStringHash, -::std::equal_to< OUString > > NameIndexHash; +std::equal_to< OUString > > NameIndexHash; static uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ) { diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index ba030a688fab..8a9d26730946 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -53,7 +53,6 @@ #include "vbaworkbooks.hxx" #include <vbahelper/vbahelper.hxx> -#include <boost/unordered_map.hpp> #include <vector> #include <osl/file.hxx> using namespace ::ooo::vba; |