core.git: 2 commits - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/core/crsr/pam.cxx                     |    1 -
 sw/source/writerfilter/dmapper/DomainMapper.hxx |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9b11c113e9f07d1b60ad2a3d19ef8d089bfb4ab1
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Jul 12 16:24:09 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jul 12 20:04:58 2024 +0200

    cid#1607641 silence Uncaught exception
    
    Change-Id: I26b4c999cfd6d782c340a7a101b11c979d0a8329
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170416
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/writerfilter/dmapper/DomainMapper.hxx 
b/sw/source/writerfilter/dmapper/DomainMapper.hxx
index fb03a9a9fd8b..03b6540cfca3 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper.hxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper.hxx
@@ -24,6 +24,7 @@
 #include "SettingsTable.hxx"
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/style/TabAlign.hpp>
+#include <o3tl/deleter.hxx>
 #include <rtl/ref.hxx>
 
 #include <map>
@@ -70,7 +71,7 @@ typedef tools::SvRef<StyleSheetTable> StyleSheetTablePtr;
 class DomainMapper : public LoggedProperties, public LoggedTable,
                     public BinaryObj, public LoggedStream
 {
-    std::unique_ptr<DomainMapper_Impl> m_pImpl;
+    std::unique_ptr<DomainMapper_Impl, 
o3tl::default_delete<DomainMapper_Impl>> m_pImpl;
 
 public:
     DomainMapper(const css::uno::Reference<css::uno::XComponentContext>& 
xContext,
commit 725d235c53efc3665736d49c7b27e025c3ccbad0
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Jul 12 16:18:39 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jul 12 20:04:51 2024 +0200

    cid#1607932 Unused value
    
    since:
    
    commit 84a3db80b4fd66c6854b3135b5f69b61fd828e62
    Author:     Jens-Heiner Rechtien <h...@openoffice.org>
    AuthorDate: Mon Sep 18 23:08:29 2000 +0000
    
        initial import
    
    Change-Id: Ic853ca130d45c2393f0f6b20877a4461ef6fa585
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170415
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 6fc9c6f5d6b7..fcc8682f22dd 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -1102,7 +1102,6 @@ SwContentNode* GetNode( SwPaM & rPam, bool& rbFirst, 
SwMoveFnCollection const &
                             ( !bInReadOnly && pFrame->IsProtected() ) ||
                             pFrame->IsHiddenNow())
                         {
-                            pNd = nullptr;
                             continue;
                         }
                         *rPam.GetPoint() = aPos;