diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-02-15 22:31:33 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-02-15 21:50:23 +0000 |
| commit | 013d9789c753d46f0a038e54db6e21f4d4922891 (patch) | |
| tree | 52480d6515d2def1f568a2f6023ee0799cd9b2af /accessibility/source/extended | |
| parent | d007cef2dfd0c4d7b009b4f943464c6c4854d88d (diff) | |
Drop :: prefix from std in [a-b]*/
Change-Id: I0422aaf39bbce889c95ed9a81a0784cb03a1badd
Reviewed-on: https://gerrit.libreoffice.org/34320
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'accessibility/source/extended')
| -rw-r--r-- | accessibility/source/extended/accessiblelistboxentry.cxx | 2 | ||||
| -rw-r--r-- | accessibility/source/extended/textwindowaccessibility.cxx | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 3b2971063d92..2eb8f395e8ff 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -326,7 +326,7 @@ namespace accessibility { // we have a entry as parent -> get its accessible // shorten our access path by one - ::std::deque< sal_Int32 > aParentPath( m_aEntryPath ); + std::deque< sal_Int32 > aParentPath( m_aEntryPath ); aParentPath.pop_back(); // get the entry for this shortened access path diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index a82311c705be..198fd2a84fef 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -814,8 +814,8 @@ void Document::retrieveParagraphSelection(Paragraph const * pParagraph, Paragraphs::size_type nNumber = pParagraph->getNumber(); TextPaM aStartPaM( rSelection.GetStart() ); TextPaM aEndPaM( rSelection.GetEnd() ); - TextPaM aMinPaM( ::std::min( aStartPaM, aEndPaM ) ); - TextPaM aMaxPaM( ::std::max( aStartPaM, aEndPaM ) ); + TextPaM aMinPaM( std::min( aStartPaM, aEndPaM ) ); + TextPaM aMaxPaM( std::max( aStartPaM, aEndPaM ) ); if ( nNumber >= aMinPaM.GetPara() && nNumber <= aMaxPaM.GetPara() ) { @@ -827,7 +827,7 @@ void Document::retrieveParagraphSelection(Paragraph const * pParagraph, // XXX numeric overflow (3x) if ( aStartPaM > aEndPaM ) - ::std::swap( *pBegin, *pEnd ); + std::swap( *pBegin, *pEnd ); } else { @@ -2218,8 +2218,8 @@ void Document::handleSelectionChangeNotification() case 2: { //old has no selection but new has selection - nMin = ::std::min(nNewFirstPara, nNewLastPara); - nMax = ::std::max(nNewFirstPara, nNewLastPara); + nMin = std::min(nNewFirstPara, nNewLastPara); + nMax = std::max(nNewFirstPara, nNewLastPara); sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::SELECTION_CHANGED); sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); } @@ -2227,8 +2227,8 @@ void Document::handleSelectionChangeNotification() case 3: { //old has selection but new has no selection. - nMin = ::std::min(m_nSelectionFirstPara, m_nSelectionLastPara); - nMax = ::std::max(m_nSelectionFirstPara, m_nSelectionLastPara); + nMin = std::min(m_nSelectionFirstPara, m_nSelectionLastPara); + nMax = std::max(m_nSelectionFirstPara, m_nSelectionLastPara); sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::SELECTION_CHANGED); sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); } @@ -2348,12 +2348,12 @@ void Document::handleSelectionChangeNotification() else { // old and new selection not empty => notify events for the two ranges left and right of the overlap - ::std::vector< TextPaM > aTextPaMs(4); + std::vector< TextPaM > aTextPaMs(4); aTextPaMs[0] = aOldTextStart; aTextPaMs[1] = aOldTextEnd; aTextPaMs[2] = aNewTextStart; aTextPaMs[3] = aNewTextEnd; - ::std::sort( aTextPaMs.begin(), aTextPaMs.end() ); + std::sort( aTextPaMs.begin(), aTextPaMs.end() ); nFirst1 = aTextPaMs[0].GetPara(); nLast1 = aTextPaMs[1].GetPara() + ( aTextPaMs[0] != aTextPaMs[1] ? 1 : 0 ); |