sc/source/ui/docshell/docsh6.cxx | 2 +- sfx2/qa/cppunit/view.cxx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit b5835c23cdf533be015e64d61ce1df250180f1fb Author: Caolán McNamara <[email protected]> AuthorDate: Wed May 15 11:32:57 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Wed May 15 20:46:29 2024 +0200 WaE: C6011 Dereferencing NULL pointer warnings Change-Id: I1d603f804bada2a6cd9fd8784da4de125a2b87fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167663 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sfx2/qa/cppunit/view.cxx b/sfx2/qa/cppunit/view.cxx index e0e8c69b2a36..9141e4fba36b 100644 --- a/sfx2/qa/cppunit/view.cxx +++ b/sfx2/qa/cppunit/view.cxx @@ -43,7 +43,9 @@ CPPUNIT_TEST_FIXTURE(Sfx2ViewTest, testReloadPage) aSet.Put(SfxInt32Item(SID_PAGE_NUMBER, 1)); SfxRequest aReq(SID_RELOAD, SfxCallMode::SLOT, aSet); pFrame->ExecReload_Impl(aReq); - uno::Reference<frame::XModel> xModel = SfxObjectShell::Current()->GetBaseModel(); + SfxObjectShell* pDocSh = SfxObjectShell::Current(); + CPPUNIT_ASSERT(pDocSh); + uno::Reference<frame::XModel> xModel = pDocSh->GetBaseModel(); mxComponent = xModel; // Check the current page after reload. commit d5ff0410e7df5ca95ec3076386881e49eb46ddca Author: Szymon Kłos <[email protected]> AuthorDate: Tue May 7 15:33:21 2024 +0200 Commit: Caolán McNamara <[email protected]> CommitDate: Wed May 15 20:46:16 2024 +0200 lok: don't show separator conversion dialog in online it is more likely that you run file not created with your user locale. Don't show annoying dialog about separator conversion in LOK as we didn't show it before. Recently we enabled it and it become visible. Change-Id: I5a37865dbe63bca0c55205b59be3a64ceb824b17 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167281 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Gökay ŞATIR <[email protected]> (cherry picked from commit 83269aa84a0af8b9a32424af6b01815aaad4f42a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167672 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 34092f13feed..f82b9da9fa82 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -496,7 +496,7 @@ void ScDocShell::CheckConfigOptions() pScMod->SetFormulaOptions(aNew); // Launch a nice warning dialog to let the users know of this change. - ScTabViewShell* pViewShell = GetBestViewShell(); + ScTabViewShell* pViewShell = comphelper::LibreOfficeKit::isActive() ? nullptr : GetBestViewShell(); if (pViewShell) { std::shared_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(pViewShell->GetFrameWeld(),
