winaccessibility/source/UAccCOM/MAccessible.cxx | 28 ++++++---------- winaccessibility/source/service/AccObjectWinManager.cxx | 6 +-- 2 files changed, 13 insertions(+), 21 deletions(-)
New commits: commit a427a46db0fa453acabe10389e106441031b317e Author: Michael Weghorn <[email protected]> AuthorDate: Tue Mar 1 10:32:34 2022 +0000 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Mar 1 15:52:18 2022 +0100 wina11y: Use range-based for Change-Id: Ie03126205d45ad2fcae14af53ab7a499f3c445f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130759 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx index c405e6799d2b..bcde1ccf46a4 100644 --- a/winaccessibility/source/service/AccObjectWinManager.cxx +++ b/winaccessibility/source/service/AccObjectWinManager.cxx @@ -1057,11 +1057,9 @@ bool AccObjectWinManager::IsStateManageDescendant(XAccessible* pAccessible) if( !pRState.is() ) return false; - Sequence<short> pStates = pRState->getStates(); - int count = pStates.getLength(); - for( int iIndex = 0;iIndex < count;iIndex++ ) + for (sal_Int16 nState : pRState->getStates()) { - if (pStates[iIndex] == AccessibleStateType::MANAGES_DESCENDANTS) + if (nState == AccessibleStateType::MANAGES_DESCENDANTS) return true; } } commit 45ae2fb7a7de4da4c3d6c7c359aaf92ccf0688a2 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Mar 1 10:27:11 2022 +0000 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Mar 1 15:52:04 2022 +0100 wina11y: Use more range-based for And use const reference to css::style::TabStop instead of creating a copy. Change-Id: I4092cbefcfbdaa6a6697974b7f40242e26cc6aad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130758 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index a24536c8f36f..56542b10028f 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -2712,43 +2712,37 @@ OUString CMAccessible::get_StringFromAny(Any const & pAny) OUStringBuffer pString; - int count = val.getLength(); + for (const OUString& rElem : val) + pString.append(rElem); - for( int iIndex = 0;iIndex < count;iIndex++ ) - { - pString.append(val[iIndex]); - } return pString.makeStringAndClear(); } else if (pAny.getValueType() == cppu::UnoType<Sequence< css::style::TabStop >>::get()) { Sequence < css::style::TabStop > val; pAny >>= val; - int count = val.getLength(); OUStringBuffer buf; - for( int iIndex = 0;iIndex < count;iIndex++ ) + for (const css::style::TabStop& rSingleVal : val) { - css::style::TabStop sigleVal = val[iIndex]; - buf.append("Position="); - buf.append(sigleVal.Position); + buf.append(rSingleVal.Position); buf.append(",TabAlign="); - buf.append(sal_Int32(sigleVal.Alignment)); + buf.append(sal_Int32(rSingleVal.Alignment)); buf.append(","); buf.append("DecimalChar="); - if(sigleVal.DecimalChar==';' || sigleVal.DecimalChar == ':' || sigleVal.DecimalChar == ',' || - sigleVal.DecimalChar == '=' || sigleVal.DecimalChar == '\\') + if (rSingleVal.DecimalChar==';' || rSingleVal.DecimalChar == ':' || rSingleVal.DecimalChar == ',' || + rSingleVal.DecimalChar == '=' || rSingleVal.DecimalChar == '\\') buf.append('\\'); - buf.append(sigleVal.DecimalChar); + buf.append(rSingleVal.DecimalChar); buf.append(","); buf.append("FillChar="); - if(sigleVal.FillChar==';' || sigleVal.FillChar == ':' || sigleVal.FillChar == ',' || - sigleVal.FillChar == '=' || sigleVal.FillChar == '\\') + if (rSingleVal.FillChar==';' || rSingleVal.FillChar == ':' || rSingleVal.FillChar == ',' || + rSingleVal.FillChar == '=' || rSingleVal.FillChar == '\\') buf.append('\\'); - buf.append(sigleVal.FillChar); + buf.append(rSingleVal.FillChar); buf.append(","); } return buf.makeStringAndClear();
