haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Invalidate canonical id unconditionally 

Signed-off-by: Paris Oplopoios <paris.oplopoios@collabora.com>
Change-Id: I061e34af1a1676e5bba5d476ea9e7ff5758744a1
private/gokay/tab-translations
Paris Oplopoios 2023-09-12 00:07:22 +03:00 committed by Paris
parent 0898e05e3a
commit e5b7464bbf
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kit/Kit.cpp
View File

@ -1705,12 +1705,7 @@ private:
viewCount << " view" << (viewCount != 1 ? "s." : "."));
session->initWatermark();
// Invalidate canonical ID for Draw and PDF files so that the slides
// in the slide pane will render
if (session->hasWatermark() || _loKitDocument->getDocumentType() == LOK_DOCTYPE_DRAWING)
{
invalidateCanonicalId(session->getId());
}
invalidateCanonicalId(session->getId());
return _loKitDocument;
}

2
test/TileCacheTests.cpp
View File

@ -1366,7 +1366,7 @@ void TileCacheTests::requestTiles(std::shared_ptr<http::WebSocketSession>& socke
// expected tile: part= width= height= tileposx= tileposy= tilewidth= tileheight=
StringVector tokens(StringVector::tokenize(tile, ' '));
LOK_ASSERT_EQUAL(std::string("tile:"), tokens[0]);
LOK_ASSERT_EQUAL(0, std::stoi(tokens[1].substr(std::string("nviewid=").size())));
LOK_ASSERT_EQUAL(1000, std::stoi(tokens[1].substr(std::string("nviewid=").size())));
LOK_ASSERT_EQUAL(part, std::stoi(tokens[2].substr(std::string("part=").size())));
LOK_ASSERT_EQUAL(pixTileSize,
std::stoi(tokens[3].substr(std::string("width=").size())));