sw/source/uibase/utlui/content.cxx | 1 - vcl/unx/generic/app/wmadaptor.cxx | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-)
New commits: commit 963ecf83b664385274c88fe38fa87d768a084e3e Author: Caolán McNamara <[email protected]> AuthorDate: Fri Mar 6 16:22:42 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Mar 6 20:08:19 2026 +0100 cid#1684042 Dereference before null check remove redundant but harmless extra check Change-Id: Ie861ccb2355a8caf27f7e506ac5d0e76000d6041 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201140 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 6778bd267310..a44677cf0147 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -705,7 +705,6 @@ void SwContentType::FillMemberList(bool* pbContentChanged) while (pNode /*&& pNode->IsStartNode() && pNode->GetStartNode()->GetStartNodeType() == SwStartNodeType::SwFlyStartNode*/ - && pFrameFormat && pFrameFormat->GetAnchor().GetAnchorId() == RndStdIds::FLY_AT_FLY && (pFrameFormat = pNode->GetFlyFormat())) { commit aa09769b358521b133c94ed7c9dcfaf3626fead1 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Mar 6 16:13:09 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Mar 6 20:08:06 2026 +0100 cid#1684044 silence Dereference before null check Change-Id: I5f9d931e8f49a00defe5a8e28aad6af6ed3d8ec4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201139 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 05897c80f3fc..82c9a905646e 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -176,10 +176,8 @@ static int compareProtocol( const void* pLeft, const void* pRight ) std::unique_ptr<WMAdaptor> WMAdaptor::createWMAdaptor(SalX11Display* pSalDisplay) { - std::unique_ptr<WMAdaptor> pAdaptor; - // try a NetWM - pAdaptor.reset(new NetWMAdaptor( pSalDisplay )); + std::unique_ptr<WMAdaptor> pAdaptor(new NetWMAdaptor(pSalDisplay)); if( ! pAdaptor->isValid() ) { pAdaptor.reset();
