diff options
Diffstat (limited to 'cppcanvas/source/mtfrenderer/textaction.cxx')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/textaction.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
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 ) ) ); |