diff options
Diffstat (limited to 'drawinglayer/source/primitive2d')
11 files changed, 27 insertions, 27 deletions
diff --git a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx index 4f658322aab0..9bdd689f0e78 100644 --- a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx @@ -55,7 +55,7 @@ namespace drawinglayer if(rAttribute.getTiling()) { // get object range and create tiling matrices - ::std::vector< basegfx::B2DHomMatrix > aMatrices; + std::vector< basegfx::B2DHomMatrix > aMatrices; texture::GeoTexSvxTiled aTiling( rAttribute.getGraphicRange(), rAttribute.getOffsetX(), diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx index 464a4e12b722..210ed61a251a 100644 --- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx @@ -42,7 +42,7 @@ namespace drawinglayer // create hatch const basegfx::BColor aHatchColor(getFillHatch().getColor()); const double fAngle(getFillHatch().getAngle()); - ::std::vector< basegfx::B2DHomMatrix > aMatrices; + std::vector< basegfx::B2DHomMatrix > aMatrices; double fDistance(getFillHatch().getDistance()); const bool bAdaptDistance(0 != getFillHatch().getMinimalDiscreteDistance()); diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 6c3cfe91e4ea..f1d728bd5592 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -665,7 +665,7 @@ namespace if(bDashDotUsed) { - ::std::vector< double > fDotDashArray; + std::vector< double > fDotDashArray; const double fDashLen(rLineInfo.GetDashLen()); const double fDotLen(rLineInfo.GetDotLen()); const double fDistance(rLineInfo.GetDistance()); @@ -682,7 +682,7 @@ namespace fDotDashArray.push_back(fDistance); } - const double fAccumulated(::std::accumulate(fDotDashArray.begin(), fDotDashArray.end(), 0.0)); + const double fAccumulated(std::accumulate(fDotDashArray.begin(), fDotDashArray.end(), 0.0)); const drawinglayer::attribute::StrokeAttribute aStrokeAttribute( fDotDashArray, fAccumulated); @@ -1251,7 +1251,7 @@ namespace const OUString& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLength, - const ::std::vector< double >& rDXArray, + const std::vector< double >& rDXArray, TargetHolder& rTarget, PropertyHolder& rProperty) { @@ -2030,7 +2030,7 @@ namespace drawinglayer::primitive2d::TextLayouterDevice aTextLayouterDevice; aTextLayouterDevice.setFont(rPropertyHolders.Current().getFont()); - ::std::vector< double > aTextArray( + std::vector< double > aTextArray( aTextLayouterDevice.getTextArray( pA->GetText(), nTextIndex, diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx index cf07d115fa07..6d6ef225d022 100644 --- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx @@ -172,7 +172,7 @@ namespace drawinglayer if(!aMaskRange.isEmpty() && aMaskRange.getWidth() > 0.0 && aMaskRange.getHeight() > 0.0) { // create tiling matrices - ::std::vector< basegfx::B2DHomMatrix > aMatrices; + std::vector< basegfx::B2DHomMatrix > aMatrices; texture::GeoTexSvxTiled aTiling(getReferenceRange()); aTiling.appendTransformations(aMatrices); diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index 85caf51dc292..0d41a8d88a7c 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -100,7 +100,7 @@ namespace drawinglayer if(fLogicDashLength > 0.0 && !getRGBColorA().equal(getRGBColorB())) { // apply dashing; get line and gap snippets - ::std::vector< double > aDash; + std::vector< double > aDash; basegfx::B2DPolyPolygon aDashedPolyPolyA; basegfx::B2DPolyPolygon aDashedPolyPolyB; diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx index 9721e4e06c85..0f70c0f20326 100644 --- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx @@ -953,7 +953,7 @@ namespace drawinglayer if(mfOffsetA > mfOffsetB) { OSL_ENSURE(false, "Wrong offset order (!)"); - ::std::swap(mfOffsetA, mfOffsetB); + std::swap(mfOffsetA, mfOffsetB); } } @@ -1054,18 +1054,18 @@ namespace drawinglayer } // scale A and B have to be positive - mfScaleA = ::std::max(mfScaleA, 0.0); - mfScaleB = ::std::max(mfScaleB, 0.0); + mfScaleA = std::max(mfScaleA, 0.0); + mfScaleB = std::max(mfScaleB, 0.0); // scale B has to be bigger than scale A; swap if different if(mfScaleA > mfScaleB) { OSL_ENSURE(false, "Wrong offset order (!)"); - ::std::swap(mfScaleA, mfScaleB); + std::swap(mfScaleA, mfScaleB); if(mpTranslate) { - ::std::swap(mpTranslate->maTranslateA, mpTranslate->maTranslateB); + std::swap(mpTranslate->maTranslateA, mpTranslate->maTranslateB); } } } @@ -1081,14 +1081,14 @@ namespace drawinglayer mpTranslate(nullptr) { // scale A and B have to be positive - mfScaleA = ::std::max(mfScaleA, 0.0); - mfScaleB = ::std::max(mfScaleB, 0.0); + mfScaleA = std::max(mfScaleA, 0.0); + mfScaleB = std::max(mfScaleB, 0.0); // scale B has to be bigger than scale A; swap if different if(mfScaleA > mfScaleB) { OSL_ENSURE(false, "Wrong offset order (!)"); - ::std::swap(mfScaleA, mfScaleB); + std::swap(mfScaleA, mfScaleB); } } diff --git a/drawinglayer/source/primitive2d/textbreakuphelper.cxx b/drawinglayer/source/primitive2d/textbreakuphelper.cxx index fa6b213cc0c1..3383b66f87cd 100644 --- a/drawinglayer/source/primitive2d/textbreakuphelper.cxx +++ b/drawinglayer/source/primitive2d/textbreakuphelper.cxx @@ -62,13 +62,13 @@ namespace drawinglayer { // prepare values for new portion basegfx::B2DHomMatrix aNewTransform; - ::std::vector< double > aNewDXArray; + std::vector< double > aNewDXArray; const bool bNewStartIsNotOldStart(nIndex > mrSource.getTextPosition()); if(!mbNoDXArray) { // prepare new DXArray for the single word - aNewDXArray = ::std::vector< double >( + aNewDXArray = std::vector< double >( mrSource.getDXArray().begin() + (nIndex - mrSource.getTextPosition()), mrSource.getDXArray().begin() + ((nIndex + nLength) - mrSource.getTextPosition())); } diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx index 144759735e14..c97e37c7aae1 100644 --- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx @@ -40,7 +40,7 @@ namespace drawinglayer const OUString& rText, sal_Int32 nTextPosition, sal_Int32 nTextLength, - const ::std::vector< double >& rDXArray, + const std::vector< double >& rDXArray, const attribute::FontAttribute& rFontAttribute) const { // create the SimpleTextPrimitive needed in any case @@ -311,7 +311,7 @@ namespace drawinglayer const OUString& rText, sal_Int32 nTextPosition, sal_Int32 nTextLength, - const ::std::vector< double >& rDXArray, + const std::vector< double >& rDXArray, const attribute::FontAttribute& rFontAttribute, const css::lang::Locale& rLocale, const basegfx::BColor& rFontColor, diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index 4e28bf616c97..e58aacfa0113 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -234,7 +234,7 @@ namespace drawinglayer const OUString& rText, sal_uInt32 nIndex, sal_uInt32 nLength, - const ::std::vector< double >& rDXArray) const + const std::vector< double >& rDXArray) const { const sal_uInt32 nDXArrayCount(rDXArray.size()); sal_uInt32 nTextLength(nLength); @@ -333,12 +333,12 @@ namespace drawinglayer rRectangle, rText, nStyle, rGDIMetaFile); } - ::std::vector< double > TextLayouterDevice::getTextArray( + std::vector< double > TextLayouterDevice::getTextArray( const OUString& rText, sal_uInt32 nIndex, sal_uInt32 nLength) const { - ::std::vector< double > aRetval; + std::vector< double > aRetval; sal_uInt32 nTextLength(nLength); const sal_uInt32 nStringLength(rText.getLength()); @@ -350,7 +350,7 @@ namespace drawinglayer if(nTextLength) { aRetval.reserve(nTextLength); - ::std::vector<long> aArray(nTextLength); + std::vector<long> aArray(nTextLength); mrDevice.GetTextArray(rText, &aArray[0], nIndex, nLength); aRetval.assign(aArray.begin(), aArray.end()); } diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx index dee8af23ac88..a9ad1ec2dd89 100644 --- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx @@ -171,7 +171,7 @@ namespace drawinglayer if(pDotDashArray) { - ::std::vector< double > aDoubleArray; + std::vector< double > aDoubleArray; for(const int* p = pDotDashArray; *p; ++p) { diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index bd9fc0ba30ad..ba3ea7a0a60e 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -124,7 +124,7 @@ namespace drawinglayer // outlines already aligned to given, but wrong DXArray if(getDXArray().size() && !basegfx::fTools::equal(aScale.getX(), 1.0)) { - ::std::vector< double > aScaledDXArray = getDXArray(); + std::vector< double > aScaledDXArray = getDXArray(); const double fDXArrayScale(1.0 / aScale.getX()); for(double & a : aScaledDXArray) @@ -219,7 +219,7 @@ namespace drawinglayer const OUString& rText, sal_Int32 nTextPosition, sal_Int32 nTextLength, - const ::std::vector< double >& rDXArray, + const std::vector< double >& rDXArray, const attribute::FontAttribute& rFontAttribute, const css::lang::Locale& rLocale, const basegfx::BColor& rFontColor, |