sw/inc/accmap.hxx | 2 +- sw/source/core/access/acccontext.hxx | 4 ++-- sw/source/core/access/accmap.cxx | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-)
New commits: commit 0f472e35033b356cc2dd885762ec4c4cc7b02b8f Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Tue Dec 21 13:33:58 2021 +0100 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Tue Dec 21 15:03:12 2021 +0100 Typo: "seleted" instead of "selected" Except "getSeletedPositionStart" and "getSeletedPositionEnd" defined in offapi/com/sun/star/accessibility/XAccessibleTextSelection.idl since e5618f1707626a8c096ea2ca8da3cbe2c5f3db16 author Steve Yin <stev...@apache.org> 2013-11-16 23:58:19 +0100 committer Michael Meeks <michael.me...@collabora.com> 2013-11-19 10:02:25 +0000 commit e5618f1707626a8c096ea2ca8da3cbe2c5f3db16 (patch) tree de014d37b3de5a7ab505a86a6e6ce46ade4bdc1f parent 1263b20f56d896706c982ad1b91d2936abf5d617 (diff) Integrate branch of IAccessible2 Change-Id: I814923003bb247c4ef66f296ac4033bae9073988 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127227 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 625f17e0dacd..5b32fe204c57 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -118,7 +118,7 @@ class SwAccessibleMap final : public ::accessibility::IAccessibleViewForwarder, void InvalidateShapeSelection(); //mpSelectedFrameMap contains the old selected objects. - std::unique_ptr<SwAccessibleContextMap_Impl> mpSeletedFrameMap; + std::unique_ptr<SwAccessibleContextMap_Impl> mpSelectedFrameMap; OUString maDocName; diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 999f57374afc..4faf8e23723f 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -351,8 +351,8 @@ public: } //This method is used to update the selected state and fire the selected state changed event. - virtual bool SetSelectedState(bool bSeleted); - bool IsSeletedInDoc() const { return m_isSelectedInDoc; } + virtual bool SetSelectedState(bool bSelected); + bool IsSelectedInDoc() const { return m_isSelectedInDoc; } static OUString GetResource(TranslateId pResId, const OUString *pArg1 = nullptr, diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 7234a571a72c..4b0506475e51 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -1359,7 +1359,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection() if(xAccContext.is() && xAccContext->getAccessibleRole() == AccessibleRole::PARAGRAPH) { SwAccessibleParagraph* pAccPara = static_cast< SwAccessibleParagraph *>(xAccContext.get()); - if(pAccFrame->IsSeletedInDoc()) + if(pAccFrame->IsSelectedInDoc()) { m_setParaAdd.insert(pAccPara); } @@ -1424,9 +1424,9 @@ void SwAccessibleMap::InvalidateShapeInParaSelection() } if(!isChanged) { - SwAccessibleContextMap_Impl::iterator aEraseIter = mpSeletedFrameMap->find( pFrame ); - if(aEraseIter != mpSeletedFrameMap->end()) - mpSeletedFrameMap->erase(aEraseIter); + SwAccessibleContextMap_Impl::iterator aEraseIter = mpSelectedFrameMap->find( pFrame ); + if(aEraseIter != mpSelectedFrameMap->end()) + mpSelectedFrameMap->erase(aEraseIter); } else { @@ -1441,12 +1441,12 @@ void SwAccessibleMap::InvalidateShapeInParaSelection() } } } - if( !mpSeletedFrameMap ) - mpSeletedFrameMap.reset( new SwAccessibleContextMap_Impl ); - if( !mpSeletedFrameMap->empty() ) + if( !mpSelectedFrameMap ) + mpSelectedFrameMap.reset( new SwAccessibleContextMap_Impl ); + if( !mpSelectedFrameMap->empty() ) { - SwAccessibleContextMap_Impl::iterator aIter = mpSeletedFrameMap->begin(); - while( aIter != mpSeletedFrameMap->end() ) + SwAccessibleContextMap_Impl::iterator aIter = mpSelectedFrameMap->begin(); + while( aIter != mpSelectedFrameMap->end() ) { uno::Reference < XAccessible > xAcc = (*aIter).second; if(xAcc.is()) @@ -1455,13 +1455,13 @@ void SwAccessibleMap::InvalidateShapeInParaSelection() vecRemove.push_back(static_cast< SwAccessibleContext * >(xAcc.get())); } bMarkChanged = true; - mpSeletedFrameMap->clear(); + mpSelectedFrameMap->clear(); } SwAccessibleContextMap_Impl::iterator aIter = mapTemp.begin(); while( aIter != mapTemp.end() ) { - mpSeletedFrameMap->emplace( (*aIter).first, (*aIter).second ); + mpSelectedFrameMap->emplace( (*aIter).first, (*aIter).second ); ++aIter; } mapTemp.clear();