cui/source/factory/dlgfact.cxx | 57 ----------------------------------------- cui/source/factory/dlgfact.hxx | 2 - include/svx/svxdlg.hxx | 14 ---------- 3 files changed, 73 deletions(-)
New commits: commit 5663308424df3c5d5b81472254451ab84bfb6872 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Feb 19 16:49:06 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Feb 20 08:18:33 2026 +0100 Drop now unused AbstractSvxNameDialog As mentioned in earlier commit commit 7c42839f7b4a26d1f239a5f1968b65295f9c4117 Author: Michael Weghorn <[email protected]> Date: Tue Feb 17 15:43:22 2026 +0100 tdf#158280 Move SvxNameDialog etc. from cui to svtools , SvxNameDialog can now be used directly instead of via the AbstractSvxNameDialog abstraction. Now that all users of AbstractSvxNameDialog have been ported to use SvxNameDialog directly in previous commits, drop the now unused AbstractSvxNameDialog altogether. Change-Id: Iff696fa557ba0bf80a5f2976271ce83bda1e5aec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199747 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 2e5e98190940..92583fb3b6a0 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -743,63 +743,6 @@ VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateSvxEditDictionaryDia return VclPtr<CuiAbstractController_Impl<SvxEditDictionaryDialog>>::Create(pParent, rName); } -namespace -{ -class AbstractSvxNameDialog_Impl final - : public vcl::AbstractDialogImpl_Sync<AbstractSvxNameDialog, SvxNameDialog> -{ -public: - using AbstractDialogImpl_BASE::AbstractDialogImpl_BASE; - OUString GetName() override { return m_pDlg->GetName(); } - void SetCheckNameHdl(const Link<AbstractSvxNameDialog&, bool>& rLink) override; - void SetCheckNameTooltipHdl(const Link<AbstractSvxNameDialog&, OUString>& rLink) override; - void SetEditHelpId(const OUString& rHelpId) override { m_pDlg->SetEditHelpId(rHelpId); } - //from class Window - void SetText(const OUString& rStr) override { m_pDlg->set_title(rStr); } - -private: - Link<AbstractSvxNameDialog&, bool> aCheckNameHdl; - Link<AbstractSvxNameDialog&, OUString> aCheckNameTooltipHdl; - DECL_LINK(CheckNameHdl, SvxNameDialog&, bool); - DECL_LINK(CheckNameTooltipHdl, SvxNameDialog&, OUString); -}; -} - -void AbstractSvxNameDialog_Impl::SetCheckNameHdl(const Link<AbstractSvxNameDialog&, bool>& rLink) -{ - aCheckNameHdl = rLink; - if (rLink.IsSet()) - m_pDlg->SetCheckNameHdl(LINK(this, AbstractSvxNameDialog_Impl, CheckNameHdl)); - else - m_pDlg->SetCheckNameHdl(Link<SvxNameDialog&, bool>()); -} - -void AbstractSvxNameDialog_Impl::SetCheckNameTooltipHdl( - const Link<AbstractSvxNameDialog&, OUString>& rLink) -{ - aCheckNameTooltipHdl = rLink; - if (rLink.IsSet()) - m_pDlg->SetCheckNameTooltipHdl(LINK(this, AbstractSvxNameDialog_Impl, CheckNameTooltipHdl)); - else - m_pDlg->SetCheckNameTooltipHdl(Link<SvxNameDialog&, OUString>()); -} - -IMPL_LINK_NOARG(AbstractSvxNameDialog_Impl, CheckNameHdl, SvxNameDialog&, bool) -{ - return aCheckNameHdl.Call(*this); -} - -IMPL_LINK_NOARG(AbstractSvxNameDialog_Impl, CheckNameTooltipHdl, SvxNameDialog&, OUString) -{ - return aCheckNameTooltipHdl.Call(*this); -} - -VclPtr<AbstractSvxNameDialog> AbstractDialogFactory_Impl::CreateSvxNameDialog(weld::Window* pParent, - const OUString& rName, const OUString& rDesc, const OUString& rTitle) -{ - return VclPtr<AbstractSvxNameDialog_Impl>::Create(pParent, rName, rDesc, rTitle); -} - namespace { class AbstractSvxObjectNameDialog_Impl final diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 4a2792ae3765..4a2c0f26916c 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -117,8 +117,6 @@ public: virtual VclPtr<AbstractFmInputRecordNoDialog> CreateFmInputRecordNoDialog(weld::Window* pParent) override; virtual VclPtr<AbstractSvxNewDictionaryDialog> CreateSvxNewDictionaryDialog(weld::Window* pParent) override; virtual VclPtr<VclAbstractDialog> CreateSvxEditDictionaryDialog(weld::Window* pParent, const OUString& rName) override; - virtual VclPtr<AbstractSvxNameDialog> CreateSvxNameDialog(weld::Window* pParent, - const OUString& rName, const OUString& rDesc, const OUString& rTitle = u""_ustr) override; // #i68101# virtual VclPtr<AbstractSvxObjectNameDialog> CreateSvxObjectNameDialog(weld::Window* pParent, const OUString& rName) override; virtual VclPtr<AbstractSvxObjectTitleDescDialog> CreateSvxObjectTitleDescDialog(weld::Window* pParent, const OUString& rTitle, const OUString& rDescription, bool isDecorative) override; diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 4c1190cb50ba..1608f9b414cc 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -145,18 +145,6 @@ public: virtual css::uno::Reference< css::linguistic2::XDictionary > GetNewDictionary() = 0; }; -class AbstractSvxNameDialog : public VclAbstractDialog -{ -protected: - virtual ~AbstractSvxNameDialog() override = default; -public: - virtual OUString GetName() = 0; - virtual void SetCheckNameHdl( const Link<AbstractSvxNameDialog&,bool>& rLink ) = 0; - virtual void SetCheckNameTooltipHdl( const Link<AbstractSvxNameDialog&,OUString>& rLink ) = 0; - virtual void SetEditHelpId(const OUString&) = 0; - virtual void SetText( const OUString& rStr ) = 0; -}; - class AbstractSvxObjectNameDialog :public VclAbstractDialog { protected: @@ -360,8 +348,6 @@ public: virtual VclPtr<AbstractFmInputRecordNoDialog> CreateFmInputRecordNoDialog(weld::Window* pParent) = 0; virtual VclPtr<AbstractSvxNewDictionaryDialog> CreateSvxNewDictionaryDialog(weld::Window* pParent) = 0; virtual VclPtr<VclAbstractDialog> CreateSvxEditDictionaryDialog(weld::Window* pParent, const OUString& rName) = 0; - virtual VclPtr<AbstractSvxNameDialog> CreateSvxNameDialog(weld::Window* pParent, - const OUString& rName, const OUString& rDesc, const OUString& rTitle = u""_ustr ) = 0; // #i68101# virtual VclPtr<AbstractSvxObjectNameDialog> CreateSvxObjectNameDialog(weld::Window* pParent, const OUString& rName) = 0;
