ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#130857 weld: Have default Dialog::SetInstallLOKNotifierHdl impls

Browse Source 
Instead of overriding the purely virtual
weld::Dialog::SetInstallLOKNotifierHdl in both, the gtk
and the qt weld implementations, have an empty default
implementation right in the weld::Dialog base class instead.

This method is only relevant for the case where
LibreOfficeKit is used.

Change-Id: If4cafb9d9f00ad497fdd35ee9dfbf400bc18301d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/203188
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-04-04 23:43:34 +02:00
parent b6349277aa
commit 9996febe1d
5 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vcl/weld/Dialog.hxx
+1 -2
View File
@@ -66,8 +66,7 @@ public:
// undo previous dialog collapse
virtual void undo_collapse() = 0;
virtual void SetInstallLOKNotifierHdl(const Link<void*, vcl::ILibreOfficeKitNotifier*>& rLink)
= 0;
virtual void SetInstallLOKNotifierHdl(const Link<void*, vcl::ILibreOfficeKitNotifier*>& rLink);
};
}
vcl/inc/qt5/QtInstanceDialog.hxx
-3
View File
@@ -49,9 +49,6 @@ public:
virtual void undo_collapse() override;
virtual void
SetInstallLOKNotifierHdl(const Link<void*, vcl::ILibreOfficeKitNotifier*>&) override;
virtual int run() override;
virtual void response(int nResponse) override;
vcl/qt5/QtInstanceDialog.cxx
-4
View File
@@ -138,10 +138,6 @@ void QtInstanceDialog::undo_collapse()
});
}
void QtInstanceDialog::SetInstallLOKNotifierHdl(const Link<void*, vcl::ILibreOfficeKitNotifier*>&)
{
}
int QtInstanceDialog::run()
{
SolarMutexGuard g;
vcl/source/weld/Dialog.cxx
+2
View File
@@ -57,6 +57,8 @@ void Dialog::set_default_response(int nResponse)
std::unique_ptr<weld::Button> pButton = weld_button_for_response(nResponse);
change_default_button(nullptr, pButton.get());
}
void Dialog::SetInstallLOKNotifierHdl(const Link<void*, vcl::ILibreOfficeKitNotifier*>&) {}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
vcl/unx/gtk3/gtkinst.cxx
-5
View File
@@ -7257,11 +7257,6 @@ public:
void close(bool bCloseSignal);
virtual void SetInstallLOKNotifierHdl(const Link<void*, vcl::ILibreOfficeKitNotifier*>&) override
{
//not implemented for the gtk variant
}
virtual ~GtkInstanceDialog() override
{
if (!m_aHiddenWidgets.empty())