[Libreoffice-commits] online.git: wsd/TileCache.hpp

[mert (via logerrit)]

 wsd/TileCache.hpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a8a11ef8f9a30d2d5507b58958ebd00ae632b782
Author:     mert <mert.tumer at collabora.com>
AuthorDate: Sun Nov 10 08:09:00 2019 +0300
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Sun Nov 10 23:46:09 2019 +0100

    Fix mixed watermark texts
    
    Change-Id: Id350d9dffc479350f240e82a4cc62ec97e5d68e1
    Reviewed-on: https://gerrit.libreoffice.org/82372
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/wsd/TileCache.hpp b/wsd/TileCache.hpp
index bdf17e211..50303c895 100644
--- a/wsd/TileCache.hpp
+++ b/wsd/TileCache.hpp
@@ -39,7 +39,8 @@ public:
                _tilePosX == other._tilePosX &&
                _tilePosY == other._tilePosY &&
                _tileWidth == other._tileWidth &&
-               _tileHeight == other._tileHeight;
+               _tileHeight == other._tileHeight &&
+               _normalizedViewId == other._normalizedViewId;
     }
 };
 
@@ -63,6 +64,7 @@ struct TileCacheDescHasher
         hash = (hash << 5) + hash + t.getTilePosY();
         hash = (hash << 5) + hash + t.getTileWidth();
         hash = (hash << 5) + hash + t.getTileHeight();
+        hash = (hash << 5) + hash + t.getNormalizedViewId();
 
         return hash;
     }