diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-19 17:18:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-23 08:15:35 +0200 |
| commit | 87a9979c8938b800aab6e35903d60d24892e7f2e (patch) | |
| tree | 6beb01f22537e63df24c023ab65d391a7bee0cf6 /sfx2 | |
| parent | d76c4e5c9aaf8bd27ec97679bcaeba5b18aca493 (diff) | |
overload std::hash for OUString and OString
no need to explicitly specify it anymore
Change-Id: I6ad9259cce77201fdd75152533f5151aae83e9ec
Reviewed-on: https://gerrit.libreoffice.org/43567
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/Metadatable.cxx | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index f9f9dd022ab6..9a93d6cfd3f9 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -568,7 +568,7 @@ void IndexTabPage_Impl::dispose() namespace sfx2 { - typedef std::unordered_map< OUString, int, OUStringHash > KeywordInfo; + typedef std::unordered_map< OUString, int > KeywordInfo; } void IndexTabPage_Impl::InitializeIndex() diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 1ca0ea85808f..45f7152c0160 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -532,7 +532,7 @@ StyleTreeArr_Impl& MakeTree_Impl(StyleTreeArr_Impl& rArr) ::comphelper::getProcessComponentContext(), Application::GetSettings().GetLanguageTag().getLocale()); - std::unordered_map<OUString, StyleTree_Impl*, OUStringHash> styleFinder; + std::unordered_map<OUString, StyleTree_Impl*> styleFinder; styleFinder.reserve(rArr.size()); for (const auto& pEntry : rArr) { diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index 90258798ead6..d4db1e0b3be0 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -376,11 +376,11 @@ XmlIdRegistry::GetXmlIdForElement(const Metadatable& i_rObject) const /// generate unique xml:id template< typename T > /*static*/ OUString create_id(const - std::unordered_map< OUString, T, OUStringHash > & i_rXmlIdMap) + std::unordered_map< OUString, T > & i_rXmlIdMap) { static bool bHack = (getenv("LIBO_ONEWAY_STABLE_ODF_EXPORT") != nullptr); static const char prefix[] = "id"; // prefix for generated xml:id - typename std::unordered_map< OUString, T, OUStringHash > + typename std::unordered_map< OUString, T > ::const_iterator iter; OUString id; @@ -416,7 +416,7 @@ typedef ::std::vector< Metadatable* > XmlIdVector_t; /// Idref -> (content.xml element list, styles.xml element list) typedef std::unordered_map< OUString, - ::std::pair< XmlIdVector_t, XmlIdVector_t >, OUStringHash > XmlIdMap_t; + ::std::pair< XmlIdVector_t, XmlIdVector_t > > XmlIdMap_t; /// pointer hash template template<typename T> struct PtrHash @@ -895,7 +895,7 @@ typedef std::unordered_map< const Metadatable*, /// Idref -> (content.xml element, styles.xml element) typedef std::unordered_map< OUString, - ::std::pair< Metadatable*, Metadatable* >, OUStringHash > + ::std::pair< Metadatable*, Metadatable* > > ClipboardXmlIdMap_t; struct XmlIdRegistryClipboard::XmlIdRegistry_Impl |