acc. check: move AccessibilityIssue from svx to sfx2

Move AccessibilityIssue and AccessibilityIssueCollection from
svx to sfx2 because we need to use them in sfx2, but svx is
dependent on sfx2 so this creates a circular dependency.

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

5 files changed, 28 insertions, 28 deletions

diff --git a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
index 4f71190554ba..7360ccd1d862 100644
--- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
+++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
@@ -31,8 +31,8 @@ CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testCheck)
     aCheck.check();
     auto& aIssues = aCheck.getIssueCollecton().getIssues();
     CPPUNIT_ASSERT_EQUAL(size_t(2), aIssues.size());
-    CPPUNIT_ASSERT_EQUAL(svx::AccessibilityIssueID::DOCUMENT_LANGUAGE, aIssues[0]->m_eIssueID);
-    CPPUNIT_ASSERT_EQUAL(svx::AccessibilityIssueID::DOCUMENT_TITLE, aIssues[1]->m_eIssueID);
+    CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::DOCUMENT_LANGUAGE, aIssues[0]->m_eIssueID);
+    CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::DOCUMENT_TITLE, aIssues[1]->m_eIssueID);
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/access/AccessibilityCheck.cxx b/sw/source/core/access/AccessibilityCheck.cxx
index 6f17ded00dc6..06a90e98ac4c 100644
--- a/sw/source/core/access/AccessibilityCheck.cxx
+++ b/sw/source/core/access/AccessibilityCheck.cxx
@@ -35,8 +35,8 @@ namespace sw
 namespace
 {
 std::shared_ptr<sw::AccessibilityIssue>
-lclAddIssue(svx::AccessibilityIssueCollection& rIssueCollection, OUString const& rText,
-            svx::AccessibilityIssueID eIssue = svx::AccessibilityIssueID::UNSPECIFIED)
+lclAddIssue(sfx::AccessibilityIssueCollection& rIssueCollection, OUString const& rText,
+            sfx::AccessibilityIssueID eIssue = sfx::AccessibilityIssueID::UNSPECIFIED)
 {
     auto pIssue = std::make_shared<sw::AccessibilityIssue>(eIssue);
     pIssue->m_aIssueText = rText;
@@ -47,10 +47,10 @@ lclAddIssue(svx::AccessibilityIssueCollection& rIssueCollection, OUString const&
 class BaseCheck
 {
 protected:
-    svx::AccessibilityIssueCollection& m_rIssueCollection;
+    sfx::AccessibilityIssueCollection& m_rIssueCollection;
 
 public:
-    BaseCheck(svx::AccessibilityIssueCollection& rIssueCollection)
+    BaseCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
         : m_rIssueCollection(rIssueCollection)
     {
     }
@@ -60,7 +60,7 @@ public:
 class NodeCheck : public BaseCheck
 {
 public:
-    NodeCheck(svx::AccessibilityIssueCollection& rIssueCollection)
+    NodeCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
         : BaseCheck(rIssueCollection)
     {
     }
@@ -101,7 +101,7 @@ class NoTextNodeAltTextCheck : public NodeCheck
     }
 
 public:
-    NoTextNodeAltTextCheck(svx::AccessibilityIssueCollection& rIssueCollection)
+    NoTextNodeAltTextCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
         : NodeCheck(rIssueCollection)
     {
     }
@@ -184,7 +184,7 @@ private:
     }
 
 public:
-    TableNodeMergeSplitCheck(svx::AccessibilityIssueCollection& rIssueCollection)
+    TableNodeMergeSplitCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
         : NodeCheck(rIssueCollection)
     {
     }
@@ -211,7 +211,7 @@ private:
     };
 
 public:
-    NumberingCheck(svx::AccessibilityIssueCollection& rIssueCollection)
+    NumberingCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
         : NodeCheck(rIssueCollection)
         , pPreviousTextNode(nullptr)
     {
@@ -264,7 +264,7 @@ private:
     }
 
 public:
-    HyperlinkCheck(svx::AccessibilityIssueCollection& rIssueCollection)
+    HyperlinkCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
         : NodeCheck(rIssueCollection)
     {
     }
@@ -394,7 +394,7 @@ private:
     }
 
 public:
-    TextContrastCheck(svx::AccessibilityIssueCollection& rIssueCollection)
+    TextContrastCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
         : NodeCheck(rIssueCollection)
     {
     }
@@ -442,7 +442,7 @@ private:
     }
 
 public:
-    BlinkingTextCheck(svx::AccessibilityIssueCollection& rIssueCollection)
+    BlinkingTextCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
         : NodeCheck(rIssueCollection)
     {
     }
@@ -477,7 +477,7 @@ private:
     int nPreviousLevel;
 
 public:
-    HeaderCheck(svx::AccessibilityIssueCollection& rIssueCollection)
+    HeaderCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
         : NodeCheck(rIssueCollection)
         , nPreviousLevel(0)
     {
@@ -505,7 +505,7 @@ public:
 class DocumentCheck : public BaseCheck
 {
 public:
-    DocumentCheck(svx::AccessibilityIssueCollection& rIssueCollection)
+    DocumentCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
         : BaseCheck(rIssueCollection)
     {
     }
@@ -517,7 +517,7 @@ public:
 class DocumentDefaultLanguageCheck : public DocumentCheck
 {
 public:
-    DocumentDefaultLanguageCheck(svx::AccessibilityIssueCollection& rIssueCollection)
+    DocumentDefaultLanguageCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
         : DocumentCheck(rIssueCollection)
     {
     }
@@ -530,7 +530,7 @@ public:
         if (eLanguage == LANGUAGE_NONE)
         {
             lclAddIssue(m_rIssueCollection, SwResId(STR_DOCUMENT_DEFAULT_LANGUAGE),
-                        svx::AccessibilityIssueID::DOCUMENT_LANGUAGE);
+                        sfx::AccessibilityIssueID::DOCUMENT_LANGUAGE);
         }
         else
         {
@@ -543,7 +543,7 @@ public:
                     OUString sIssueText
                         = SwResId(STR_STYLE_NO_LANGUAGE).replaceAll("%STYLE_NAME%", sName);
                     lclAddIssue(m_rIssueCollection, sIssueText,
-                                svx::AccessibilityIssueID::STYLE_LANGUAGE);
+                                sfx::AccessibilityIssueID::STYLE_LANGUAGE);
                 }
             }
         }
@@ -553,7 +553,7 @@ public:
 class DocumentTitleCheck : public DocumentCheck
 {
 public:
-    DocumentTitleCheck(svx::AccessibilityIssueCollection& rIssueCollection)
+    DocumentTitleCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
         : DocumentCheck(rIssueCollection)
     {
     }
@@ -571,7 +571,7 @@ public:
             if (sTitle.isEmpty())
             {
                 lclAddIssue(m_rIssueCollection, SwResId(STR_DOCUMENT_TITLE),
-                            svx::AccessibilityIssueID::DOCUMENT_TITLE);
+                            sfx::AccessibilityIssueID::DOCUMENT_TITLE);
             }
         }
     }
@@ -580,7 +580,7 @@ public:
 class FootnoteEndnoteCheck : public DocumentCheck
 {
 public:
-    FootnoteEndnoteCheck(svx::AccessibilityIssueCollection& rIssueCollection)
+    FootnoteEndnoteCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
         : DocumentCheck(rIssueCollection)
     {
     }
diff --git a/sw/source/core/access/AccessibilityIssue.cxx b/sw/source/core/access/AccessibilityIssue.cxx
index 1d2e1efc7708..a9eccf478a31 100644
--- a/sw/source/core/access/AccessibilityIssue.cxx
+++ b/sw/source/core/access/AccessibilityIssue.cxx
@@ -14,8 +14,8 @@
 
 namespace sw
 {
-AccessibilityIssue::AccessibilityIssue(svx::AccessibilityIssueID eIssueID)
-    : svx::AccessibilityIssue(eIssueID)
+AccessibilityIssue::AccessibilityIssue(sfx::AccessibilityIssueID eIssueID)
+    : sfx::AccessibilityIssue(eIssueID)
     , m_eIssueObject(IssueObject::UNKNOWN)
     , m_pDoc(nullptr)
 {
diff --git a/sw/source/core/inc/AccessibilityCheck.hxx b/sw/source/core/inc/AccessibilityCheck.hxx
index 30bcb90e00a1..4bcc56000bc4 100644
--- a/sw/source/core/inc/AccessibilityCheck.hxx
+++ b/sw/source/core/inc/AccessibilityCheck.hxx
@@ -11,12 +11,12 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_ACCESSIBILITYCHECK_HXX
 #define INCLUDED_SW_SOURCE_CORE_ACCESSIBILITYCHECK_HXX
 
-#include <svx/AccessibilityCheck.hxx>
+#include <sfx2/AccessibilityCheck.hxx>
 #include <doc.hxx>
 
 namespace sw
 {
-class SW_DLLPUBLIC AccessibilityCheck final : public svx::AccessibilityCheck
+class SW_DLLPUBLIC AccessibilityCheck final : public sfx::AccessibilityCheck
 {
 private:
     SwDoc* m_pDoc;
diff --git a/sw/source/core/inc/AccessibilityIssue.hxx b/sw/source/core/inc/AccessibilityIssue.hxx
index 11b017dea6a5..3d59c420708f 100644
--- a/sw/source/core/inc/AccessibilityIssue.hxx
+++ b/sw/source/core/inc/AccessibilityIssue.hxx
@@ -11,7 +11,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_ACCESSIBILITYISSUE_HXX
 #define INCLUDED_SW_SOURCE_CORE_ACCESSIBILITYISSUE_HXX
 
-#include <svx/AccessibilityIssue.hxx>
+#include <sfx2/AccessibilityIssue.hxx>
 #include <doc.hxx>
 
 namespace sw
@@ -24,7 +24,7 @@ enum class IssueObject
     TABLE,
 };
 
-class SW_DLLPUBLIC AccessibilityIssue final : public svx::AccessibilityIssue
+class SW_DLLPUBLIC AccessibilityIssue final : public sfx::AccessibilityIssue
 {
 private:
     IssueObject m_eIssueObject;
@@ -32,7 +32,7 @@ private:
     OUString m_sObjectID;
 
 public:
-    AccessibilityIssue(svx::AccessibilityIssueID eIssueID = svx::AccessibilityIssueID::UNSPECIFIED);
+    AccessibilityIssue(sfx::AccessibilityIssueID eIssueID = sfx::AccessibilityIssueID::UNSPECIFIED);
 
     void setIssueObject(IssueObject eIssueObject);
     void setDoc(SwDoc* pDoc);