cui/source/dialogs/toolbartabpage.cxx | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 1d52b5b08952685d31902cc2ec37c50ec04d6f83
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon May 26 20:42:30 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue May 27 00:48:01 2025 +0200
cui: fix warning C6013: Dereferencing NULL pointer 'Current()'
C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win_analyze/cui/source/dialogs/toolbartabpage.cxx(110):
error C2220: the following warning is treated as an error
C: make[1]: ***
[C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win_analyze/solenv/gbuild/LinkTarget.mk:338:
C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win_analyze/workdir/CxxObject/cui/source/dialogs/toolbartabpage.o]
Error 2
make[1]: *** Waiting for unfinished jobs....
after
commit 4ab26f4ea0c627844531144a6a903c357a604a5e
Author: Heiko Tietze <tietze.he...@gmail.com>
Date: Mon May 26 12:03:40 2025 +0200
Resolves tdf#158880 - Let users select multiple toolbars at once
Change-Id: I54375b705e332d49b7635dc257ff20e9f61d3f39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185859
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/cui/source/dialogs/toolbartabpage.cxx
b/cui/source/dialogs/toolbartabpage.cxx
index d1a76ae8526e..6598632c85a2 100644
--- a/cui/source/dialogs/toolbartabpage.cxx
+++ b/cui/source/dialogs/toolbartabpage.cxx
@@ -42,8 +42,10 @@ void ToolbarTabPage::Reset(const SfxItemSet* /* rSet*/)
comphelper::getProcessComponentContext());
if (!xContext)
return;
- css::uno::Reference<css::frame::XFrame> xFrame
- = SfxViewFrame::Current()->GetFrame().GetFrameInterface();
+ SfxViewFrame* pViewFrm = SfxViewFrame::Current();
+ if (!pViewFrm)
+ return;
+ css::uno::Reference<css::frame::XFrame> xFrame =
pViewFrm->GetFrame().GetFrameInterface();
if (!xFrame)
return;
css::uno::Reference<css::ui::XModuleUIConfigurationManagerSupplier>
xSupplier
@@ -126,4 +128,4 @@ IMPL_LINK(ToolbarTabPage, ToggleHdl, const
weld::TreeView::iter_col&, rRowCol, v
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
