commit b8e9e1bc7713ac159c3f23f9e4be4ddb656a9d79
author Szymon Kłos <szymon.klos@collabora.com> Tue Oct 05 17:02:56 2021 +0200
committer Szymon Kłos <szymon.klos@collabora.com> Wed Oct 06 11:09:14 2021 +0200
tree 26fe006120f9a2779dc67831608a0e34c3cfb85d
parent dfff37d1d92074abbd8ad0dc5c79a4e269d09f61

jsdialog: avoid compiler warning for plain vcl window

Change-Id: Icfe5a07e74801d59d6bb0988948bdf20f22bc3e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123110
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>

vcl/inc/jsdialog/jsdialogbuilder.hxx

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index dc30508..2828573 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -686,4 +686,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: */

vcl/jsdialog/jsdialogbuilder.cxx

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 64f2b30..b38753f 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1048,9 +1048,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());