acc. check: add writer specific accessibility issue

This adds sw::AccessibilityIssue and refactors the existing
code to work with it.

In addition adds AccessibilityIssueCollection which holds
the vector of results.

Change-Id: Ide0fdbdba337bbf8c2fd18770895fb63a22528b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85919
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>

3 files changed, 22 insertions, 10 deletions

diff --git a/include/svx/AccessibilityCheck.hxx b/include/svx/AccessibilityCheck.hxx
index 14e31065b879..f31b39d1d165 100644
--- a/include/svx/AccessibilityCheck.hxx
+++ b/include/svx/AccessibilityCheck.hxx
@@ -11,9 +11,10 @@
 #ifndef INCLUDED_SVX_ACCESSIBILITYCHECK_HXX
 #define INCLUDED_SVX_ACCESSIBILITYCHECK_HXX
 
+#include <svx/svxdllapi.h>
 #include <vector>
+#include <memory>
 #include <rtl/ustring.hxx>
-#include <svx/svxdllapi.h>
 #include <svx/AccessibilityIssue.hxx>
 
 namespace svx
@@ -21,14 +22,14 @@ namespace svx
 class SVX_DLLPUBLIC AccessibilityCheck
 {
 protected:
-    std::vector<AccessibilityIssue> m_aIssueCollection;
+    AccessibilityIssueCollection m_aIssueCollection;
 
 public:
     virtual ~AccessibilityCheck() {}
 
     virtual void check() = 0;
 
-    std::vector<svx::AccessibilityIssue> const& getIssueCollecton() { return m_aIssueCollection; }
+    AccessibilityIssueCollection& getIssueCollecton() { return m_aIssueCollection; }
 };
 
 } // end svx namespace
diff --git a/include/svx/AccessibilityCheckDialog.hxx b/include/svx/AccessibilityCheckDialog.hxx
index c55d69cbc696..d1cb2b8e20ab 100644
--- a/include/svx/AccessibilityCheckDialog.hxx
+++ b/include/svx/AccessibilityCheckDialog.hxx
@@ -27,27 +27,27 @@ private:
     std::unique_ptr<weld::Container> m_xContainer;
     std::unique_ptr<weld::Label> m_xLabel;
 
-    svx::AccessibilityIssue const& m_rAccessibilityIssue;
+    std::shared_ptr<AccessibilityIssue> const& m_pAccessibilityIssue;
 
 public:
     AccessibilityCheckEntry(weld::Container* pParent,
-                            svx::AccessibilityIssue const& rAccessibilityIssue);
+                            std::shared_ptr<AccessibilityIssue> const& pAccessibilityIssue);
+
     weld::Widget* get_widget() const { return m_xContainer.get(); }
 };
 
 class SVX_DLLPUBLIC AccessibilityCheckDialog final : public weld::GenericDialogController
 {
 private:
-    std::vector<svx::AccessibilityIssue> m_rAccessibilityIssueCollection;
+    AccessibilityIssueCollection m_aIssueCollection;
     std::vector<std::unique_ptr<AccessibilityCheckEntry>> m_aAccessibilityCheckEntries;
 
     // Controls
     std::unique_ptr<weld::Box> m_xAccessibilityCheckBox;
 
 public:
-    AccessibilityCheckDialog(
-        weld::Window* pParent,
-        std::vector<svx::AccessibilityIssue> const& rAccessibilityIssueCollection);
+    AccessibilityCheckDialog(weld::Window* pParent,
+                             AccessibilityIssueCollection const& rIssueCollection);
     virtual ~AccessibilityCheckDialog() override;
     virtual short run() override;
 };
diff --git a/include/svx/AccessibilityIssue.hxx b/include/svx/AccessibilityIssue.hxx
index 9d9143aef683..1f5089d97064 100644
--- a/include/svx/AccessibilityIssue.hxx
+++ b/include/svx/AccessibilityIssue.hxx
@@ -30,11 +30,22 @@ public:
         : m_eIssueID(eIssueID)
     {
     }
+    virtual ~AccessibilityIssue() {}
 
     AccessibilityIssueID m_eIssueID;
     OUString m_aIssueText;
 };
-}
+
+class SVX_DLLPUBLIC AccessibilityIssueCollection
+{
+private:
+    std::vector<std::shared_ptr<AccessibilityIssue>> m_aIssues;
+
+public:
+    std::vector<std::shared_ptr<AccessibilityIssue>>& getIssues() { return m_aIssues; }
+};
+
+} // end svx namespace
 
 #endif // INCLUDED_SVX_ACCESSIBILITYISSUE_HXX