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 | |
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')
-rw-r--r-- | sc/source/ui/condformat/colorformat.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/condformat/condformatdlgentry.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/dbgui/scendlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/optdlg/opredlin.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpview.cxx | 3 |
5 files changed, 19 insertions, 14 deletions
diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index c4d2a79effd2..e74507776e25 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -74,9 +74,9 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(weld::Window* pParent, const ScDataBa , maPos(rPos) , mxBtnOk(m_xBuilder->weld_button("ok")) , mxBtnCancel(m_xBuilder->weld_button("cancel")) - , mxLbPos(new ColorListBox(m_xBuilder->weld_menu_button("positive_colour"), pParent)) - , mxLbNeg(new ColorListBox(m_xBuilder->weld_menu_button("negative_colour"), pParent)) - , mxLbAxisCol(new ColorListBox(m_xBuilder->weld_menu_button("axis_colour"), pParent)) + , mxLbPos(new ColorListBox(m_xBuilder->weld_menu_button("positive_colour"), [this]{ return m_xDialog.get(); })) + , mxLbNeg(new ColorListBox(m_xBuilder->weld_menu_button("negative_colour"), [this]{ return m_xDialog.get(); })) + , mxLbAxisCol(new ColorListBox(m_xBuilder->weld_menu_button("axis_colour"), [this]{ return m_xDialog.get(); })) , mxLbFillType(m_xBuilder->weld_combo_box("fill_type")) , mxLbTypeMin(m_xBuilder->weld_combo_box("min")) , mxLbTypeMax(m_xBuilder->weld_combo_box("max")) diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index d997a91fd429..9eb310528063 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -722,8 +722,8 @@ ScColorScale2FrmtEntry::ScColorScale2FrmtEntry(ScCondFormatList* pParent, ScDocu , mxLbEntryTypeMax(mxBuilder->weld_combo_box("colscalemax")) , mxEdMin(mxBuilder->weld_entry("edcolscalemin")) , mxEdMax(mxBuilder->weld_entry("edcolscalemax")) - , mxLbColMin(new ColorListBox(mxBuilder->weld_menu_button("lbcolmin"), pParent->GetFrameWeld())) - , mxLbColMax(new ColorListBox(mxBuilder->weld_menu_button("lbcolmax"), pParent->GetFrameWeld())) + , mxLbColMin(new ColorListBox(mxBuilder->weld_menu_button("lbcolmin"), [this]{ return mpParent->GetFrameWeld(); })) + , mxLbColMax(new ColorListBox(mxBuilder->weld_menu_button("lbcolmax"), [this]{ return mpParent->GetFrameWeld(); })) , mxFtMin(mxBuilder->weld_label("Label_minimum")) , mxFtMax(mxBuilder->weld_label("Label_maximum")) { @@ -859,9 +859,9 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry(ScCondFormatList* pParent, ScDocu , mxEdMin(mxBuilder->weld_entry("edcolscalemin")) , mxEdMiddle(mxBuilder->weld_entry("edcolscalemiddle")) , mxEdMax(mxBuilder->weld_entry("edcolscalemax")) - , mxLbColMin(new ColorListBox(mxBuilder->weld_menu_button("lbcolmin"), pParent->GetFrameWeld())) - , mxLbColMiddle(new ColorListBox(mxBuilder->weld_menu_button("lbcolmiddle"), pParent->GetFrameWeld())) - , mxLbColMax(new ColorListBox(mxBuilder->weld_menu_button("lbcolmax"), pParent->GetFrameWeld())) + , mxLbColMin(new ColorListBox(mxBuilder->weld_menu_button("lbcolmin"), [this]{ return mpParent->GetFrameWeld(); })) + , mxLbColMiddle(new ColorListBox(mxBuilder->weld_menu_button("lbcolmiddle"), [this]{ return mpParent->GetFrameWeld(); })) + , mxLbColMax(new ColorListBox(mxBuilder->weld_menu_button("lbcolmax"), [this]{ return mpParent->GetFrameWeld(); })) , mxFtMin(mxBuilder->weld_label("Label_minimum")) , mxFtMax(mxBuilder->weld_label("Label_maximum")) { diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 42c27e558210..a1bc89825196 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -41,7 +41,7 @@ ScNewScenarioDlg::ScNewScenarioDlg(weld::Window* pParent, const OUString& rName, , m_xEdName(m_xBuilder->weld_entry("name")) , m_xEdComment(m_xBuilder->weld_text_view("comment")) , m_xCbShowFrame(m_xBuilder->weld_check_button("showframe")) - , m_xLbColor(new ColorListBox(m_xBuilder->weld_menu_button("bordercolor"), pParent)) + , m_xLbColor(new ColorListBox(m_xBuilder->weld_menu_button("bordercolor"), [this] { return m_xDialog.get(); })) , m_xCbTwoWay(m_xBuilder->weld_check_button("copyback")) , m_xCbCopyAll(m_xBuilder->weld_check_button("copysheet")) , m_xCbProtect(m_xBuilder->weld_check_button("preventchanges")) 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")) |