[Libreoffice-commits] core.git: 2 commits - sc/source winaccessibility/source

[Michael Weghorn (via logerrit)]

 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |    4 ++--
 winaccessibility/source/UAccCOM/MAccessible.cxx      |   11 -----------
 winaccessibility/source/UAccCOM/MAccessible.h        |    1 -
 3 files changed, 2 insertions(+), 14 deletions(-)

New commits:
commit 26e45694433721a8837a2133c05798776576def6
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Mon Sep 6 15:54:13 2021 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Tue Sep 7 08:18:22 2021 +0200

    wina11y: Drop unused CMAccessible::IsDescendantManage
    
    Change-Id: I90aa35ec3567d720c8adbe0cfc96343bef678ba1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121730
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index d7e19374d8f2..e9c563b3da5e 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -1405,17 +1405,6 @@ IMAccessible* CMAccessible::GetChildInterface(long dChildID)//for test
     return nullptr;
 }
 
-/**
-* For List, tree and table,these roles belong to manage_descendant in UNO,
-* need to process specifically when navigate
-* @return  BOOL, if it is descendantmanager, return true.
-*/
-bool CMAccessible::IsDescendantManage()
-{
-
-    return (m_iRole==ROLE_SYSTEM_LIST)||(m_iRole==ROLE_SYSTEM_OUTLINE)||(m_iRole==ROLE_SYSTEM_TABLE);
-}
-
 /**
 * for descendantmanager circumstance,provide child interface when navigate
 * @param    varCur, the current child.
diff --git a/winaccessibility/source/UAccCOM/MAccessible.h b/winaccessibility/source/UAccCOM/MAccessible.h
index 4ad335579cce..80e9cb463ca1 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.h
+++ b/winaccessibility/source/UAccCOM/MAccessible.h
@@ -208,7 +208,6 @@ private:
     HRESULT GetLastChild(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation
     HRESULT GetNextSibling(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation
     HRESULT GetPreSibling(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation
-    bool IsDescendantManage();//identify whether the current COM belongs to manage_descendant roles
 
     // the following private methods are used to implement accSelect method
     HRESULT SelectChild(css::accessibility::XAccessible* pItem);
commit c772f4458ec0ce486c8bfefecd99c37527bec732
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Mon Sep 6 15:43:55 2021 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Tue Sep 7 08:18:10 2021 +0200

    Use while instead of for loop
    
    ... since only the condition and no init-statement or
    iteration-expression is set anyway.
    
    Change-Id: Icd9c5c9cf1e89f39984ed13624246731da0d7acc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121729
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index e414074819dd..484ab05c0eb6 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -717,7 +717,7 @@ void ScAccessibleSpreadsheet::RemoveSelection(const ScMarkData &refScMarkData)
     AccessibleEventObject aEvent;
     aEvent.Source = uno::Reference< XAccessible >(this);
     MAP_ADDR_XACC::iterator miRemove = m_mapSelectionSend.begin();
-    for(;  miRemove != m_mapSelectionSend.end() ;)
+    while (miRemove != m_mapSelectionSend.end())
     {
         if (refScMarkData.IsCellMarked(miRemove->first.Col(),miRemove->first.Row(),true) ||
             refScMarkData.IsCellMarked(miRemove->first.Col(),miRemove->first.Row()) )
@@ -1567,7 +1567,7 @@ void ScAccessibleSpreadsheet::RemoveFormulaSelection(bool bRemoveAll )
     AccessibleEventObject aEvent;
     aEvent.Source = uno::Reference< XAccessible >(this);
     MAP_ADDR_XACC::iterator miRemove = m_mapFormulaSelectionSend.begin();
-    for(;  miRemove != m_mapFormulaSelectionSend.end() ;)
+    while (miRemove != m_mapFormulaSelectionSend.end())
     {
         if( !bRemoveAll && IsScAddrFormulaSel(miRemove->first) )
         {