diff options
| author | tymyjan <tymyjan@yahoo.co.uk> | 2016-04-03 15:53:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-04 05:46:34 +0000 |
| commit | bfb9612226314cd037c8eda30cc6ebbb46dc8512 (patch) | |
| tree | 9cb3d9d1bf9ec134adb0ec9d7e4eae67979f8347 /sc | |
| parent | 362ab03eb276fd7cf73a6882faa4e4f14fcab2a4 (diff) | |
tdf#97499 Fixed containers parameters clearing #3
Change-Id: I1c105de7e1df251533179fba77e3797ef1c4e2d4
Reviewed-on: https://gerrit.libreoffice.org/23752
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/formulaparserpool.hxx | 3 | ||||
| -rw-r--r-- | sc/inc/lookupcache.hxx | 4 | ||||
| -rw-r--r-- | sc/inc/macromgr.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/dbfunc3.cxx | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/sc/inc/formulaparserpool.hxx b/sc/inc/formulaparserpool.hxx index 28e8a73c810d..ba8b1c51d499 100644 --- a/sc/inc/formulaparserpool.hxx +++ b/sc/inc/formulaparserpool.hxx @@ -44,8 +44,7 @@ private: typedef std::unordered_map< OUString, css::uno::Reference< css::sheet::XFormulaParser >, - OUStringHash, - ::std::equal_to< OUString > > ParserMap; + OUStringHash > ParserMap; const ScDocument& mrDoc; ParserMap maParsers; diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx index 9412de35ebbb..9e33c2b1d7ac 100644 --- a/sc/inc/lookupcache.hxx +++ b/sc/inc/lookupcache.hxx @@ -185,7 +185,7 @@ private: } }; - typedef std::unordered_map< QueryKey, QueryCriteriaAndResult, QueryKey::Hash, ::std::equal_to< QueryKey > > QueryMap; + typedef std::unordered_map< QueryKey, QueryCriteriaAndResult, QueryKey::Hash > QueryMap; QueryMap maQueryMap; ScRange maRange; ScDocument * mpDoc; @@ -195,7 +195,7 @@ private: }; -typedef std::unordered_map< ScRange, ScLookupCache*, ScLookupCache::Hash, ::std::equal_to< ScRange > > ScLookupCacheMap; +typedef std::unordered_map< ScRange, ScLookupCache*, ScLookupCache::Hash > ScLookupCacheMap; #endif diff --git a/sc/inc/macromgr.hxx b/sc/inc/macromgr.hxx index afe803e4432d..9906b55d08f9 100644 --- a/sc/inc/macromgr.hxx +++ b/sc/inc/macromgr.hxx @@ -38,7 +38,7 @@ public: void BroadcastModuleUpdate(const OUString& aModuleName); private: - typedef std::unordered_map< OUString, bool, OUStringHash, ::std::equal_to< OUString > > NameBoolMap; + typedef std::unordered_map< OUString, bool, OUStringHash > NameBoolMap; NameBoolMap mhFuncToVolatile; css::uno::Reference< css::container::XContainerListener > mxContainerListener; diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 4e90c19531bf..576c349ebc58 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -1761,7 +1761,7 @@ bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest ) bool bValid = ( aDestData.Dimension >= 0 ); // dropping onto a field // look through the source range - std::unordered_set< OUString, OUStringHash, std::equal_to<OUString> > aMembersSet; // for lookup + std::unordered_set< OUString, OUStringHash > aMembersSet; // for lookup std::vector< OUString > aMembersVector; // members in original order, for inserting aMembersVector.reserve( std::max( static_cast<SCSIZE>( rSource.aEnd.Col() - rSource.aStart.Col() + 1 ), static_cast<SCSIZE>( rSource.aEnd.Row() - rSource.aStart.Row() + 1 ) ) ); |