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>

12 files changed, 115 insertions, 61 deletions

diff --git a/include/svx/AccessibilityCheck.hxx b/include/sfx2/AccessibilityCheck.hxx
index f31b39d1d165..6de1069e58a1 100644
--- a/include/svx/AccessibilityCheck.hxx
+++ b/include/sfx2/AccessibilityCheck.hxx
@@ -8,32 +8,33 @@
  *
  */
 
-#ifndef INCLUDED_SVX_ACCESSIBILITYCHECK_HXX
-#define INCLUDED_SVX_ACCESSIBILITYCHECK_HXX
+#ifndef INCLUDED_SFX2_ACCESSIBILITYCHECKDIALOG_HXX
+#define INCLUDED_SFX2_ACCESSIBILITYCHECKDIALOG_HXX
 
-#include <svx/svxdllapi.h>
+#include <sfx2/dllapi.h>
 #include <vector>
 #include <memory>
 #include <rtl/ustring.hxx>
-#include <svx/AccessibilityIssue.hxx>
+#include <sfx2/AccessibilityIssue.hxx>
 
-namespace svx
+namespace sfx
 {
-class SVX_DLLPUBLIC AccessibilityCheck
+class SFX2_DLLPUBLIC AccessibilityCheck
 {
 protected:
     AccessibilityIssueCollection m_aIssueCollection;
 
 public:
-    virtual ~AccessibilityCheck() {}
+    AccessibilityCheck() = default;
+    virtual ~AccessibilityCheck();
 
     virtual void check() = 0;
 
-    AccessibilityIssueCollection& getIssueCollecton() { return m_aIssueCollection; }
+    AccessibilityIssueCollection& getIssueCollecton();
 };
 
-} // end svx namespace
+} // end sfx namespace
 
-#endif // INCLUDED_SVX_ACCESSIBILITYCHECKDIALOG_HXX
+#endif // INCLUDED_SFX2_ACCESSIBILITYCHECKDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/AccessibilityIssue.hxx b/include/sfx2/AccessibilityIssue.hxx
index 776e47ff7880..250594e769af 100644
--- a/include/svx/AccessibilityIssue.hxx
+++ b/include/sfx2/AccessibilityIssue.hxx
@@ -8,15 +8,15 @@
  *
  */
 
-#ifndef INCLUDED_SVX_ACCESSIBILITYISSUE_HXX
-#define INCLUDED_SVX_ACCESSIBILITYISSUE_HXX
+#ifndef INCLUDED_SFX2_ACCESSIBILITYISSUE_HXX
+#define INCLUDED_SFX2_ACCESSIBILITYISSUE_HXX
 
-#include <svx/svxdllapi.h>
+#include <sfx2/dllapi.h>
 #include <rtl/ustring.hxx>
 #include <vector>
 #include <memory>
 
-namespace svx
+namespace sfx
 {
 enum class AccessibilityIssueID
 {
@@ -26,14 +26,12 @@ enum class AccessibilityIssueID
     STYLE_LANGUAGE
 };
 
-class SVX_DLLPUBLIC AccessibilityIssue
+class SFX2_DLLPUBLIC AccessibilityIssue
 {
 public:
-    AccessibilityIssue(AccessibilityIssueID eIssueID = AccessibilityIssueID::UNSPECIFIED)
-        : m_eIssueID(eIssueID)
-    {
-    }
-    virtual ~AccessibilityIssue() {}
+    AccessibilityIssue(AccessibilityIssueID eIssueID = AccessibilityIssueID::UNSPECIFIED);
+    virtual ~AccessibilityIssue();
+
     virtual bool canGotoIssue() const = 0;
     virtual void gotoIssue() const = 0;
 
@@ -41,17 +39,19 @@ public:
     OUString m_aIssueText;
 };
 
-class SVX_DLLPUBLIC AccessibilityIssueCollection
+class SFX2_DLLPUBLIC AccessibilityIssueCollection
 {
 private:
     std::vector<std::shared_ptr<AccessibilityIssue>> m_aIssues;
 
 public:
-    std::vector<std::shared_ptr<AccessibilityIssue>>& getIssues() { return m_aIssues; }
+    AccessibilityIssueCollection() = default;
+
+    std::vector<std::shared_ptr<AccessibilityIssue>>& getIssues();
 };
 
-} // end svx namespace
+} // end sfx namespace
 
-#endif // INCLUDED_SVX_ACCESSIBILITYISSUE_HXX
+#endif // INCLUDED_SFX2_ACCESSIBILITYISSUE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/AccessibilityCheckDialog.hxx b/include/svx/AccessibilityCheckDialog.hxx
index 0656abe1593d..bb7205ba4dcb 100644
--- a/include/svx/AccessibilityCheckDialog.hxx
+++ b/include/svx/AccessibilityCheckDialog.hxx
@@ -11,7 +11,7 @@
 #ifndef INCLUDED_SVX_ACCESSIBILITYCHECKDIALOG_HXX
 #define INCLUDED_SVX_ACCESSIBILITYCHECKDIALOG_HXX
 
-#include <svx/AccessibilityCheck.hxx>
+#include <sfx2/AccessibilityCheck.hxx>
 #include <sal/types.h>
 #include <svx/svxdllapi.h>
 #include <tools/gen.hxx>
@@ -28,11 +28,11 @@ private:
     std::unique_ptr<weld::Label> m_xLabel;
     std::unique_ptr<weld::Button> m_xGotoButton;
 
-    std::shared_ptr<AccessibilityIssue> const& m_pAccessibilityIssue;
+    std::shared_ptr<sfx::AccessibilityIssue> const& m_pAccessibilityIssue;
 
 public:
     AccessibilityCheckEntry(weld::Container* pParent,
-                            std::shared_ptr<AccessibilityIssue> const& pAccessibilityIssue);
+                            std::shared_ptr<sfx::AccessibilityIssue> const& pAccessibilityIssue);
 
     weld::Widget* get_widget() const { return m_xContainer.get(); }
 
@@ -42,7 +42,7 @@ public:
 class SVX_DLLPUBLIC AccessibilityCheckDialog final : public weld::GenericDialogController
 {
 private:
-    AccessibilityIssueCollection m_aIssueCollection;
+    sfx::AccessibilityIssueCollection m_aIssueCollection;
     std::vector<std::unique_ptr<AccessibilityCheckEntry>> m_aAccessibilityCheckEntries;
 
     // Controls
@@ -50,7 +50,7 @@ private:
 
 public:
     AccessibilityCheckDialog(weld::Window* pParent,
-                             AccessibilityIssueCollection const& rIssueCollection);
+                             sfx::AccessibilityIssueCollection const& rIssueCollection);
     virtual ~AccessibilityCheckDialog() override;
     virtual short run() override;
 };
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index db9b8566b91d..fbcab50a5c2a 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -75,6 +75,8 @@ $(eval $(call gb_Library_use_externals,sfx,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,sfx,\
+    sfx2/source/accessibility/AccessibilityCheck \
+    sfx2/source/accessibility/AccessibilityIssue \
     sfx2/source/appl/app \
     sfx2/source/appl/appbas \
     sfx2/source/appl/appbaslib \
diff --git a/sfx2/source/accessibility/AccessibilityCheck.cxx b/sfx2/source/accessibility/AccessibilityCheck.cxx
new file mode 100644
index 000000000000..7e6c3209053c
--- /dev/null
+++ b/sfx2/source/accessibility/AccessibilityCheck.cxx
@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#include <sfx2/AccessibilityCheck.hxx>
+
+namespace sfx
+{
+AccessibilityCheck::~AccessibilityCheck() = default;
+
+AccessibilityIssueCollection& AccessibilityCheck::getIssueCollecton() { return m_aIssueCollection; }
+
+} // end sfx namespace
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/accessibility/AccessibilityIssue.cxx b/sfx2/source/accessibility/AccessibilityIssue.cxx
new file mode 100644
index 000000000000..b276faf54c3f
--- /dev/null
+++ b/sfx2/source/accessibility/AccessibilityIssue.cxx
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#include <sfx2/AccessibilityIssue.hxx>
+
+namespace sfx
+{
+AccessibilityIssue::AccessibilityIssue(AccessibilityIssueID eIssueID)
+    : m_eIssueID(eIssueID)
+{
+}
+
+AccessibilityIssue::~AccessibilityIssue() {}
+
+std::vector<std::shared_ptr<AccessibilityIssue>>& AccessibilityIssueCollection::getIssues()
+{
+    return m_aIssues;
+}
+
+} // end sfx namespace
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/AccessibilityCheckDialog.cxx b/svx/source/dialog/AccessibilityCheckDialog.cxx
index 5864bd9661bf..4032e62f89f0 100644
--- a/svx/source/dialog/AccessibilityCheckDialog.cxx
+++ b/svx/source/dialog/AccessibilityCheckDialog.cxx
@@ -9,13 +9,14 @@
  */
 
 #include <svx/AccessibilityCheckDialog.hxx>
-#include <svx/AccessibilityIssue.hxx>
+
+#include <sfx2/AccessibilityIssue.hxx>
 #include <vcl/svapp.hxx>
 
 namespace svx
 {
 AccessibilityCheckEntry::AccessibilityCheckEntry(
-    weld::Container* pParent, std::shared_ptr<AccessibilityIssue> const& rAccessibilityIssue)
+    weld::Container* pParent, std::shared_ptr<sfx::AccessibilityIssue> const& rAccessibilityIssue)
     : m_xBuilder(Application::CreateBuilder(pParent, "svx/ui/accessibilitycheckentry.ui"))
     , m_xContainer(m_xBuilder->weld_container("accessibilityCheckEntryBox"))
     , m_xLabel(m_xBuilder->weld_label("accessibilityCheckEntryLabel"))
@@ -34,7 +35,7 @@ IMPL_LINK_NOARG(AccessibilityCheckEntry, GotoButtonClicked, weld::Button&, void)
 }
 
 AccessibilityCheckDialog::AccessibilityCheckDialog(
-    weld::Window* pParent, AccessibilityIssueCollection const& rIssueCollection)
+    weld::Window* pParent, sfx::AccessibilityIssueCollection const& rIssueCollection)
     : GenericDialogController(pParent, "svx/ui/accessibilitycheckdialog.ui",
                               "AccessibilityCheckDialog")
     , m_aIssueCollection(rIssueCollection)
@@ -48,7 +49,7 @@ short AccessibilityCheckDialog::run()
 {
     sal_Int32 i = 0;
 
-    for (std::shared_ptr<AccessibilityIssue> const& pIssue : m_aIssueCollection.getIssues())
+    for (std::shared_ptr<sfx::AccessibilityIssue> const& pIssue : m_aIssueCollection.getIssues())
     {
         auto xEntry
             = std::make_unique<AccessibilityCheckEntry>(m_xAccessibilityCheckBox.get(), pIssue);
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);