diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-03-08 17:18:06 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-03-09 10:08:45 +0100 |
| commit | 862fd2fa19b64972247bde9b171ec828a30e1676 (patch) | |
| tree | 9520a81e54e69864b427d7367fa790e9e6c3543e /sc/source/ui/optdlg | |
| parent | 2befe5c56c29fec45c898c00773e906d2d2d9f19 (diff) | |
defer getting toplevel for color picker until we need it
Change-Id: I60f4ded47f7d80b397647ea3344e83a5dfd1b11e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112183
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/optdlg')
| -rw-r--r-- | sc/source/ui/optdlg/opredlin.cxx | 12 | ||||
| -rw-r--r-- | sc/source/ui/optdlg/tpview.cxx | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 4d8f1a24c483..963ea1bb3e52 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -30,10 +30,14 @@ ScRedlineOptionsTabPage::ScRedlineOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) : SfxTabPage(pPage, pController, "modules/scalc/ui/optchangespage.ui", "OptChangesPage", &rSet) - , m_xContentColorLB(new ColorListBox(m_xBuilder->weld_menu_button("changes"), pController->getDialog())) - , m_xRemoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button("deletions"), pController->getDialog())) - , m_xInsertColorLB(new ColorListBox(m_xBuilder->weld_menu_button("entries"), pController->getDialog())) - , m_xMoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button("insertions"), pController->getDialog())) + , m_xContentColorLB(new ColorListBox(m_xBuilder->weld_menu_button("changes"), + [this]{ return GetDialogController()->getDialog(); })) + , m_xRemoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button("deletions"), + [this]{ return GetDialogController()->getDialog(); })) + , m_xInsertColorLB(new ColorListBox(m_xBuilder->weld_menu_button("entries"), + [this]{ return GetDialogController()->getDialog(); })) + , m_xMoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button("insertions"), + [this]{ return GetDialogController()->getDialog(); })) { m_xContentColorLB->SetSlotId(SID_AUTHOR_COLOR); m_xRemoveColorLB->SetSlotId(SID_AUTHOR_COLOR); diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index bf1db08d8cb3..a5f56979e3cd 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -36,7 +36,8 @@ ScTpContentOptions::ScTpContentOptions(weld::Container* pPage, weld::DialogContr : SfxTabPage(pPage, pController, "modules/scalc/ui/tpviewpage.ui", "TpViewPage", &rArgSet) , m_xGridLB(m_xBuilder->weld_combo_box("grid")) , m_xColorFT(m_xBuilder->weld_label("color_label")) - , m_xColorLB(new ColorListBox(m_xBuilder->weld_menu_button("color"), pController->getDialog())) + , m_xColorLB(new ColorListBox(m_xBuilder->weld_menu_button("color"), + [this]{ return GetDialogController()->getDialog(); })) , m_xBreakCB(m_xBuilder->weld_check_button("break")) , m_xGuideLineCB(m_xBuilder->weld_check_button("guideline")) , m_xFormulaCB(m_xBuilder->weld_check_button("formula")) |