diff options
83 files changed, 255 insertions, 255 deletions
diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx index 8c233ec3025d..90d4b0a3811e 100644 --- a/accessibility/inc/extended/accessiblelistboxentry.hxx +++ b/accessibility/inc/extended/accessiblelistboxentry.hxx @@ -77,7 +77,7 @@ namespace accessibility private: /** The treelistbox control */ - ::std::deque< sal_Int32 > m_aEntryPath; + std::deque< sal_Int32 > m_aEntryPath; SvTreeListEntry* m_pSvLBoxEntry; // Needed for a11y focused item... diff --git a/accessibility/inc/extended/accessibletabbar.hxx b/accessibility/inc/extended/accessibletabbar.hxx index 9b95e994a885..f538c13e8683 100644 --- a/accessibility/inc/extended/accessibletabbar.hxx +++ b/accessibility/inc/extended/accessibletabbar.hxx @@ -47,7 +47,7 @@ namespace accessibility public AccessibleTabBar_BASE { private: - typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; + typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; AccessibleChildren m_aAccessibleChildren; diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx b/accessibility/inc/extended/accessibletabbarpagelist.hxx index be287316b426..7f7d045b1a4d 100644 --- a/accessibility/inc/extended/accessibletabbarpagelist.hxx +++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx @@ -49,7 +49,7 @@ namespace accessibility public AccessibleTabBarPageList_BASE { private: - typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; + typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; AccessibleChildren m_aAccessibleChildren; sal_Int32 m_nIndexInParent; diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index f7e739eb2d6e..8db74f5c8b38 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -125,7 +125,7 @@ private: ::sal_Int32 m_nHeight; }; -typedef ::std::vector< ParagraphInfo > Paragraphs; +typedef std::vector< ParagraphInfo > Paragraphs; typedef ::cppu::WeakAggComponentImplHelper7< css::accessibility::XAccessible, @@ -615,7 +615,7 @@ private: Paragraphs::iterator m_aFocused; - ::std::queue< ::TextHint > m_aParagraphNotifications; + std::queue< ::TextHint > m_aParagraphNotifications; bool m_bSelectionChangedNotification; }; diff --git a/accessibility/inc/helper/characterattributeshelper.hxx b/accessibility/inc/helper/characterattributeshelper.hxx index bbffd80c5058..50e36902eae1 100644 --- a/accessibility/inc/helper/characterattributeshelper.hxx +++ b/accessibility/inc/helper/characterattributeshelper.hxx @@ -34,7 +34,7 @@ class CharacterAttributesHelper { private: - typedef ::std::map< OUString, css::uno::Any > AttributeMap; + typedef std::map< OUString, css::uno::Any > AttributeMap; AttributeMap m_aAttributeMap; diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx index af8e9d640301..43039facbbee 100644 --- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx @@ -57,7 +57,7 @@ private: VCLExternalSolarLock* m_pExternalLock; protected: - typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; + typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; AccessibleChildren m_aAccessibleChildren; VclPtr<Menu> m_pMenu; diff --git a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx index ebe9ac1a6ae4..5e0dce31e493 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx @@ -34,7 +34,7 @@ class StatusBar; class VCLXAccessibleStatusBar : public VCLXAccessibleComponent { private: - typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; + typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; AccessibleChildren m_aAccessibleChildren; VclPtr<StatusBar> m_pStatusBar; diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx index bdef5ef291da..d30aa57959de 100644 --- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx +++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx @@ -39,7 +39,7 @@ class VCLXAccessibleTabControl : public VCLXAccessibleComponent, public VCLXAccessibleTabControl_BASE { private: - typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; + typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren; AccessibleChildren m_aAccessibleChildren; VclPtr<TabControl> m_pTabControl; 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 ); diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index 05fdad815d20..363b03dda67d 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -591,8 +591,8 @@ sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndI if ( !implIsValidRange( nStartIndex, nEndIndex, sText.getLength() ) ) throw IndexOutOfBoundsException(); - sal_Int32 nMinIndex = ::std::min( nStartIndex, nEndIndex ); - sal_Int32 nMaxIndex = ::std::max( nStartIndex, nEndIndex ); + sal_Int32 nMinIndex = std::min( nStartIndex, nEndIndex ); + sal_Int32 nMaxIndex = std::max( nStartIndex, nEndIndex ); VCLXEdit* pVCLXEdit = static_cast< VCLXEdit* >( GetVCLXWindow() ); if ( pVCLXEdit && pVCLXEdit->isEditable() ) diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index 55f8675bedea..2064365cd834 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -90,7 +90,7 @@ void VCLXAccessibleRadioButton::FillAccessibleRelationSet( utl::AccessibleRelati VclPtr< RadioButton > pRadioButton = GetAsDynamic< RadioButton >(); if ( pRadioButton ) { - ::std::vector< VclPtr<RadioButton> > aGroup(pRadioButton->GetRadioButtonGroup()); + std::vector< VclPtr<RadioButton> > aGroup(pRadioButton->GetRadioButtonGroup()); if (!aGroup.empty()) { sal_Int32 i = 0; diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index cf043af7f105..b45e48fa1564 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -101,7 +101,7 @@ namespace animcore { -typedef ::std::list< Reference< XAnimationNode > > ChildList_t; +typedef std::list< Reference< XAnimationNode > > ChildList_t; class AnimationNodeBase : public XAnimateMotion, @@ -1768,11 +1768,11 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertBefore( const Referenc if( !newChild.is() || !refChild.is() ) throw IllegalArgumentException(); - ChildList_t::iterator before = ::std::find(maChildren.begin(), maChildren.end(), refChild); + ChildList_t::iterator before = std::find(maChildren.begin(), maChildren.end(), refChild); if( before == maChildren.end() ) throw NoSuchElementException(); - if( ::std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() ) + if( std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() ) throw ElementExistException(); maChildren.insert( before, newChild ); @@ -1792,11 +1792,11 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const Reference if( !newChild.is() || !refChild.is() ) throw IllegalArgumentException(); - ChildList_t::iterator before = ::std::find(maChildren.begin(), maChildren.end(), refChild); + ChildList_t::iterator before = std::find(maChildren.begin(), maChildren.end(), refChild); if( before == maChildren.end() ) throw NoSuchElementException(); - if( ::std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() ) + if( std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() ) throw ElementExistException(); ++before; @@ -1820,11 +1820,11 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Referenc if( !newChild.is() || !oldChild.is() ) throw IllegalArgumentException(); - ChildList_t::iterator replace = ::std::find(maChildren.begin(), maChildren.end(), oldChild); + ChildList_t::iterator replace = std::find(maChildren.begin(), maChildren.end(), oldChild); if( replace == maChildren.end() ) throw NoSuchElementException(); - if( ::std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() ) + if( std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() ) throw ElementExistException(); Reference< XInterface > xNull( nullptr ); @@ -1847,7 +1847,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference if( !oldChild.is() ) throw IllegalArgumentException(); - ChildList_t::iterator old = ::std::find(maChildren.begin(), maChildren.end(), oldChild); + ChildList_t::iterator old = std::find(maChildren.begin(), maChildren.end(), oldChild); if( old == maChildren.end() ) throw NoSuchElementException(); @@ -1868,7 +1868,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference if( !newChild.is() ) throw IllegalArgumentException(); - if( ::std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() ) + if( std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() ) throw ElementExistException(); Reference< XInterface > xThis( static_cast< OWeakObject * >(this) ); diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx index 29921e78c553..f134d3038ef4 100644 --- a/avmedia/source/framework/MediaControlBase.cxx +++ b/avmedia/source/framework/MediaControlBase.cxx @@ -64,7 +64,7 @@ void MediaControlBase::UpdateVolumeSlider( MediaItem aMediaItem ) { mpVolumeSlider->Enable(); const sal_Int32 nVolumeDB = aMediaItem.getVolumeDB(); - mpVolumeSlider->SetThumbPos( ::std::min( ::std::max( nVolumeDB, static_cast< sal_Int32 >( AVMEDIA_DB_RANGE ) ), + mpVolumeSlider->SetThumbPos( std::min( std::max( nVolumeDB, static_cast< sal_Int32 >( AVMEDIA_DB_RANGE ) ), static_cast< sal_Int32 >( 0 ) ) ); } } @@ -81,7 +81,7 @@ void MediaControlBase::UpdateTimeSlider( MediaItem aMediaItem ) if( fDuration > 0.0 ) { - const double fTime = ::std::min( aMediaItem.getTime(), fDuration ); + const double fTime = std::min( aMediaItem.getTime(), fDuration ); if( !mpTimeSlider->GetLineSize() ) mpTimeSlider->SetLineSize( static_cast< sal_uInt32 >( AVMEDIA_TIME_RANGE * AVMEDIA_LINEINCREMENT / fDuration ) ); diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 442e9f5c9bca..dd47d5229c6e 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -201,7 +201,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector ) for( size_t i = 0; i < SAL_N_ELEMENTS(pFilters); i += 2 ) { - rFilterNameVector.push_back( ::std::make_pair< OUString, OUString >( + rFilterNameVector.push_back( std::make_pair< OUString, OUString >( OUString::createFromAscii(pFilters[i]), OUString::createFromAscii(pFilters[i+1]) ) ); } diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 88ec86301d92..9e92dddf3d64 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -556,7 +556,7 @@ void MediaWindowImpl::Resize() if (mpMediaWindowControl) { const sal_Int32 nControlHeight = mpMediaWindowControl->GetSizePixel().Height(); - const sal_Int32 nControlY = ::std::max(aCurSize.Height() - nControlHeight - nOffset, 0L); + const sal_Int32 nControlY = std::max(aCurSize.Height() - nControlHeight - nOffset, 0L); aPlayerWindowSize.Height() = (nControlY - (nOffset << 1)); mpMediaWindowControl->SetPosSizePixel(Point(nOffset, nControlY ), Size(aCurSize.Width() - (nOffset << 1), nControlHeight)); diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 461c3ab69ef9..a9d4c928e7c5 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -241,7 +241,7 @@ bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc ) void AccessibleDialogWindow::InsertChild( const ChildDescriptor& rDesc ) { // check, if object is already in child list - AccessibleChildren::iterator aIter = ::std::find( m_aAccessibleChildren.begin(), m_aAccessibleChildren.end(), rDesc ); + AccessibleChildren::iterator aIter = std::find( m_aAccessibleChildren.begin(), m_aAccessibleChildren.end(), rDesc ); // if not found, insert in child list if ( aIter == m_aAccessibleChildren.end() ) @@ -269,7 +269,7 @@ void AccessibleDialogWindow::InsertChild( const ChildDescriptor& rDesc ) void AccessibleDialogWindow::RemoveChild( const ChildDescriptor& rDesc ) { // find object in child list - AccessibleChildren::iterator aIter = ::std::find( m_aAccessibleChildren.begin(), m_aAccessibleChildren.end(), rDesc ); + AccessibleChildren::iterator aIter = std::find( m_aAccessibleChildren.begin(), m_aAccessibleChildren.end(), rDesc ); // if found, remove from child list if ( aIter != m_aAccessibleChildren.end() ) @@ -325,7 +325,7 @@ void AccessibleDialogWindow::UpdateChildren() void AccessibleDialogWindow::SortChildren() { // sort child list - ::std::sort( m_aAccessibleChildren.begin(), m_aAccessibleChildren.end() ); + std::sort( m_aAccessibleChildren.begin(), m_aAccessibleChildren.end() ); } diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 43d40784ee21..4d4cde8b6819 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -637,7 +637,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) long nMaxY = nTextHeight - nVisHeight; long nOldY = pTextView->GetStartDocPos().Y(); long nNewY = nLine * pTextEngine->GetCharHeight() - nVisHeight / 2; - nNewY = ::std::min( nNewY, nMaxY ); + nNewY = std::min( nNewY, nMaxY ); pTextView->Scroll( 0, -( nNewY - nOldY ) ); pTextView->ShowCursor( false ); pModWin->GetEditVScrollBar().SetThumbPos( pTextView->GetStartDocPos().Y() ); diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index ae859336ee64..34eaa8bcfe9e 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -98,7 +98,7 @@ static bool StringCompareLessThan( const OUString& rStr1, const OUString& rStr2 Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryContainer >& xModLibContainer, const Reference< script::XLibraryContainer >& xDlgLibContainer ) { // create a sorted list of module library names - ::std::vector<OUString> aModLibList; + std::vector<OUString> aModLibList; if ( xModLibContainer.is() ) { Sequence< OUString > aModLibNames = xModLibContainer->getElementNames(); @@ -106,11 +106,11 @@ Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryCon const OUString* pModLibNames = aModLibNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nModLibCount ; i++ ) aModLibList.push_back( pModLibNames[ i ] ); - ::std::sort( aModLibList.begin() , aModLibList.end() , StringCompareLessThan ); + std::sort( aModLibList.begin() , aModLibList.end() , StringCompareLessThan ); } // create a sorted list of dialog library names - ::std::vector<OUString> aDlgLibList; + std::vector<OUString> aDlgLibList; if ( xDlgLibContainer.is() ) { Sequence< OUString > aDlgLibNames = xDlgLibContainer->getElementNames(); @@ -118,13 +118,13 @@ Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryCon const OUString* pDlgLibNames = aDlgLibNames.getConstArray(); for ( sal_Int32 i = 0 ; i < nDlgLibCount ; i++ ) aDlgLibList.push_back( pDlgLibNames[ i ] ); - ::std::sort( aDlgLibList.begin() , aDlgLibList.end() , StringCompareLessThan ); + std::sort( aDlgLibList.begin() , aDlgLibList.end() , StringCompareLessThan ); } // merge both lists - ::std::vector<OUString> aLibList( aModLibList.size() + aDlgLibList.size() ); - ::std::merge( aModLibList.begin(), aModLibList.end(), aDlgLibList.begin(), aDlgLibList.end(), aLibList.begin(), StringCompareLessThan ); - ::std::vector<OUString>::iterator aIterEnd = ::std::unique( aLibList.begin(), aLibList.end() ); // move unique elements to the front + std::vector<OUString> aLibList( aModLibList.size() + aDlgLibList.size() ); + std::merge( aModLibList.begin(), aModLibList.end(), aDlgLibList.begin(), aDlgLibList.end(), aLibList.begin(), StringCompareLessThan ); + std::vector<OUString>::iterator aIterEnd = std::unique( aLibList.begin(), aLibList.end() ); // move unique elements to the front aLibList.erase( aIterEnd, aLibList.end() ); // remove duplicates // copy to sequence diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 14381efba979..c89db1f31c8a 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -546,8 +546,8 @@ void TabBar::Sort() } // sort module and dialog lists by page text - ::std::sort( aModuleList.begin() , aModuleList.end() ); - ::std::sort( aDialogList.begin() , aDialogList.end() ); + std::sort( aModuleList.begin() , aModuleList.end() ); + std::sort( aDialogList.begin() , aDialogList.end() ); sal_uInt16 nModules = sal::static_int_cast<sal_uInt16>( aModuleList.size() ); diff --git a/basctl/source/basicide/breakpoint.cxx b/basctl/source/basicide/breakpoint.cxx index 3396a198a772..8e8973d7b2bd 100644 --- a/basctl/source/basicide/breakpoint.cxx +++ b/basctl/source/basicide/breakpoint.cxx @@ -55,7 +55,7 @@ void BreakPointList::transfer(BreakPointList & rList) void BreakPointList::InsertSorted(BreakPoint* pNewBrk) { - for ( ::std::vector< BreakPoint* >::iterator i = maBreakPoints.begin(); i < maBreakPoints.end(); ++i ) + for ( std::vector< BreakPoint* >::iterator i = maBreakPoints.begin(); i < maBreakPoints.end(); ++i ) { if ( pNewBrk->nLine <= (*i)->nLine ) { @@ -131,7 +131,7 @@ void BreakPointList::ResetHitCount() BreakPoint* BreakPointList::remove(BreakPoint* ptr) { - for ( ::std::vector< BreakPoint* >::iterator i = maBreakPoints.begin(); i < maBreakPoints.end(); ++i ) + for ( std::vector< BreakPoint* >::iterator i = maBreakPoints.begin(); i < maBreakPoints.end(); ++i ) { if ( ptr == *i ) { diff --git a/basctl/source/basicide/breakpoint.hxx b/basctl/source/basicide/breakpoint.hxx index 2ade823452bf..5e666e5cdac9 100644 --- a/basctl/source/basicide/breakpoint.hxx +++ b/basctl/source/basicide/breakpoint.hxx @@ -50,7 +50,7 @@ class BreakPointList { private: void operator =(BreakPointList) = delete; - ::std::vector<BreakPoint*> maBreakPoints; + std::vector<BreakPoint*> maBreakPoints; public: BreakPointList(); diff --git a/basctl/source/basicide/documentenumeration.cxx b/basctl/source/basicide/documentenumeration.cxx index 8e91502592be..224189d5e678 100644 --- a/basctl/source/basicide/documentenumeration.cxx +++ b/basctl/source/basicide/documentenumeration.cxx @@ -105,7 +105,7 @@ namespace basctl { namespace docs { const IDocumentDescriptorFilter* _pFilter ) { // ensure we don't encounter some models multiple times - ::std::set< Reference< XModel >, ::comphelper::OInterfaceCompare< XModel > > aEncounteredModels; + std::set< Reference< XModel >, ::comphelper::OInterfaceCompare< XModel > > aEncounteredModels; for ( const Reference< XFrame >* pFrame = _rFrames.getConstArray(); pFrame != _rFrames.getConstArray() + _rFrames.getLength(); diff --git a/basctl/source/basicide/documentenumeration.hxx b/basctl/source/basicide/documentenumeration.hxx index 886c9358c62f..964a2c8c4d92 100644 --- a/basctl/source/basicide/documentenumeration.hxx +++ b/basctl/source/basicide/documentenumeration.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace uno { namespace basctl { namespace docs { - typedef ::std::vector< css::uno::Reference< css::frame::XController > > Controllers; + typedef std::vector< css::uno::Reference< css::frame::XController > > Controllers; struct DocumentDescriptor { @@ -40,7 +40,7 @@ namespace basctl { namespace docs { Controllers aControllers; }; - typedef ::std::vector< DocumentDescriptor > Documents; + typedef std::vector< DocumentDescriptor > Documents; /// allows pre-filtering when enumerating document descriptors diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index ff3e49c9a31e..e31f618d2d6d 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -41,7 +41,7 @@ namespace basctl { -using ::std::map; +using std::map; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index d17f91210c91..efeab6380792 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -1250,7 +1250,7 @@ void LibPage::ExportAsPackage( const OUString& aLibName ) xSFA->kill( aMetaInfFolder ); xSFA->createFolder( aMetaInfFolder ); - ::std::vector< Sequence<beans::PropertyValue> > manifest; + std::vector< Sequence<beans::PropertyValue> > manifest; const OUString strMediaType = "MediaType" ; const OUString strFullPath = "FullPath" ; const OUString strBasicMediaType = "application/vnd.sun.star.basic-library" ; diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index 49a0f271b2d4..721dee8330c8 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -1124,7 +1124,7 @@ namespace basctl namespace { - struct DocumentTitleLess : public ::std::binary_function< ScriptDocument, ScriptDocument, bool > + struct DocumentTitleLess : public std::binary_function< ScriptDocument, ScriptDocument, bool > { explicit DocumentTitleLess( const CollatorWrapper& _rCollator ) :m_aCollator( _rCollator ) @@ -1178,7 +1178,7 @@ namespace basctl { CollatorWrapper aCollator( ::comphelper::getProcessComponentContext() ); aCollator.loadDefaultCollator( SvtSysLocale().GetLanguageTag().getLocale(), 0 ); - ::std::sort( aScriptDocs.begin(), aScriptDocs.end(), DocumentTitleLess( aCollator ) ); + std::sort( aScriptDocs.begin(), aScriptDocs.end(), DocumentTitleLess( aCollator ) ); } return aScriptDocs; @@ -1258,7 +1258,7 @@ namespace basctl } // sort - ::std::sort( aModuleNames.getArray() , aModuleNames.getArray() + aModuleNames.getLength() , StringCompareLessThan ); + std::sort( aModuleNames.getArray() , aModuleNames.getArray() + aModuleNames.getLength() , StringCompareLessThan ); return aModuleNames; } @@ -1271,9 +1271,9 @@ namespace basctl OUString aBaseName = _eType == E_SCRIPTS ? OUString("Module") : OUString("Dialog"); Sequence< OUString > aUsedNames( getObjectNames( _eType, _rLibName ) ); - ::std::set< OUString > aUsedNamesCheck; - ::std::copy( aUsedNames.begin(), aUsedNames.end(), - ::std::insert_iterator< ::std::set< OUString > >( aUsedNamesCheck, aUsedNamesCheck.begin() ) ); + std::set< OUString > aUsedNamesCheck; + std::copy( aUsedNames.begin(), aUsedNames.end(), + std::insert_iterator< std::set< OUString > >( aUsedNamesCheck, aUsedNamesCheck.begin() ) ); bool bValid = false; sal_Int32 i = 1; diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index a2ac76553099..d33dd9d06233 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -527,8 +527,8 @@ void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt ) if ( pForm ) { // stop listening with all children - ::std::vector<DlgEdObj*> aChildList = pForm->GetChildren(); - ::std::vector<DlgEdObj*>::iterator aIter; + std::vector<DlgEdObj*> aChildList = pForm->GetChildren(); + std::vector<DlgEdObj*>::iterator aIter; for ( aIter = aChildList.begin() ; aIter != aChildList.end() ; ++aIter ) { (*aIter)->EndListening( false ); @@ -565,8 +565,8 @@ void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt ) } // create a helper list of control names, sorted by tab index - ::std::vector< OUString > aNameList( aIndexToNameMap.size() ); - ::std::transform( + std::vector< OUString > aNameList( aIndexToNameMap.size() ); + std::transform( aIndexToNameMap.begin(), aIndexToNameMap.end(), aNameList.begin(), ::o3tl::select2nd< IndexToNameMap::value_type >( ) @@ -1257,7 +1257,7 @@ void DlgEdForm::AddChild( DlgEdObj* pDlgEdObj ) void DlgEdForm::RemoveChild( DlgEdObj* pDlgEdObj ) { - pChildren.erase( ::std::find( pChildren.begin() , pChildren.end() , pDlgEdObj ) ); + pChildren.erase( std::find( pChildren.begin() , pChildren.end() , pDlgEdObj ) ); } void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt ) @@ -1389,7 +1389,7 @@ void DlgEdForm::UpdateStep() void DlgEdForm::UpdateTabIndices() { // stop listening with all children - ::std::vector<DlgEdObj*>::iterator aIter; + std::vector<DlgEdObj*>::iterator aIter; for ( aIter = pChildren.begin() ; aIter != pChildren.end() ; ++aIter ) { (*aIter)->EndListening( false ); @@ -1479,7 +1479,7 @@ void DlgEdForm::UpdateGroups() if ( xTabModel.is() ) { // create a global list of controls that belong to the dialog - ::std::vector<DlgEdObj*> aChildList = GetChildren(); + std::vector<DlgEdObj*> aChildList = GetChildren(); sal_uInt32 nSize = aChildList.size(); Sequence< Reference< awt::XControl > > aSeqControls( nSize ); for ( sal_uInt32 i = 0; i < nSize; ++i ) @@ -1546,7 +1546,7 @@ void DlgEdForm::NbcMove( const Size& rSize ) StartListening(); // set geometry properties of all children - ::std::vector<DlgEdObj*>::iterator aIter; + std::vector<DlgEdObj*>::iterator aIter; for ( aIter = pChildren.begin() ; aIter != pChildren.end() ; ++aIter ) { (*aIter)->EndListening(false); @@ -1568,7 +1568,7 @@ void DlgEdForm::NbcResize(const Point& rRef, const Fraction& xFract, const Fract StartListening(); // set geometry properties of all children - ::std::vector<DlgEdObj*>::iterator aIter; + std::vector<DlgEdObj*>::iterator aIter; for ( aIter = pChildren.begin() ; aIter != pChildren.end() ; ++aIter ) { (*aIter)->EndListening(false); diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index bc87d60e2b0a..57c16698699e 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -74,7 +74,7 @@ private: bool operator<( const ChildDescriptor& rDesc ) const; }; - typedef ::std::vector< ChildDescriptor > AccessibleChildren; + typedef std::vector< ChildDescriptor > AccessibleChildren; AccessibleChildren m_aAccessibleChildren; VCLExternalSolarLock* m_pExternalLock; diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index f88423976450..babad14c1ef1 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -31,7 +31,7 @@ namespace basctl { -typedef ::std::multimap< sal_Int16, OUString > IndexToNameMap; +typedef std::multimap< sal_Int16, OUString > IndexToNameMap; class DlgEdForm; @@ -148,7 +148,7 @@ class DlgEdForm: public DlgEdObj private: DlgEditor& rDlgEditor; - ::std::vector<DlgEdObj*> pChildren; + std::vector<DlgEdObj*> pChildren; mutable ::boost::optional< css::awt::DeviceInfo > mpDeviceInfo; diff --git a/basctl/source/inc/scriptdocument.hxx b/basctl/source/inc/scriptdocument.hxx index 68835bf3d074..04db4f1363a9 100644 --- a/basctl/source/inc/scriptdocument.hxx +++ b/basctl/source/inc/scriptdocument.hxx @@ -58,7 +58,7 @@ namespace basctl }; class ScriptDocument; - typedef ::std::vector< ScriptDocument > ScriptDocuments; + typedef std::vector< ScriptDocument > ScriptDocuments; /** encapsulates a document which contains Basic scripts and dialogs */ diff --git a/basegfx/source/color/bcolortools.cxx b/basegfx/source/color/bcolortools.cxx index 095ea50aa5f9..b28607bf298d 100644 --- a/basegfx/source/color/bcolortools.cxx +++ b/basegfx/source/color/bcolortools.cxx @@ -26,8 +26,8 @@ namespace basegfx { namespace tools BColor rgb2hsl(const BColor& rRGBColor) { const double r=rRGBColor.getRed(), g=rRGBColor.getGreen(), b=rRGBColor.getBlue(); - const double minVal = ::std::min( ::std::min( r, g ), b ); - const double maxVal = ::std::max( ::std::max( r, g ), b ); + const double minVal = std::min( std::min( r, g ), b ); + const double maxVal = std::max( std::max( r, g ), b ); const double d = maxVal - minVal; double h=0, s=0, l=0; diff --git a/basegfx/source/curve/b2dbeziertools.cxx b/basegfx/source/curve/b2dbeziertools.cxx index d1e98c980f8e..ec6ef1c63213 100644 --- a/basegfx/source/curve/b2dbeziertools.cxx +++ b/basegfx/source/curve/b2dbeziertools.cxx @@ -104,7 +104,7 @@ namespace basegfx } // it is a bezier - ::std::vector< double >::const_iterator aIter = ::std::lower_bound(maLengthArray.begin(), maLengthArray.end(), fDistance); + std::vector< double >::const_iterator aIter = std::lower_bound(maLengthArray.begin(), maLengthArray.end(), fDistance); const sal_uInt32 nIndex(aIter - maLengthArray.begin()); const double fHighBound(maLengthArray[nIndex]); const double fLowBound(nIndex ? maLengthArray[nIndex - 1] : 0.0); diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx index ed81ea37b194..ca4aa090625f 100644 --- a/basegfx/source/curve/b2dcubicbezier.cxx +++ b/basegfx/source/curve/b2dcubicbezier.cxx @@ -281,7 +281,7 @@ namespace basegfx const double fJ1y(rfEA.getY() - rfPA.getY() - 1.0/3.0*(rfPB.getY() - rfPA.getY())); const double fJ2x(rfEB.getX() - rfPA.getX() - 2.0/3.0*(rfPB.getX() - rfPA.getX())); const double fJ2y(rfEB.getY() - rfPA.getY() - 2.0/3.0*(rfPB.getY() - rfPA.getY())); - const double fDistanceError2(::std::max(fJ1x*fJ1x + fJ1y*fJ1y, fJ2x*fJ2x + fJ2y*fJ2y)); + const double fDistanceError2(std::max(fJ1x*fJ1x + fJ1y*fJ1y, fJ2x*fJ2x + fJ2y*fJ2y)); // stop if error measure does not improve anymore. This is a // safety guard against floating point inaccuracies. @@ -640,7 +640,7 @@ namespace basegfx if(isBezier()) { ImpSubDivDistance(maStartPoint, maControlPointA, maControlPointB, maEndPoint, rTarget, - fDistanceBound * fDistanceBound, ::std::numeric_limits<double>::max(), 30); + fDistanceBound * fDistanceBound, std::numeric_limits<double>::max(), 30); } else { @@ -912,7 +912,7 @@ namespace basegfx bool B2DCubicBezier::getMinimumExtremumPosition(double& rfResult) const { - ::std::vector< double > aAllResults; + std::vector< double > aAllResults; aAllResults.reserve(4); getAllExtremumPositions(aAllResults); @@ -930,14 +930,14 @@ namespace basegfx } else { - rfResult = *(::std::min_element(aAllResults.begin(), aAllResults.end())); + rfResult = *(std::min_element(aAllResults.begin(), aAllResults.end())); return true; } } namespace { - inline void impCheckExtremumResult(double fCandidate, ::std::vector< double >& rResult) + inline void impCheckExtremumResult(double fCandidate, std::vector< double >& rResult) { // check for range ]0.0 .. 1.0[ with excluding 1.0 and 0.0 clearly // by using the equalZero test, NOT ::more or ::less which will use the @@ -952,7 +952,7 @@ namespace basegfx } } - void B2DCubicBezier::getAllExtremumPositions(::std::vector< double >& rResults) const + void B2DCubicBezier::getAllExtremumPositions(std::vector< double >& rResults) const { rResults.clear(); diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx index 1b5b7be6da61..916d5263a5d6 100644 --- a/basegfx/source/polygon/b2dlinegeometry.cxx +++ b/basegfx/source/polygon/b2dlinegeometry.cxx @@ -245,7 +245,7 @@ namespace basegfx { // before splitting recursively with internal simple criteria, use // ExtremumPosFinder to remove those - ::std::vector< double > aExtremumPositions; + std::vector< double > aExtremumPositions; aExtremumPositions.reserve(4); aEdge.getAllExtremumPositions(aExtremumPositions); @@ -257,7 +257,7 @@ namespace basegfx if(nCount > 1) { // create order from left to right - ::std::sort(aExtremumPositions.begin(), aExtremumPositions.end()); + std::sort(aExtremumPositions.begin(), aExtremumPositions.end()); } for(sal_uInt32 b(0); b < nCount;) diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx index 2cf40a12175c..8ec8d63104bc 100644 --- a/basegfx/source/polygon/b2dpolygon.cxx +++ b/basegfx/source/polygon/b2dpolygon.cxx @@ -52,7 +52,7 @@ public: class CoordinateDataArray2D { - typedef ::std::vector< CoordinateData2D > CoordinateData2DVector; + typedef std::vector< CoordinateData2D > CoordinateData2DVector; CoordinateData2DVector maVector; @@ -152,7 +152,7 @@ public: for(sal_uInt32 a(0); a < nHalfSize; a++) { - ::std::swap(*aStart, *aEnd); + std::swap(*aStart, *aEnd); ++aStart; --aEnd; } @@ -239,13 +239,13 @@ public: void flip() { - ::std::swap(maPrevVector, maNextVector); + std::swap(maPrevVector, maNextVector); } }; class ControlVectorArray2D { - typedef ::std::vector< ControlVectorPair2D > ControlVectorPair2DVector; + typedef std::vector< ControlVectorPair2D > ControlVectorPair2DVector; ControlVectorPair2DVector maVector; sal_uInt32 mnUsedVectors; @@ -443,7 +443,7 @@ public: aEnd->flip(); // swap entries - ::std::swap(*aStart, *aEnd); + std::swap(*aStart, *aEnd); ++aStart; --aEnd; @@ -530,7 +530,7 @@ public: // subdividing the bezier segment. // Ideal here is a subdivision at the extreme values, so use // getAllExtremumPositions to get all extremas in one run - ::std::vector< double > aExtremas; + std::vector< double > aExtremas; aExtremas.reserve(4); aEdge.getAllExtremumPositions(aExtremas); diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx index 9b8bf8413158..22c2e9219854 100644 --- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx +++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx @@ -67,7 +67,7 @@ namespace basegfx double getCut() const { return mfCut; } }; - typedef ::std::vector< temporaryPoint > temporaryPointVector; + typedef std::vector< temporaryPoint > temporaryPointVector; class temporaryPolygonData { @@ -97,7 +97,7 @@ namespace basegfx if(nCount) { // sort temp points to assure increasing fCut values and increasing indices - ::std::sort(rTempPoints.begin(), rTempPoints.end()); + std::sort(rTempPoints.begin(), rTempPoints.end()); // prepare loop B2DCubicBezier aEdge; diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx index 23e01233852c..8253c24f6226 100644 --- a/basegfx/source/polygon/b2dpolygontools.cxx +++ b/basegfx/source/polygon/b2dpolygontools.cxx @@ -1123,14 +1123,14 @@ namespace basegfx return false; } - void applyLineDashing(const B2DPolygon& rCandidate, const ::std::vector<double>& rDotDashArray, B2DPolyPolygon* pLineTarget, B2DPolyPolygon* pGapTarget, double fDotDashLength) + void applyLineDashing(const B2DPolygon& rCandidate, const std::vector<double>& rDotDashArray, B2DPolyPolygon* pLineTarget, B2DPolyPolygon* pGapTarget, double fDotDashLength) { const sal_uInt32 nPointCount(rCandidate.count()); const sal_uInt32 nDotDashCount(rDotDashArray.size()); if(fTools::lessOrEqual(fDotDashLength, 0.0)) { - fDotDashLength = ::std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0); + fDotDashLength = std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0); } if(fTools::more(fDotDashLength, 0.0) && (pLineTarget || pGapTarget) && nPointCount) diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx b/basegfx/source/polygon/b2dpolygontriangulator.cxx index c54a700aef6a..a986a7cff4e2 100644 --- a/basegfx/source/polygon/b2dpolygontriangulator.cxx +++ b/basegfx/source/polygon/b2dpolygontriangulator.cxx @@ -104,8 +104,8 @@ namespace basegfx void setNext(EdgeEntry* pNext) { mpNext = pNext; } }; - typedef ::std::vector< EdgeEntry > EdgeEntries; - typedef ::std::vector< EdgeEntry* > EdgeEntryPointers; + typedef std::vector< EdgeEntry > EdgeEntries; + typedef std::vector< EdgeEntry* > EdgeEntryPointers; class Triangulator { @@ -245,7 +245,7 @@ namespace basegfx if(!maStartEntries.empty()) { // sort initial list - ::std::sort(maStartEntries.begin(), maStartEntries.end()); + std::sort(maStartEntries.begin(), maStartEntries.end()); // insert to own simply linked list EdgeEntries::iterator aPos(maStartEntries.begin()); diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx index dce8afd48d63..88cafdedcd39 100644 --- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx +++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx @@ -90,11 +90,11 @@ namespace basegfx } }; - typedef ::std::vector< PN > PNV; - typedef ::std::vector< VN > VNV; - typedef ::std::vector< SN > SNV; - typedef ::std::pair< basegfx::B2DPoint /*orig*/, basegfx::B2DPoint /*repl*/ > CorrectionPair; - typedef ::std::vector< CorrectionPair > CorrectionTable; + typedef std::vector< PN > PNV; + typedef std::vector< VN > VNV; + typedef std::vector< SN > SNV; + typedef std::pair< basegfx::B2DPoint /*orig*/, basegfx::B2DPoint /*repl*/ > CorrectionPair; + typedef std::vector< CorrectionPair > CorrectionTable; class solver { @@ -161,14 +161,14 @@ namespace basegfx void impSwitchNext(PN& rPNa, PN& rPNb) { - ::std::swap(rPNa.mnIN, rPNb.mnIN); + std::swap(rPNa.mnIN, rPNb.mnIN); if(mbIsCurve) { VN& rVNa = maVNV[rPNa.mnI]; VN& rVNb = maVNV[rPNb.mnI]; - ::std::swap(rVNa.maNext, rVNb.maNext); + std::swap(rVNa.maNext, rVNb.maNext); } if(!mbChanged) @@ -429,7 +429,7 @@ namespace basegfx void impSolve() { // sort by point to identify common nodes easier - ::std::sort(maSNV.begin(), maSNV.end()); + std::sort(maSNV.begin(), maSNV.end()); // handle common nodes const sal_uInt32 nNodeCount(maSNV.size()); @@ -745,7 +745,7 @@ namespace basegfx if(nCount > 1) { sal_uInt32 a, b; - ::std::vector< StripHelper > aHelpers; + std::vector< StripHelper > aHelpers; aHelpers.resize(nCount); for(a = 0; a < nCount; a++) @@ -825,7 +825,7 @@ namespace basegfx else { sal_uInt32 a, b; - ::std::vector< StripHelper > aHelpers; + std::vector< StripHelper > aHelpers; aHelpers.resize(nCount); for(a = 0; a < nCount; a++) diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx index 8e8f4c505abc..990ec1b331b8 100644 --- a/basegfx/source/polygon/b2dpolypolygontools.cxx +++ b/basegfx/source/polygon/b2dpolypolygontools.cxx @@ -231,12 +231,12 @@ namespace basegfx return fabs(getSignedArea(rCandidate)); } - void applyLineDashing(const B2DPolyPolygon& rCandidate, const ::std::vector<double>& rDotDashArray, B2DPolyPolygon* pLineTarget, B2DPolyPolygon* pGapTarget, double fFullDashDotLen) + void applyLineDashing(const B2DPolyPolygon& rCandidate, const std::vector<double>& rDotDashArray, B2DPolyPolygon* pLineTarget, B2DPolyPolygon* pGapTarget, double fFullDashDotLen) { if(0.0 == fFullDashDotLen && rDotDashArray.size()) { // calculate fFullDashDotLen from rDotDashArray - fFullDashDotLen = ::std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0); + fFullDashDotLen = std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0); } if(rCandidate.count() && fFullDashDotLen > 0.0) diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx index 21c5c86cc9db..c707e61b218c 100644 --- a/basegfx/source/polygon/b2dtrapezoid.cxx +++ b/basegfx/source/polygon/b2dtrapezoid.cxx @@ -59,7 +59,7 @@ namespace basegfx // define vector of simple edges - typedef ::std::vector< TrDeSimpleEdge > TrDeSimpleEdges; + typedef std::vector< TrDeSimpleEdge > TrDeSimpleEdges; // helper class for holding a traversing edge. It will always have some // distance in YPos. The slope (in a numerically useful form, see comments) is @@ -180,7 +180,7 @@ namespace basegfx // define double linked list of edges (for fast random insert) - typedef ::std::list< TrDeEdgeEntry > TrDeEdgeEntries; + typedef std::list< TrDeEdgeEntry > TrDeEdgeEntries; } // end of anonymous namespace } // end of namespace basegfx @@ -250,7 +250,7 @@ namespace basegfx // local data sal_uInt32 mnInitialEdgeEntryCount; TrDeEdgeEntries maTrDeEdgeEntries; - ::std::vector< B2DPoint > maPoints; + std::vector< B2DPoint > maPoints; /// new points allocated for cuts PointBlockAllocator maNewPoints; diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx index 69a375eed4c5..e77143c58cef 100644 --- a/basegfx/source/polygon/b3dpolygon.cxx +++ b/basegfx/source/polygon/b3dpolygon.cxx @@ -67,7 +67,7 @@ public: class CoordinateDataArray3D { - typedef ::std::vector< CoordinateData3D > CoordinateData3DVector; + typedef std::vector< CoordinateData3D > CoordinateData3DVector; CoordinateData3DVector maVector; @@ -222,7 +222,7 @@ public: for(sal_uInt32 a(0); a < nHalfSize; a++) { - ::std::swap(*aStart, *aEnd); + std::swap(*aStart, *aEnd); ++aStart; --aEnd; } @@ -243,7 +243,7 @@ public: class BColorArray { - typedef ::std::vector< ::basegfx::BColor > BColorDataVector; + typedef std::vector< ::basegfx::BColor > BColorDataVector; BColorDataVector maVector; sal_uInt32 mnUsedEntries; @@ -387,7 +387,7 @@ public: for(sal_uInt32 a(0); a < nHalfSize; a++) { - ::std::swap(*aStart, *aEnd); + std::swap(*aStart, *aEnd); ++aStart; --aEnd; } @@ -397,7 +397,7 @@ public: class NormalsArray3D { - typedef ::std::vector< ::basegfx::B3DVector > NormalsData3DVector; + typedef std::vector< ::basegfx::B3DVector > NormalsData3DVector; NormalsData3DVector maVector; sal_uInt32 mnUsedEntries; @@ -540,7 +540,7 @@ public: for(sal_uInt32 a(0); a < nHalfSize; a++) { - ::std::swap(*aStart, *aEnd); + std::swap(*aStart, *aEnd); ++aStart; --aEnd; } @@ -560,7 +560,7 @@ public: class TextureCoordinate2D { - typedef ::std::vector< ::basegfx::B2DPoint > TextureData2DVector; + typedef std::vector< ::basegfx::B2DPoint > TextureData2DVector; TextureData2DVector maVector; sal_uInt32 mnUsedEntries; @@ -703,7 +703,7 @@ public: for(sal_uInt32 a(0); a < nHalfSize; a++) { - ::std::swap(*aStart, *aEnd); + std::swap(*aStart, *aEnd); ++aStart; --aEnd; } diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx index 95b0bef4e046..0e09d996dd37 100644 --- a/basegfx/source/polygon/b3dpolygontools.cxx +++ b/basegfx/source/polygon/b3dpolygontools.cxx @@ -94,14 +94,14 @@ namespace basegfx return fRetval; } - void applyLineDashing(const B3DPolygon& rCandidate, const ::std::vector<double>& rDotDashArray, B3DPolyPolygon* pLineTarget, B3DPolyPolygon* pGapTarget, double fDotDashLength) + void applyLineDashing(const B3DPolygon& rCandidate, const std::vector<double>& rDotDashArray, B3DPolyPolygon* pLineTarget, B3DPolyPolygon* pGapTarget, double fDotDashLength) { const sal_uInt32 nPointCount(rCandidate.count()); const sal_uInt32 nDotDashCount(rDotDashArray.size()); if(fTools::lessOrEqual(fDotDashLength, 0.0)) { - fDotDashLength = ::std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0); + fDotDashLength = std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0); } if(fTools::more(fDotDashLength, 0.0) && (pLineTarget || pGapTarget) && nPointCount) diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx b/basegfx/source/polygon/b3dpolypolygon.cxx index 1ff3cac901b9..74c8b835298a 100644 --- a/basegfx/source/polygon/b3dpolypolygon.cxx +++ b/basegfx/source/polygon/b3dpolypolygon.cxx @@ -29,7 +29,7 @@ class ImplB3DPolyPolygon { - typedef ::std::vector< ::basegfx::B3DPolygon > PolygonVector; + typedef std::vector< ::basegfx::B3DPolygon > PolygonVector; PolygonVector maPolygons; diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx index 79ff6e91d6a1..b097f1c82886 100644 --- a/basegfx/source/polygon/b3dpolypolygontools.cxx +++ b/basegfx/source/polygon/b3dpolypolygontools.cxx @@ -243,7 +243,7 @@ namespace basegfx } // min/max limitations - nHorSeg = ::std::min(nMaxSegments, ::std::max(nMinSegments, nHorSeg)); + nHorSeg = std::min(nMaxSegments, std::max(nMinSegments, nHorSeg)); if(!nVerSeg) { @@ -251,7 +251,7 @@ namespace basegfx } // min/max limitations - nVerSeg = ::std::min(nMaxSegments, ::std::max(nMinSegments, nVerSeg)); + nVerSeg = std::min(nMaxSegments, std::max(nMinSegments, nVerSeg)); // create constants const double fVerDiffPerStep((fVerStop - fVerStart) / (double)nVerSeg); @@ -342,7 +342,7 @@ namespace basegfx } // min/max limitations - nHorSeg = ::std::min(nMaxSegments, ::std::max(nMinSegments, nHorSeg)); + nHorSeg = std::min(nMaxSegments, std::max(nMinSegments, nHorSeg)); if(!nVerSeg) { @@ -350,7 +350,7 @@ namespace basegfx } // min/max limitations - nVerSeg = ::std::min(nMaxSegments, ::std::max(nMinSegments, nVerSeg)); + nVerSeg = std::min(nMaxSegments, std::max(nMinSegments, nVerSeg)); // vertical loop for(sal_uInt32 a(0); a < nVerSeg; a++) diff --git a/basegfx/source/range/b2xrange.cxx b/basegfx/source/range/b2xrange.cxx index 9ee5b9060026..5f68e95fd5ca 100644 --- a/basegfx/source/range/b2xrange.cxx +++ b/basegfx/source/range/b2xrange.cxx @@ -32,7 +32,7 @@ namespace basegfx nested types. */ template< class RangeType > void doComputeSetDifference( - ::std::vector< RangeType >& o_rRanges, + std::vector< RangeType >& o_rRanges, const RangeType& a, const RangeType& b ) { @@ -98,7 +98,7 @@ namespace basegfx } } - ::std::vector< B2IRange >& computeSetDifference( ::std::vector< B2IRange >& o_rResult, + std::vector< B2IRange >& computeSetDifference( std::vector< B2IRange >& o_rResult, const B2IRange& rFirst, const B2IRange& rSecond ) { @@ -107,7 +107,7 @@ namespace basegfx return o_rResult; } - ::std::vector< B2DRange >& computeSetDifference( ::std::vector< B2DRange >& o_rResult, + std::vector< B2DRange >& computeSetDifference( std::vector< B2DRange >& o_rResult, const B2DRange& rFirst, const B2DRange& rSecond ) { diff --git a/basegfx/source/raster/rasterconvert3d.cxx b/basegfx/source/raster/rasterconvert3d.cxx index 2ccd4a3ab031..859ed47721e8 100644 --- a/basegfx/source/raster/rasterconvert3d.cxx +++ b/basegfx/source/raster/rasterconvert3d.cxx @@ -62,17 +62,17 @@ namespace basegfx // sort global entries by Y, X once. After this, the vector // is seen as frozen. Pointers to its entries will be used in the following code. - ::std::sort(maLineEntries.begin(), maLineEntries.end()); + std::sort(maLineEntries.begin(), maLineEntries.end()); // local parameters - ::std::vector< RasterConversionLineEntry3D >::iterator aCurrentEntry(maLineEntries.begin()); - ::std::vector< RasterConversionLineEntry3D* > aCurrentLine; - ::std::vector< RasterConversionLineEntry3D* > aNextLine; - ::std::vector< RasterConversionLineEntry3D* >::iterator aRasterConversionLineEntry3D; + std::vector< RasterConversionLineEntry3D >::iterator aCurrentEntry(maLineEntries.begin()); + std::vector< RasterConversionLineEntry3D* > aCurrentLine; + std::vector< RasterConversionLineEntry3D* > aNextLine; + std::vector< RasterConversionLineEntry3D* >::iterator aRasterConversionLineEntry3D; sal_uInt32 nPairCount(0); // get scanlines first LineNumber as start - sal_Int32 nLineNumber(::std::max(aCurrentEntry->getY(), nStartLine)); + sal_Int32 nLineNumber(std::max(aCurrentEntry->getY(), nStartLine)); while((aCurrentLine.size() || aCurrentEntry != maLineEntries.end()) && (nLineNumber < nStopLine)) { @@ -112,7 +112,7 @@ namespace basegfx // since all entries are already in one processed line. This needs to be done // every time since not only new spans may have benn added or old removed, // but incrementing may also have changed the order - ::std::sort(aCurrentLine.begin(), aCurrentLine.end(), lineComparator()); + std::sort(aCurrentLine.begin(), aCurrentLine.end(), lineComparator()); // process current scanline aRasterConversionLineEntry3D = aCurrentLine.begin(); @@ -161,9 +161,9 @@ namespace basegfx { if(nYStart > nYEnd) { - ::std::swap(aStart, aEnd); - ::std::swap(nYStart, nYEnd); - ::std::swap(a, b); + std::swap(aStart, aEnd); + std::swap(nYStart, nYEnd); + std::swap(a, b); } const sal_uInt32 nYDelta(nYEnd - nYStart); @@ -278,8 +278,8 @@ namespace basegfx if(nYStart > nYEnd) { - ::std::swap(aStart, aEnd); - ::std::swap(nYStart, nYEnd); + std::swap(aStart, aEnd); + std::swap(nYStart, nYEnd); } const sal_uInt32 nYDelta(static_cast<sal_uInt32>(nYEnd - nYStart)); diff --git a/basegfx/source/tools/keystoplerp.cxx b/basegfx/source/tools/keystoplerp.cxx index 5819663cfd44..2ffede92ef9a 100644 --- a/basegfx/source/tools/keystoplerp.cxx +++ b/basegfx/source/tools/keystoplerp.cxx @@ -31,7 +31,7 @@ static void validateInput(const std::vector<double>& rKeyStops) "KeyStopLerp::KeyStopLerp(): key stop vector must have two entries or more" ); // rKeyStops must be sorted in ascending order - for( ::std::size_t i=1, len=rKeyStops.size(); i<len; ++i ) + for( std::size_t i=1, len=rKeyStops.size(); i<len; ++i ) { if( rKeyStops[i-1] > rKeyStops[i] ) OSL_FAIL( "KeyStopLerp::KeyStopLerp(): time vector is not sorted in ascending order!" ); diff --git a/basegfx/source/tools/tools.cxx b/basegfx/source/tools/tools.cxx index 95ed692c859d..ec7170b513a7 100644 --- a/basegfx/source/tools/tools.cxx +++ b/basegfx/source/tools/tools.cxx @@ -46,19 +46,19 @@ namespace basegfx // calc maximum orthogonal distance for all four bound // rect corners to the line - const double nMaxDistance( ::std::max( + const double nMaxDistance( std::max( 0.0, - ::std::max( + std::max( distance(rFitTarget.getMinX(), rFitTarget.getMinY(), rMoveDirection, nC), - ::std::max( + std::max( distance(rFitTarget.getMinX(), rFitTarget.getMaxY(), rMoveDirection, nC), - ::std::max( + std::max( distance(rFitTarget.getMaxX(), rFitTarget.getMinY(), rMoveDirection, diff --git a/basegfx/source/workbench/bezierclip.cxx b/basegfx/source/workbench/bezierclip.cxx index 478f2899bf30..86a439ea297b 100644 --- a/basegfx/source/workbench/bezierclip.cxx +++ b/basegfx/source/workbench/bezierclip.cxx @@ -106,13 +106,13 @@ void Impl_calcFatLine( FatLine& line, const Bezier& c ) // worth the overhead) if( dP2 * dP3 > 0.0 ) { - line.dMin = 3.0/4.0 * ::std::min(0.0, ::std::min(dP2, dP3)); - line.dMax = 3.0/4.0 * ::std::max(0.0, ::std::max(dP2, dP3)); + line.dMin = 3.0/4.0 * std::min(0.0, std::min(dP2, dP3)); + line.dMax = 3.0/4.0 * std::max(0.0, std::max(dP2, dP3)); } else { - line.dMin = 4.0/9.0 * ::std::min(0.0, ::std::min(dP2, dP3)); - line.dMax = 4.0/9.0 * ::std::max(0.0, ::std::max(dP2, dP3)); + line.dMin = 4.0/9.0 * std::min(0.0, std::min(dP2, dP3)); + line.dMax = 4.0/9.0 * std::max(0.0, std::max(dP2, dP3)); } } @@ -120,10 +120,10 @@ void Impl_calcBounds( Point2D& leftTop, Point2D& rightBottom, const Bezier& c1 ) { - leftTop.x = ::std::min( c1.p0.x, ::std::min( c1.p1.x, ::std::min( c1.p2.x, c1.p3.x ) ) ); - leftTop.y = ::std::min( c1.p0.y, ::std::min( c1.p1.y, ::std::min( c1.p2.y, c1.p3.y ) ) ); - rightBottom.x = ::std::max( c1.p0.x, ::std::max( c1.p1.x, ::std::max( c1.p2.x, c1.p3.x ) ) ); - rightBottom.y = ::std::max( c1.p0.y, ::std::max( c1.p1.y, ::std::max( c1.p2.y, c1.p3.y ) ) ); + leftTop.x = std::min( c1.p0.x, std::min( c1.p1.x, std::min( c1.p2.x, c1.p3.x ) ) ); + leftTop.y = std::min( c1.p0.y, std::min( c1.p1.y, std::min( c1.p2.y, c1.p3.y ) ) ); + rightBottom.x = std::max( c1.p0.x, std::max( c1.p1.x, std::max( c1.p2.x, c1.p3.x ) ) ); + rightBottom.y = std::max( c1.p0.y, std::max( c1.p1.y, std::max( c1.p2.y, c1.p3.y ) ) ); } bool Impl_doBBoxIntersect( const Bezier& c1, @@ -138,8 +138,8 @@ bool Impl_doBBoxIntersect( const Bezier& c1, Impl_calcBounds( lt1, rb1, c1 ); Impl_calcBounds( lt2, rb2, c2 ); - if( ::std::min(rb1.x, rb2.x) < ::std::max(lt1.x, lt2.x) || - ::std::min(rb1.y, rb2.y) < ::std::max(lt1.y, lt2.y) ) + if( std::min(rb1.x, rb2.x) < std::max(lt1.x, lt2.x) || + std::min(rb1.y, rb2.y) < std::max(lt1.y, lt2.y) ) { return false; } @@ -220,8 +220,8 @@ bool Impl_calcSafeParams( double& t1, tolEqual(p0.y, upperYBound) ) { // yes, simulate intersection then - currLowerT = ::std::min(currLowerT, ::std::min(p0.x, p1.x)); - currHigherT = ::std::max(currHigherT, ::std::max(p0.x, p1.x)); + currLowerT = std::min(currLowerT, std::min(p0.x, p1.x)); + currHigherT = std::max(currHigherT, std::max(p0.x, p1.x)); } } else @@ -236,8 +236,8 @@ bool Impl_calcSafeParams( double& t1, // calc intersection with horizontal dMax line const double currTHigh( (upperYBound - p0.y) * r_x / r_y + p0.x ); - currLowerT = ::std::min(currLowerT, ::std::min(currTLow, currTHigh)); - currHigherT = ::std::max(currHigherT, ::std::max(currTLow, currTHigh)); + currLowerT = std::min(currLowerT, std::min(currTLow, currTHigh)); + currHigherT = std::max(currHigherT, std::max(currTLow, currTHigh)); } // set flag that at least one segment is contained or @@ -248,8 +248,8 @@ bool Impl_calcSafeParams( double& t1, #ifndef WITH_SAFEPARAMBASE_TEST // limit intersections found to permissible t parameter range - t1 = ::std::max(0.0, currLowerT); - t2 = ::std::min(1.0, currHigherT); + t1 = std::max(0.0, currLowerT); + t2 = std::min(1.0, currHigherT); #endif return bIntersection; @@ -810,7 +810,7 @@ bool Impl_calcSafeParams_focus( double& t1, for( j=0; j<j_card; ++j ) { // calc single d_{ij} sum: - for( d=0.0, k=::std::max(0,i-n); k<=k_max && k<=i; ++k ) + for( d=0.0, k=std::max(0,i-n); k<=k_max && k<=i; ++k ) { l = i - k; // invariant: k + l = i assert(k>=0 && k<=n-1); // k \in {0,...,n-1} @@ -895,7 +895,7 @@ bool Impl_calcSafeParams_focus( double& t1, c1_orig, where c1_orig is 'safe' from c2_part. If the whole c1_orig is safe, false must be returned, true otherwise. */ -template <class Functor> void Impl_applySafeRanges_rec( ::std::back_insert_iterator< ::std::vector< ::std::pair<double, double> > >& result, +template <class Functor> void Impl_applySafeRanges_rec( std::back_insert_iterator< std::vector< std::pair<double, double> > >& result, double delta, const Functor& safeRangeFunctor, int recursionLevel, @@ -970,8 +970,8 @@ template <class Functor> void Impl_applySafeRanges_rec( ::std::back_insert_itera // [last_t1,last_t2], on the other hand, so values // of [t1,t2] outside that range are irrelevant // here. Clip range appropriately. - t1_c1 = ::std::max(t1_c1, last_t1_c1); - t2_c1 = ::std::min(t2_c1, last_t2_c1); + t1_c1 = std::max(t1_c1, last_t1_c1); + t2_c1 = std::min(t2_c1, last_t2_c1); // TODO: respect delta // for now, end condition is just a fixed threshold on the t's @@ -991,12 +991,12 @@ template <class Functor> void Impl_applySafeRanges_rec( ::std::back_insert_itera if( recursionLevel % 2 ) { // uneven level: have to swap the t's, since curves are swapped, too - *result++ = ::std::make_pair( last_t1_c2 + (last_t2_c2 - last_t1_c2)/2.0, + *result++ = std::make_pair( last_t1_c2 + (last_t2_c2 - last_t1_c2)/2.0, last_t1_c1 + (last_t2_c1 - last_t1_c1)/2.0 ); } else { - *result++ = ::std::make_pair( last_t1_c1 + (last_t2_c1 - last_t1_c1)/2.0, + *result++ = std::make_pair( last_t1_c1 + (last_t2_c1 - last_t1_c1)/2.0, last_t1_c2 + (last_t2_c2 - last_t1_c2)/2.0 ); } @@ -1157,7 +1157,7 @@ struct BezierTangencyFunctor Maximal allowed distance to true intersection (measured in the original curve's coordinate system) */ -void clipBezier( ::std::back_insert_iterator< ::std::vector< ::std::pair<double, double> > >& result, +void clipBezier( std::back_insert_iterator< std::vector< std::pair<double, double> > >& result, double delta, const Bezier& c1, const Bezier& c2 ) @@ -1173,8 +1173,8 @@ void clipBezier( ::std::back_insert_iterator< ::std::vector< ::std::pair<double, // tangencies. Sederberg et al. state that collinear normal // algorithm then degrades quickly. - ::std::vector< ::std::pair<double,double> > results; - ::std::back_insert_iterator< ::std::vector< ::std::pair<double, double> > > ii(results); + std::vector< std::pair<double,double> > results; + std::back_insert_iterator< std::vector< std::pair<double, double> > > ii(results); Impl_calcCollinearNormals( ii, delta, 0, c1, c1, 0.0, 1.0, c2, c2, 0.0, 1.0 ); @@ -1187,8 +1187,8 @@ void clipBezier( ::std::back_insert_iterator< ::std::vector< ::std::pair<double, // e.g. intersect with the right part of curve 2. // divide c1 and c2 at collinear normal intersection points - ::std::vector< Bezier > c1_segments( results.size()+1 ); - ::std::vector< Bezier > c2_segments( results.size()+1 ); + std::vector< Bezier > c1_segments( results.size()+1 ); + std::vector< Bezier > c2_segments( results.size()+1 ); Bezier c1_remainder( c1 ); Bezier c2_remainder( c2 ); unsigned int i; @@ -1898,8 +1898,8 @@ int main(int argc, const char *argv[]) #endif #ifdef WITH_BEZIERCLIP_TEST - ::std::vector< ::std::pair<double, double> > result; - ::std::back_insert_iterator< ::std::vector< ::std::pair<double, double> > > ii(result); + std::vector< std::pair<double, double> > result; + std::back_insert_iterator< std::vector< std::pair<double, double> > > ii(result); // test full bezier clipping const double bezierClip_xOffset( curr_Offset ); diff --git a/basegfx/source/workbench/bezierclip.hxx b/basegfx/source/workbench/bezierclip.hxx index 11ab32109414..adb92009ad69 100644 --- a/basegfx/source/workbench/bezierclip.hxx +++ b/basegfx/source/workbench/bezierclip.hxx @@ -63,7 +63,7 @@ template <typename DataType> DataType calcLineDistance( const DataType& a, return a*x + b*y + c; } -typedef ::std::vector< Point2D > Polygon2D; +typedef std::vector< Point2D > Polygon2D; /* little abs template */ template <typename NumType> NumType absval( NumType x ) @@ -73,7 +73,7 @@ template <typename NumType> NumType absval( NumType x ) Polygon2D convexHull( const Polygon2D& rPoly ); -// TODO: find proper epsilon here (try ::std::numeric_limits<NumType>::epsilon()?)! +// TODO: find proper epsilon here (try std::numeric_limits<NumType>::epsilon()?)! #define DBL_EPSILON 1.0e-100 /* little approximate comparisons */ diff --git a/basegfx/source/workbench/convexhull.cxx b/basegfx/source/workbench/convexhull.cxx index e94c2d76045a..3e728777ace8 100644 --- a/basegfx/source/workbench/convexhull.cxx +++ b/basegfx/source/workbench/convexhull.cxx @@ -43,7 +43,7 @@ template <class PointType> double theta( const PointType& p1, const PointType& p /* Model of LessThanComparable for theta sort. * Uses the theta function from Sedgewick: Algorithms in XXX, chapter 24 */ -template <class PointType> class ThetaCompare : public ::std::binary_function< const PointType&, const PointType&, bool > +template <class PointType> class ThetaCompare : public std::binary_function< const PointType&, const PointType&, bool > { public: explicit ThetaCompare( const PointType& rRefPoint ) : maRefPoint( rRefPoint ) {} @@ -152,7 +152,7 @@ Polygon2D convexHull( const Polygon2D& rPoly ) { const Polygon2D::size_type N( rPoly.size() ); Polygon2D result( N + 1 ); - ::std::copy(rPoly.begin(), rPoly.end(), result.begin()+1 ); + std::copy(rPoly.begin(), rPoly.end(), result.begin()+1 ); Polygon2D::size_type min, i; // determine safe point on hull (smallest y value) @@ -173,12 +173,12 @@ Polygon2D convexHull( const Polygon2D& rPoly ) } // TODO: add inner elimination optimization from Sedgewick: Algorithms in XXX, chapter 25 - // TODO: use radix sort instead of ::std::sort(), calc theta only once and store + // TODO: use radix sort instead of std::sort(), calc theta only once and store // setup first point and sort - ::std::swap( result[1], result[min] ); + std::swap( result[1], result[min] ); ThetaCompare<Point2D> cmpFunc(result[1]); - ::std::sort( result.begin()+1, result.end(), cmpFunc ); + std::sort( result.begin()+1, result.end(), cmpFunc ); // setup sentinel result[0] = result[N]; @@ -191,7 +191,7 @@ Polygon2D convexHull( const Polygon2D& rPoly ) --M; ++M; - ::std::swap( result[M], result[i] ); + std::swap( result[M], result[i] ); } // copy range [1,M] to output diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx index e13d156c3e2f..989f78ecabc4 100644 --- a/basegfx/test/boxclipper.cxx +++ b/basegfx/test/boxclipper.cxx @@ -42,7 +42,7 @@ using namespace ::basegfx; namespace basegfx2d { /// Gets a random ordinal [0,n) -double getRandomOrdinal( const ::std::size_t n ) +double getRandomOrdinal( const std::size_t n ) { // use this one when displaying polygons in OOo, which still sucks // great rocks when trying to import non-integer svg:d attributes diff --git a/basegfx/test/boxclipper.hxx b/basegfx/test/boxclipper.hxx index 70eed2adcee5..95dd2c7df849 100644 --- a/basegfx/test/boxclipper.hxx +++ b/basegfx/test/boxclipper.hxx @@ -26,7 +26,7 @@ namespace basegfx2d { -double getRandomOrdinal( const ::std::size_t n ); +double getRandomOrdinal( const std::size_t n ); } diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index 8a6032f84d21..a41feb1f4a86 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -63,9 +63,9 @@ namespace basic using ::com::sun::star::lang::XComponent; using ::com::sun::star::document::XEmbeddedScripts; - typedef ::std::map< Reference< XInterface >, BasicManager*, ::comphelper::OInterfaceCompare< XInterface > > BasicManagerStore; + typedef std::map< Reference< XInterface >, BasicManager*, ::comphelper::OInterfaceCompare< XInterface > > BasicManagerStore; - typedef ::std::vector< BasicManagerCreationListener* > CreationListeners; + typedef std::vector< BasicManagerCreationListener* > CreationListeners; class ImplRepository : public ::utl::OEventListenerAdapter, public SfxListener { @@ -337,7 +337,7 @@ namespace basic { SolarMutexGuard g; - CreationListeners::iterator pos = ::std::find( m_aCreationListeners.begin(), m_aCreationListeners.end(), &_rListener ); + CreationListeners::iterator pos = std::find( m_aCreationListeners.begin(), m_aCreationListeners.end(), &_rListener ); if ( pos != m_aCreationListeners.end() ) m_aCreationListeners.erase( pos ); else { diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx index 475a02fb4fce..32e0041f77e3 100644 --- a/basic/source/basmgr/vbahelper.cxx +++ b/basic/source/basmgr/vbahelper.cxx @@ -46,7 +46,7 @@ uno::Reference< frame::XModuleManager2 > lclCreateModuleManager() return frame::ModuleManager::create(xContext); } -typedef ::std::vector<uno::Reference<frame::XModel>> ModelVector; +typedef std::vector<uno::Reference<frame::XModel>> ModelVector; ModelVector CreateDocumentsEnumeration( const uno::Reference< frame::XModel >& rxModel) @@ -144,7 +144,7 @@ void lclIterateDocuments( ModifyDocumentFunc pModifyDocumentFunc, const uno::Ref struct CurrDirPool { ::osl::Mutex maMutex; - ::std::map< OUString, OUString > maCurrDirs; + std::map< OUString, OUString > maCurrDirs; }; struct StaticCurrDirPool : public ::rtl::Static< CurrDirPool, StaticCurrDirPool > {}; diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 8976a89be9cd..dd92692881da 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -84,7 +84,7 @@ using namespace com::sun::star::script; using namespace com::sun::star::uno; typedef ::cppu::WeakImplHelper< XInvocation > DocObjectWrapper_BASE; -typedef ::std::map< sal_Int16, Any > OutParamMap; +typedef std::map< sal_Int16, Any > OutParamMap; class DocObjectWrapper : public DocObjectWrapper_BASE { diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx index a43f4544031f..c50489175ba3 100644 --- a/basic/source/inc/expr.hxx +++ b/basic/source/inc/expr.hxx @@ -35,8 +35,8 @@ class SbiSymDef; class SbiProcDef; -typedef ::std::unique_ptr<SbiExprList> SbiExprListPtr; -typedef ::std::vector<SbiExprListPtr> SbiExprListVector; +typedef std::unique_ptr<SbiExprList> SbiExprListPtr; +typedef std::vector<SbiExprListPtr> SbiExprListVector; struct SbVar { SbiExprNode* pNext; // next element (for structures) diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx index 9d2553f67b1b..e81ce3b50c29 100644 --- a/basic/source/inc/parser.hxx +++ b/basic/source/inc/parser.hxx @@ -26,7 +26,7 @@ #include <vector> -typedef ::std::vector< OUString > StringVector; +typedef std::vector< OUString > StringVector; struct SbiParseStack; diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index a3c79e6cdee8..e1fd4802ce12 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -28,7 +28,7 @@ #include <vector> -typedef ::std::vector<css::beans::PropertyValue> SbPropertyValueArr_Impl; +typedef std::vector<css::beans::PropertyValue> SbPropertyValueArr_Impl; typedef ::cppu::WeakImplHelper< css::beans::XPropertySet, css::beans::XPropertyAccess > SbPropertyValuesHelper; diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index 9ec617a7230a..3ee8f0478f1a 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -71,7 +71,7 @@ class SbUnoStructRefObject: public SbxObject return rProp.toAsciiUpperCase().compareTo( rOtherProp.toAsciiUpperCase() ) < 0; } }; - typedef ::std::map< OUString, StructRefInfo*, caseLessComp > StructFieldInfo; + typedef std::map< OUString, StructRefInfo*, caseLessComp > StructFieldInfo; StructFieldInfo maFields; StructRefInfo maMemberInfo; bool mbMemberCacheInit; diff --git a/binaryurp/source/cache.hxx b/binaryurp/source/cache.hxx index 9bd87898c528..009886eb8f38 100644 --- a/binaryurp/source/cache.hxx +++ b/binaryurp/source/cache.hxx @@ -86,7 +86,7 @@ private: typedef std::list<T> LruList; // last recently used list typedef typename LruList::iterator LruListIt; struct CmpT{ bool operator()( const LruListIt& rA, const LruListIt& rB) const { return (*rA<*rB);}}; - typedef ::std::map< LruListIt, IdxType, CmpT > LruItMap; // a map into a LruList + typedef std::map< LruListIt, IdxType, CmpT > LruItMap; // a map into a LruList std::size_t size_; LruItMap map_; diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx index 65d7f6442294..ce2a34c417f9 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx b/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx index c12f148e6ffd..dc199bdc1b94 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx index 9c254914d400..99cf7766a0c4 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx @@ -34,11 +34,11 @@ namespace CPPU_CURRENT_NAMESPACE struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx b/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx index 5d868e5ddff3..dd084e340a1e 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx index 1b24c9253b4b..59ff09b72621 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx @@ -44,11 +44,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx index f97e81e419eb..d167bf25c584 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx @@ -42,11 +42,11 @@ void dummy_can_throw_anything( char const * ); struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx b/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx index 25d618331b06..01655c480e1d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx b/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx index 0d3a6b34326d..5c4dac85b249 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx index 03badeb2e096..73c60aa05abc 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx @@ -46,11 +46,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx index 8c8793acd446..be81af026eac 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx index b5f609adc39a..21df650f7ae0 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx b/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx index 54e16de04941..aacbd05fa568 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx b/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx index 2828a2927eac..9de4b6f485f6 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx b/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx index 116e3fa16244..95f0c15f660c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx @@ -38,11 +38,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx index 65dcba617551..5cd1b32f6355 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx @@ -38,11 +38,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx b/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx index 0f6c5469bf73..0fe413f6827c 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx @@ -42,11 +42,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx index 515062192f7e..af42fba6a4ba 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx @@ -38,11 +38,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index eecedbbb61cb..7f524df6d1d5 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -360,7 +360,7 @@ sal_Int32 VtableFactory::createVtables( #ifdef USE_DOUBLE_MMAP //Finished generating block, swap writable pointer with executable //pointer - ::std::swap(block.start, block.exec); + std::swap(block.start, block.exec); #endif blocks.push_back(block); } catch (...) { diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index a84701d3f2ff..5f4ada393d34 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -213,10 +213,10 @@ struct rtl_mem inline static void operator delete ( void *, void * ) {} - static inline rtl_mem * allocate( ::std::size_t bytes ); + static inline rtl_mem * allocate( std::size_t bytes ); }; -inline rtl_mem * rtl_mem::allocate( ::std::size_t bytes ) +inline rtl_mem * rtl_mem::allocate( std::size_t bytes ) { void * p = rtl_allocateMemory( bytes ); if (nullptr == p) diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h index eea1f562e009..1abc05160876 100644 --- a/bridges/source/jni_uno/jni_info.h +++ b/bridges/source/jni_uno/jni_info.h @@ -118,7 +118,7 @@ struct JNI_type_info_holder inline JNI_type_info_holder() : m_info( nullptr ) {} }; -typedef ::std::unordered_map< +typedef std::unordered_map< OUString, JNI_type_info_holder, OUStringHash > t_str2type; class JNI_info |