summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-06-27 16:14:11 +0100
committerSzymon Kłos <szymon.klos@collabora.com>2021-01-19 17:07:08 +0100
commitb48b8842feb31e299f8f0e39275f5466704755d8 (patch)
tree82d6d994875ffc93b592626e6b79e17524914151
parent4618849a1cbba4e249ee13c3b6412337160a2816 (diff)
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@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109606 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
-rw-r--r--vcl/jsdialog/jsdialogbuilder.cxx14
1 files changed, 10 insertions, 4 deletions
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)