core.git: 2 commits - svl/source vcl/source

[Caolán McNamara (via logerrit)]

 svl/source/numbers/zforlist.cxx |    2 +-
 vcl/source/gdi/metaact.cxx      |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 64fa566e659112b46d063dc0e0a89fe8f8065235
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Mar 29 08:57:46 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Mar 29 11:19:27 2024 +0100

    ofz#67699 Integer-overflow
    
    Change-Id: Ifb949cb4816c21587f337827fe50f993a64a3f60
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165509
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 81d72cdf8dbd..a7e7c01f2936 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -678,6 +678,9 @@ MetaTextArrayAction::~MetaTextArrayAction()
 
 void MetaTextArrayAction::Execute( OutputDevice* pOut )
 {
+    if (!AllowPoint(pOut->LogicToPixel(maStartPt)))
+        return;
+
     pOut->DrawTextArray( maStartPt, maStr, maDXAry, maKashidaAry, mnIndex, 
mnLen );
 }
 
commit a39399f263c1e791c883c7cf866f9ee377b1a474
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Mar 29 08:59:24 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Mar 29 11:19:21 2024 +0100

    pre-thread -> per-thread
    
    Change-Id: I1b5fa94370fc9432d76b25fe9cf663c926c32a99
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165508
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 7b2bcd4352e7..5939e93bd67a 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3925,7 +3925,7 @@ sal_uInt32 SvNFEngine::GetCLOffsetRO(const 
SvNFFormatData& rFormatData, SvNFLang
     return nCLOffset;
 }
 
-// we can't cache to SvNFFormatData in RO mode, so cache to a temp map which 
we can consult pre-thread in FindFormatRO
+// we can't cache to SvNFFormatData in RO mode, so cache to a per-thread temp 
map which we can consult in FindFormatRO
 // caches can be merged with SvNumberFormatter::MergeDefaultFormatKeys
 void SvNFEngine::CacheFormatRO(SvNFFormatData::DefaultFormatKeysMap& 
rFormatCache, sal_uInt32 nSearch, sal_uInt32 nFormat)
 {