[Libreoffice-commits] core.git: slideshow/source vcl/source

[Caolán McNamara (via logerrit)]

 slideshow/source/inc/tools.hxx |    1 -
 vcl/source/outdev/textline.cxx |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit ad09c49b34f78770fa2510381dbc8b555baf05a1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Aug 10 16:51:09 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Aug 10 20:24:34 2021 +0200

    use o3tl::hash_combine
    
    Change-Id: I0d6cd4313652669939cdbdc8e4ae7c62dae3022b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120280
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index f4210e477ea2..edfefe246fe4 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -70,7 +70,6 @@ namespace slideshow
             return d + (d >> 3);
         }
 
-        // xxx todo: remove with boost::hash when 1.33 is available
         template <typename T>
         struct hash
         {
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 7d78f30fe326..127e1ce4a139 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -34,7 +34,7 @@
 
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/polygon/WaveLine.hxx>
-#include <boost/functional/hash.hpp>
+#include <o3tl/hash_combine.hxx>
 #include <o3tl/lru_map.hxx>
 
 #define UNDERLINE_LAST      LINESTYLE_BOLDWAVE
@@ -90,8 +90,8 @@ namespace {
             size_t operator() ( const Key& rKey ) const
             {
                 size_t aSeed = 0;
-                boost::hash_combine(aSeed, rKey.m_aFirst);
-                boost::hash_combine(aSeed, rKey.m_aSecond);
+                o3tl::hash_combine(aSeed, rKey.m_aFirst);
+                o3tl::hash_combine(aSeed, rKey.m_aSecond);
                 return aSeed;
             }
         };