sc/inc/scabstdlg.hxx | 2 sc/qa/unit/screenshots/screenshots.cxx | 2 sc/source/ui/attrdlg/scdlgfact.cxx | 4 sc/source/ui/attrdlg/scdlgfact.hxx | 2 sc/source/ui/inc/datafdlg.hxx | 4 sc/source/ui/miscdlgs/datafdlg.cxx | 13 +-- sc/source/ui/vba/vbaworksheet.cxx | 2 sc/source/ui/view/cellsh2.cxx | 2 sc/uiconfig/scalc/ui/dataform.ui | 133 +++++++++++++-------------------- 9 files changed, 68 insertions(+), 96 deletions(-)
New commits: commit 43ce6eb15fd82c1f56e2417a481b93c7a95542f8 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Oct 14 22:31:01 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Oct 16 08:44:48 2025 +0200 sc: Use ref instead of pointer for ScDataFormDlg's ScTabViewShell Change-Id: Ieb9465ed016b4f334c75d9c208dd4f14e5ef957f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192416 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index f7b817d237ed..a2f51e384450 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -444,7 +444,7 @@ public: virtual VclPtr<AbstractScDeleteCellDlg> CreateScDeleteCellDlg(weld::Window* pParent, bool bDisallowCellMove) = 0 ; //for dataform - virtual VclPtr<AbstractScDataFormDlg> CreateScDataFormDlg(weld::Window* pParent, ScTabViewShell* pTabViewShell) = 0; + virtual VclPtr<AbstractScDataFormDlg> CreateScDataFormDlg(weld::Window* pParent, ScTabViewShell& rTabViewShell) = 0; virtual VclPtr<AbstractScDeleteContentsDlg> CreateScDeleteContentsDlg(weld::Window* pParent) = 0; virtual VclPtr<AbstractScFillSeriesDlg> CreateScFillSeriesDlg(weld::Window* pParent, diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx index 19b6e25a0cc2..466dafdf1b09 100644 --- a/sc/qa/unit/screenshots/screenshots.cxx +++ b/sc/qa/unit/screenshots/screenshots.cxx @@ -213,7 +213,7 @@ VclPtr<VclAbstractDialog> ScScreenshotTest::createDialogByID(sal_uInt32 nID) { ////FIXME: looks butt-ugly w/ empty file, move it elsewhere, where ////we actually have some data - pReturnDialog = mpFact->CreateScDataFormDlg(mpViewShell->GetFrameWeld(), mpViewShell); + pReturnDialog = mpFact->CreateScDataFormDlg(mpViewShell->GetFrameWeld(), *mpViewShell); break; } diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 43e4ea73e95e..67ee17a4da49 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -286,12 +286,12 @@ VclPtr<AbstractScDeleteCellDlg> ScAbstractDialogFactory_Impl::CreateScDeleteCell } VclPtr<AbstractScDataFormDlg> ScAbstractDialogFactory_Impl::CreateScDataFormDlg(weld::Window* pParent, - ScTabViewShell* pTabViewShell) + ScTabViewShell& rTabViewShell) { // for dataform using AbstractScDataFormDlg_Impl = ScreenshottedDialog_Impl_Sync<AbstractScDataFormDlg, ScDataFormDlg>; - return VclPtr<AbstractScDataFormDlg_Impl>::Create(pParent, pTabViewShell); + return VclPtr<AbstractScDataFormDlg_Impl>::Create(pParent, rTabViewShell); } namespace diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 3e246df150d1..c3bea7a553ee 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -56,7 +56,7 @@ public: virtual VclPtr<AbstractScDeleteCellDlg> CreateScDeleteCellDlg(weld::Window* pParent, bool bDisallowCellMove ) override; //for dataform - virtual VclPtr<AbstractScDataFormDlg> CreateScDataFormDlg(weld::Window* pParent, ScTabViewShell* pTabViewShell) override; + virtual VclPtr<AbstractScDataFormDlg> CreateScDataFormDlg(weld::Window* pParent, ScTabViewShell& rTabViewShell) override; virtual VclPtr<AbstractScDeleteContentsDlg> CreateScDeleteContentsDlg(weld::Window* pParent) override; diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx index 20be6d271c59..380963623abd 100644 --- a/sc/source/ui/inc/datafdlg.hxx +++ b/sc/source/ui/inc/datafdlg.hxx @@ -24,7 +24,7 @@ class ScDataFormDlg : public weld::GenericDialogController private: OUString sNewRecord; - ScTabViewShell* pTabViewShell; + ScTabViewShell& m_rTabViewShell; ScDocument* pDoc; sal_uInt16 aColLength; SCROW nCurrentRow; @@ -46,7 +46,7 @@ private: std::vector<std::unique_ptr<ScDataFormFragment>> m_aEntries; public: - ScDataFormDlg(weld::Window* pParent, ScTabViewShell* pTabViewShell); + ScDataFormDlg(weld::Window* pParent, ScTabViewShell& rTabViewShell); virtual ~ScDataFormDlg() override; void FillCtrls(); diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index c5462ba149b0..24567dc58805 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -17,9 +17,9 @@ #include <vcl/svapp.hxx> #include <osl/diagnose.h> -ScDataFormDlg::ScDataFormDlg(weld::Window* pParent, ScTabViewShell* pTabViewShellOri) +ScDataFormDlg::ScDataFormDlg(weld::Window* pParent, ScTabViewShell& rTabViewShellOri) : GenericDialogController(pParent, u"modules/scalc/ui/dataform.ui"_ustr, u"DataFormDialog"_ustr) - , pTabViewShell(pTabViewShellOri) + , m_rTabViewShell(rTabViewShellOri) , aColLength(0) , nCurrentRow(0) , nStartCol(0) @@ -40,8 +40,7 @@ ScDataFormDlg::ScDataFormDlg(weld::Window* pParent, ScTabViewShell* pTabViewShel sNewRecord = m_xFixedText->get_label(); //read header from current document, and add new controls - OSL_ENSURE( pTabViewShell, "pTabViewShell is NULL! :-/" ); - ScViewData& rViewData = pTabViewShell->GetViewData(); + ScViewData& rViewData = m_rTabViewShell.GetViewData(); pDoc = &rViewData.GetDocument(); @@ -229,7 +228,7 @@ IMPL_LINK( ScDataFormDlg, Impl_DataModifyHdl, weld::Entry&, rEdit, void) IMPL_LINK_NOARG(ScDataFormDlg, Impl_NewHdl, weld::Button&, void) { - ScViewData& rViewData = pTabViewShell->GetViewData(); + ScViewData& rViewData = m_rTabViewShell.GetViewData(); ScDocShell& rDocSh = rViewData.GetDocShell(); if ( !pDoc ) return; @@ -240,7 +239,7 @@ IMPL_LINK_NOARG(ScDataFormDlg, Impl_NewHdl, weld::Button&, void) if ( !bHasData ) return; - pTabViewShell->DataFormPutData(nCurrentRow, nStartRow, nStartCol, nEndRow, nEndCol, m_aEntries, aColLength); + m_rTabViewShell.DataFormPutData(nCurrentRow, nStartRow, nStartCol, nEndRow, nEndCol, m_aEntries, aColLength); nCurrentRow++; if (nCurrentRow >= nEndRow + 2) { @@ -287,7 +286,7 @@ IMPL_LINK_NOARG(ScDataFormDlg, Impl_RestoreHdl, weld::Button&, void) IMPL_LINK_NOARG(ScDataFormDlg, Impl_DeleteHdl, weld::Button&, void) { - ScViewData& rViewData = pTabViewShell->GetViewData(); + ScViewData& rViewData = m_rTabViewShell.GetViewData(); ScDocShell& rDocSh = rViewData.GetDocShell(); if (!pDoc) return; diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 26835553af2d..a7667bfb1243 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -871,7 +871,7 @@ ScVbaWorksheet::ShowDataForm( ) { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); ScopedVclPtr<AbstractScDataFormDlg> pDlg(pFact->CreateScDataFormDlg(pTabViewShell->GetFrameWeld(), - pTabViewShell)); + *pTabViewShell)); pDlg->Execute(); } } diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index a2d407f5e365..aa2dc82d7885 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -369,7 +369,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); ScopedVclPtr<AbstractScDataFormDlg> pDlg(pFact->CreateScDataFormDlg( - pTabViewShell->GetFrameWeld(), pTabViewShell)); + pTabViewShell->GetFrameWeld(), *pTabViewShell)); pDlg->Execute(); commit d48dce17e0045bf433c252b590ec91f51d8d0891 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Oct 14 22:17:22 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Oct 16 08:44:39 2025 +0200 sc: Resave dataform.ui with glade 3.40 This dialog can be used using "Data" -> "Form..." in Calc. Change-Id: I739d62f7a9351329a016a9cda8b781956f27d416 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192415 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sc/uiconfig/scalc/ui/dataform.ui b/sc/uiconfig/scalc/ui/dataform.ui index acfb80316c7d..b560b2202c42 100644 --- a/sc/uiconfig/scalc/ui/dataform.ui +++ b/sc/uiconfig/scalc/ui/dataform.ui @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="sc"> <requires lib="gtk+" version="3.20"/> <object class="GtkDialog" id="DataFormDialog"> - <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> <property name="title" translatable="yes" context="dataform|DataFormDialog">Data Form</property> - <property name="type_hint">dialog</property> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="homogeneous">True</property> - <property name="layout_style">end</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="help"> <property name="label" translatable="yes" context="stock">_Help</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -36,9 +36,9 @@ <object class="GtkButton" id="close"> <property name="label" translatable="yes" context="dataform|close">_Close</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> @@ -50,44 +50,44 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> + <property name="column-spacing">12</property> <child> <object class="GtkScrolledWindow" id="scrollbar"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">always</property> - <property name="shadow_type">in</property> + <property name="hscrollbar-policy">never</property> + <property name="vscrollbar-policy">always</property> + <property name="shadow-type">in</property> <child> <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkBox" id="box1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="spacing">6</property> <child> <object class="GtkBox" id="box2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="margin-start">6</property> <property name="margin-end">6</property> - <property name="margin_top">6</property> - <property name="margin_bottom">6</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> @@ -95,35 +95,11 @@ <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <property name="row_homogeneous">True</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> + <property name="row-homogeneous">True</property> <child> <placeholder/> </child> @@ -147,22 +123,22 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkButtonBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <property name="homogeneous">True</property> - <property name="layout_style">start</property> + <property name="layout-style">start</property> <child> <object class="GtkLabel" id="label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="dataform|label">New Record</property> <property name="xalign">0</property> </object> @@ -176,11 +152,11 @@ <object class="GtkButton" id="new"> <property name="label" translatable="yes" context="dataform|new">_New</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="has-default">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> @@ -192,9 +168,9 @@ <object class="GtkButton" id="delete"> <property name="label" translatable="yes" context="dataform|delete">_Delete</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> @@ -206,9 +182,9 @@ <object class="GtkButton" id="restore"> <property name="label" translatable="yes" context="dataform|restore">_Restore</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> @@ -220,9 +196,9 @@ <object class="GtkButton" id="prev"> <property name="label" translatable="yes" context="dataform|prev">_Previous Record</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> @@ -235,9 +211,9 @@ <object class="GtkButton" id="next"> <property name="label" translatable="yes" context="dataform|next">Ne_xt Record</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> @@ -248,8 +224,8 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> </object> @@ -265,9 +241,6 @@ <action-widget response="-11">help</action-widget> <action-widget response="-7">close</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> <child internal-child="accessible"> <object class="AtkObject" id="DataFormDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="dataform|extended_tip|DataFormDialog">Data Entry Form is a tool to make table data entry easy in spreadsheets.</property>
