summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2017-02-17 19:06:24 +0200
committerTor Lillqvist <tml@collabora.com>2017-02-17 18:41:19 +0000
commitb57d51e32fb85e9cde64f85719725253162c42e4 (patch)
treeafe75470b9fc3c12a3d240577b07042985882675 /drawinglayer
parentc910d1dae1a9fcf0591098244debc863dd59618a (diff)
Drop :: prefix from std in [de]*/
Change-Id: I3247894fe022dce7f0aa351bd85fefcd7c545dd4 Reviewed-on: https://gerrit.libreoffice.org/34377 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/source/attribute/sdrlightingattribute3d.cxx10
-rw-r--r--drawinglayer/source/attribute/sdrlineattribute.cxx10
-rw-r--r--drawinglayer/source/attribute/strokeattribute.cxx12
-rw-r--r--drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx2
-rw-r--r--drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx2
-rw-r--r--drawinglayer/source/primitive2d/metafileprimitive2d.cxx8
-rw-r--r--drawinglayer/source/primitive2d/patternfillprimitive2d.cxx2
-rw-r--r--drawinglayer/source/primitive2d/polygonprimitive2d.cxx2
-rw-r--r--drawinglayer/source/primitive2d/svggradientprimitive2d.cxx16
-rw-r--r--drawinglayer/source/primitive2d/textbreakuphelper.cxx4
-rw-r--r--drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx4
-rw-r--r--drawinglayer/source/primitive2d/textlayoutdevice.cxx8
-rw-r--r--drawinglayer/source/primitive2d/textlineprimitive2d.cxx2
-rw-r--r--drawinglayer/source/primitive2d/textprimitive2d.cxx4
-rw-r--r--drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx2
-rw-r--r--drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx2
-rw-r--r--drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx14
-rw-r--r--drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx18
-rw-r--r--drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx2
-rw-r--r--drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx2
-rw-r--r--drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx2
-rw-r--r--drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx2
-rw-r--r--drawinglayer/source/processor2d/vclhelperbufferdevice.cxx4
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx2
-rw-r--r--drawinglayer/source/processor2d/vclprocessor2d.cxx4
-rw-r--r--drawinglayer/source/processor3d/defaultprocessor3d.cxx2
-rw-r--r--drawinglayer/source/processor3d/zbufferprocessor3d.cxx8
-rw-r--r--drawinglayer/source/texture/texture.cxx8
28 files changed, 79 insertions, 79 deletions
diff --git a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx
index f2705e998a2a..c2f44f26dff6 100644
--- a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx
@@ -33,11 +33,11 @@ namespace drawinglayer
public:
// 3D light attribute definitions
basegfx::BColor maAmbientLight;
- ::std::vector< Sdr3DLightAttribute > maLightVector;
+ std::vector< Sdr3DLightAttribute > maLightVector;
ImpSdrLightingAttribute(
const basegfx::BColor& rAmbientLight,
- const ::std::vector< Sdr3DLightAttribute >& rLightVector)
+ const std::vector< Sdr3DLightAttribute >& rLightVector)
: maAmbientLight(rAmbientLight),
maLightVector(rLightVector)
{
@@ -51,7 +51,7 @@ namespace drawinglayer
// data read access
const basegfx::BColor& getAmbientLight() const { return maAmbientLight; }
- const ::std::vector< Sdr3DLightAttribute >& getLightVector() const { return maLightVector; }
+ const std::vector< Sdr3DLightAttribute >& getLightVector() const { return maLightVector; }
bool operator==(const ImpSdrLightingAttribute& rCandidate) const
{
@@ -68,7 +68,7 @@ namespace drawinglayer
SdrLightingAttribute::SdrLightingAttribute(
const basegfx::BColor& rAmbientLight,
- const ::std::vector< Sdr3DLightAttribute >& rLightVector)
+ const std::vector< Sdr3DLightAttribute >& rLightVector)
: mpSdrLightingAttribute(ImpSdrLightingAttribute(
rAmbientLight, rLightVector))
{
@@ -119,7 +119,7 @@ namespace drawinglayer
return rCandidate.mpSdrLightingAttribute == mpSdrLightingAttribute;
}
- const ::std::vector< Sdr3DLightAttribute >& SdrLightingAttribute::getLightVector() const
+ const std::vector< Sdr3DLightAttribute >& SdrLightingAttribute::getLightVector() const
{
return mpSdrLightingAttribute->getLightVector();
}
diff --git a/drawinglayer/source/attribute/sdrlineattribute.cxx b/drawinglayer/source/attribute/sdrlineattribute.cxx
index 1da16445188b..fa6267c1e958 100644
--- a/drawinglayer/source/attribute/sdrlineattribute.cxx
+++ b/drawinglayer/source/attribute/sdrlineattribute.cxx
@@ -35,7 +35,7 @@ namespace drawinglayer
double mfTransparence; // [0.0 .. 1.0], 0.0==no transp.
basegfx::BColor maColor; // color of line
css::drawing::LineCap meCap; // BUTT, ROUND, or SQUARE
- ::std::vector< double > maDotDashArray; // array of double which defines the dot-dash pattern
+ std::vector< double > maDotDashArray; // array of double which defines the dot-dash pattern
double mfFullDotDashLen; // sum of maDotDashArray (for convenience)
ImpSdrLineAttribute(
@@ -44,7 +44,7 @@ namespace drawinglayer
double fTransparence,
const basegfx::BColor& rColor,
css::drawing::LineCap eCap,
- const ::std::vector< double >& rDotDashArray,
+ const std::vector< double >& rDotDashArray,
double fFullDotDashLen)
: meJoin(eJoin),
mfWidth(fWidth),
@@ -73,7 +73,7 @@ namespace drawinglayer
double getTransparence() const { return mfTransparence; }
const basegfx::BColor& getColor() const { return maColor; }
css::drawing::LineCap getCap() const { return meCap; }
- const ::std::vector< double >& getDotDashArray() const { return maDotDashArray; }
+ const std::vector< double >& getDotDashArray() const { return maDotDashArray; }
double getFullDotDashLen() const { return mfFullDotDashLen; }
bool operator==(const ImpSdrLineAttribute& rCandidate) const
@@ -99,7 +99,7 @@ namespace drawinglayer
double fTransparence,
const basegfx::BColor& rColor,
css::drawing::LineCap eCap,
- const ::std::vector< double >& rDotDashArray,
+ const std::vector< double >& rDotDashArray,
double fFullDotDashLen)
: mpSdrLineAttribute(
ImpSdrLineAttribute(
@@ -179,7 +179,7 @@ namespace drawinglayer
return mpSdrLineAttribute->getColor();
}
- const ::std::vector< double >& SdrLineAttribute::getDotDashArray() const
+ const std::vector< double >& SdrLineAttribute::getDotDashArray() const
{
return mpSdrLineAttribute->getDotDashArray();
}
diff --git a/drawinglayer/source/attribute/strokeattribute.cxx b/drawinglayer/source/attribute/strokeattribute.cxx
index 05e9ba509e26..2ff6dd0c106e 100644
--- a/drawinglayer/source/attribute/strokeattribute.cxx
+++ b/drawinglayer/source/attribute/strokeattribute.cxx
@@ -30,11 +30,11 @@ namespace drawinglayer
{
public:
// data definitions
- ::std::vector< double > maDotDashArray; // array of double which defines the dot-dash pattern
+ std::vector< double > maDotDashArray; // array of double which defines the dot-dash pattern
double mfFullDotDashLen; // sum of maDotDashArray (for convenience)
ImpStrokeAttribute(
- const ::std::vector< double >& rDotDashArray,
+ const std::vector< double >& rDotDashArray,
double fFullDotDashLen)
: maDotDashArray(rDotDashArray),
mfFullDotDashLen(fFullDotDashLen)
@@ -48,13 +48,13 @@ namespace drawinglayer
}
// data read access
- const ::std::vector< double >& getDotDashArray() const { return maDotDashArray; }
+ const std::vector< double >& getDotDashArray() const { return maDotDashArray; }
double getFullDotDashLen() const
{
if(0.0 == mfFullDotDashLen && maDotDashArray.size())
{
// calculate length on demand
- const double fAccumulated(::std::accumulate(maDotDashArray.begin(), maDotDashArray.end(), 0.0));
+ const double fAccumulated(std::accumulate(maDotDashArray.begin(), maDotDashArray.end(), 0.0));
const_cast< ImpStrokeAttribute* >(this)->mfFullDotDashLen = fAccumulated;
}
@@ -75,7 +75,7 @@ namespace drawinglayer
}
StrokeAttribute::StrokeAttribute(
- const ::std::vector< double >& rDotDashArray,
+ const std::vector< double >& rDotDashArray,
double fFullDotDashLen)
: mpStrokeAttribute(ImpStrokeAttribute(
rDotDashArray, fFullDotDashLen))
@@ -127,7 +127,7 @@ namespace drawinglayer
return rCandidate.mpStrokeAttribute == mpStrokeAttribute;
}
- const ::std::vector< double >& StrokeAttribute::getDotDashArray() const
+ const std::vector< double >& StrokeAttribute::getDotDashArray() const
{
return mpStrokeAttribute->getDotDashArray();
}
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,
diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
index 37f4b4041cab..2d0304deb5df 100644
--- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
@@ -135,7 +135,7 @@ namespace drawinglayer
const basegfx::B2DRange aOutlineRange(basegfx::tools::getRange(aTexPolyPolygon));
const basegfx::BColor aHatchColor(getHatch().getColor());
const double fAngle(getHatch().getAngle());
- ::std::vector< basegfx::B2DHomMatrix > aMatrices;
+ std::vector< basegfx::B2DHomMatrix > aMatrices;
// get hatch transformations
switch(getHatch().getStyle())
diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
index 4de490ac1e89..9c52e5e57bbe 100644
--- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
@@ -126,7 +126,7 @@ namespace drawinglayer
}
// build vector of PolyPolygons
- ::std::vector< basegfx::B3DPolyPolygon > a3DPolyPolygonVector;
+ std::vector< basegfx::B3DPolyPolygon > a3DPolyPolygonVector;
for(sal_uInt32 a(0L); a < aFill.count(); a++)
{
diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
index bf593985b94b..a53caf43e315 100644
--- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
@@ -45,7 +45,7 @@ namespace drawinglayer
{
namespace primitive3d
{
- basegfx::B3DRange getRangeFrom3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill)
+ basegfx::B3DRange getRangeFrom3DGeometry(std::vector< basegfx::B3DPolyPolygon >& rFill)
{
basegfx::B3DRange aRetval;
@@ -57,7 +57,7 @@ namespace drawinglayer
return aRetval;
}
- void applyNormalsKindSphereTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange)
+ void applyNormalsKindSphereTo3DGeometry(std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange)
{
// create sphere normals
const basegfx::B3DPoint aCenter(rRange.getCenter());
@@ -68,7 +68,7 @@ namespace drawinglayer
}
}
- void applyNormalsKindFlatTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill)
+ void applyNormalsKindFlatTo3DGeometry(std::vector< basegfx::B3DPolyPolygon >& rFill)
{
for(basegfx::B3DPolyPolygon & a : rFill)
{
@@ -76,7 +76,7 @@ namespace drawinglayer
}
}
- void applyNormalsInvertTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill)
+ void applyNormalsInvertTo3DGeometry(std::vector< basegfx::B3DPolyPolygon >& rFill)
{
// invert normals
for(basegfx::B3DPolyPolygon & a : rFill)
@@ -88,7 +88,7 @@ namespace drawinglayer
void applyTextureTo3DGeometry(
css::drawing::TextureProjectionMode eModeX,
css::drawing::TextureProjectionMode eModeY,
- ::std::vector< basegfx::B3DPolyPolygon >& rFill,
+ std::vector< basegfx::B3DPolyPolygon >& rFill,
const basegfx::B3DRange& rRange,
const basegfx::B2DVector& rTextureSize)
{
@@ -165,7 +165,7 @@ namespace drawinglayer
}
Primitive3DContainer create3DPolyPolygonFillPrimitives(
- const ::std::vector< basegfx::B3DPolyPolygon >& r3DPolyPolygonVector,
+ const std::vector< basegfx::B3DPolyPolygon >& r3DPolyPolygonVector,
const basegfx::B3DHomMatrix& rObjectTransform,
const basegfx::B2DVector& rTextureSize,
const attribute::Sdr3DObjectAttribute& aSdr3DObjectAttribute,
@@ -298,7 +298,7 @@ namespace drawinglayer
}
Primitive3DContainer createHiddenGeometryPrimitives3D(
- const ::std::vector< basegfx::B3DPolyPolygon >& r3DPolyPolygonVector,
+ const std::vector< basegfx::B3DPolyPolygon >& r3DPolyPolygonVector,
const basegfx::B3DHomMatrix& rObjectTransform,
const basegfx::B2DVector& rTextureSize,
const attribute::Sdr3DObjectAttribute& aSdr3DObjectAttribute)
diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
index dba0f54bcbd0..b150120ee9d1 100644
--- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
@@ -111,14 +111,14 @@ namespace
bool bCreateTextureCoordinates)
{
OSL_ENSURE(rPolA.count() == rPolB.count(), "impAddInBetweenFill: unequally sized polygons (!)");
- const sal_uInt32 nPolygonCount(::std::min(rPolA.count(), rPolB.count()));
+ const sal_uInt32 nPolygonCount(std::min(rPolA.count(), rPolB.count()));
for(sal_uInt32 a(0L); a < nPolygonCount; a++)
{
const basegfx::B3DPolygon aSubA(rPolA.getB3DPolygon(a));
const basegfx::B3DPolygon aSubB(rPolB.getB3DPolygon(a));
OSL_ENSURE(aSubA.count() == aSubB.count(), "impAddInBetweenFill: unequally sized polygons (!)");
- const sal_uInt32 nPointCount(::std::min(aSubA.count(), aSubB.count()));
+ const sal_uInt32 nPointCount(std::min(aSubA.count(), aSubB.count()));
if(nPointCount)
{
@@ -208,14 +208,14 @@ namespace
bool bSmoothHorizontalNormals)
{
OSL_ENSURE(rPolA.count() == rPolB.count(), "sdrExtrudePrimitive3D: unequally sized polygons (!)");
- const sal_uInt32 nPolygonCount(::std::min(rPolA.count(), rPolB.count()));
+ const sal_uInt32 nPolygonCount(std::min(rPolA.count(), rPolB.count()));
for(sal_uInt32 a(0L); a < nPolygonCount; a++)
{
basegfx::B3DPolygon aSubA(rPolA.getB3DPolygon(a));
basegfx::B3DPolygon aSubB(rPolB.getB3DPolygon(a));
OSL_ENSURE(aSubA.count() == aSubB.count(), "sdrExtrudePrimitive3D: unequally sized polygons (!)");
- const sal_uInt32 nPointCount(::std::min(aSubA.count(), aSubB.count()));
+ const sal_uInt32 nPointCount(std::min(aSubA.count(), aSubB.count()));
if(nPointCount)
{
@@ -292,14 +292,14 @@ namespace
{
const double fWeightB(1.0 - fWeightA);
OSL_ENSURE(rPolA.count() == rPolB.count(), "sdrExtrudePrimitive3D: unequally sized polygons (!)");
- const sal_uInt32 nPolygonCount(::std::min(rPolA.count(), rPolB.count()));
+ const sal_uInt32 nPolygonCount(std::min(rPolA.count(), rPolB.count()));
for(sal_uInt32 a(0L); a < nPolygonCount; a++)
{
basegfx::B3DPolygon aSubA(rPolA.getB3DPolygon(a));
const basegfx::B3DPolygon aSubB(rPolB.getB3DPolygon(a));
OSL_ENSURE(aSubA.count() == aSubB.count(), "sdrExtrudePrimitive3D: unequally sized polygons (!)");
- const sal_uInt32 nPointCount(::std::min(aSubA.count(), aSubB.count()));
+ const sal_uInt32 nPointCount(std::min(aSubA.count(), aSubB.count()));
for(sal_uInt32 b(0L); b < nPointCount; b++)
{
@@ -572,7 +572,7 @@ namespace drawinglayer
}
void extractPlanesFromSlice(
- ::std::vector< basegfx::B3DPolyPolygon >& rFill,
+ std::vector< basegfx::B3DPolyPolygon >& rFill,
const Slice3DVector& rSliceVector,
bool bCreateNormals,
bool bSmoothHorizontalNormals,
@@ -595,7 +595,7 @@ namespace drawinglayer
// texture parameters
double fInvTexHeight(1.0);
- ::std::vector<double> aTexHeightArray;
+ std::vector<double> aTexHeightArray;
basegfx::B3DRange aTexRangeFront;
basegfx::B3DRange aTexRangeBack;
@@ -624,7 +624,7 @@ namespace drawinglayer
aCenter = aNextCenter;
}
- const double fTexHeight(::std::accumulate(aTexHeightArray.begin(), aTexHeightArray.end(), 0.0));
+ const double fTexHeight(std::accumulate(aTexHeightArray.begin(), aTexHeightArray.end(), 0.0));
if(!basegfx::fTools::equalZero(fTexHeight))
{
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
index 9cfbba2473a6..750d4d8977e3 100644
--- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
@@ -76,7 +76,7 @@ namespace drawinglayer
}
// create geometry
- ::std::vector< basegfx::B3DPolyPolygon > aFill;
+ std::vector< basegfx::B3DPolyPolygon > aFill;
extractPlanesFromSlice(aFill, rSliceVector,
bCreateNormals, true/*smoothHorizontalNormals*/, getSmoothNormals(), getSmoothLids(), false,
0.5, 0.6, bCreateTextureCoordinatesX || bCreateTextureCoordinatesY, aTexTransform);
diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
index 64041d8439df..0bffc5801b01 100644
--- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
@@ -71,7 +71,7 @@ namespace drawinglayer
}
// create geometry
- ::std::vector< basegfx::B3DPolyPolygon > aFill;
+ std::vector< basegfx::B3DPolyPolygon > aFill;
extractPlanesFromSlice(aFill, rSliceVector,
bCreateNormals, true/*smoothHorizontalNormals*/, getSmoothNormals(), getSmoothLids(), bClosedRotation,
0.85, 0.6, bCreateTextureCoordinatesX || bCreateTextureCoordinatesY, aTexTransform);
diff --git a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
index 6cd4b576460f..76c2ac5d24eb 100644
--- a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
@@ -39,7 +39,7 @@ namespace drawinglayer
if(getPolyPolygon3D().count())
{
- ::std::vector< basegfx::B3DPolyPolygon > aFill;
+ std::vector< basegfx::B3DPolyPolygon > aFill;
aFill.push_back(getPolyPolygon3D());
// get full range
diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
index 6cb80766a359..1374778dc2ce 100644
--- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
@@ -115,7 +115,7 @@ namespace drawinglayer
}
// build vector of PolyPolygons
- ::std::vector< basegfx::B3DPolyPolygon > a3DPolyPolygonVector;
+ std::vector< basegfx::B3DPolyPolygon > a3DPolyPolygonVector;
for(sal_uInt32 a(0L); a < aFill.count(); a++)
{
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index ba1181009f0e..7d58734363ae 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -38,7 +38,7 @@
namespace
{
- typedef ::std::vector< VclPtr<VirtualDevice> > aBuffers;
+ typedef std::vector< VclPtr<VirtualDevice> > aBuffers;
class VDevBuffer : public Timer, protected cppu::BaseMutex
{
@@ -209,7 +209,7 @@ namespace
void VDevBuffer::free(VirtualDevice& rDevice)
{
::osl::MutexGuard aGuard(m_aMutex);
- const aBuffers::iterator aUsedFound(::std::find(maUsedBuffers.begin(), maUsedBuffers.end(), &rDevice));
+ const aBuffers::iterator aUsedFound(std::find(maUsedBuffers.begin(), maUsedBuffers.end(), &rDevice));
OSL_ENSURE(aUsedFound != maUsedBuffers.end(), "OOps, non-registered buffer freed (!)");
maUsedBuffers.erase(aUsedFound);
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 885367d3a78f..4537422316a5 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -896,7 +896,7 @@ namespace drawinglayer
// PDF export. Emulate data handling from UnoControlPDFExportContact
// I have now moved describePDFControl to toolkit, thus i can implement the PDF
// form control support now as follows
- ::std::unique_ptr< vcl::PDFWriter::AnyWidget > pPDFControl(
+ std::unique_ptr< vcl::PDFWriter::AnyWidget > pPDFControl(
::toolkitform::describePDFControl( rXControl, *mpPDFExtOutDevData ) );
if(pPDFControl.get())
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 58a1801a0d1d..f3c6c88ad61c 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -239,7 +239,7 @@ namespace drawinglayer
}
// create transformed integer DXArray in view coordinate system
- ::std::vector< long > aTransformedDXArray;
+ std::vector< long > aTransformedDXArray;
if(rTextCandidate.getDXArray().size())
{
@@ -247,7 +247,7 @@ namespace drawinglayer
const basegfx::B2DVector aPixelVector(maCurrentTransformation * basegfx::B2DVector(1.0, 0.0));
const double fPixelVectorFactor(aPixelVector.getLength());
- for(::std::vector< double >::const_iterator aStart(rTextCandidate.getDXArray().begin());
+ for(std::vector< double >::const_iterator aStart(rTextCandidate.getDXArray().begin());
aStart != rTextCandidate.getDXArray().end(); ++aStart)
{
aTransformedDXArray.push_back(basegfx::fround((*aStart) * fPixelVectorFactor));
diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
index 50830bae4275..ca51d04587ae 100644
--- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
@@ -229,7 +229,7 @@ namespace drawinglayer
const basegfx::B3DPoint aZero(aInvObjectToView * basegfx::B3DPoint(0.0, 0.0, 0.0));
const basegfx::B3DPoint aOne(aInvObjectToView * basegfx::B3DPoint(1.0, 1.0, 1.0));
const basegfx::B3DVector aLogicPixel(aOne - aZero);
- double fLogicPixelSizeWorld(::std::max(::std::max(fabs(aLogicPixel.getX()), fabs(aLogicPixel.getY())), fabs(aLogicPixel.getZ())));
+ double fLogicPixelSizeWorld(std::max(std::max(fabs(aLogicPixel.getX()), fabs(aLogicPixel.getY())), fabs(aLogicPixel.getZ())));
// calculate logic pixel size in texture coordinates
const double fLogicTexSizeX(fLogicPixelSizeWorld / rPrimitive.getTextureSize().getX());
diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
index 9d881d1c25e6..85cbe4fdef84 100644
--- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
@@ -279,8 +279,8 @@ void ZBufferRasterConverter3D::processLineSpan(const basegfx::RasterConversionLi
{
if(nLine >= 0 && nLine < (sal_Int32)mrBuffer.getHeight())
{
- sal_uInt32 nXA(::std::min(mrBuffer.getWidth(), (sal_uInt32)::std::max((sal_Int32)0, basegfx::fround(rA.getX().getVal()))));
- const sal_uInt32 nXB(::std::min(mrBuffer.getWidth(), (sal_uInt32)::std::max((sal_Int32)0, basegfx::fround(rB.getX().getVal()))));
+ sal_uInt32 nXA(std::min(mrBuffer.getWidth(), (sal_uInt32)std::max((sal_Int32)0, basegfx::fround(rA.getX().getVal()))));
+ const sal_uInt32 nXB(std::min(mrBuffer.getWidth(), (sal_uInt32)std::max((sal_Int32)0, basegfx::fround(rB.getX().getVal()))));
if(nXA < nXB)
{
@@ -299,14 +299,14 @@ void ZBufferRasterConverter3D::processLineSpan(const basegfx::RasterConversionLi
while(nXA < nXB)
{
// early-test Z values if we need to do anything at all
- const double fNewZ(::std::max(0.0, ::std::min((double)0xffff, maIntZ.getVal())));
+ const double fNewZ(std::max(0.0, std::min((double)0xffff, maIntZ.getVal())));
const sal_uInt16 nNewZ(static_cast< sal_uInt16 >(fNewZ));
sal_uInt16& rOldZ(mrBuffer.getZ(nScanlineIndex));
if(nNewZ > rOldZ)
{
// detect color and opacity for this pixel
- const sal_uInt16 nOpacity(::std::max((sal_Int16)0, static_cast< sal_Int16 >(decideColorAndOpacity(aNewColor) * 255.0)));
+ const sal_uInt16 nOpacity(std::max((sal_Int16)0, static_cast< sal_Int16 >(decideColorAndOpacity(aNewColor) * 255.0)));
if(nOpacity > 0)
{
diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx
index 7d53a46e4d29..75565008b103 100644
--- a/drawinglayer/source/texture/texture.cxx
+++ b/drawinglayer/source/texture/texture.cxx
@@ -615,7 +615,7 @@ namespace drawinglayer
&& mnSteps == pCompare->mnSteps);
}
- void GeoTexSvxHatch::appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices)
+ void GeoTexSvxHatch::appendTransformations(std::vector< basegfx::B2DHomMatrix >& rMatrices)
{
if(mbDefinitionRangeEqualsOutputRange)
{
@@ -641,7 +641,7 @@ namespace drawinglayer
// calculate vertical start value and a security maximum integer value to avoid death loops
double fStart(basegfx::snapToNearestMultiple(aBackUnitRange.getMinY(), mfDistance));
const sal_uInt32 nNeededIntegerSteps(basegfx::fround((aBackUnitRange.getHeight() / mfDistance) + 0.5));
- sal_uInt32 nMaxIntegerSteps(::std::min(nNeededIntegerSteps, sal_uInt32(10000)));
+ sal_uInt32 nMaxIntegerSteps(std::min(nNeededIntegerSteps, sal_uInt32(10000)));
while(fStart < aBackUnitRange.getMaxY() && nMaxIntegerSteps)
{
@@ -725,12 +725,12 @@ namespace drawinglayer
return iterateTiles(nullptr);
}
- void GeoTexSvxTiled::appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices) const
+ void GeoTexSvxTiled::appendTransformations(std::vector< basegfx::B2DHomMatrix >& rMatrices) const
{
iterateTiles(&rMatrices);
}
- sal_Int32 GeoTexSvxTiled::iterateTiles(::std::vector< basegfx::B2DHomMatrix >* pMatrices) const
+ sal_Int32 GeoTexSvxTiled::iterateTiles(std::vector< basegfx::B2DHomMatrix >* pMatrices) const
{
const double fWidth(maRange.getWidth());
sal_Int32 nTiles = 0;