cui/source/options/appearance.cxx | 4 ++-- cui/source/options/appearance.hxx | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
New commits: commit 5ae4ca2634a83435a51a8736610a1e6bf7702af6 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Jan 12 14:23:52 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Jan 28 09:50:38 2026 +0100 crashreporting: fix crash in SvxAppearanceTabPage::SvxAppearanceTabPage Seen in https://crashreport.libreoffice.org/stats/crash_details/ed1c2ca4-f71b-441a-8bf6-48fd965bdb77 Get "Automatic" string using CuiResId instead Change-Id: Ib973e0139685c4e270a084fb9e878db8c14aace2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197111 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 7acfec5a8ad8534d4177750aa5b110b16b53378c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197177 diff --git a/cui/source/options/appearance.cxx b/cui/source/options/appearance.cxx index 21312ae75ccf..6467981d0ade 100644 --- a/cui/source/options/appearance.cxx +++ b/cui/source/options/appearance.cxx @@ -123,7 +123,6 @@ SvxAppearanceTabPage::SvxAppearanceTabPage(weld::Container* pPage, , m_xNotebookbarIconSize(m_xBuilder->weld_combo_box(u"notebookbariconsdropdown"_ustr)) , m_xSizeGrid(m_xBuilder->weld_widget(u"grdIconSize"_ustr)) , m_xCustomizationFrame(m_xBuilder->weld_widget(u"items"_ustr)) - , m_sAutoStr(m_xIconsDropDown->get_text(0)) { InitThemes(); InitCustomization(); @@ -559,7 +558,8 @@ void SvxAppearanceTabPage::InitIcons() const vcl::IconThemeInfo& autoIconTheme = vcl::IconThemeInfo::FindIconThemeById(mInstalledIconThemes, autoThemeId); - OUString entryForAuto = m_sAutoStr + " (" + autoIconTheme.GetDisplayName() + ")"; + OUString sAutoStr(CuiResId(RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC)); + OUString entryForAuto = sAutoStr + " (" + autoIconTheme.GetDisplayName() + ")"; m_xIconsDropDown->append(u"auto"_ustr, entryForAuto); // index 0 means choose style automatically diff --git a/cui/source/options/appearance.hxx b/cui/source/options/appearance.hxx index f327ceaee609..086f7f660e30 100644 --- a/cui/source/options/appearance.hxx +++ b/cui/source/options/appearance.hxx @@ -50,7 +50,6 @@ private: std::unique_ptr<weld::ComboBox> m_xNotebookbarIconSize; std::unique_ptr<weld::Widget> m_xSizeGrid; std::unique_ptr<weld::Widget> m_xCustomizationFrame; - OUString m_sAutoStr; sal_Int32 nInitialToolbarIconSizeSel; sal_Int32 nInitialSidebarIconSizeSel;
