diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-14 09:21:33 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-14 12:54:25 +0000 |
commit | 22b80ac8e213ff63ce4f60e7d491f12cb42db313 (patch) | |
tree | b00f1ed362747a05d79686a8709c3408cfdee59b /drawinglayer | |
parent | d8026ad65c8d50868f0f2fc0d2bd95820cddea83 (diff) |
boost->std
Change-Id: I3fd9e1599c5ad812879a58cf1dabbcd393105e1c
Reviewed-on: https://gerrit.libreoffice.org/18564
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'drawinglayer')
-rw-r--r-- | drawinglayer/source/processor3d/defaultprocessor3d.cxx | 8 | ||||
-rw-r--r-- | drawinglayer/source/processor3d/zbufferprocessor3d.cxx | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx index 7d38304f4bd3..38b53d00d045 100644 --- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx +++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx @@ -57,7 +57,7 @@ namespace drawinglayer const bool bOldModulate(getModulate()); mbModulate = rPrimitive.getModulate(); const bool bOldFilter(getFilter()); mbFilter = rPrimitive.getFilter(); const bool bOldSimpleTextureActive(getSimpleTextureActive()); - boost::shared_ptr< texture::GeoTexSvx > pOldTex = (bTransparence) ? mpTransparenceGeoTexSvx : mpGeoTexSvx; + std::shared_ptr< texture::GeoTexSvx > pOldTex = (bTransparence) ? mpTransparenceGeoTexSvx : mpGeoTexSvx; // create texture const attribute::FillGradientAttribute& rFillGradient = rPrimitive.getGradient(); @@ -67,7 +67,7 @@ namespace drawinglayer const basegfx::BColor aStart(rFillGradient.getStartColor()); const basegfx::BColor aEnd(rFillGradient.getEndColor()); const sal_uInt32 nMaxSteps(sal_uInt32((aStart.getMaximumDistance(aEnd) * 127.5) + 0.5)); - boost::shared_ptr< texture::GeoTexSvx > pNewTex; + std::shared_ptr< texture::GeoTexSvx > pNewTex; if(nMaxSteps) { @@ -219,7 +219,7 @@ namespace drawinglayer // rescue values const bool bOldModulate(getModulate()); mbModulate = rPrimitive.getModulate(); const bool bOldFilter(getFilter()); mbFilter = rPrimitive.getFilter(); - boost::shared_ptr< texture::GeoTexSvx > pOldTex = mpGeoTexSvx; + std::shared_ptr< texture::GeoTexSvx > pOldTex = mpGeoTexSvx; // calculate logic pixel size in object coordinates. Create transformation view // to object by inverting ObjectToView @@ -260,7 +260,7 @@ namespace drawinglayer // rescue values const bool bOldModulate(getModulate()); mbModulate = rPrimitive.getModulate(); const bool bOldFilter(getFilter()); mbFilter = rPrimitive.getFilter(); - boost::shared_ptr< texture::GeoTexSvx > pOldTex = mpGeoTexSvx; + std::shared_ptr< texture::GeoTexSvx > pOldTex = mpGeoTexSvx; // create texture const attribute::FillGraphicAttribute& rFillGraphicAttribute = rPrimitive.getFillGraphicAttribute(); diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx index 52371c2613e9..ec7f2760cd6a 100644 --- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx +++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx @@ -466,8 +466,8 @@ void ZBufferRasterConverter3D::processLineSpan(const basegfx::RasterConversionLi class RasterPrimitive3D { private: - boost::shared_ptr< drawinglayer::texture::GeoTexSvx > mpGeoTexSvx; - boost::shared_ptr< drawinglayer::texture::GeoTexSvx > mpTransparenceGeoTexSvx; + std::shared_ptr< drawinglayer::texture::GeoTexSvx > mpGeoTexSvx; + std::shared_ptr< drawinglayer::texture::GeoTexSvx > mpTransparenceGeoTexSvx; drawinglayer::attribute::MaterialAttribute3D maMaterial; basegfx::B3DPolyPolygon maPolyPolygon; double mfCenterZ; @@ -480,8 +480,8 @@ private: public: RasterPrimitive3D( - const boost::shared_ptr< drawinglayer::texture::GeoTexSvx >& pGeoTexSvx, - const boost::shared_ptr< drawinglayer::texture::GeoTexSvx >& pTransparenceGeoTexSvx, + const std::shared_ptr< drawinglayer::texture::GeoTexSvx >& pGeoTexSvx, + const std::shared_ptr< drawinglayer::texture::GeoTexSvx >& pTransparenceGeoTexSvx, const drawinglayer::attribute::MaterialAttribute3D& rMaterial, const basegfx::B3DPolyPolygon& rPolyPolygon, bool bModulate, @@ -520,8 +520,8 @@ public: return mfCenterZ < rComp.mfCenterZ; } - const boost::shared_ptr< drawinglayer::texture::GeoTexSvx >& getGeoTexSvx() const { return mpGeoTexSvx; } - const boost::shared_ptr< drawinglayer::texture::GeoTexSvx >& getTransparenceGeoTexSvx() const { return mpTransparenceGeoTexSvx; } + const std::shared_ptr< drawinglayer::texture::GeoTexSvx >& getGeoTexSvx() const { return mpGeoTexSvx; } + const std::shared_ptr< drawinglayer::texture::GeoTexSvx >& getTransparenceGeoTexSvx() const { return mpTransparenceGeoTexSvx; } const drawinglayer::attribute::MaterialAttribute3D& getMaterial() const { return maMaterial; } const basegfx::B3DPolyPolygon& getPolyPolygon() const { return maPolyPolygon; } bool getModulate() const { return mbModulate; } |