[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/jsdialog

[Caolán McNamara (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit b48b8842feb31e299f8f0e39275f5466704755d8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jun 27 16:14:11 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Jan 19 17:07:08 2021 +0100

    cid#1464972 Unchecked dynamic_cast
    
    Change-Id: If40ee310e0a16af7ce93a5f93e2b436069aa153a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97317
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109606
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index d040108b9e22..d3c7f8f8764c 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -252,13 +252,19 @@ void JSDropTarget::fire_dragEnter(const css::datatransfer::dnd::DropTargetDragEn
     }
 }
 
+namespace
+{
+vcl::Window* extract_sal_widget(weld::Widget* pParent)
+{
+    SalInstanceWidget* pInstanceWidget = dynamic_cast<SalInstanceWidget*>(pParent);
+    return pInstanceWidget ? pInstanceWidget->getWidget() : nullptr;
+}
+}
+
 // used for dialogs
 JSInstanceBuilder::JSInstanceBuilder(weld::Widget* pParent, const OUString& rUIRoot,
                                      const OUString& rUIFile)
-    : SalInstanceBuilder(dynamic_cast<SalInstanceWidget*>(pParent)
-                             ? dynamic_cast<SalInstanceWidget*>(pParent)->getWidget()
-                             : nullptr,
-                         rUIRoot, rUIFile)
+    : SalInstanceBuilder(extract_sal_widget(pParent), rUIRoot, rUIFile)
     , m_nWindowId(0)
     , m_aParentDialog(nullptr)
     , m_aContentWindow(nullptr)