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 /include | |
| 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 'include')
| -rw-r--r-- | include/comphelper/sequenceashashmap.hxx | 3 | ||||
| -rw-r--r-- | include/formula/FormulaCompiler.hxx | 4 | ||||
| -rw-r--r-- | include/svtools/toolboxcontroller.hxx | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx index 9c92bb03a6b1..cea549305922 100644 --- a/include/comphelper/sequenceashashmap.hxx +++ b/include/comphelper/sequenceashashmap.hxx @@ -43,8 +43,7 @@ namespace comphelper{ struct SequenceAsHashMapBase : public std::unordered_map< OUString , css::uno::Any , - OUStringHash , - ::std::equal_to< OUString > > + OUStringHash > { }; diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index 516d7f0efe14..081afa64f48f 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -60,8 +60,8 @@ struct FormulaArrayStack }; -typedef std::unordered_map< OUString, OpCode, OUStringHash, ::std::equal_to< OUString > > OpCodeHashMap; -typedef std::unordered_map< OUString, OUString, OUStringHash, ::std::equal_to< OUString > > ExternalHashMap; +typedef std::unordered_map< OUString, OpCode, OUStringHash > OpCodeHashMap; +typedef std::unordered_map< OUString, OUString, OUStringHash > ExternalHashMap; class FORMULA_DLLPUBLIC FormulaCompiler { diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index d749ca40727c..1f0f08100855 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -153,8 +153,7 @@ class SVT_DLLPUBLIC ToolboxController : typedef std::unordered_map< OUString, css::uno::Reference< css::frame::XDispatch >, - OUStringHash, - std::equal_to< OUString > > URLToDispatchMap; + OUStringHash > URLToDispatchMap; // methods to support status forwarder, known by the old sfx2 toolbox controller implementation void addStatusListener( const OUString& aCommandURL ); |