[Libreoffice-commits] core.git: sw/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed Sep 30 15:14:54 UTC 2020


 sw/source/core/access/AccessibilityCheck.cxx |    8 ++++----
 sw/source/core/access/AccessibilityIssue.cxx |    2 +-
 sw/source/core/inc/AccessibilityIssue.hxx    |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit c6deef548c1b401f00209013fa3eefb4e61db846
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Sep 30 11:02:23 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 30 17:14:03 2020 +0200

    AccessibilityIssue::setDoc never passed a null ScDoc*
    
    Change-Id: I88d11b8252723ee5b493d0effc9ed24757aed3b2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103691
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/access/AccessibilityCheck.cxx b/sw/source/core/access/AccessibilityCheck.cxx
index 1127f9576cda..58ea49972df0 100644
--- a/sw/source/core/access/AccessibilityCheck.cxx
+++ b/sw/source/core/access/AccessibilityCheck.cxx
@@ -94,7 +94,7 @@ class NoTextNodeAltTextCheck : public NodeCheck
         {
             auto pIssue = lclAddIssue(m_rIssueCollection, sIssueText,
                                       sfx::AccessibilityIssueID::NO_ALT_OLE);
-            pIssue->setDoc(&pNoTextNode->GetDoc());
+            pIssue->setDoc(pNoTextNode->GetDoc());
             pIssue->setIssueObject(IssueObject::OLE);
             pIssue->setObjectID(pNoTextNode->GetFlyFormat()->GetName());
         }
@@ -102,7 +102,7 @@ class NoTextNodeAltTextCheck : public NodeCheck
         {
             auto pIssue = lclAddIssue(m_rIssueCollection, sIssueText,
                                       sfx::AccessibilityIssueID::NO_ALT_GRAPHIC);
-            pIssue->setDoc(&pNoTextNode->GetDoc());
+            pIssue->setDoc(pNoTextNode->GetDoc());
             pIssue->setIssueObject(IssueObject::GRAPHIC);
             pIssue->setObjectID(pNoTextNode->GetFlyFormat()->GetName());
         }
@@ -136,7 +136,7 @@ private:
         OUString sIssueText = SwResId(STR_TABLE_MERGE_SPLIT).replaceAll("%OBJECT_NAME%", sName);
         auto pIssue = lclAddIssue(m_rIssueCollection, sIssueText,
                                   sfx::AccessibilityIssueID::TABLE_MERGE_SPLIT);
-        pIssue->setDoc(&rDoc);
+        pIssue->setDoc(rDoc);
         pIssue->setIssueObject(IssueObject::TABLE);
         pIssue->setObjectID(sName);
     }
@@ -527,7 +527,7 @@ public:
         pIssue->setIssueObject(IssueObject::TEXT);
         pIssue->setNode(pTextNode);
         SwDoc& rDocument = pTextNode->GetDoc();
-        pIssue->setDoc(&rDocument);
+        pIssue->setDoc(rDocument);
         pIssue->setStart(pTextAttr->GetStart());
         pIssue->setEnd(pTextAttr->GetAnyEnd());
     }
diff --git a/sw/source/core/access/AccessibilityIssue.cxx b/sw/source/core/access/AccessibilityIssue.cxx
index 991ec866a37a..b15d22955a87 100644
--- a/sw/source/core/access/AccessibilityIssue.cxx
+++ b/sw/source/core/access/AccessibilityIssue.cxx
@@ -26,7 +26,7 @@ AccessibilityIssue::AccessibilityIssue(sfx::AccessibilityIssueID eIssueID)
 
 void AccessibilityIssue::setIssueObject(IssueObject eIssueObject) { m_eIssueObject = eIssueObject; }
 
-void AccessibilityIssue::setDoc(SwDoc* pDoc) { m_pDoc = pDoc; }
+void AccessibilityIssue::setDoc(SwDoc& rDoc) { m_pDoc = &rDoc; }
 
 void AccessibilityIssue::setObjectID(OUString const& rID) { m_sObjectID = rID; }
 
diff --git a/sw/source/core/inc/AccessibilityIssue.hxx b/sw/source/core/inc/AccessibilityIssue.hxx
index 3b5e12c67156..c929ead6f167 100644
--- a/sw/source/core/inc/AccessibilityIssue.hxx
+++ b/sw/source/core/inc/AccessibilityIssue.hxx
@@ -41,7 +41,7 @@ public:
     AccessibilityIssue(sfx::AccessibilityIssueID eIssueID = sfx::AccessibilityIssueID::UNSPECIFIED);
 
     void setIssueObject(IssueObject eIssueObject);
-    void setDoc(SwDoc* pDoc);
+    void setDoc(SwDoc& rDoc);
     void setObjectID(OUString const& rID);
     void setNode(SwNode* pNode) { m_pNode = pNode; }
 


More information about the Libreoffice-commits mailing list