jsdialog: Common weld::Widget implementation

Change-Id: Iab21652c6abaf143fb421d6030f6acc394733bcb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94073
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94489
Tested-by: Jenkins

1 files changed, 6 insertions, 8 deletions

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index a3a8457b3145..e23e8f1a75e2 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -84,8 +84,7 @@ std::unique_ptr<weld::ComboBox> JSInstanceBuilder::weld_combo_box(const OString&
 
 JSLabel::JSLabel(VclPtr<vcl::Window> aOwnedToplevel, FixedText* pLabel,
                  SalInstanceBuilder* pBuilder, bool bTakeOwnership)
-    : SalInstanceLabel(pLabel, pBuilder, bTakeOwnership)
-    , JSDialogSender(aOwnedToplevel)
+    : JSWidget<SalInstanceLabel, FixedText>(aOwnedToplevel, pLabel, pBuilder, bTakeOwnership)
 {
 }
 
@@ -97,8 +96,7 @@ void JSLabel::set_label(const OUString& rText)
 
 JSEntry::JSEntry(VclPtr<vcl::Window> aOwnedToplevel, ::Edit* pEntry, SalInstanceBuilder* pBuilder,
                  bool bTakeOwnership)
-    : SalInstanceEntry(pEntry, pBuilder, bTakeOwnership)
-    , JSDialogSender(aOwnedToplevel)
+    : JSWidget<SalInstanceEntry, ::Edit>(aOwnedToplevel, pEntry, pBuilder, bTakeOwnership)
 {
 }
 
@@ -110,8 +108,8 @@ void JSEntry::set_text(const OUString& rText)
 
 JSListBox::JSListBox(VclPtr<vcl::Window> aOwnedToplevel, ::ListBox* pListBox,
                      SalInstanceBuilder* pBuilder, bool bTakeOwnership)
-    : SalInstanceComboBoxWithoutEdit(pListBox, pBuilder, bTakeOwnership)
-    , JSDialogSender(aOwnedToplevel)
+    : JSWidget<SalInstanceComboBoxWithoutEdit, ::ListBox>(aOwnedToplevel, pListBox, pBuilder,
+                                                          bTakeOwnership)
 {
 }
 
@@ -130,8 +128,8 @@ void JSListBox::remove(int pos)
 
 JSComboBox::JSComboBox(VclPtr<vcl::Window> aOwnedToplevel, ::ComboBox* pComboBox,
                        SalInstanceBuilder* pBuilder, bool bTakeOwnership)
-    : SalInstanceComboBoxWithEdit(pComboBox, pBuilder, bTakeOwnership)
-    , JSDialogSender(aOwnedToplevel)
+    : JSWidget<SalInstanceComboBoxWithEdit, ::ComboBox>(aOwnedToplevel, pComboBox, pBuilder,
+                                                        bTakeOwnership)
 {
 }