diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-06 10:35:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-06 11:12:03 +0100 |
| commit | 58d89f27d1097c766c5de4098ff0ce30051ed74b (patch) | |
| tree | 52adf683a2ddc72f11fc1c4d7a6afde494ce6829 | |
| parent | 202d9af5ab4291a8f867791293477a18ae48051d (diff) | |
no need to use OUStringHash here anymore
Change-Id: I2faa8c971dc7f4642353dceafa25b9022a0dfd2a
Reviewed-on: https://gerrit.libreoffice.org/67436
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/xmloff/xmlimp.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/printerinfomanager.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/builder.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/core/xmlimp.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 885bab2ab1fe..6e5210939105 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -223,7 +223,7 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public cppu::WeakImplHelper< css::uno::Reference< css::xml::sax::XFastDocumentHandler > mxFastDocumentHandler; static css::uno::Reference< css::xml::sax::XFastTokenHandler > xTokenHandler; static std::unordered_map< sal_Int32, std::pair< OUString, OUString > > aNamespaceMap; - static std::unordered_map< OUString, OUString, OUStringHash > aNamespaceURIPrefixMap; + static std::unordered_map< OUString, OUString > aNamespaceURIPrefixMap; static bool bIsNSMapsInitialized; static void initializeNamespaceMaps(); diff --git a/vcl/inc/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx index 49bbc1491483..2ef705a4cf05 100644 --- a/vcl/inc/printerinfomanager.hxx +++ b/vcl/inc/printerinfomanager.hxx @@ -91,7 +91,7 @@ protected: OUString m_aFile; // details other config files that have this printer // in case of removal all have to be removed - std::unordered_set< OUString, OUStringHash > m_aAlternateFiles; + std::unordered_set< OUString > m_aAlternateFiles; // group in m_aFile containing the printer // this must be unique over all configuration files // it usually should be the printer name diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index c95ed2800193..b2c688cee952 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -2370,7 +2370,7 @@ namespace BuilderUtils { using namespace com::sun::star::accessibility; - static const std::unordered_map<OString, sal_Int16, OStringHash> aAtkRoleToAccessibleRole = { + static const std::unordered_map<OString, sal_Int16> aAtkRoleToAccessibleRole = { /* This is in atkobject.h's AtkRole order */ { "invalid", AccessibleRole::UNKNOWN }, { "accelerator label", AccessibleRole::UNKNOWN }, diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 11b749e2cdf1..f557bcf77a7f 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -86,7 +86,7 @@ using namespace ::xmloff::token; css::uno::Reference< css::xml::sax::XFastTokenHandler > SvXMLImport::xTokenHandler( new FastTokenHandler() ); std::unordered_map< sal_Int32, std::pair< OUString, OUString > > SvXMLImport::aNamespaceMap; -std::unordered_map< OUString, OUString, OUStringHash > SvXMLImport::aNamespaceURIPrefixMap; +std::unordered_map< OUString, OUString > SvXMLImport::aNamespaceURIPrefixMap; const OUString SvXMLImport::aDefaultNamespace = OUString(""); const OUString SvXMLImport::aNamespaceSeparator = OUString(":"); bool SvXMLImport::bIsNSMapsInitialized = false; |