sw/source/ui/frmdlg/column.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4f8bb267489b14aa1dab360786d8f99c763f03b4
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Thu Nov 30 17:46:08 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Dec 1 18:09:35 2023 +0100
tdf#158450: fix crash when picking custom colour for column separator line
bt:
0x00007ffeed9c4a2b in SwColumnPage::SwColumnPage(weld::Container*,
weld::DialogController*, SfxItemSet const&)::$_0::operator()() const
(this=0x5555574a8e38) at
/home/julien/lo/libreoffice/sw/source/ui/frmdlg/column.cxx:396
396 [this]{ return GetDialogController()->getDialog();
}))
0 0x00007ffeed9c4a2b in SwColumnPage::SwColumnPage(weld::Container*,
weld::DialogController*, SfxItemSet const&)::$_0::operator()() const
(this=0x5555574a8e38) at
/home/julien/lo/libreoffice/sw/source/ui/frmdlg/column.cxx:396
1 0x00007ffeed9c4a05 in std::__invoke_impl<weld::Dialog*,
SwColumnPage::SwColumnPage(weld::Container*, weld::DialogController*,
SfxItemSet const&)::$_0&>(std::__invoke_other,
SwColumnPage::SwColumnPage(weld::Container*, weld::DialogController*,
SfxItemSet const&)::$_0&) (__f=...) at
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/invoke.h:61
2 0x00007ffeed9c4985 in std::__invoke_r<weld::Window*,
SwColumnPage::SwColumnPage(weld::Container*, weld::DialogController*,
SfxItemSet const&)::$_0&>(SwColumnPage::SwColumnPage(weld::Container*,
weld::DialogController*, SfxItemSet const&)::$_0&) (__fn=...) at
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/invoke.h:114
3 0x00007ffeed9c489d in std::_Function_handler<weld::Window* (),
SwColumnPage::SwColumnPage(weld::Container*, weld::DialogController*,
SfxItemSet const&)::$_0>::_M_invoke(std::_Any_data const&) (__functor=...) at
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/std_function.h:290
4 0x00007ffff1cb89e5 in std::function<weld::Window* ()>::operator()()
const (this=0x5555574a8e38) at
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/std_function.h:591
5 0x00007ffff1c94604 in ColorWindow::OpenPickerClickHdl(weld::Button&)
(this=0x5555574a8db0) at
/home/julien/lo/libreoffice/svx/source/tbxctrls/tbcontrl.cxx:2283
6 0x00007ffff1c9356d in ColorWindow::LinkStubOpenPickerClickHdl(void*,
weld::Button&) (instance=0x5555574a8db0, data=...) at
/home/julien/lo/libreoffice/svx/source/tbxctrls/tbcontrl.cxx:2279
See complete bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=191146
Regression from:
862fd2fa19b64972247bde9b171ec828a30e1676
defer getting toplevel for color picker until we need it
Change-Id: I2932281cb3b1cb510013a19f6bcf3d9f9c6cdb7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160164
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 028b9f1b209a..380bbb768f16 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -393,7 +393,7 @@ SwColumnPage::SwColumnPage(weld::Container* pPage,
weld::DialogController* pCont
, m_xTextDirectionFT(m_xBuilder->weld_label("textdirectionft"))
, m_xTextDirectionLB(new
svx::FrameDirectionListBox(m_xBuilder->weld_combo_box("textdirectionlb")))
, m_xLineColorDLB(new ColorListBox(m_xBuilder->weld_menu_button("colorlb"),
- [this]{ return GetDialogController()->getDialog(); }))
+ [pController]{ return pController->getDialog(); }))
, m_xLineTypeDLB(new
SvtLineListBox(m_xBuilder->weld_menu_button("linestylelb")))
, m_xEd1(new
SwPercentField(m_xBuilder->weld_metric_spin_button("width1mf", FieldUnit::CM)))
, m_xEd2(new
SwPercentField(m_xBuilder->weld_metric_spin_button("width2mf", FieldUnit::CM)))
