From b57d51e32fb85e9cde64f85719725253162c42e4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 17 Feb 2017 19:06:24 +0200 Subject: Drop :: prefix from std in [de]*/ Change-Id: I3247894fe022dce7f0aa351bd85fefcd7c545dd4 Reviewed-on: https://gerrit.libreoffice.org/34377 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist --- .../source/accessibility/AccessibleParaManager.cxx | 26 +++++++++++----------- .../accessibility/AccessibleStaticTextBase.cxx | 20 ++++++++--------- .../source/accessibility/AccessibleStringWrap.cxx | 2 +- editeng/source/editeng/editdoc.hxx | 2 +- editeng/source/editeng/impedit3.cxx | 10 ++++----- editeng/source/editeng/impedit4.cxx | 2 +- editeng/source/items/borderline.cxx | 2 +- editeng/source/misc/svxacorr.cxx | 2 +- editeng/source/outliner/outliner.cxx | 2 +- editeng/source/rtf/svxrtf.cxx | 4 ++-- editeng/source/uno/unoedhlp.cxx | 26 +++++++++++----------- editeng/source/uno/unoedprx.cxx | 14 ++++++------ editeng/source/uno/unofored.cxx | 4 ++-- editeng/source/uno/unoforou.cxx | 4 ++-- 14 files changed, 60 insertions(+), 60 deletions(-) (limited to 'editeng') 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() ) diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 536646882341..291a0676891c 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -371,7 +371,7 @@ struct ExtraPortionInfo bool bCompressed; std::unique_ptr pOrgDXArray; - ::std::vector< sal_Int32 > lineBreaksList; + std::vector< sal_Int32 > lineBreaksList; ExtraPortionInfo(); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 9247b1a7651f..9a6b009bbdd4 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -2354,7 +2354,7 @@ void ImpEditEngine::CreateTextPortions( ParaPortion* pParaPortion, sal_Int32& rS ContentNode* pNode = pParaPortion->GetNode(); DBG_ASSERT( pNode->Len(), "CreateTextPortions should not be used for empty paragraphs!" ); - ::std::set< sal_Int32 > aPositions; + std::set< sal_Int32 > aPositions; aPositions.insert( 0 ); sal_uInt16 nAttr = 0; @@ -2427,10 +2427,10 @@ void ImpEditEngine::CreateTextPortions( ParaPortion* pParaPortion, sal_Int32& rS // A portion may also have been formed by a line break: aPositions.insert( nPortionStart ); - ::std::set< sal_Int32 >::iterator nInvPos = aPositions.find( nPortionStart ); + std::set< sal_Int32 >::iterator nInvPos = aPositions.find( nPortionStart ); DBG_ASSERT( (nInvPos != aPositions.end()), "InvPos ?!" ); - ::std::set< sal_Int32 >::iterator i = nInvPos; + std::set< sal_Int32 >::iterator i = nInvPos; ++i; while ( i != aPositions.end() ) { @@ -3032,7 +3032,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt // Over the Portions of the line ... bool bParsingFields = false; - ::std::vector< sal_Int32 >::iterator itSubLines; + std::vector< sal_Int32 >::iterator itSubLines; for ( sal_Int32 nPortion = pLine->GetStartPortion(); nPortion <= pLine->GetEndPortion(); nPortion++ ) { @@ -3230,7 +3230,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt aStartPos.X() -= pLine->GetHeight(); } } - ::std::vector< sal_Int32 >::iterator curIt = itSubLines; + std::vector< sal_Int32 >::iterator curIt = itSubLines; ++itSubLines; if( itSubLines != pExtraInfo->lineBreaksList.end() ) { diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 56d8566a2ec4..7d5227845100 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -794,7 +794,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, break; case EE_CHAR_COLOR: { - SvxColorList::const_iterator const iter = ::std::find( + SvxColorList::const_iterator const iter = std::find( rColorList.begin(), rColorList.end(), static_cast(rItem).GetValue()); assert(iter != rColorList.end()); diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index f6ffce807a0a..41aaf8f0bbbd 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -500,7 +500,7 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sa case FINE_DASHED: case DASH_DOT: case DASH_DOT_DOT: - ::std::swap( nOut, nIn); + std::swap( nOut, nIn); break; default: ; // nothing diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index fef8739e5f20..fdd66c356ad8 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1901,7 +1901,7 @@ OUString SvxAutoCorrect::GetAutoCorrFileName( const LanguageTag& rLanguageTag, if (bUnlocalized) { // we don't want variant, so we'll take "fr" instead of "fr-CA" for example - ::std::vector< OUString > vecFallBackStrings = rLanguageTag.getFallbackStrings(false); + std::vector< OUString > vecFallBackStrings = rLanguageTag.getFallbackStrings(false); if (!vecFallBackStrings.empty()) sExt = vecFallBackStrings[0]; } diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 04db26f58e38..41564f4108de 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -57,7 +57,7 @@ #include #include #include -using ::std::advance; +using std::advance; // Outliner diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 0aef5b3e32cf..ed9d7809a369 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -298,7 +298,7 @@ void SvxRTFParser::ReadStyleTable() sal_uInt16 nStyleNo = 0; bool bHasStyleNo = false; int _nOpenBrakets = 1; // the first was already detected earlier!! - ::std::unique_ptr pStyle( + std::unique_ptr pStyle( new SvxRTFStyleType( *pAttrPool, &aWhichMap[0] )); pStyle->aAttrSet.Put( GetRTFDefaults() ); @@ -911,7 +911,7 @@ void SvxRTFParser::AttrGroupEnd() // process the current, delete from Stack // - all character attributes sre keep the area // - all paragraph attributes to get the area // up to the previous paragraph - ::std::unique_ptr pNew( + std::unique_ptr pNew( new SvxRTFItemStackType(*pOld, *pInsPos, true)); pNew->aAttrSet.SetParent( pOld->aAttrSet.GetParent() ); diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx index 646d009d0b20..7d72e8c27f06 100644 --- a/editeng/source/uno/unoedhlp.cxx +++ b/editeng/source/uno/unoedhlp.cxx @@ -41,46 +41,46 @@ SvxEditSourceHint::SvxEditSourceHint( SfxHintId _nId, sal_uLong nValue, sal_Int3 } -::std::unique_ptr SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify ) +std::unique_ptr SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify ) { if( aNotify ) { switch( aNotify->eNotificationType ) { case EE_NOTIFY_TEXTMODIFIED: - return ::std::unique_ptr( new TextHint( SfxHintId::TextModified, aNotify->nParagraph ) ); + return std::unique_ptr( new TextHint( SfxHintId::TextModified, aNotify->nParagraph ) ); case EE_NOTIFY_PARAGRAPHINSERTED: - return ::std::unique_ptr( new TextHint( SfxHintId::TextParaInserted, aNotify->nParagraph ) ); + return std::unique_ptr( new TextHint( SfxHintId::TextParaInserted, aNotify->nParagraph ) ); case EE_NOTIFY_PARAGRAPHREMOVED: - return ::std::unique_ptr( new TextHint( SfxHintId::TextParaRemoved, aNotify->nParagraph ) ); + return std::unique_ptr( new TextHint( SfxHintId::TextParaRemoved, aNotify->nParagraph ) ); case EE_NOTIFY_PARAGRAPHSMOVED: - return ::std::unique_ptr( new SvxEditSourceHint( SfxHintId::EditSourceParasMoved, aNotify->nParagraph, aNotify->nParam1, aNotify->nParam2 ) ); + return std::unique_ptr( new SvxEditSourceHint( SfxHintId::EditSourceParasMoved, aNotify->nParagraph, aNotify->nParam1, aNotify->nParam2 ) ); case EE_NOTIFY_TextHeightChanged: - return ::std::unique_ptr( new TextHint( SfxHintId::TextHeightChanged, aNotify->nParagraph ) ); + return std::unique_ptr( new TextHint( SfxHintId::TextHeightChanged, aNotify->nParagraph ) ); case EE_NOTIFY_TEXTVIEWSCROLLED: - return ::std::unique_ptr( new TextHint( SfxHintId::TextViewScrolled ) ); + return std::unique_ptr( new TextHint( SfxHintId::TextViewScrolled ) ); case EE_NOTIFY_TEXTVIEWSELECTIONCHANGED: - return ::std::unique_ptr( new SvxEditSourceHint( SfxHintId::EditSourceSelectionChanged ) ); + return std::unique_ptr( new SvxEditSourceHint( SfxHintId::EditSourceSelectionChanged ) ); case EE_NOTIFY_BLOCKNOTIFICATION_START: - return ::std::unique_ptr( new TextHint( SfxHintId::TextBlockNotificationStart, 0 ) ); + return std::unique_ptr( new TextHint( SfxHintId::TextBlockNotificationStart, 0 ) ); case EE_NOTIFY_BLOCKNOTIFICATION_END: - return ::std::unique_ptr( new TextHint( SfxHintId::TextBlockNotificationEnd, 0 ) ); + return std::unique_ptr( new TextHint( SfxHintId::TextBlockNotificationEnd, 0 ) ); case EE_NOTIFY_INPUT_START: - return ::std::unique_ptr( new TextHint( SfxHintId::TextInputStart, 0 ) ); + return std::unique_ptr( new TextHint( SfxHintId::TextInputStart, 0 ) ); case EE_NOTIFY_INPUT_END: - return ::std::unique_ptr( new TextHint( SfxHintId::TextInputEnd, 0 ) ); + return std::unique_ptr( new TextHint( SfxHintId::TextInputEnd, 0 ) ); case EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA: - return ::std::unique_ptr( new SvxEditSourceHintEndPara ); + return std::unique_ptr( new SvxEditSourceHintEndPara ); default: OSL_FAIL( "SvxEditSourceHelper::EENotification2Hint unknown notification" ); break; diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index b5e94f5550ee..363ed425f6c9 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -207,7 +207,7 @@ void SvxAccessibleTextIndex::SetEEIndex( sal_uInt16 nEEIndex, const SvxTextForwa break; } - mnIndex += ::std::max(aFieldInfo.aCurrentText.getLength()-1, (sal_Int32)0); + mnIndex += std::max(aFieldInfo.aCurrentText.getLength()-1, (sal_Int32)0); } } @@ -260,13 +260,13 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder& if( aFieldInfo.aPosition.nIndex > mnEEIndex ) break; - mnEEIndex -= ::std::max(aFieldInfo.aCurrentText.getLength()-1, (sal_Int32)0); + mnEEIndex -= std::max(aFieldInfo.aCurrentText.getLength()-1, (sal_Int32)0); // we're within a field if( aFieldInfo.aPosition.nIndex >= mnEEIndex ) { AreInField(); - SetFieldOffset( ::std::max(aFieldInfo.aCurrentText.getLength()-1, (sal_Int32)0) - (aFieldInfo.aPosition.nIndex - mnEEIndex), + SetFieldOffset( std::max(aFieldInfo.aCurrentText.getLength()-1, (sal_Int32)0) - (aFieldInfo.aPosition.nIndex - mnEEIndex), aFieldInfo.aCurrentText.getLength() ); mnEEIndex = aFieldInfo.aPosition.nIndex ; break; @@ -304,7 +304,7 @@ SvxEditSource* SvxEditSourceAdapter::Clone() const { if( mbEditSourceValid && mpAdaptee.get() ) { - ::std::unique_ptr< SvxEditSource > pClonedAdaptee( mpAdaptee->Clone() ); + std::unique_ptr< SvxEditSource > pClonedAdaptee( mpAdaptee->Clone() ); if( pClonedAdaptee.get() ) { @@ -388,7 +388,7 @@ SfxBroadcaster& SvxEditSourceAdapter::GetBroadcaster() const return maDummyBroadcaster; } -void SvxEditSourceAdapter::SetEditSource( ::std::unique_ptr< SvxEditSource > && pAdaptee ) +void SvxEditSourceAdapter::SetEditSource( std::unique_ptr< SvxEditSource > && pAdaptee ) { if( pAdaptee.get() ) { @@ -442,7 +442,7 @@ OUString SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const if( rSel.nStartPara > rSel.nEndPara || (rSel.nStartPara == rSel.nEndPara && rSel.nStartPos > rSel.nEndPos) ) { - ::std::swap( aStartIndex, aEndIndex ); + std::swap( aStartIndex, aEndIndex ); } OUString sStr = mpTextForwarder->GetText( MakeEESelection(aStartIndex, aEndIndex) ); @@ -1093,7 +1093,7 @@ bool SvxAccessibleTextAdapter::IsEditable( const ESelection& rSel ) if( rSel.nStartPara > rSel.nEndPara || (rSel.nStartPara == rSel.nEndPara && rSel.nStartPos > rSel.nEndPos) ) { - ::std::swap( aStartIndex, aEndIndex ); + std::swap( aStartIndex, aEndIndex ); } return aStartIndex.IsEditableRange( aEndIndex ); diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx index 8f7683e995a6..f2063e4d515a 100644 --- a/editeng/source/uno/unofored.cxx +++ b/editeng/source/uno/unofored.cxx @@ -290,7 +290,7 @@ Rectangle SvxEditEngineForwarder::GetCharBounds( sal_Int32 nPara, sal_Int32 nInd // EditEngine's 'internal' methods like GetCharacterBounds() // don't rotate for vertical text. Size aSize( rEditEngine.CalcTextWidth(), rEditEngine.GetTextHeight() ); - ::std::swap( aSize.Width(), aSize.Height() ); + std::swap( aSize.Width(), aSize.Height() ); bool bIsVertical( rEditEngine.IsVertical() ); // #108900# Handle virtual position one-past-the end of the string @@ -372,7 +372,7 @@ OutputDevice* SvxEditEngineForwarder::GetRefDevice() const bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, sal_Int32& nIndex ) const { Size aSize( rEditEngine.CalcTextWidth(), rEditEngine.GetTextHeight() ); - ::std::swap( aSize.Width(), aSize.Height() ); + std::swap( aSize.Width(), aSize.Height() ); Point aEEPos( SvxEditSourceHelper::UserSpaceToEE( rPos, aSize, rEditEngine.IsVertical() )); diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx index 1fa359a8c7b4..6e75f2ae44f8 100644 --- a/editeng/source/uno/unoforou.cxx +++ b/editeng/source/uno/unoforou.cxx @@ -292,7 +292,7 @@ Rectangle SvxOutlinerForwarder::GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex // EditEngine's 'internal' methods like GetCharacterBounds() // don't rotate for vertical text. Size aSize( rOutliner.CalcTextSize() ); - ::std::swap( aSize.Width(), aSize.Height() ); + std::swap( aSize.Width(), aSize.Height() ); bool bIsVertical( rOutliner.IsVertical() ); // #108900# Handle virtual position one-past-the end of the string @@ -369,7 +369,7 @@ OutputDevice* SvxOutlinerForwarder::GetRefDevice() const bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, sal_Int32& nIndex ) const { Size aSize( rOutliner.CalcTextSize() ); - ::std::swap( aSize.Width(), aSize.Height() ); + std::swap( aSize.Width(), aSize.Height() ); Point aEEPos( SvxEditSourceHelper::UserSpaceToEE( rPos, aSize, rOutliner.IsVertical() )); -- cgit