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/uno | |
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/uno')
-rw-r--r-- | editeng/source/uno/unoedhlp.cxx | 26 | ||||
-rw-r--r-- | editeng/source/uno/unoedprx.cxx | 14 | ||||
-rw-r--r-- | editeng/source/uno/unofored.cxx | 4 | ||||
-rw-r--r-- | editeng/source/uno/unoforou.cxx | 4 |
4 files changed, 24 insertions, 24 deletions
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<SfxHint> SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify ) +std::unique_ptr<SfxHint> SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify ) { if( aNotify ) { switch( aNotify->eNotificationType ) { case EE_NOTIFY_TEXTMODIFIED: - return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextModified, aNotify->nParagraph ) ); + return std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextModified, aNotify->nParagraph ) ); case EE_NOTIFY_PARAGRAPHINSERTED: - return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextParaInserted, aNotify->nParagraph ) ); + return std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextParaInserted, aNotify->nParagraph ) ); case EE_NOTIFY_PARAGRAPHREMOVED: - return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextParaRemoved, aNotify->nParagraph ) ); + return std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextParaRemoved, aNotify->nParagraph ) ); case EE_NOTIFY_PARAGRAPHSMOVED: - return ::std::unique_ptr<SfxHint>( new SvxEditSourceHint( SfxHintId::EditSourceParasMoved, aNotify->nParagraph, aNotify->nParam1, aNotify->nParam2 ) ); + return std::unique_ptr<SfxHint>( new SvxEditSourceHint( SfxHintId::EditSourceParasMoved, aNotify->nParagraph, aNotify->nParam1, aNotify->nParam2 ) ); case EE_NOTIFY_TextHeightChanged: - return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextHeightChanged, aNotify->nParagraph ) ); + return std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextHeightChanged, aNotify->nParagraph ) ); case EE_NOTIFY_TEXTVIEWSCROLLED: - return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextViewScrolled ) ); + return std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextViewScrolled ) ); case EE_NOTIFY_TEXTVIEWSELECTIONCHANGED: - return ::std::unique_ptr<SfxHint>( new SvxEditSourceHint( SfxHintId::EditSourceSelectionChanged ) ); + return std::unique_ptr<SfxHint>( new SvxEditSourceHint( SfxHintId::EditSourceSelectionChanged ) ); case EE_NOTIFY_BLOCKNOTIFICATION_START: - return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextBlockNotificationStart, 0 ) ); + return std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextBlockNotificationStart, 0 ) ); case EE_NOTIFY_BLOCKNOTIFICATION_END: - return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextBlockNotificationEnd, 0 ) ); + return std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextBlockNotificationEnd, 0 ) ); case EE_NOTIFY_INPUT_START: - return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextInputStart, 0 ) ); + return std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextInputStart, 0 ) ); case EE_NOTIFY_INPUT_END: - return ::std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextInputEnd, 0 ) ); + return std::unique_ptr<SfxHint>( new TextHint( SfxHintId::TextInputEnd, 0 ) ); case EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA: - return ::std::unique_ptr<SfxHint>( new SvxEditSourceHintEndPara ); + return std::unique_ptr<SfxHint>( 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() )); |