vcl/inc/jsdialog/jsdialogbuilder.hxx | 10 ++++++++++ vcl/jsdialog/jsdialogbuilder.cxx | 5 ++--- 2 files changed, 12 insertions(+), 3 deletions(-)
New commits: commit 43f4c94c38089ba84256a88d1468e3ced5ef2be7 Author: Szymon Kłos <[email protected]> AuthorDate: Tue Oct 5 17:02:56 2021 +0200 Commit: Szymon Kłos <[email protected]> CommitDate: Wed Oct 6 11:53:10 2021 +0200 jsdialog: avoid compiler warning for plain vcl window Change-Id: Icfe5a07e74801d59d6bb0988948bdf20f22bc3e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123109 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx index dfd692e0a026..7dba4b7a3120 100644 --- a/vcl/inc/jsdialog/jsdialogbuilder.hxx +++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx @@ -684,4 +684,14 @@ public: JSBox(JSDialogSender* pSender, VclBox* pBox, SalInstanceBuilder* pBuilder, bool bTakeOwnership); }; +class JSWidgetInstance : public JSWidget<SalInstanceWidget, vcl::Window> +{ +public: + JSWidgetInstance(JSDialogSender* pSender, vcl::Window* pObject, SalInstanceBuilder* pBuilder, + bool bTakeOwnership) + : JSWidget<SalInstanceWidget, vcl::Window>(pSender, pObject, pBuilder, bTakeOwnership) + { + } +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index 0a8c39c9cecb..cb95b528af8b 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -1056,9 +1056,8 @@ std::unique_ptr<weld::Box> JSInstanceBuilder::weld_box(const OString& id) std::unique_ptr<weld::Widget> JSInstanceBuilder::weld_widget(const OString& id) { vcl::Window* pWidget = m_xBuilder->get(id); - auto pWeldWidget = pWidget ? std::make_unique<JSWidget<SalInstanceWidget, vcl::Window>>( - this, pWidget, this, false) - : nullptr; + auto pWeldWidget + = pWidget ? std::make_unique<JSWidgetInstance>(this, pWidget, this, false) : nullptr; if (pWeldWidget) RememberWidget(id, pWeldWidget.get());
