diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx | 3 | ||||
| -rw-r--r-- | include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/metaact.hxx | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 42bfd7348437..eea2f2f932b4 100644 --- a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -24,6 +24,7 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <memory> namespace drawinglayer @@ -55,7 +56,7 @@ namespace drawinglayer double mfBackScale; /// decomposition data when ReducedLineGeometry is used, see get3DDecomposition - geometry::ViewInformation3D* mpLastRLGViewInformation; + std::unique_ptr<geometry::ViewInformation3D> mpLastRLGViewInformation; bool mbSmoothNormals : 1; // Plane self bool mbSmoothLids : 1; // Front/back diff --git a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index a26aea5a5cd9..da713c1663fb 100644 --- a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -24,6 +24,7 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <memory> namespace drawinglayer @@ -57,7 +58,7 @@ namespace drawinglayer double mfRotation; /// decomposition data when ReducedLineGeometry is used, see get3DDecomposition - geometry::ViewInformation3D* mpLastRLGViewInformation; + std::unique_ptr<geometry::ViewInformation3D> mpLastRLGViewInformation; bool mbSmoothNormals : 1; // Plane self bool mbSmoothLids : 1; // Front/back diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 8fe4f1d43845..a5e939e4fd72 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -1433,7 +1433,8 @@ private: OString maComment; sal_Int32 mnValue; sal_uInt32 mnDataSize; - sal_uInt8* mpData; + std::unique_ptr<sal_uInt8[]> + mpData; SAL_DLLPRIVATE void ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 nDataSize ); @@ -1456,7 +1457,7 @@ public: const OString& GetComment() const { return maComment; } sal_Int32 GetValue() const { return mnValue; } sal_uInt32 GetDataSize() const { return mnDataSize; } - const sal_uInt8* GetData() const { return mpData; } + const sal_uInt8* GetData() const { return mpData.get(); } }; class VCL_DLLPUBLIC MetaLayoutModeAction : public MetaAction |