diff options
| -rw-r--r-- | include/svx/AccessibilityCheck.hxx | 7 | ||||
| -rw-r--r-- | sw/source/core/access/AccessibilityCheck.cxx | 24 |
2 files changed, 13 insertions, 18 deletions
diff --git a/include/svx/AccessibilityCheck.hxx b/include/svx/AccessibilityCheck.hxx index 32970112d5e9..14e31065b879 100644 --- a/include/svx/AccessibilityCheck.hxx +++ b/include/svx/AccessibilityCheck.hxx @@ -21,17 +21,14 @@ namespace svx class SVX_DLLPUBLIC AccessibilityCheck { protected: - std::vector<AccessibilityIssue> m_aAccessibilityIssueCollection; + std::vector<AccessibilityIssue> m_aIssueCollection; public: virtual ~AccessibilityCheck() {} virtual void check() = 0; - std::vector<svx::AccessibilityIssue> const& getIssueCollecton() - { - return m_aAccessibilityIssueCollection; - } + std::vector<svx::AccessibilityIssue> const& getIssueCollecton() { return m_aIssueCollection; } }; } // end svx namespace diff --git a/sw/source/core/access/AccessibilityCheck.cxx b/sw/source/core/access/AccessibilityCheck.cxx index c75122de54bb..84a4772ecba2 100644 --- a/sw/source/core/access/AccessibilityCheck.cxx +++ b/sw/source/core/access/AccessibilityCheck.cxx @@ -28,11 +28,11 @@ OUString sTableMergeSplit("Table '%OBJECT_NAME%' contains merges or splits"); class NodeCheck { protected: - std::vector<svx::AccessibilityIssue>& m_rAccessibilityIssueCollection; + std::vector<svx::AccessibilityIssue>& m_rIssueCollection; public: - NodeCheck(std::vector<svx::AccessibilityIssue>& rAccessibilityIssueCollection) - : m_rAccessibilityIssueCollection(rAccessibilityIssueCollection) + NodeCheck(std::vector<svx::AccessibilityIssue>& rIssueCollection) + : m_rIssueCollection(rIssueCollection) { } virtual ~NodeCheck() {} @@ -53,13 +53,13 @@ class NoTextNodeAltTextCheck : public NodeCheck OUString sName = pNoTextNode->GetFlyFormat()->GetName(); svx::AccessibilityIssue aIssue; aIssue.m_aIssueText = sNoAlt.replaceAll("%OBJECT_NAME%", sName); - m_rAccessibilityIssueCollection.push_back(aIssue); + m_rIssueCollection.push_back(aIssue); } } public: - NoTextNodeAltTextCheck(std::vector<svx::AccessibilityIssue>& rAccessibilityIssueCollection) - : NodeCheck(rAccessibilityIssueCollection) + NoTextNodeAltTextCheck(std::vector<svx::AccessibilityIssue>& rIssueCollection) + : NodeCheck(rIssueCollection) { } @@ -89,7 +89,7 @@ private: OUString sName = rTable.GetTableStyleName(); svx::AccessibilityIssue aIssue; aIssue.m_aIssueText = sTableMergeSplit.replaceAll("%OBJECT_NAME%", sName); - m_rAccessibilityIssueCollection.push_back(aIssue); + m_rIssueCollection.push_back(aIssue); } else { @@ -120,7 +120,7 @@ private: OUString sName = rTable.GetTableStyleName(); svx::AccessibilityIssue aIssue; aIssue.m_aIssueText = sTableMergeSplit.replaceAll("%OBJECT_NAME%", sName); - m_rAccessibilityIssueCollection.push_back(aIssue); + m_rIssueCollection.push_back(aIssue); } } } @@ -159,7 +159,7 @@ void AccessibilityCheck::checkObject(SdrObject* pObject) OUString sName = pObject->GetName(); svx::AccessibilityIssue aIssue; aIssue.m_aIssueText = sNoAlt.replaceAll("%OBJECT_NAME%", sName); - m_aAccessibilityIssueCollection.push_back(aIssue); + m_aIssueCollection.push_back(aIssue); } } } @@ -170,10 +170,8 @@ void AccessibilityCheck::check() return; std::vector<std::unique_ptr<NodeCheck>> aNodeChecks; - aNodeChecks.push_back( - std::make_unique<NoTextNodeAltTextCheck>(m_aAccessibilityIssueCollection)); - aNodeChecks.push_back( - std::make_unique<TableNodeMergeSplitCheck>(m_aAccessibilityIssueCollection)); + aNodeChecks.push_back(std::make_unique<NoTextNodeAltTextCheck>(m_aIssueCollection)); + aNodeChecks.push_back(std::make_unique<TableNodeMergeSplitCheck>(m_aIssueCollection)); auto const& pNodes = m_pDoc->GetNodes(); SwNode* pNode = nullptr; |