use boost::optional in OutDevState

Change-Id: I83fb85fcba6cd2a5dc4f99fdfd3238d72afb7bc2
Reviewed-on: https://gerrit.libreoffice.org/51770
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 9 insertions, 8 deletions

diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx
index d58faac00c52..d1f1ff6726b9 100644
--- a/include/vcl/outdevstate.hxx
+++ b/include/vcl/outdevstate.hxx
@@ -30,6 +30,7 @@
 #include <tools/fontenum.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
+#include <boost/optional.hpp>
 
 class Color;
 
@@ -80,17 +81,17 @@ public:
     OutDevState();
     ~OutDevState();
 
-    std::unique_ptr<MapMode>        mpMapMode;
+    boost::optional<MapMode>        mpMapMode;
     bool            mbMapActive;
     std::unique_ptr<vcl::Region>    mpClipRegion;
-    std::unique_ptr<Color>          mpLineColor;
-    std::unique_ptr<Color>          mpFillColor;
+    boost::optional<Color>          mpLineColor;
+    boost::optional<Color>          mpFillColor;
     std::unique_ptr<vcl::Font>      mpFont;
-    std::unique_ptr<Color>          mpTextColor;
-    std::unique_ptr<Color>          mpTextFillColor;
-    std::unique_ptr<Color>          mpTextLineColor;
-    std::unique_ptr<Color>          mpOverlineColor;
-    std::unique_ptr<Point>          mpRefPoint;
+    boost::optional<Color>          mpTextColor;
+    boost::optional<Color>          mpTextFillColor;
+    boost::optional<Color>          mpTextLineColor;
+    boost::optional<Color>          mpOverlineColor;
+    boost::optional<Point>          mpRefPoint;
     TextAlign       meTextAlign;
     RasterOp        meRasterOp;
     ComplexTextLayoutFlags  mnTextLayoutMode;