diff options
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/inc/pch/precompiled_cppcanvas.hxx | 2 | ||||
| -rw-r--r-- | cppcanvas/source/inc/canvasgraphichelper.hxx | 4 | ||||
| -rw-r--r-- | cppcanvas/source/wrapper/implcanvas.hxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx index c398076a85a3..65bc1daeb268 100644 --- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx +++ b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx @@ -116,7 +116,7 @@ #include <cppu/unotype.hxx> #include <i18nlangtag/lang.h> #include <o3tl/cow_wrapper.hxx> -#include <o3tl/optional.hxx> +#include <optional> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx index c1c23657a3f4..15ac6d825d5b 100644 --- a/cppcanvas/source/inc/canvasgraphichelper.hxx +++ b/cppcanvas/source/inc/canvasgraphichelper.hxx @@ -25,7 +25,7 @@ #include <cppcanvas/canvasgraphic.hxx> #include <cppcanvas/canvas.hxx> -#include <o3tl/optional.hxx> +#include <optional> namespace com { namespace sun { namespace star { namespace rendering { @@ -61,7 +61,7 @@ namespace cppcanvas private: mutable css::rendering::RenderState maRenderState; - o3tl::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon; + std::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon; CanvasSharedPtr mpCanvas; }; diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx index a75b853f2c08..859f595cb61f 100644 --- a/cppcanvas/source/wrapper/implcanvas.hxx +++ b/cppcanvas/source/wrapper/implcanvas.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/rendering/ViewState.hpp> #include <cppcanvas/canvas.hxx> -#include <o3tl/optional.hxx> +#include <optional> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -77,7 +77,7 @@ namespace cppcanvas private: mutable css::rendering::ViewState maViewState; - o3tl::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon; + std::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon; const css::uno::Reference< css::rendering::XCanvas > mxCanvas; }; |