ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Drop now unused AbstractSvxNameDialog

Browse Source 
As mentioned in earlier commit

    commit 7c42839f7b
    Author: Michael Weghorn <m.weghorn@posteo.de>
    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 <m.weghorn@posteo.de>
Tested-by: Jenkins
This commit is contained in:
Michael Weghorn
2026-02-20 08:18:33 +01:00
parent 706bdb9eca
commit 5663308424
3 changed files with 0 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cui/source/factory/dlgfact.cxx
-57
View File
@@ -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
cui/source/factory/dlgfact.hxx
-2
View File
@@ -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;
include/svx/svxdlg.hxx
-14
View File
@@ -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;