diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-23 11:52:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-26 08:44:58 +0200 |
| commit | 38e7aef0fad58dcf2d59a7c219b7858d6c4cd771 (patch) | |
| tree | 7232362e2afea7ae387c2da7c07ff4af24d5e97a /include | |
| parent | bea081b5099786e5fcadddd72c247b9a9488286a (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/metaact.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/outdevstate.hxx | 17 | ||||
| -rw-r--r-- | include/vcl/pdfwriter.hxx | 1 |
3 files changed, 9 insertions, 10 deletions
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 9fac991ac19e..930261b5866f 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -36,7 +36,6 @@ #include <vcl/gfxlink.hxx> #include <vcl/lineinfo.hxx> #include <vcl/metaactiontypes.hxx> -#include <vcl/outdevstate.hxx> class SvStream; enum class DrawTextFlags; 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; diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index 758acdb1f08d..1e38a9f67cb8 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -29,7 +29,6 @@ #include <vcl/vclenum.hxx> #include <vcl/font.hxx> #include <vcl/graphictools.hxx> -#include <vcl/outdevstate.hxx> #include <vcl/outdev.hxx> #include <com/sun/star/io/XOutputStream.hpp> |