core.git: 2 commits - forms/source sw/source

[Caolán McNamara (via logerrit)]

 forms/source/component/imgprod.cxx      |    3 ++-
 sw/source/ui/dialog/wordcountdialog.cxx |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 7cf623ae1771f448ab4f82c175156a7e776fa964
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Dec 31 15:12:21 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Dec 31 21:02:20 2023 +0100

    cid#1559993 Division or modulo by float zero
    
    Change-Id: I071d576fc998022c76364778423e0346f69cb051
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161500
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/ui/dialog/wordcountdialog.cxx 
b/sw/source/ui/dialog/wordcountdialog.cxx
index b0b92a6ae1a7..1277545c6e12 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -67,9 +67,10 @@ void SwWordCountFloatDlg::SetValues(const SwDocStat& 
rCurrent, const SwDocStat&
     setValue(*m_xDocCjkcharsFT, rDoc.nAsianWord, rLocaleData);
     setValue(*m_xDocComments, rCurrent.nComments, rLocaleData);
 
-    if (m_xStandardizedPagesLabelFT->get_visible())
+    const sal_Int64 nCharsPerStandardizedPage = 
m_xStandardizedPagesLabelFT->get_visible() ?
+        officecfg::Office::Writer::WordCount::StandardizedPageSize::get() : 0;
+    if (nCharsPerStandardizedPage)
     {
-        sal_Int64 nCharsPerStandardizedPage = 
officecfg::Office::Writer::WordCount::StandardizedPageSize::get();
         setDoubleValue(*m_xCurrentStandardizedPagesFT,
             static_cast<double>(rCurrent.nChar) / nCharsPerStandardizedPage);
         setDoubleValue(*m_xDocStandardizedPagesFT,
commit 4b9a538418e434e9a0757e6a7e814fb03ec32954
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Dec 31 15:20:35 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Dec 31 21:02:10 2023 +0100

    cid#707862 Uninitialized pointer field
    
    returned since
    
    commit 04c3ef3c7224644b7e54ff215343391cef77f7b5
    Date:   Sat Dec 30 15:08:30 2023 +0200
    
        ImgProdLockBytes is unnecessary
    
    Change-Id: Iabd3cf1f64b87b8ffb8c73702ef138cf7b7d64a7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161502
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/forms/source/component/imgprod.cxx 
b/forms/source/component/imgprod.cxx
index b9ee123e80ba..d281367eb23a 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -36,7 +36,8 @@
 
 
 ImageProducer::ImageProducer()
-    : mnTransIndex(0)
+    : mpStm(nullptr)
+    , mnTransIndex(0)
     , mbConsInit(false)
 {
     moGraphic.emplace();