diff options
author | Tor Lillqvist <tml@collabora.com> | 2017-02-17 19:06:24 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2017-02-17 18:41:19 +0000 |
commit | b57d51e32fb85e9cde64f85719725253162c42e4 (patch) | |
tree | afe75470b9fc3c12a3d240577b07042985882675 /editeng/source/accessibility | |
parent | c910d1dae1a9fcf0591098244debc863dd59618a (diff) |
Drop :: prefix from std in [de]*/
Change-Id: I3247894fe022dce7f0aa351bd85fefcd7c545dd4
Reviewed-on: https://gerrit.libreoffice.org/34377
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'editeng/source/accessibility')
3 files changed, 24 insertions, 24 deletions
diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx index b3dd3d8e0f33..4d77ba95698d 100644 --- a/editeng/source/accessibility/AccessibleParaManager.cxx +++ b/editeng/source/accessibility/AccessibleParaManager.cxx @@ -182,7 +182,7 @@ namespace accessibility maEEOffset = rOffset; MemFunAdapter< const Point& > aAdapter( &::accessibility::AccessibleEditableTextPara::SetEEOffset, rOffset ); - ::std::for_each( begin(), end(), aAdapter ); + std::for_each( begin(), end(), aAdapter ); } void AccessibleParaManager::SetActive( bool bActive ) @@ -246,7 +246,7 @@ namespace accessibility void AccessibleParaManager::SetState( const sal_Int16 nStateId ) { - ::std::for_each( begin(), end(), + std::for_each( begin(), end(), MemFunAdapter< const sal_Int16 >( &AccessibleEditableTextPara::SetState, nStateId ) ); } @@ -260,13 +260,13 @@ namespace accessibility void AccessibleParaManager::UnSetState( const sal_Int16 nStateId ) { - ::std::for_each( begin(), end(), + std::for_each( begin(), end(), MemFunAdapter< const sal_Int16 >( &AccessibleEditableTextPara::UnSetState, nStateId ) ); } // not generic yet, no arguments... - class AccessibleParaManager_DisposeChildren : public ::std::unary_function< ::accessibility::AccessibleEditableTextPara&, void > + class AccessibleParaManager_DisposeChildren : public std::unary_function< ::accessibility::AccessibleEditableTextPara&, void > { public: AccessibleParaManager_DisposeChildren() {} @@ -280,12 +280,12 @@ namespace accessibility { AccessibleParaManager_DisposeChildren aFunctor; - ::std::for_each( begin(), end(), + std::for_each( begin(), end(), WeakChildAdapter< AccessibleParaManager_DisposeChildren > (aFunctor) ); } // not generic yet, too many method arguments... - class StateChangeEvent : public ::std::unary_function< ::accessibility::AccessibleEditableTextPara&, void > + class StateChangeEvent : public std::unary_function< ::accessibility::AccessibleEditableTextPara&, void > { public: typedef void return_type; @@ -326,16 +326,16 @@ namespace accessibility VectorOfChildren::const_iterator front = maChildren.begin(); VectorOfChildren::const_iterator back = front; - ::std::advance( front, nStartPara ); - ::std::advance( back, nEndPara ); + std::advance( front, nStartPara ); + std::advance( back, nEndPara ); StateChangeEvent aFunctor( nEventId, rNewValue, rOldValue ); - ::std::for_each( front, back, AccessibleParaManager::WeakChildAdapter< StateChangeEvent >( aFunctor ) ); + std::for_each( front, back, AccessibleParaManager::WeakChildAdapter< StateChangeEvent >( aFunctor ) ); } } - class ReleaseChild : public ::std::unary_function< const AccessibleParaManager::WeakChild&, AccessibleParaManager::WeakChild > + class ReleaseChild : public std::unary_function< const AccessibleParaManager::WeakChild&, AccessibleParaManager::WeakChild > { public: AccessibleParaManager::WeakChild operator()( const AccessibleParaManager::WeakChild& rPara ) @@ -361,10 +361,10 @@ namespace accessibility VectorOfChildren::iterator front = maChildren.begin(); VectorOfChildren::iterator back = front; - ::std::advance( front, nStartPara ); - ::std::advance( back, nEndPara ); + std::advance( front, nStartPara ); + std::advance( back, nEndPara ); - ::std::transform( front, back, front, ReleaseChild() ); + std::transform( front, back, front, ReleaseChild() ); } } diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index 6406b2934231..6700b1402a43 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -61,9 +61,9 @@ using namespace ::com::sun::star::accessibility; namespace accessibility { - typedef ::std::vector< beans::PropertyValue > PropertyValueVector; + typedef std::vector< beans::PropertyValue > PropertyValueVector; - class PropertyValueEqualFunctor : public ::std::binary_function< beans::PropertyValue, beans::PropertyValue, bool > + class PropertyValueEqualFunctor : public std::binary_function< beans::PropertyValue, beans::PropertyValue, bool > { public: PropertyValueEqualFunctor() @@ -111,7 +111,7 @@ namespace accessibility // receive pointer to our frontend class and view window AccessibleStaticTextBase_Impl(); - void SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource ); + void SetEditSource( std::unique_ptr< SvxEditSource > && pEditSource ); void SetEventSource( const uno::Reference< XAccessible >& rInterface ) { @@ -190,7 +190,7 @@ namespace accessibility // now the maTextParagraph has an empty parent reference set } - void AccessibleStaticTextBase_Impl::SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource ) + void AccessibleStaticTextBase_Impl::SetEditSource( std::unique_ptr< SvxEditSource > && pEditSource ) { maEditSource.SetEditSource( std::move(pEditSource) ); @@ -436,7 +436,7 @@ namespace accessibility // AccessibleStaticTextBase implementation - AccessibleStaticTextBase::AccessibleStaticTextBase( ::std::unique_ptr< SvxEditSource > && pEditSource ) : + AccessibleStaticTextBase::AccessibleStaticTextBase( std::unique_ptr< SvxEditSource > && pEditSource ) : mpImpl( new AccessibleStaticTextBase_Impl() ) { SolarMutexGuard aGuard; @@ -448,7 +448,7 @@ namespace accessibility { } - void AccessibleStaticTextBase::SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource ) + void AccessibleStaticTextBase::SetEditSource( std::unique_ptr< SvxEditSource > && pEditSource ) { // precondition: solar mutex locked DBG_TESTSOLARMUTEX(); @@ -663,7 +663,7 @@ namespace accessibility SolarMutexGuard aGuard; if( nStartIndex > nEndIndex ) - ::std::swap(nStartIndex, nEndIndex); + std::swap(nStartIndex, nEndIndex); //if startindex equals endindex we will get nothing. So return an empty string directly. if ( nStartIndex == nEndIndex ) { @@ -884,7 +884,7 @@ namespace accessibility SolarMutexGuard aGuard; if( nStartIndex > nEndIndex ) - ::std::swap(nStartIndex, nEndIndex); + std::swap(nStartIndex, nEndIndex); EPosition aStartIndex( mpImpl->Range2Internal(nStartIndex) ); EPosition aEndIndex( mpImpl->Range2Internal(nEndIndex) ); @@ -914,7 +914,7 @@ namespace accessibility { const beans::PropertyValue* pItr = aSeq.getConstArray(); const beans::PropertyValue* pEnd = pItr + aSeq.getLength(); - const beans::PropertyValue* pFind = ::std::find_if( pItr, pEnd, ::std::bind2nd( PropertyValueEqualFunctor(), std::cref( *aItr ) ) ); + const beans::PropertyValue* pFind = std::find_if( pItr, pEnd, std::bind2nd( PropertyValueEqualFunctor(), std::cref( *aItr ) ) ); if ( pFind != pEnd ) { aIntersectionVec.push_back( *pFind ); @@ -952,7 +952,7 @@ namespace accessibility { const beans::PropertyValue* pItr = aIntersectionSeq.getConstArray(); const beans::PropertyValue* pEnd = pItr + aIntersectionSeq.getLength(); - bool bNone = ::std::none_of( pItr, pEnd, ::std::bind2nd( PropertyValueEqualFunctor(), std::cref( pDefAttr[i] ) ) ); + bool bNone = std::none_of( pItr, pEnd, std::bind2nd( PropertyValueEqualFunctor(), std::cref( pDefAttr[i] ) ) ); if ( bNone && pDefAttr[i].Handle != 0) { aDiffVec.push_back( pDefAttr[i] ); diff --git a/editeng/source/accessibility/AccessibleStringWrap.cxx b/editeng/source/accessibility/AccessibleStringWrap.cxx index d3e6f49dfef7..f5589f703854 100644 --- a/editeng/source/accessibility/AccessibleStringWrap.cxx +++ b/editeng/source/accessibility/AccessibleStringWrap.cxx @@ -59,7 +59,7 @@ void AccessibleStringWrap::GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRec rRect.Left() = 0; rRect.Top() = 0; rRect.SetSize( Size(mrDev.GetTextHeight(), labs(aXArray[0] - aXArray[1])) ); - rRect.Move( ::std::min(aXArray[0], aXArray[1]), 0 ); + rRect.Move( std::min(aXArray[0], aXArray[1]), 0 ); } if( mrFont.IsVertical() ) |