[Libreoffice-commits] core.git: 2 commits - chart2/source sw/source

[Caolán McNamara (via logerrit)]

 chart2/source/controller/sidebar/ChartColorWrapper.cxx |    3 +++
 sw/source/core/text/inftxt.cxx                         |    5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 260bc16e1923016d0628a8779e219b290d4c9011
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jun 8 15:23:04 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Jun 8 20:42:55 2023 +0200

    check for empty model like ObjectIdentifier::getObjectPropertySet
    
    a speculative fix for:
    
https://crashreport.libreoffice.org/stats/crash_details/5b3c8597-9ffa-49b8-8cc2-132e69456249
    
    Change-Id: I4f45cf4c7ed51c814d4cb01b8f55709586d7a981
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152745
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx 
b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
index e1011a684787..aee8483cadf4 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -39,6 +39,9 @@ namespace {
 
 OUString getCID(const css::uno::Reference<css::frame::XModel>& xModel)
 {
+    if (!xModel.is())
+        return OUString();
+
     css::uno::Reference<css::frame::XController> 
xController(xModel->getCurrentController());
     css::uno::Reference<css::view::XSelectionSupplier> 
xSelectionSupplier(xController, css::uno::UNO_QUERY);
     if (!xSelectionSupplier.is())
commit 3fe8d0e47418c4ce47a6ae6802ccbb0dd496f853
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jun 8 12:50:46 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Jun 8 20:42:44 2023 +0200

    ofz#59696 Abrt
    
    Change-Id: I8ef148ab96e2fedd6b464bff87b43d9736300f6f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152738
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 32b8b2609df0..32676958c914 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -19,6 +19,7 @@
 
 #include <com/sun/star/linguistic2/XHyphenator.hpp>
 
+#include <unotools/configmgr.hxx>
 #include <unotools/linguprops.hxx>
 #include <unotools/lingucfg.hxx>
 #include <hintids.hxx>
@@ -1631,8 +1632,8 @@ void SwTextFormatInfo::CtorInitTextFormatInfo( 
OutputDevice* pRenderContext, SwT
     m_nLineNetHeight = 0;
     SetLineStart(TextFrameIndex(0));
 
-    SvtCTLOptions::TextNumerals const nTextNumerals(
-            SvtCTLOptions::GetCTLTextNumerals());
+    SvtCTLOptions::TextNumerals const nTextNumerals = 
!utl::ConfigManager::IsFuzzing() ?
+            SvtCTLOptions::GetCTLTextNumerals() : 
SvtCTLOptions::NUMERALS_ARABIC;
     // cannot cache for NUMERALS_CONTEXT because we need to know the string
     // for the whole paragraph now
     if (nTextNumerals != SvtCTLOptions::NUMERALS_CONTEXT)