core.git: 3 commits - editeng/source vcl/qa

[Michael Weghorn (via logerrit)]

 editeng/source/accessibility/AccessibleContextBase.cxx |   24 ++++++++---------
 vcl/qa/cppunit/a11y/atspi2/atspi2.cxx                  |    2 +
 2 files changed, 14 insertions(+), 12 deletions(-)

New commits:
commit f0d8873f511a3eb951f50bc2ee2ed9b2a2cad4e4
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Nov 6 18:23:43 2024 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Nov 7 08:49:36 2024 +0100

    a11y tests: Map DESCRIBED_BY relation type to AT-SPI
    
    Change-Id: I9d0122459cf0a90ce1c49c6bdc07b24ff93bc417
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176152
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx 
b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
index 7c6feb7755f1..527a5e73fdda 100644
--- a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
+++ b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
@@ -206,6 +206,8 @@ static AtspiRelationType mapRelationType(sal_Int16 
nRelation)
             return ATSPI_RELATION_CONTROLLED_BY;
         case accessibility::AccessibleRelationType::CONTROLLER_FOR:
             return ATSPI_RELATION_CONTROLLER_FOR;
+        case accessibility::AccessibleRelationType::DESCRIBED_BY:
+            return ATSPI_RELATION_DESCRIBED_BY;
         case accessibility::AccessibleRelationType::LABEL_FOR:
             return ATSPI_RELATION_LABEL_FOR;
         case accessibility::AccessibleRelationType::LABELED_BY:
commit 7599afa86eb0c9583e1c89764fa2f35f0c80bb86
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Nov 6 15:45:18 2024 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Nov 7 08:49:28 2024 +0100

    editeng a11y: Use range-based for
    
    Change-Id: Ie686eb0c76e77139e9d59b1d08a7ac7e99f71316
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176151
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
    Tested-by: Jenkins

diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx 
b/editeng/source/accessibility/AccessibleContextBase.cxx
index 2b68e7f40e0b..d904490751f0 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -138,12 +138,13 @@ void AccessibleContextBase::SetRelationSet (
         { AccessibleRelationType::LABELED_BY, 
AccessibleEventId::LABELED_BY_RELATION_CHANGED },
         { AccessibleRelationType::LABEL_FOR, 
AccessibleEventId::LABEL_FOR_RELATION_CHANGED },
         { AccessibleRelationType::MEMBER_OF, 
AccessibleEventId::MEMBER_OF_RELATION_CHANGED },
-        { AccessibleRelationType::INVALID, -1},
     };
-    for (int i=0; 
aRelationDescriptors[i].first!=AccessibleRelationType::INVALID; i++)
-        if (mxRelationSet->containsRelation(aRelationDescriptors[i].first)
-        != rxNewRelationSet->containsRelation(aRelationDescriptors[i].first))
-        CommitChange (aRelationDescriptors[i].second, uno::Any(), uno::Any(), 
-1);
+    for (const std::pair<short int, short int>& rPair : aRelationDescriptors)
+    {
+        if (mxRelationSet->containsRelation(rPair.first)
+            != rxNewRelationSet->containsRelation(rPair.first))
+            CommitChange(rPair.second, uno::Any(), uno::Any(), -1);
+    }
 
     mxRelationSet = rxNewRelationSet;
 }
commit 355f6466dc13d2ebd7e8ba323df0da832b0ed096
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Nov 6 15:39:36 2024 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Nov 7 08:49:22 2024 +0100

    editeng a11y: Drop "typedef std::pair<short int,short int> RD"
    
    Use initializer syntax for the array elements.
    
    Change-Id: Ibe8dbc372cfb5f7134267f26d5bd27fd153a797b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176150
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx 
b/editeng/source/accessibility/AccessibleContextBase.cxx
index 8f2fbf6d4045..2b68e7f40e0b 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -132,14 +132,13 @@ void AccessibleContextBase::SetRelationSet (
 {
     // Try to emit some meaningful events indicating differing relations in
     // both sets.
-    typedef std::pair<short int,short int> RD;
-    const RD aRelationDescriptors[] = {
-        RD(AccessibleRelationType::CONTROLLED_BY, 
AccessibleEventId::CONTROLLED_BY_RELATION_CHANGED),
-        RD(AccessibleRelationType::CONTROLLER_FOR, 
AccessibleEventId::CONTROLLER_FOR_RELATION_CHANGED),
-        RD(AccessibleRelationType::LABELED_BY, 
AccessibleEventId::LABELED_BY_RELATION_CHANGED),
-        RD(AccessibleRelationType::LABEL_FOR, 
AccessibleEventId::LABEL_FOR_RELATION_CHANGED),
-        RD(AccessibleRelationType::MEMBER_OF, 
AccessibleEventId::MEMBER_OF_RELATION_CHANGED),
-        RD(AccessibleRelationType::INVALID, -1),
+    const std::pair<short int, short int> aRelationDescriptors[] = {
+        { AccessibleRelationType::CONTROLLED_BY, 
AccessibleEventId::CONTROLLED_BY_RELATION_CHANGED },
+        { AccessibleRelationType::CONTROLLER_FOR, 
AccessibleEventId::CONTROLLER_FOR_RELATION_CHANGED },
+        { AccessibleRelationType::LABELED_BY, 
AccessibleEventId::LABELED_BY_RELATION_CHANGED },
+        { AccessibleRelationType::LABEL_FOR, 
AccessibleEventId::LABEL_FOR_RELATION_CHANGED },
+        { AccessibleRelationType::MEMBER_OF, 
AccessibleEventId::MEMBER_OF_RELATION_CHANGED },
+        { AccessibleRelationType::INVALID, -1},
     };
     for (int i=0; 
aRelationDescriptors[i].first!=AccessibleRelationType::INVALID; i++)
         if (mxRelationSet->containsRelation(aRelationDescriptors[i].first)