diff options
Diffstat (limited to 'drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx')
| -rw-r--r-- | drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx index 59098d3cd3ef..3e0abc582732 100644 --- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx @@ -29,6 +29,7 @@ #include <basegfx/matrix/b3dhommatrix.hxx> #include <drawinglayer/primitive3d/polygonprimitive3d.hxx> #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> +#include <utility> using namespace com::sun::star; @@ -142,7 +143,7 @@ namespace drawinglayer::primitive3d aOutlineRange, aOutlineRange, getHatch().getDistance(), - fAngle - F_PI4); + fAngle - M_PI_4); aHatch.appendTransformations(aMatrices); @@ -155,7 +156,7 @@ namespace drawinglayer::primitive3d aOutlineRange, aOutlineRange, getHatch().getDistance(), - fAngle - F_PI2); + fAngle - M_PI_2); aHatch.appendTransformations(aMatrices); @@ -267,13 +268,13 @@ namespace drawinglayer::primitive3d } HatchTexturePrimitive3D::HatchTexturePrimitive3D( - const attribute::FillHatchAttribute& rHatch, + attribute::FillHatchAttribute aHatch, const Primitive3DContainer& rChildren, const basegfx::B2DVector& rTextureSize, bool bModulate, bool bFilter) : TexturePrimitive3D(rChildren, rTextureSize, bModulate, bFilter), - maHatch(rHatch) + maHatch(std::move(aHatch)) { } @@ -291,7 +292,7 @@ namespace drawinglayer::primitive3d Primitive3DContainer HatchTexturePrimitive3D::get3DDecomposition(const geometry::ViewInformation3D& /*rViewInformation*/) const { - ::osl::MutexGuard aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); if(getBuffered3DDecomposition().empty()) { |