From 6de3688cc6bd52ce08ff8a4327e59dbbc8a5c7d4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 15 Feb 2017 23:55:18 +0200 Subject: Drop :: prefix from std in c*/ Change-Id: If078cda95fa6ccd37270a5e9d81cfa0b84e71155 Reviewed-on: https://gerrit.libreoffice.org/34324 Tested-by: Jenkins Reviewed-by: Tor Lillqvist --- cppcanvas/source/inc/implrenderer.hxx | 6 ++--- cppcanvas/source/mtfrenderer/implrenderer.cxx | 26 +++++++++++----------- cppcanvas/source/mtfrenderer/mtftools.cxx | 2 +- cppcanvas/source/mtfrenderer/textaction.cxx | 16 ++++++------- .../source/mtfrenderer/transparencygroupaction.hxx | 4 ++-- 5 files changed, 27 insertions(+), 27 deletions(-) (limited to 'cppcanvas/source') diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index b9babf1df753..be9656466c69 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -72,7 +72,7 @@ namespace cppcanvas void popState(); void clearStateStack(); private: - ::std::vector< OutDevState > m_aStates; + std::vector< OutDevState > m_aStates; }; // EMF+ @@ -161,7 +161,7 @@ static float GetSwapFloat( SvStream& rSt ) OutDevState aDevState; } EmfPlusGraphicState; - typedef ::std::map GraphicStateMap; + typedef std::map GraphicStateMap; class ImplRenderer : public virtual Renderer, protected CanvasGraphicHelper { @@ -196,7 +196,7 @@ static float GetSwapFloat( SvStream& rSt ) // prefetched and prepared canvas actions // (externally not visible) - typedef ::std::vector< MtfAction > ActionVector; + typedef std::vector< MtfAction > ActionVector; /* EMF+ */ static void ReadRectangle (SvStream& s, float& x, float& y, float &width, float& height, bool bCompressed = false); diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index cdbd5a646755..f12efdb10b1b 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1579,8 +1579,8 @@ namespace cppcanvas // least one dimension // Remark the 1L cannot be replaced, that would cause max to compare long/int - const Size aMtfSizePix( ::std::max( aMtfSizePixPre.Width(), 1L ), - ::std::max( aMtfSizePixPre.Height(), 1L ) ); + const Size aMtfSizePix( std::max( aMtfSizePixPre.Width(), 1L ), + std::max( aMtfSizePixPre.Height(), 1L ) ); // Setup local transform, such that the // metafile renders itself into the given @@ -2588,7 +2588,7 @@ namespace cppcanvas // generating a DX array, and uniformly // distributing the excess/insufficient width // to every logical character. - ::std::unique_ptr< long []> pDXArray( new long[nLen] ); + std::unique_ptr< long []> pDXArray( new long[nLen] ); rVDev.GetTextArray( pAct->GetText(), pDXArray.get(), pAct->GetIndex(), pAct->GetLen() ); @@ -2749,9 +2749,9 @@ namespace cppcanvas { // only a single action. Setup subset, and call functor Action::Subset aSubset; - aSubset.mnSubsetBegin = ::std::max( sal_Int32( 0 ), + aSubset.mnSubsetBegin = std::max( sal_Int32( 0 ), nStartIndex - aRangeBegin->mnOrigIndex ); - aSubset.mnSubsetEnd = ::std::min( aRangeBegin->mpAction->getActionCount(), + aSubset.mnSubsetEnd = std::min( aRangeBegin->mpAction->getActionCount(), nEndIndex - aRangeBegin->mnOrigIndex ); ENSURE_OR_RETURN_FALSE( aSubset.mnSubsetBegin >= 0 && aSubset.mnSubsetEnd >= 0, @@ -2766,7 +2766,7 @@ namespace cppcanvas // render partial first, full intermediate, and // partial last action Action::Subset aSubset; - aSubset.mnSubsetBegin = ::std::max( sal_Int32( 0 ), + aSubset.mnSubsetBegin = std::max( sal_Int32( 0 ), nStartIndex - aRangeBegin->mnOrigIndex ); aSubset.mnSubsetEnd = aRangeBegin->mpAction->getActionCount(); @@ -2826,9 +2826,9 @@ namespace cppcanvas // clip given range to permissible values (there might be // ranges before and behind the valid indices) - io_rStartIndex = ::std::max( nMinActionIndex, + io_rStartIndex = std::max( nMinActionIndex, io_rStartIndex ); - io_rEndIndex = ::std::min( nMaxActionIndex, + io_rEndIndex = std::min( nMaxActionIndex, io_rEndIndex ); if( io_rStartIndex == io_rEndIndex || @@ -2847,10 +2847,10 @@ namespace cppcanvas // find start and end action // ========================= - o_rRangeBegin = ::std::lower_bound( aBegin, aEnd, + o_rRangeBegin = std::lower_bound( aBegin, aEnd, MtfAction( ActionSharedPtr(), io_rStartIndex ), UpperBoundActionIndexComparator() ); - o_rRangeEnd = ::std::lower_bound( aBegin, aEnd, + o_rRangeEnd = std::lower_bound( aBegin, aEnd, MtfAction( ActionSharedPtr(), io_rEndIndex ), UpperBoundActionIndexComparator() ); return true; @@ -2917,8 +2917,8 @@ namespace cppcanvas // #i44110# correct null-sized output - there are shapes // which have zero size in at least one dimension // Remark the 1L cannot be replaced, that would cause max to compare long/int - const Size aMtfSizePix( ::std::max( aMtfSizePixPre.Width(), 1L ), - ::std::max( aMtfSizePixPre.Height(), 1L ) ); + const Size aMtfSizePix( std::max( aMtfSizePixPre.Width(), 1L ), + std::max( aMtfSizePixPre.Height(), 1L ) ); sal_Int32 nCurrActions(0); ActionFactoryParameters aParms(aStateStack, @@ -3102,7 +3102,7 @@ namespace cppcanvas try { - return ::std::for_each( maActions.begin(), maActions.end(), ActionRenderer( aMatrix ) ).result(); + return std::for_each( maActions.begin(), maActions.end(), ActionRenderer( aMatrix ) ).result(); } catch( uno::Exception& ) { diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx index 56b948e13a16..b6f1fff2876d 100644 --- a/cppcanvas/source/mtfrenderer/mtftools.cxx +++ b/cppcanvas/source/mtfrenderer/mtftools.cxx @@ -293,7 +293,7 @@ namespace cppcanvas { const sal_Int32 nNumLoops( static_cast< sal_Int32 >( - ::std::max( 1.0, + std::max( 1.0, nLineWidth / nDashSkip ) + .5) ); double x = nX; diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index 727ce0e2b071..eb95d3983ae9 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -158,7 +158,7 @@ namespace cppcanvas return tools::createTextLinesPolyPolygon( 0.0, // extract character cell furthest to the right - *(::std::max_element( + *(std::max_element( rOffsets.getConstArray(), rOffsets.getConstArray() + rOffsets.getLength() )), rTextLineInfo ); @@ -193,7 +193,7 @@ namespace cppcanvas { // no external DX array given, create one from given // string - ::std::unique_ptr< long []> pCharWidths( new long[nLen] ); + std::unique_ptr< long []> pCharWidths( new long[nLen] ); rVDev.GetTextArray( rText, pCharWidths.get(), nStartPos, nLen ); @@ -306,7 +306,7 @@ namespace cppcanvas // assumed to have output position 0), correct begin // iterator. const double nMinPos( rSubset.mnSubsetBegin <= 0 ? 0 : - *(::std::min_element( pOffsets+rSubset.mnSubsetBegin-1, + *(std::min_element( pOffsets+rSubset.mnSubsetBegin-1, pOffsets+rSubset.mnSubsetEnd )) ); // determine rightmost position in given subset range @@ -315,7 +315,7 @@ namespace cppcanvas // assumed to have output position 0), correct begin // iterator. const double nMaxPos( - *(::std::max_element( pOffsets + (rSubset.mnSubsetBegin <= 0 ? + *(std::max_element( pOffsets + (rSubset.mnSubsetBegin <= 0 ? 0 : rSubset.mnSubsetBegin-1), pOffsets + rSubset.mnSubsetEnd )) ); @@ -357,7 +357,7 @@ namespace cppcanvas // move to new output position (subtract nMinPos, // which is the new '0' position), copy only the range // as given by rSubset. - ::std::transform( pOffsets + rSubset.mnSubsetBegin, + std::transform( pOffsets + rSubset.mnSubsetBegin, pOffsets + rSubset.mnSubsetEnd, pAdaptedOffsets, [nMinPos](double aPos) { return aPos - nMinPos; } ); @@ -376,10 +376,10 @@ namespace cppcanvas // create temporary new text layout with subset string - const sal_Int32 nNewStartPos( rOrigContext.StartPosition + ::std::min( + const sal_Int32 nNewStartPos( rOrigContext.StartPosition + std::min( rSubset.mnSubsetBegin, rOrigContext.Length-1 ) ); - const sal_Int32 nNewLength( ::std::max( - ::std::min( + const sal_Int32 nNewLength( std::max( + std::min( rSubset.mnSubsetEnd - rSubset.mnSubsetBegin, rOrigContext.Length ), sal_Int32( 0 ) ) ); diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx index e73ebf37d8b5..b31ee8118a90 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx @@ -43,8 +43,8 @@ namespace cppcanvas { struct OutDevState; - typedef ::std::unique_ptr< GDIMetaFile > MtfAutoPtr; - typedef ::std::unique_ptr< Gradient > GradientAutoPtr; + typedef std::unique_ptr< GDIMetaFile > MtfAutoPtr; + typedef std::unique_ptr< Gradient > GradientAutoPtr; /** Transparency group action. -- cgit v1.2.3