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/+/168208
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins

6 files changed, 9 insertions, 0 deletions

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.