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

2020-01-09 Thread Tomaž Vajngerl (via logerrit) 
 include/sfx2/AccessibilityIssue.hxx|6 +++
 sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx   |   20 -
 sw/qa/core/accessibilitycheck/data/AccessibilityTests1.odt |binary
 sw/source/core/access/AccessibilityCheck.cxx   |   11 ---
 4 files changed, 31 insertions(+), 6 deletions(-)

New commits:
commit 912cd707b5128c5ef9d365d8179cf2b65aeaaa1d
Author: Tomaž Vajngerl 
AuthorDate: Thu Jan 9 11:34:11 2020 +0100
Commit: Tomaž Vajngerl 
CommitDate: Thu Jan 9 17:05:25 2020 +0100

tdf#45636: test for no-alt and table split/merge access. check

Change-Id: I6474b5e0db90143efa1ea066142961c2fe250ae6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86492
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/sfx2/AccessibilityIssue.hxx 
b/include/sfx2/AccessibilityIssue.hxx
index 250594e769af..8e0d85cdd7ae 100644
--- a/include/sfx2/AccessibilityIssue.hxx
+++ b/include/sfx2/AccessibilityIssue.hxx
@@ -23,7 +23,11 @@ enum class AccessibilityIssueID
 UNSPECIFIED, // TODO: remove - temporary
 DOCUMENT_TITLE,
 DOCUMENT_LANGUAGE,
-STYLE_LANGUAGE
+STYLE_LANGUAGE,
+NO_ALT_OLE,
+NO_ALT_GRAPHIC,
+NO_ALT_SHAPE,
+TABLE_MERGE_SPLIT,
 };
 
 class SFX2_DLLPUBLIC AccessibilityIssue
diff --git a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx 
b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
index 7360ccd1d862..61902aabc459 100644
--- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
+++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
@@ -23,7 +23,7 @@ public:
 }
 };
 
-CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testCheck)
+CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testCheckDocumentIssues)
 {
 SwDoc* pDoc = createDoc("DocumentTest.odt");
 CPPUNIT_ASSERT(pDoc);
@@ -35,6 +35,24 @@ CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testCheck)
 CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::DOCUMENT_TITLE, 
aIssues[1]->m_eIssueID);
 }
 
+CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testTableSplitMergeAndAltText)
+{
+SwDoc* pDoc = createDoc("AccessibilityTests1.odt");
+CPPUNIT_ASSERT(pDoc);
+sw::AccessibilityCheck aCheck(pDoc);
+aCheck.check();
+auto& aIssues = aCheck.getIssueCollecton().getIssues();
+CPPUNIT_ASSERT_EQUAL(size_t(7), aIssues.size());
+
+CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::NO_ALT_GRAPHIC, 
aIssues[0]->m_eIssueID);
+CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::NO_ALT_OLE, 
aIssues[1]->m_eIssueID);
+CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::TABLE_MERGE_SPLIT, 
aIssues[2]->m_eIssueID);
+CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::TABLE_MERGE_SPLIT, 
aIssues[3]->m_eIssueID);
+CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::TABLE_MERGE_SPLIT, 
aIssues[4]->m_eIssueID);
+CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::TABLE_MERGE_SPLIT, 
aIssues[5]->m_eIssueID);
+CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::NO_ALT_SHAPE, 
aIssues[6]->m_eIssueID);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/core/accessibilitycheck/data/AccessibilityTests1.odt 
b/sw/qa/core/accessibilitycheck/data/AccessibilityTests1.odt
new file mode 100644
index ..2e319f58e7a2
Binary files /dev/null and 
b/sw/qa/core/accessibilitycheck/data/AccessibilityTests1.odt differ
diff --git a/sw/source/core/access/AccessibilityCheck.cxx 
b/sw/source/core/access/AccessibilityCheck.cxx
index 06a90e98ac4c..aaeacae84bac 100644
--- a/sw/source/core/access/AccessibilityCheck.cxx
+++ b/sw/source/core/access/AccessibilityCheck.cxx
@@ -83,16 +83,18 @@ class NoTextNodeAltTextCheck : public NodeCheck
 
 OUString sIssueText = 
SwResId(STR_NO_ALT).replaceAll("%OBJECT_NAME%", sName);
 
-auto pIssue = lclAddIssue(m_rIssueCollection, sIssueText);
-
 if (pNoTextNode->IsOLENode())
 {
+auto pIssue = lclAddIssue(m_rIssueCollection, sIssueText,
+  
sfx::AccessibilityIssueID::NO_ALT_OLE);
 pIssue->setDoc(pNoTextNode->GetDoc());
 pIssue->setIssueObject(IssueObject::OLE);
 pIssue->setObjectID(pNoTextNode->GetFlyFormat()->GetName());
 }
 else if (pNoTextNode->IsGrfNode())
 {
+auto pIssue = lclAddIssue(m_rIssueCollection, sIssueText,
+  
sfx::AccessibilityIssueID::NO_ALT_GRAPHIC);
 pIssue->setDoc(pNoTextNode->GetDoc());
 pIssue->setIssueObject(IssueObject::GRAPHIC);
 pIssue->setObjectID(pNoTextNode->GetFlyFormat()->GetName());
@@ -126,7 +128,8 @@ private:
 const SwTableFormat* pFormat = rTable.GetFrameFormat();
 OUString sName = pFormat->GetName();
 OUString sIssueText = 
SwResId(STR_TABLE_MERGE_SPLIT).replaceAll("%OBJECT_NAME%",

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

2018-03-02 Thread Noel Grandin 
 include/sfx2/watermarkitem.hxx |7 ---
 sw/qa/extras/uiwriter/uiwriter.cxx |2 +-
 sw/source/core/edit/edfcol.cxx |4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 7e80b63d8304d435d305ea61988eaf6cf9667886
Author: Noel Grandin 
Date:   Thu Mar 1 15:52:45 2018 +0200

use more Color in SfxWatermarkItem

Change-Id: Ifbbce6509c02cf3d93d0500104af7c07c3216266
Reviewed-on: https://gerrit.libreoffice.org/50577
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/sfx2/watermarkitem.hxx b/include/sfx2/watermarkitem.hxx
index 43abdfeec081..448eb47990f8 100644
--- a/include/sfx2/watermarkitem.hxx
+++ b/include/sfx2/watermarkitem.hxx
@@ -11,6 +11,7 @@
 
 #include 
 #include 
+#include 
 
 class SFX2_DLLPUBLIC SfxWatermarkItem: public SfxPoolItem
 {
@@ -30,15 +31,15 @@ public:
 voidSetAngle(const sal_Int16 nAngle) { m_nAngle = 
nAngle; }
 sal_Int16   GetTransparency() const { return m_nTransparency; }
 voidSetTransparency(const sal_Int16 nTransparency) { 
m_nTransparency = nTransparency; }
-sal_uInt32  GetColor() const { return m_nColor; }
-voidSetColor(const sal_uInt32 nColor) { m_nColor = 
nColor; }
+Color   GetColor() const { return m_nColor; }
+voidSetColor(Color nColor) { m_nColor = nColor; }
 
 private:
 OUStringm_aText;
 OUStringm_aFont;
 sal_Int16   m_nAngle;
 sal_Int16   m_nTransparency;
-sal_uInt32  m_nColor;
+Color   m_nColor;
 };
 
 #endif
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index d6838d8acf89..a5c9282d3121 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -980,7 +980,7 @@ void SwUiWriterTest::testWatermarkDOCX()
 CPPUNIT_ASSERT_EQUAL(OUString("CustomWatermark"), pWatermark->GetText());
 CPPUNIT_ASSERT_EQUAL(OUString("DejaVu Sans Light"), pWatermark->GetFont());
 CPPUNIT_ASSERT_EQUAL(sal_Int16(45), pWatermark->GetAngle());
-CPPUNIT_ASSERT_EQUAL(sal_uInt32(0x548dd4), pWatermark->GetColor());
+CPPUNIT_ASSERT_EQUAL(Color(0x548dd4), pWatermark->GetColor());
 CPPUNIT_ASSERT_EQUAL(sal_Int16(50), pWatermark->GetTransparency());
 }
 
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 4a0fcd5e6266..572dc6078de1 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -1442,7 +1442,7 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem& 
rWatermark,
 if (xWatermark.is())
 {
 drawing::HomogenMatrix3 aMatrix;
-sal_uInt32 nColor = 0xc0c0c0;
+Color nColor = 0xc0c0c0;
 sal_Int16 nTransparency = 50;
 sal_Int16 nAngle = 45;
 OUString aFont = "";
@@ -1476,7 +1476,7 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem& 
rWatermark,
 OUString sFont = rWatermark.GetFont();
 sal_Int16 nAngle = rWatermark.GetAngle();
 sal_Int16 nTransparency = rWatermark.GetTransparency();
-sal_uInt32 nColor = rWatermark.GetColor();
+Color nColor = rWatermark.GetColor();
 
 // Calc the ratio.
 double fRatio = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits