diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-08-21 19:38:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-22 16:23:26 +0200 |
| commit | 0944ef734571ae34cbecc53812e576a39b3722f0 (patch) | |
| tree | d0668770deb4ac230aeaa96fab187c1127d53455 /include/drawinglayer | |
| parent | 0f6457b1e867c49bc82f2b18e2e462fb7100051f (diff) | |
no need to use unique_ptr for ViewInformation3D
it is already a COW type
Change-Id: Ie098bd293115650128ebb18d5c16747b519717c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120825
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/drawinglayer')
| -rw-r--r-- | include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx | 4 | ||||
| -rw-r--r-- | include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 76078be50fde..d20d4b48a1d0 100644 --- a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -22,9 +22,11 @@ #include <drawinglayer/drawinglayerdllapi.h> +#include <drawinglayer/geometry/viewinformation3d.hxx> #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <memory> +#include <optional> namespace drawinglayer::primitive3d @@ -54,7 +56,7 @@ namespace drawinglayer::primitive3d double mfBackScale; /// decomposition data when ReducedLineGeometry is used, see get3DDecomposition - std::unique_ptr<geometry::ViewInformation3D> mpLastRLGViewInformation; + std::optional<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 1945af6be877..941c949cbb8f 100644 --- a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -22,9 +22,11 @@ #include <drawinglayer/drawinglayerdllapi.h> +#include <drawinglayer/geometry/viewinformation3d.hxx> #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <memory> +#include <optional> namespace drawinglayer::primitive3d @@ -56,7 +58,7 @@ namespace drawinglayer::primitive3d double mfRotation; /// decomposition data when ReducedLineGeometry is used, see get3DDecomposition - std::unique_ptr<geometry::ViewInformation3D> mpLastRLGViewInformation; + std::optional<geometry::ViewInformation3D> mpLastRLGViewInformation; bool mbSmoothNormals : 1; // Plane self bool mbSmoothLids : 1; // Front/back |