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 AbstractDialogFactory_Impl::CreateSvxEditDictionaryDia return VclPtr>::Create(pParent, rName); } -namespace -{ -class AbstractSvxNameDialog_Impl final - : public vcl::AbstractDialogImpl_Sync -{ -public: - using AbstractDialogImpl_BASE::AbstractDialogImpl_BASE; - OUString GetName() override { return m_pDlg->GetName(); } - void SetCheckNameHdl(const Link& rLink) override; - void SetCheckNameTooltipHdl(const Link& 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 aCheckNameHdl; - Link aCheckNameTooltipHdl; - DECL_LINK(CheckNameHdl, SvxNameDialog&, bool); - DECL_LINK(CheckNameTooltipHdl, SvxNameDialog&, OUString); -}; -} - -void AbstractSvxNameDialog_Impl::SetCheckNameHdl(const Link& rLink) -{ - aCheckNameHdl = rLink; - if (rLink.IsSet()) - m_pDlg->SetCheckNameHdl(LINK(this, AbstractSvxNameDialog_Impl, CheckNameHdl)); - else - m_pDlg->SetCheckNameHdl(Link()); -} - -void AbstractSvxNameDialog_Impl::SetCheckNameTooltipHdl( - const Link& rLink) -{ - aCheckNameTooltipHdl = rLink; - if (rLink.IsSet()) - m_pDlg->SetCheckNameTooltipHdl(LINK(this, AbstractSvxNameDialog_Impl, CheckNameTooltipHdl)); - else - m_pDlg->SetCheckNameTooltipHdl(Link()); -} - -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 AbstractDialogFactory_Impl::CreateSvxNameDialog(weld::Window* pParent, - const OUString& rName, const OUString& rDesc, const OUString& rTitle) -{ - return VclPtr::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 CreateFmInputRecordNoDialog(weld::Window* pParent) override; virtual VclPtr CreateSvxNewDictionaryDialog(weld::Window* pParent) override; virtual VclPtr CreateSvxEditDictionaryDialog(weld::Window* pParent, const OUString& rName) override; - virtual VclPtr CreateSvxNameDialog(weld::Window* pParent, - const OUString& rName, const OUString& rDesc, const OUString& rTitle = u""_ustr) override; // #i68101# virtual VclPtr CreateSvxObjectNameDialog(weld::Window* pParent, const OUString& rName) override; virtual VclPtr 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& rLink ) = 0; - virtual void SetCheckNameTooltipHdl( const Link& 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 CreateFmInputRecordNoDialog(weld::Window* pParent) = 0; virtual VclPtr CreateSvxNewDictionaryDialog(weld::Window* pParent) = 0; virtual VclPtr CreateSvxEditDictionaryDialog(weld::Window* pParent, const OUString& rName) = 0; - virtual VclPtr CreateSvxNameDialog(weld::Window* pParent, - const OUString& rName, const OUString& rDesc, const OUString& rTitle = u""_ustr ) = 0; // #i68101# virtual VclPtr CreateSvxObjectNameDialog(weld::Window* pParent, const OUString& rName) = 0;