sc/source/ui/condformat/condformatdlgentry.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 396f396a5b9220031982c8b3c26e34806450d074
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Sep 13 14:55:06 2024 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Sep 13 19:25:23 2024 +0200

    Fix regression from 27be65a7d5326608f75839e3964ac322e88224a1^!
    
    Crash when:
    - open https://bugs.documentfoundation.org/attachment.cgi?id=196417
    - select a cell with icon
    - Format/Conditional/Icon Set...
    => popup dialog with message which at the end proposes "No" or "Yes"
    - Click "No"
    => Crash with bt:
    0  0x00007f35e28acb66 in ScIconSetFrmtDataEntry::SetFirstEntry 
(this=0x55b37f0244d0) at 
/home/julien/lo/libreoffice/sc/source/ui/condformat/condformatdlgentry.cxx:1357
    1  0x00007f35e28ad4cc in ScIconSetFrmtEntry::IconSetTypeHdl 
(this=0x55b37ee14940) at 
/home/julien/lo/libreoffice/sc/source/ui/condformat/condformatdlgentry.cxx:1422
    2  0x00007f35e28ad1ac in ScIconSetFrmtEntry::ScIconSetFrmtEntry 
(this=0x55b37ee14940, pParent=0x55b37ad5a4e0, pDoc=0x55b37ae30350, rPos=..., 
pFormat=0x0)
       at 
/home/julien/lo/libreoffice/sc/source/ui/condformat/condformatdlgentry.cxx:1391
    3  0x00007f35e289185d in ScCondFormatList::init (this=0x55b37ad5a4e0, 
rDoc=..., pFormat=0x0, rRanges=..., rPos=..., eType=condformat::dialog::ICONSET)
       at 
/home/julien/lo/libreoffice/sc/source/ui/condformat/condformatdlg.cxx:117
    4  0x00007f35e2894ef0 in ScCondFormatDlg::ScCondFormatDlg
       (this=0x55b37eed53b0, pB=0x55b37ae6fd50, pCW=0x55b37ef0eb00, 
pParent=0x55b37af94cc8, pViewData=0x55b37b17c160, 
rItem=std::shared_ptr<ScCondFormatDlgData> (use count 2, weak count 0) = {...})
       at 
/home/julien/lo/libreoffice/sc/source/ui/condformat/condformatdlg.cxx:479
    
    Change-Id: Ifd79edd1fe04ebbf50fd736989e5dd787cf91aa3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173338
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 0bff49e32f44..c612229c9380 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1276,6 +1276,7 @@ 
ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry(weld::Container* pParent, ScIconS
     : mxBuilder(Application::CreateBuilder(pParent, 
u"modules/scalc/ui/conditionaliconset.ui"_ustr))
     , mxGrid(mxBuilder->weld_container(u"ConditionalIconSet"_ustr))
     , mxImgIcon(mxBuilder->weld_image(u"icon"_ustr))
+    , mxFtEntry(mxBuilder->weld_label("label"))
     , mxEdEntry(mxBuilder->weld_entry(u"entry"_ustr))
     , mxLbEntryType(mxBuilder->weld_combo_box(u"listbox"_ustr))
     , mpContainer(pParent)

Reply via email to