sc/source/ui/dbgui/PivotLayoutDialog.cxx | 2 ++
sc/source/ui/dbgui/consdlg.cxx | 1 +
sc/source/ui/dbgui/dbnamdlg.cxx | 1 +
sc/source/ui/dbgui/pvfundlg.cxx | 1 +
sc/source/ui/inc/PivotLayoutDialog.hxx | 3 +++
sc/source/ui/inc/consdlg.hxx | 1 +
sc/source/ui/inc/dbnamdlg.hxx | 1 +
sc/source/ui/inc/namedefdlg.hxx | 1 +
sc/source/ui/inc/namedlg.hxx | 2 ++
sc/source/ui/inc/pvfundlg.hxx | 1 +
sc/source/ui/namedlg/namedefdlg.cxx | 1 +
sc/source/ui/namedlg/namedlg.cxx | 1 +
12 files changed, 16 insertions(+)
New commits:
commit 1bb08afb7eb25032c8b999a1f014e26c4b330c7f
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri May 31 09:44:11 2024 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Jun 7 08:48:09 2024 +0200
partial revert to restore existence of Expander wrappers
partial revert of:
commit 8288d2e3061327fd91e241c0b514cd973e3fcea8
Date: Mon Nov 21 11:04:53 2022 +0200
loplugin:unusedfields
because the existence of the welded expander wrappers matters
for some of the backends to fully work
Change-Id: Ie75e27329a47f708514466401e24eae6ddcd4c0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168206
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 17165eac6867..8d083cc6a280 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -110,6 +110,8 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
, mxSourceLabel(mxSourceFrame->weld_label_widget())
, mxDestFrame(m_xBuilder->weld_frame("frame1"))
, mxDestLabel(mxDestFrame->weld_label_widget())
+ , mxOptions(m_xBuilder->weld_expander("options"))
+ , mxMore(m_xBuilder->weld_expander("more"))
{
// Source UI
Link<weld::Toggleable&,void> aLink2 = LINK(this, ScPivotLayoutDialog,
ToggleSource);
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index d0921f3eb96e..1dde53c1866e 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -88,6 +88,7 @@ ScConsolidateDlg::ScConsolidateDlg(SfxBindings* pB,
SfxChildWindow* pCW, weld::W
, m_xLbDestArea(m_xBuilder->weld_combo_box("lbdestarea"))
, m_xEdDestArea(new formula::RefEdit(m_xBuilder->weld_entry("eddestarea")))
, m_xRbDestArea(new
formula::RefButton(m_xBuilder->weld_button("rbdestarea")))
+ , m_xExpander(m_xBuilder->weld_expander("more"))
, m_xBtnByRow(m_xBuilder->weld_check_button("byrow"))
, m_xBtnByCol(m_xBuilder->weld_check_button("bycol"))
, m_xBtnRefs(m_xBuilder->weld_check_button("refs"))
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 29f019b7e5db..9224baa43095 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -148,6 +148,7 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow*
pCW, weld::Window* pPa
, m_xModifyPB(m_xBuilder->weld_button("modify"))
, m_xInvalidFT(m_xBuilder->weld_label("invalid"))
, m_xFrameLabel(m_xAssignFrame->weld_label_widget())
+ , m_xExpander(m_xBuilder->weld_expander("more"))
{
m_xEdName->set_height_request_by_rows(4);
m_xEdAssign->SetReferences(this, m_xFrameLabel.get());
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 7f97e2576795..6b34d8051a57 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -246,6 +246,7 @@ ScDPFunctionDlg::ScDPFunctionDlg(
, mxLbBaseItem(m_xBuilder->weld_combo_box("baseitem"))
, mxBtnOk(m_xBuilder->weld_button("ok"))
, mxBtnCancel(m_xBuilder->weld_button("cancel"))
+ , mxExpander(m_xBuilder->weld_expander("expander"))
, mrLabelVec(rLabelVec)
, mbEmptyItem(false)
{
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx
b/sc/source/ui/inc/PivotLayoutDialog.hxx
index c07693e3518f..c2923ce34ae2 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -85,6 +85,9 @@ private:
std::unique_ptr<weld::Frame> mxDestFrame;
std::unique_ptr<weld::Label> mxDestLabel;
+ std::unique_ptr<weld::Expander> mxOptions;
+ std::unique_ptr<weld::Expander> mxMore;
+
DECL_LINK(CancelClicked, weld::Button&, void);
DECL_LINK(OKClicked, weld::Button&, void);
DECL_LINK(GetEditFocusHandler, formula::RefEdit&, void);
diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx
index 07fb1f3ed561..140472cbbaf4 100644
--- a/sc/source/ui/inc/consdlg.hxx
+++ b/sc/source/ui/inc/consdlg.hxx
@@ -66,6 +66,7 @@ private:
std::unique_ptr<formula::RefEdit> m_xEdDestArea;
std::unique_ptr<formula::RefButton> m_xRbDestArea;
+ std::unique_ptr<weld::Expander> m_xExpander;
std::unique_ptr<weld::CheckButton> m_xBtnByRow;
std::unique_ptr<weld::CheckButton> m_xBtnByCol;
diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx
index f175c7ac5394..4958f121d821 100644
--- a/sc/source/ui/inc/dbnamdlg.hxx
+++ b/sc/source/ui/inc/dbnamdlg.hxx
@@ -83,6 +83,7 @@ private:
std::unique_ptr<weld::Label> m_xInvalidFT;
std::unique_ptr<weld::Label> m_xFrameLabel;
+ std::unique_ptr<weld::Expander> m_xExpander;
private:
void Init();
void UpdateNames();
diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx
index 2c6634def35a..fe05059e8007 100644
--- a/sc/source/ui/inc/namedefdlg.hxx
+++ b/sc/source/ui/inc/namedefdlg.hxx
@@ -53,6 +53,7 @@ private:
std::unique_ptr<weld::Button> m_xBtnAdd;
std::unique_ptr<weld::Button> m_xBtnCancel;
std::unique_ptr<weld::Label> m_xFtInfo;
+ std::unique_ptr<weld::Expander> m_xExpander;
std::unique_ptr<weld::Label> m_xFtRange;
void CancelPushed();
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index d06912120eda..eadde5349618 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -68,6 +68,8 @@ private:
std::unique_ptr<weld::Label> m_xFtInfo;
+ std::unique_ptr<weld::Expander> m_xExpander;
+
std::unique_ptr<ScRangeManagerTable> m_xRangeManagerTable;
private:
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index 146048cfedbf..564f5d426225 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -82,6 +82,7 @@ private:
std::unique_ptr<weld::ComboBox> mxLbBaseItem;
std::unique_ptr<weld::Button> mxBtnOk;
std::unique_ptr<weld::Button> mxBtnCancel;
+ std::unique_ptr<weld::Expander> mxExpander;
NameMapType maBaseFieldNameMap; // cache for base field display
-> original name.
NameMapType maBaseItemNameMap; // cache for base item display ->
original name.
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx
b/sc/source/ui/namedlg/namedefdlg.cxx
index 40936e378d30..97988e390c31 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -48,6 +48,7 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow*
pCW, weld::Window*
, m_xBtnAdd(m_xBuilder->weld_button("add"))
, m_xBtnCancel(m_xBuilder->weld_button("cancel"))
, m_xFtInfo(m_xBuilder->weld_label("label"))
+ , m_xExpander(m_xBuilder->weld_expander("more"))
, m_xFtRange(m_xBuilder->weld_label("label3"))
{
m_xEdRange->SetReferences(this, m_xFtRange.get());
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 21753cefb638..652f0f1125bb 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -72,6 +72,7 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW,
weld::Window* pParen
, m_xBtnOk(m_xBuilder->weld_button("ok"))
, m_xBtnCancel(m_xBuilder->weld_button("cancel"))
, m_xFtInfo(m_xBuilder->weld_label("info"))
+ , m_xExpander(m_xBuilder->weld_expander("more"))
{
m_xEdAssign->SetReferences(this, m_xFtAssign.get());
m_xRbAssign->SetReferences(this, m_xEdAssign.get());
