diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-06-10 17:01:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-06-10 22:25:24 +0200 |
| commit | 8bcdda7e18148a7f4e15bbec0bd0550355b7bd8d (patch) | |
| tree | 8a7e8635e5304f66afd96ff81433f173f898bf8a | |
| parent | ce8186315fda526235f295ef97dd1352309643f2 (diff) | |
ofz#59696 Abrt
Change-Id: I4cf6043f55a7aae23b6a801dd41b0912b68e1d3f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152836
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
| -rw-r--r-- | svl/source/config/ctloptions.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/text/inftxt.cxx | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index eb636e0b4009..07c9c67fd654 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -21,6 +21,7 @@ #include <svl/ctloptions.hxx> #include <unotools/configitem.hxx> +#include <unotools/configmgr.hxx> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Sequence.hxx> #include <osl/mutex.hxx> @@ -430,6 +431,8 @@ void SvtCTLOptions::SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumerals ) SvtCTLOptions::TextNumerals SvtCTLOptions::GetCTLTextNumerals() { + if (utl::ConfigManager::IsFuzzing()) + return SvtCTLOptions::NUMERALS_ARABIC; return static_cast<SvtCTLOptions::TextNumerals>(officecfg::Office::Common::I18N::CTL::CTLTextNumerals::get()); } diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index f67f4e580292..715780f65269 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -19,7 +19,6 @@ #include <com/sun/star/linguistic2/XHyphenator.hpp> -#include <unotools/configmgr.hxx> #include <unotools/linguprops.hxx> #include <unotools/lingucfg.hxx> #include <hintids.hxx> @@ -1634,8 +1633,8 @@ void SwTextFormatInfo::CtorInitTextFormatInfo( OutputDevice* pRenderContext, SwT m_nLineNetHeight = 0; SetLineStart(TextFrameIndex(0)); - SvtCTLOptions::TextNumerals const nTextNumerals = !utl::ConfigManager::IsFuzzing() ? - SvtCTLOptions::GetCTLTextNumerals() : SvtCTLOptions::NUMERALS_ARABIC; + SvtCTLOptions::TextNumerals const nTextNumerals( + SvtCTLOptions::GetCTLTextNumerals()); // cannot cache for NUMERALS_CONTEXT because we need to know the string // for the whole paragraph now if (nTextNumerals != SvtCTLOptions::NUMERALS_CONTEXT) |