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

[Justin Luth (via logerrit)]

 sw/source/core/txtnode/ndtxt.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6f608c493aa42c8fcdef8cb7220423fefb8555c9
Author:     Justin Luth <jl...@mail.com>
AuthorDate: Mon May 15 09:57:55 2023 -0400
Commit:     Justin Luth <jl...@mail.com>
CommitDate: Thu May 18 21:26:06 2023 +0200

    related tdf#136536 sw: don't copy useless char escapement to next node on 
split
    
    This was clearing ANY single direct formatting attribute,
    not just char escapement.
    
    While that might be desireable in certain contexts,
    limit the hack to its intended subscript/superscript only.
    
    Change-Id: I0d503af826635c4325332cc985964957ee0b065d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151796
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <jl...@mail.com>
    (cherry picked from commit a4d011fb8ae24f90375744af5e98ba81716a22cb)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151911
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index a334baf87634..879ccaa9f35e 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -738,7 +738,7 @@ SwTextNode *SwTextNode::SplitContentNode(const SwPosition & 
rPos,
             }
 
             const std::shared_ptr<SfxItemSet>& pSet = 
pHt->GetAutoFormat().GetStyleHandle();
-            if (!pSet || pSet->Count() != 1 || 
!pSet->GetItem(RES_CHRATR_ESCAPEMENT))
+            if (!pSet || pSet->Count() != 1 || 
!pSet->HasItem(RES_CHRATR_ESCAPEMENT))
             {
                 continue;
             }