diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2021-05-01 22:13:37 +0900 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-05-11 12:28:24 +0200 |
commit | eb6819e74a66750235d3a4a894479faeee8146e2 (patch) | |
tree | c898ab63731449cf5176f35a16bacea0bb58f864 | |
parent | add o3tl version of hash_combine to not depend on boost for this (diff) | |
download | core-eb6819e74a66750235d3a4a894479faeee8146e2.tar.gz core-eb6819e74a66750235d3a4a894479faeee8146e2.zip |
change usage of boost::hash_combine to o3tl::hash_combine
Change-Id: I840518a36ac43d36c95f38e09c7bfcfe1a25a525
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114984
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
22 files changed, 98 insertions, 93 deletions
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 2d1cfa6f0b76..34f17ea7677f 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -45,7 +45,7 @@ #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <tools/stream.hxx> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> namespace basctl { @@ -679,8 +679,8 @@ bool LibInfo::Key::operator == (Key const& rKey) const size_t LibInfo::Key::Hash::operator () (Key const& rKey) const { std::size_t seed = 0; - boost::hash_combine(seed, rKey.m_aDocument.hashCode()); - boost::hash_combine(seed, rKey.m_aLibName.hashCode()); + o3tl::hash_combine(seed, rKey.m_aDocument.hashCode()); + o3tl::hash_combine(seed, rKey.m_aLibName.hashCode()); return seed; } diff --git a/sc/source/core/data/dpresfilter.cxx b/sc/source/core/data/dpresfilter.cxx index c0a496cb76ce..346cbef8b4f1 100644 --- a/sc/source/core/data/dpresfilter.cxx +++ b/sc/source/core/data/dpresfilter.cxx @@ -13,7 +13,7 @@ #include <unotools/charclass.hxx> #include <rtl/math.hxx> #include <sal/log.hxx> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> #include <com/sun/star/sheet/DataPilotFieldFilter.hpp> #include <com/sun/star/uno/Sequence.hxx> @@ -30,8 +30,8 @@ ScDPResultFilterContext::ScDPResultFilterContext() : size_t ScDPResultTree::NamePairHash::operator() (const NamePairType& rPair) const { std::size_t seed = 0; - boost::hash_combine(seed, rPair.first.hashCode()); - boost::hash_combine(seed, rPair.second.hashCode()); + o3tl::hash_combine(seed, rPair.first.hashCode()); + o3tl::hash_combine(seed, rPair.second.hashCode()); return seed; } diff --git a/sc/source/ui/view/spellcheckcontext.cxx b/sc/source/ui/view/spellcheckcontext.cxx index 637458f07385..224af6859f59 100644 --- a/sc/source/ui/view/spellcheckcontext.cxx +++ b/sc/source/ui/view/spellcheckcontext.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/linguistic2/XSpellChecker1.hpp> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> #include <unordered_map> @@ -38,8 +38,8 @@ class SpellCheckContext::SpellCheckCache size_t operator() (const CellPos& rPos) const { std::size_t seed = 0; - boost::hash_combine(seed, rPos.mnCol); - boost::hash_combine(seed, rPos.mnRow); + o3tl::hash_combine(seed, rPos.mnCol); + o3tl::hash_combine(seed, rPos.mnRow); return seed; } }; diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx index ad5ffa80f6b3..aa3a22bd2b67 100644 --- a/sdext/source/pdfimport/inc/pdfihelper.hxx +++ b/sdext/source/pdfimport/inc/pdfihelper.hxx @@ -32,7 +32,7 @@ #include <unordered_map> #include <vector> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> // virtual resolution of the PDF OutputDev in dpi #define PDFI_OUTDEV_RESOLUTION 7200 @@ -81,12 +81,12 @@ namespace pdfi size_t operator()(const FontAttributes& rFont ) const { std::size_t seed = 0; - boost::hash_combine(seed, rFont.familyName.hashCode()); - boost::hash_combine(seed, rFont.isBold); - boost::hash_combine(seed, rFont.isItalic); - boost::hash_combine(seed, rFont.isUnderline); - boost::hash_combine(seed, rFont.isOutline); - boost::hash_combine(seed, rFont.size); + o3tl::hash_combine(seed, rFont.familyName.hashCode()); + o3tl::hash_combine(seed, rFont.isBold); + o3tl::hash_combine(seed, rFont.isItalic); + o3tl::hash_combine(seed, rFont.isUnderline); + o3tl::hash_combine(seed, rFont.isOutline); + o3tl::hash_combine(seed, rFont.size); return seed; } }; @@ -184,30 +184,30 @@ namespace pdfi size_t operator()(const GraphicsContext& rGC ) const { std::size_t seed = 0; - boost::hash_combine(seed, rGC.LineColor.Red); - boost::hash_combine(seed, rGC.LineColor.Green); - boost::hash_combine(seed, rGC.LineColor.Blue); - boost::hash_combine(seed, rGC.LineColor.Alpha); - boost::hash_combine(seed, rGC.FillColor.Red); - boost::hash_combine(seed, rGC.FillColor.Green); - boost::hash_combine(seed, rGC.FillColor.Blue); - boost::hash_combine(seed, rGC.FillColor.Alpha); - boost::hash_combine(seed, rGC.LineJoin); - boost::hash_combine(seed, rGC.LineCap); - boost::hash_combine(seed, rGC.BlendMode); - boost::hash_combine(seed, rGC.LineWidth); - boost::hash_combine(seed, rGC.Flatness); - boost::hash_combine(seed, rGC.MiterLimit); - boost::hash_combine(seed, rGC.DashArray.size()); - boost::hash_combine(seed, rGC.FontId); - boost::hash_combine(seed, rGC.TextRenderMode); - boost::hash_combine(seed, rGC.Transformation.get( 0, 0 )); - boost::hash_combine(seed, rGC.Transformation.get( 1, 0 )); - boost::hash_combine(seed, rGC.Transformation.get( 0, 1 )); - boost::hash_combine(seed, rGC.Transformation.get( 1, 1 )); - boost::hash_combine(seed, rGC.Transformation.get( 0, 2 )); - boost::hash_combine(seed, rGC.Transformation.get( 1, 2 )); - boost::hash_combine(seed, rGC.Clip.count() ? rGC.Clip.getB2DPolygon(0).count() : 0); + o3tl::hash_combine(seed, rGC.LineColor.Red); + o3tl::hash_combine(seed, rGC.LineColor.Green); + o3tl::hash_combine(seed, rGC.LineColor.Blue); + o3tl::hash_combine(seed, rGC.LineColor.Alpha); + o3tl::hash_combine(seed, rGC.FillColor.Red); + o3tl::hash_combine(seed, rGC.FillColor.Green); + o3tl::hash_combine(seed, rGC.FillColor.Blue); + o3tl::hash_combine(seed, rGC.FillColor.Alpha); + o3tl::hash_combine(seed, rGC.LineJoin); + o3tl::hash_combine(seed, rGC.LineCap); + o3tl::hash_combine(seed, rGC.BlendMode); + o3tl::hash_combine(seed, rGC.LineWidth); + o3tl::hash_combine(seed, rGC.Flatness); + o3tl::hash_combine(seed, rGC.MiterLimit); + o3tl::hash_combine(seed, rGC.DashArray.size()); + o3tl::hash_combine(seed, rGC.FontId); + o3tl::hash_combine(seed, rGC.TextRenderMode); + o3tl::hash_combine(seed, rGC.Transformation.get( 0, 0 )); + o3tl::hash_combine(seed, rGC.Transformation.get( 1, 0 )); + o3tl::hash_combine(seed, rGC.Transformation.get( 0, 1 )); + o3tl::hash_combine(seed, rGC.Transformation.get( 1, 1 )); + o3tl::hash_combine(seed, rGC.Transformation.get( 0, 2 )); + o3tl::hash_combine(seed, rGC.Transformation.get( 1, 2 )); + o3tl::hash_combine(seed, rGC.Clip.count() ? rGC.Clip.getB2DPolygon(0).count() : 0); return seed; } }; diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 7edfd56a2732..3626beeec686 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -41,7 +41,7 @@ #include "vbacommandbars.hxx" -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> #include <unordered_map> using namespace ::com::sun::star; @@ -138,9 +138,9 @@ struct VbaTimerInfoHash size_t operator()( const VbaTimerInfo& rTimerInfo ) const { std::size_t seed = 0; - boost::hash_combine(seed, rTimerInfo.first.hashCode()); - boost::hash_combine(seed, rTimerInfo.second.first); - boost::hash_combine(seed, rTimerInfo.second.second); + o3tl::hash_combine(seed, rTimerInfo.first.hashCode()); + o3tl::hash_combine(seed, rTimerInfo.second.first); + o3tl::hash_combine(seed, rTimerInfo.second.second); return seed; } }; diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index 94e5f4227344..dafd43f7aad8 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -22,6 +22,7 @@ #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <memory> +#include <unistd.h> #define LOGTAG "LibreOffice/androidinst" #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LOGTAG, __VA_ARGS__)) diff --git a/vcl/inc/ControlCacheKey.hxx b/vcl/inc/ControlCacheKey.hxx index e4e7616e2322..658d05bc84a2 100644 --- a/vcl/inc/ControlCacheKey.hxx +++ b/vcl/inc/ControlCacheKey.hxx @@ -22,7 +22,7 @@ #include <tools/gen.hxx> #include <vcl/salnativewidgets.hxx> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> class ControlCacheKey { @@ -81,11 +81,11 @@ struct ControlCacheHashFunction std::size_t operator()(ControlCacheKey const& aCache) const { std::size_t seed = 0; - boost::hash_combine(seed, aCache.mnType); - boost::hash_combine(seed, aCache.mnPart); - boost::hash_combine(seed, aCache.mnState); - boost::hash_combine(seed, aCache.maSize.Width()); - boost::hash_combine(seed, aCache.maSize.Height()); + o3tl::hash_combine(seed, aCache.mnType); + o3tl::hash_combine(seed, aCache.mnPart); + o3tl::hash_combine(seed, aCache.mnState); + o3tl::hash_combine(seed, aCache.maSize.Width()); + o3tl::hash_combine(seed, aCache.maSize.Height()); return seed; } }; diff --git a/vcl/inc/impfontcache.hxx b/vcl/inc/impfontcache.hxx index 07e04a0cc848..09aa33ca906b 100644 --- a/vcl/inc/impfontcache.hxx +++ b/vcl/inc/impfontcache.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_VCL_INC_IMPFONTCACHE_HXX #define INCLUDED_VCL_INC_IMPFONTCACHE_HXX -#include <boost/functional/hash.hpp> #include <rtl/ref.hxx> #include <o3tl/lru_map.hxx> +#include <o3tl/hash_combine.hxx> #include <tools/gen.hxx> #include <vcl/glyphitem.hxx> @@ -53,8 +53,8 @@ struct GlyphBoundRectCacheHash std::size_t operator()(GlyphBoundRectCacheKey const& aCache) const { std::size_t seed = 0; - boost::hash_combine(seed, aCache.m_pFont); - boost::hash_combine(seed, aCache.m_nId); + o3tl::hash_combine(seed, aCache.m_pFont); + o3tl::hash_combine(seed, aCache.m_nId); return seed; } }; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 822b15b378ee..01010f1e61e7 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -23,6 +23,7 @@ #include <config_version.h> #include <o3tl/lru_map.hxx> +#include <o3tl/hash_combine.hxx> #include <tools/fldunit.hxx> #include <unotools/options.hxx> #include <vcl/bitmapex.hxx> @@ -41,7 +42,6 @@ #include <mutex> #include <vector> #include <unordered_map> -#include <boost/functional/hash.hpp> #include "ControlCacheKey.hxx" #include "schedulerimpl.hxx" #include <basegfx/DrawCommands.hxx> @@ -194,9 +194,9 @@ template <> struct hash<ScaleCacheKey> std::size_t operator()(ScaleCacheKey const& k) const noexcept { std::size_t seed = 0; - boost::hash_combine(seed, k.mpBitmap); - boost::hash_combine(seed, k.maDestSize.getWidth()); - boost::hash_combine(seed, k.maDestSize.getHeight()); + o3tl::hash_combine(seed, k.mpBitmap); + o3tl::hash_combine(seed, k.maDestSize.getWidth()); + o3tl::hash_combine(seed, k.maDestSize.getHeight()); return seed; } }; diff --git a/vcl/inc/widgetdraw/WidgetDefinition.hxx b/vcl/inc/widgetdraw/WidgetDefinition.hxx index cc3eb6606557..65a4dcb32c29 100644 --- a/vcl/inc/widgetdraw/WidgetDefinition.hxx +++ b/vcl/inc/widgetdraw/WidgetDefinition.hxx @@ -18,7 +18,7 @@ #include <unordered_map> #include <vector> #include <cstddef> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> #include <vcl/salnativewidgets.hxx> namespace vcl @@ -145,8 +145,8 @@ template <> struct VCL_DLLPUBLIC hash<vcl::ControlTypeAndPart> std::size_t operator()(vcl::ControlTypeAndPart const& rControlTypeAndPart) const noexcept { std::size_t seed = 0; - boost::hash_combine(seed, rControlTypeAndPart.meType); - boost::hash_combine(seed, rControlTypeAndPart.mePart); + o3tl::hash_combine(seed, rControlTypeAndPart.meType); + o3tl::hash_combine(seed, rControlTypeAndPart.mePart); return seed; } }; diff --git a/vcl/source/font/fontinstance.cxx b/vcl/source/font/fontinstance.cxx index f56333f6cf8a..48e4c291c350 100644 --- a/vcl/source/font/fontinstance.cxx +++ b/vcl/source/font/fontinstance.cxx @@ -23,9 +23,10 @@ #include <fontinstance.hxx> #include <impfontcache.hxx> - #include <PhysicalFontFace.hxx> +#include <o3tl/hash_combine.hxx> + // extend std namespace to add custom hash needed for LogicalFontInstance namespace std @@ -35,8 +36,8 @@ namespace std size_t operator()(const pair< sal_UCS4, FontWeight >& rData) const { std::size_t seed = 0; - boost::hash_combine(seed, rData.first); - boost::hash_combine(seed, rData.second); + o3tl::hash_combine(seed, rData.first); + o3tl::hash_combine(seed, rData.second); return seed; } }; diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 82b37fe4e668..cc5386039e3a 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -24,7 +24,7 @@ #include <vcl/gfxlink.hxx> #include <vcl/graphicfilter.hxx> #include <memory> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> GfxLink::GfxLink() : meType(GfxLinkType::NONE) @@ -60,7 +60,7 @@ size_t GfxLink::GetHash() const if (!maHash) { std::size_t seed = maDataContainer.calculateHash(); - boost::hash_combine(seed, meType); + o3tl::hash_combine(seed, meType); maHash = seed; } return maHash; diff --git a/vcl/source/graphic/BinaryDataContainer.cxx b/vcl/source/graphic/BinaryDataContainer.cxx index ba7a9f597c1f..339d28d601d0 100644 --- a/vcl/source/graphic/BinaryDataContainer.cxx +++ b/vcl/source/graphic/BinaryDataContainer.cxx @@ -9,7 +9,7 @@ */ #include <vcl/BinaryDataContainer.hxx> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> BinaryDataContainer::BinaryDataContainer() = default; @@ -27,9 +27,9 @@ BinaryDataContainer::BinaryDataContainer(std::unique_ptr<std::vector<sal_uInt8>> size_t BinaryDataContainer::calculateHash() const { size_t nSeed = 0; - boost::hash_combine(nSeed, getSize()); + o3tl::hash_combine(nSeed, getSize()); for (sal_uInt8 const& rByte : *mpData) - boost::hash_combine(nSeed, rByte); + o3tl::hash_combine(nSeed, rByte); return nSeed; } diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 0b4c75e8b305..42896c694794 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -19,6 +19,7 @@ #include <string.h> #include <stdlib.h> +#include <unistd.h> #include <string_view> #include <i18nlangtag/languagetag.hxx> diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 8121158013dc..9b16cd9cd5c5 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -47,7 +47,7 @@ using namespace psp; #include <osl/process.h> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> #include <utility> #include <algorithm> @@ -86,11 +86,11 @@ template <> struct hash<FontOptionsKey> std::size_t operator()(const FontOptionsKey& k) const noexcept { std::size_t seed = k.m_sFamilyName.hashCode(); - boost::hash_combine(seed, k.m_nFontSize); - boost::hash_combine(seed, k.m_eItalic); - boost::hash_combine(seed, k.m_eWeight); - boost::hash_combine(seed, k.m_eWidth); - boost::hash_combine(seed, k.m_ePitch); + o3tl::hash_combine(seed, k.m_nFontSize); + o3tl::hash_combine(seed, k.m_eItalic); + o3tl::hash_combine(seed, k.m_eWeight); + o3tl::hash_combine(seed, k.m_eWidth); + o3tl::hash_combine(seed, k.m_ePitch); return seed; } }; diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index b121f0f1b9d1..4828a49a967a 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -27,6 +27,8 @@ #include <cairo.h> #include <cairo-ft.h> +#include <deque> + namespace { typedef struct FT_FaceRec_* FT_Face; diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 75abab8bc728..ecafa66a1620 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -56,7 +56,7 @@ #include <config_dbus.h> #include <config_gio.h> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> namespace psp { @@ -78,9 +78,9 @@ namespace psp size_t operator()(const css::lang::Locale& rLocale) const { std::size_t seed = 0; - boost::hash_combine(seed, rLocale.Language.hashCode()); - boost::hash_combine(seed, rLocale.Country.hashCode()); - boost::hash_combine(seed, rLocale.Variant.hashCode()); + o3tl::hash_combine(seed, rLocale.Language.hashCode()); + o3tl::hash_combine(seed, rLocale.Country.hashCode()); + o3tl::hash_combine(seed, rLocale.Variant.hashCode()); return seed; } }; diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index c0fe1e32b863..927694f8b450 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -46,7 +46,7 @@ #include <rtl/character.hxx> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> #include <algorithm> #include <shlwapi.h> @@ -171,8 +171,8 @@ struct BlobCacheKeyHash std::size_t operator()(BlobCacheKey const& rKey) const { std::size_t seed = 0; - boost::hash_combine(seed, rKey.first.get()); - boost::hash_combine(seed, rKey.second); + o3tl::hash_combine(seed, rKey.first.get()); + o3tl::hash_combine(seed, rKey.second); return seed; } }; diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx index 0b2d302142a1..8b122fd0f9bc 100644 --- a/xmloff/inc/StyleMap.hxx +++ b/xmloff/inc/StyleMap.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <comphelper/servicehelper.hxx> #include <cppuhelper/implbase.hxx> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> #include <unordered_map> enum class XmlStyleFamily; @@ -50,8 +50,8 @@ struct StyleNameHash_Impl inline size_t StyleNameHash_Impl::operator()( const StyleNameKey_Impl& r ) const { std::size_t seed = 0; - boost::hash_combine(seed, r.m_nFamily); - boost::hash_combine(seed, r.m_aName.hashCode()); + o3tl::hash_combine(seed, r.m_nFamily); + o3tl::hash_combine(seed, r.m_aName.hashCode()); return seed; } diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx index 8efb26c1131e..5e95afc44296 100644 --- a/xmloff/source/core/xmltkmap.cxx +++ b/xmloff/source/core/xmltkmap.cxx @@ -20,7 +20,7 @@ #include <rtl/ustring.hxx> #include <xmloff/xmltkmap.hxx> #include <xmloff/xmltoken.hxx> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> #include <unordered_map> #include <utility> @@ -35,8 +35,8 @@ private: std::size_t operator()(const std::pair<sal_uInt16,OUString> &pair) const { std::size_t seed = 0; - boost::hash_combine(seed, pair.first); - boost::hash_combine(seed, pair.second.hashCode()); + o3tl::hash_combine(seed, pair.first); + o3tl::hash_combine(seed, pair.second.hashCode()); return seed; } }; diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx index f957121daa2f..ce5760856711 100644 --- a/xmloff/source/forms/property_meta_data.cxx +++ b/xmloff/source/forms/property_meta_data.cxx @@ -25,7 +25,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnamespace.hxx> -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> #include <tools/debug.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> @@ -96,8 +96,8 @@ namespace xmloff::metadata size_t operator()( const AttributeDescription& i_attribute ) const { std::size_t seed = 0; - boost::hash_combine(seed, i_attribute.attributeToken); - boost::hash_combine(seed, i_attribute.namespacePrefix); + o3tl::hash_combine(seed, i_attribute.attributeToken); + o3tl::hash_combine(seed, i_attribute.namespacePrefix); return seed; } }; diff --git a/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx index f80b06a1df3e..a8bfb77221c9 100644 --- a/xmloff/source/transform/TransformerActions.hxx +++ b/xmloff/source/transform/TransformerActions.hxx @@ -23,7 +23,7 @@ #include <xmloff/namespacemap.hxx> #include "TransformerActionInit.hxx" #include "TransformerAction.hxx" -#include <boost/functional/hash.hpp> +#include <o3tl/hash_combine.hxx> #include <unordered_map> struct NameKey_Impl @@ -58,8 +58,8 @@ struct NameHash_Impl inline size_t NameHash_Impl::operator()( const NameKey_Impl& r ) const { std::size_t seed = 0; - boost::hash_combine(seed, r.m_nPrefix); - boost::hash_combine(seed, r.m_aLocalName.hashCode()); + o3tl::hash_combine(seed, r.m_nPrefix); + o3tl::hash_combine(seed, r.m_aLocalName.hashCode()); return seed; } |