diff options
| author | tymyjan <tymyjan@yahoo.co.uk> | 2016-04-03 17:42:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-04 05:49:06 +0000 |
| commit | c20cc7e79b3b3d8bcf9136bfdc2bab6dd6a4be06 (patch) | |
| tree | daecf1a18f37c46e0cca823f976b419de8e4f2c2 /sc/source | |
| parent | bfb9612226314cd037c8eda30cc6ebbb46dc8512 (diff) | |
tdf#97499 Fixed containers parameters clearing #4
Change-Id: I7c96181399f4d7e62d4aceca404b22d68f903513
Reviewed-on: https://gerrit.libreoffice.org/23754
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/core/tool/formulaparserpool.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/excimp8.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/vba/vbawindow.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/vba/vbawindows.cxx | 3 |
4 files changed, 4 insertions, 7 deletions
diff --git a/sc/source/core/tool/formulaparserpool.cxx b/sc/source/core/tool/formulaparserpool.cxx index 8fa6114b39e9..68213df37bdd 100644 --- a/sc/source/core/tool/formulaparserpool.cxx +++ b/sc/source/core/tool/formulaparserpool.cxx @@ -48,7 +48,7 @@ public: private: typedef std::unordered_map< OUString, Reference< XSingleComponentFactory >, - OUStringHash, std::equal_to< OUString > > FactoryMap; + OUStringHash > FactoryMap; Reference< XComponentContext > mxContext; /// Global component context. FactoryMap maFactories; /// All parser factories, mapped by formula namespace. diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index a848a464919e..2695c4b12e68 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -113,8 +113,7 @@ using namespace ::comphelper; class OleNameOverrideContainer : public ::cppu::WeakImplHelper< container::XNameContainer > { private: - typedef std::unordered_map< OUString, uno::Reference< container::XIndexContainer >, OUStringHash, - std::equal_to< OUString > > NamedIndexToOleName; + typedef std::unordered_map< OUString, uno::Reference< container::XIndexContainer >, OUStringHash > NamedIndexToOleName; NamedIndexToOleName IdToOleNameHash; ::osl::Mutex m_aMutex; public: diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 081400cafb16..bda7d5daa87f 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -50,8 +50,7 @@ using namespace ::ooo::vba; using namespace ::ooo::vba::excel::XlWindowState; typedef std::unordered_map< OUString, -SCTAB, OUStringHash, -::std::equal_to< OUString > > NameIndexHash; +SCTAB, OUStringHash > NameIndexHash; typedef std::vector< uno::Reference< sheet::XSpreadsheet > > Sheets; diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index 1f90d035c3df..0b0b54a1ecf6 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -33,8 +33,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; typedef std::unordered_map< OUString, -sal_Int32, OUStringHash, -std::equal_to< OUString > > NameIndexHash; +sal_Int32, OUStringHash > NameIndexHash; static uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ) { |