sw/inc/doc.hxx | 6 +++---
sw/source/uibase/utlui/unotools.cxx | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 0a175b29c7f6b55ac96b9046653486041e98e11f
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue May 21 18:52:27 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu May 23 10:59:25 2024 +0200
sw: Use SAL_RET_MAYBENULL in GetEditShell()
after 24889135773204c6e3002dcb417c75ff1a99ccd0
"check GetEditShell()"
Change-Id: I5650e23e0c2a1c3eb81cfa71c57b809d8abc4b40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167906
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index b1b68bec2dba..461f835bc2a5 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1349,9 +1349,9 @@ public:
SwAttrPool& GetAttrPool() { return *mpAttrPool; }
// Search for an EditShell.
- SwEditShell const * GetEditShell() const;
- SW_DLLPUBLIC SwEditShell* GetEditShell();
- ::sw::IShellCursorSupplier * GetIShellCursorSupplier();
+ SAL_RET_MAYBENULL SwEditShell const * GetEditShell() const;
+ SAL_RET_MAYBENULL SW_DLLPUBLIC SwEditShell* GetEditShell();
+ SAL_RET_MAYBENULL ::sw::IShellCursorSupplier * GetIShellCursorSupplier();
// OLE 2.0-notification.
void SetOle2Link(const Link<bool,void>& rLink) {maOle2Link = rLink;}
commit be9c71df2283523a3bc87f040afb7daa0da0bfdf
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed May 22 22:34:52 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu May 23 10:59:20 2024 +0200
sw: warning C6011: Dereferencing NULL pointer
Change-Id: Ia4b7f98525e07c5a58b752d7e68d89705f87ac9c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167969
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sw/source/uibase/utlui/unotools.cxx
b/sw/source/uibase/utlui/unotools.cxx
index 93edfaad30a7..3105fa9607be 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -408,7 +408,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer,
void )
if (pDoc)
{
SwEditShell* pSh = pDoc->GetEditShell();
- if( pSh->ActionCount() )
+ if( pSh && pSh->ActionCount() )
{
pSh->EndAllAction();
pSh->UnlockPaint();
