vcl/jsdialog/jsdialogbuilder.cxx | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
New commits:
commit bc8a86743d122a7df8fcabf59959705895e631f9
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Dec 16 21:25:43 2024 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Dec 17 09:28:12 2024 +0100
vcl: silence warning C6011
Compiling with ENABLE_MSVC_ANALYZE fails with
C:/cygwin64/home/tdf/jenkins/workspace/gerrit_windows/vcl/jsdialog/jsdialogbuilder.cxx(1034):
error C2220: the following warning is treated as an error
C: C: make[1]: ***
[C:/cygwin64/home/tdf/jenkins/workspace/gerrit_windows/solenv/gbuild/LinkTarget.mk:339:
C:/cygwin64/home/tdf/jenkins/workspace/gerrit_windows/workdir/CxxObject/vcl/jsdialog/jsdialogbuilder.o]
Error 2
make[1]: *** Waiting for unfinished jobs....
Change-Id: I97bbd1a68800b2b9e2c2f1cefbf8a74d3416b811
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178612
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 117b7b97cad6..f4c0c60073e1 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1017,13 +1017,12 @@ bool JSAssistant::runAsync(std::shared_ptr<Dialog>
const& rxSelf,
std::unique_ptr<weld::Button> JSDialog::weld_button_for_response(int nResponse)
{
- PushButton* pButton
- =
dynamic_cast<::PushButton*>(m_xDialog->get_widget_for_response(nResponse));
- std::unique_ptr<weld::Button> xWeldWidget
- = pButton ? std::make_unique<JSButton>(m_pSender, pButton, nullptr,
false) : nullptr;
-
- if (xWeldWidget)
+ std::unique_ptr<weld::Button> xWeldWidget;
+ if (PushButton* pButton
+ =
dynamic_cast<::PushButton*>(m_xDialog->get_widget_for_response(nResponse)))
{
+ xWeldWidget = std::make_unique<JSButton>(m_pSender, pButton, nullptr,
false);
+
auto pParentDialog = m_xDialog->GetParentWithLOKNotifier();
if (pParentDialog)
JSInstanceBuilder::RememberWidget(OUString::number(pParentDialog->GetLOKWindowId()),
@@ -1047,11 +1046,11 @@ std::unique_ptr<weld::Button>
JSAssistant::weld_button_for_response(int nRespons
pButton = m_xWizard->m_pCancel;
else if (nResponse == RET_HELP)
pButton = m_xWizard->m_pHelp;
+
if (pButton)
+ {
xWeldWidget = std::make_unique<JSButton>(m_pSender, pButton, nullptr,
false);
- if (xWeldWidget)
- {
auto pParentDialog = m_xWizard->GetParentWithLOKNotifier();
if (pParentDialog)
JSInstanceBuilder::RememberWidget(OUString::number(pParentDialog->GetLOKWindowId()),
