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

[Julien Nabet (via logerrit)]

 sw/source/core/access/AccessibilityCheck.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2f829436bc08fc61371324a2693dca815baa47b5
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat May 14 13:53:23 2022 +0200
Commit:     Aron Budea <aron.bu...@collabora.com>
CommitDate: Wed May 18 14:54:36 2022 +0200

    Related tdf#149072: avoid warning "misuse of method"
    
    complete warning log:
    <SwTextFormatColl::GetAssignedOutlineStyleLevel()> - misuse of method
    
    part of bt when opening attachment of tdf#149072
    0  SwTextFormatColl::GetAssignedOutlineStyleLevel() const (this=0x77064d0) 
at sw/source/core/doc/fmtcol.cxx:608
    1  0x00007f8a52aa7941 in sw::(anonymous 
namespace)::HeaderCheck::check(SwNode*) (this=0xa457630, pCurrent=0x7705e98) at 
sw/source/core/access/AccessibilityCheck.cxx:622
    2  0x00007f8a52a9a6a3 in sw::AccessibilityCheck::check() 
(this=0x7ffe4a14ab10) at sw/source/core/access/AccessibilityCheck.cxx:947
    3  0x00007f8a53ed2ad7 in SwDocShell::runAccessibilityCheck() 
(this=0x74ef0e0) at sw/source/uibase/app/docst.cxx:1559
    4  0x00007f8a16e7fdec in ImpPDFTabDialog::OkHdl(weld::Button&) 
(this=0xa0e9990) at filter/source/pdf/impdialog.cxx:324
    5  0x00007f8a16e7fb2d in ImpPDFTabDialog::LinkStubOkHdl(void*, 
weld::Button&) (instance=0xa0e9990, data=...) at 
filter/source/pdf/impdialog.cxx:317
    
    Change-Id: I2ed50f14eff01babd47ada3831c0a051fc767dbe
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134312
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    (cherry picked from commit 86050db1b0c15651335d1b0bf89ee8f6409dee1d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134498
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Aron Budea <aron.bu...@collabora.com>

diff --git a/sw/source/core/access/AccessibilityCheck.cxx 
b/sw/source/core/access/AccessibilityCheck.cxx
index b2299ca36c59..6a470957d823 100644
--- a/sw/source/core/access/AccessibilityCheck.cxx
+++ b/sw/source/core/access/AccessibilityCheck.cxx
@@ -620,10 +620,11 @@ public:
 
         SwTextNode* pTextNode = pCurrent->GetTextNode();
         SwTextFormatColl* pCollection = pTextNode->GetTextColl();
-        int nLevel = pCollection->GetAssignedOutlineStyleLevel();
-        if (nLevel < 0)
+        if (!pCollection->IsAssignedToListLevelOfOutlineStyle())
             return;
 
+        int nLevel = pCollection->GetAssignedOutlineStyleLevel();
+        assert(nLevel >= 0);
         if (nLevel > m_nPreviousLevel && std::abs(nLevel - m_nPreviousLevel) > 
1)
         {
             lclAddIssue(m_rIssueCollection, 
SwResId(STR_HEADINGS_NOT_IN_ORDER));