sc/source/filter/html/htmlpars.cxx | 2 +-
sc/source/ui/view/output3.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e16730a87c17d1a3e6219159d1d012caad4ebf13
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Apr 16 17:34:35 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Apr 17 09:18:17 2024 +0200
ofz#68081 keep within bounds
Change-Id: Ib7f11f2447d5a2cc6b9b559727f2a0127c15913e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166154
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sc/source/filter/html/htmlpars.cxx
b/sc/source/filter/html/htmlpars.cxx
index 5d27f751ab6c..a09adb8c46eb 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -913,7 +913,7 @@ void ScHTMLLayoutParser::Colonize( ScEEParseEntry* pE )
{ // Replaced
nCol = pE->nCol - nColCntStart;
SCCOL nCount = static_cast<SCCOL>(xLocalColOffset->size());
- if ( nCol < nCount )
+ if (nCol >= 0 && nCol < nCount)
nColOffset = static_cast<sal_uInt16>((*xLocalColOffset)[nCol]);
else
nColOffset = static_cast<sal_uInt16>((*xLocalColOffset)[nCount -
1]);
commit 1bfdf89dcf2ca4acfb63d9cdec7a620c08b750d0
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Tue Apr 16 23:07:39 2024 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Wed Apr 17 09:18:09 2024 +0200
Fix typo
Change-Id: I64398416dcad6b573cb2eeb2089a43bf42f5bed3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166163
Tested-by: Julien Nabet <serval2...@yahoo.fr>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index a54718076857..0015dde55783 100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -210,7 +210,7 @@ void ScOutputData::DrawSelectiveObjects(SdrLayerID nLayer)
// 'original' TargetDevice, mpDev might have been changed by a
// call to ::SetContentDevice. That again might patch in a
// pre-render device fetched from
SdrPaintWindow::GetTargetOutputDevice
- // and thus the test if target is aregistered PageWindow would
fail
+ // and thus the test if target is a registered PageWindow
would fail
assert(nullptr != mpOriginalTargetDevice &&
"mpOriginalTargetDevice *must* be set when constructing ScOutputData (!)");
if (nullptr !=
pPageView->FindPageWindow(*mpOriginalTargetDevice))
{
