[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 2 commits - sfx2/source sw/source

[Caolán McNamara (via logerrit)]

 sfx2/source/sidebar/Deck.cxx         |    7 +++++--
 sw/source/filter/basflt/fltshell.cxx |    5 ++---
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 92b6f24e27e91b08439e3379eb1c83bde7082308
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Nov 24 13:06:13 2020 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon Apr 5 20:31:34 2021 +0100

    ofz#27817 null deref
    
    Change-Id: I16da6f6f78dfd0a4bc17017275a6644d6e4340c8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106533
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx
index 1fe51c4afbd5..9a2a9ddf8148 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -632,9 +632,8 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
             {
                 SwTextNode const*const pTextNode(
                         aRegion.End()->nNode.GetNode().GetTextNode());
-                assert(pTextNode);
-                SwTextField const*const pField(pTextNode->GetFieldTextAttrAt(
-                        aRegion.End()->nContent.GetIndex() - 1, true));
+                SwTextField const*const pField = pTextNode ? pTextNode->GetFieldTextAttrAt(
+                        aRegion.End()->nContent.GetIndex() - 1, true) : nullptr;
                 if (pField)
                 {
                     SwPostItField const*const pPostIt(
commit 3412a6ac0283b5c0e9fca7f1cf80f3a75a4f3675
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Sat Jan 16 17:56:06 2021 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon Apr 5 20:28:50 2021 +0100

    sidebar: only invalidate when things change.
    
    Change-Id: Icc9c5bcde224cc979b834585531b847f1c5f7d0b
    Signed-off-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109457
    Tested-by: Jenkins

diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 1cc11cafc37e..9c0c37041f58 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -430,8 +430,11 @@ void Deck::ScrollContainerWindow::Paint(vcl::RenderContext& rRenderContext, cons
 
 void Deck::ScrollContainerWindow::SetSeparators (const ::std::vector<sal_Int32>& rSeparators)
 {
-    maSeparators = rSeparators;
-    Invalidate();
+    if (rSeparators != maSeparators)
+    {
+        maSeparators = rSeparators;
+        Invalidate();
+    }
 }
 
 } // end of namespace sfx2::sidebar