From 47dd2c63f649828a833543e21d4eca5866ec9ebe Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 30 Nov 2019 16:50:00 +0100 Subject: Rewrite uses of boost::optional ...to only use functions that are also available for std::optional (in preparation for changing from boost::optional to std::optional): * uses of get are replaced with operator * or operator -> * uses of is_initialized are replaced with operator bool * uses of reset with an argument are replace with operator = (All of the replacements are also available for boost::optional "since forever", so this change should not break builds against old --with-system-boost. An alternative replacement for is_initialized would have been has_value, but that is only available since Boost 1.68.) Change-Id: I532687b6a5ee37dab28befb8e0eb05c22cbecf0f Reviewed-on: https://gerrit.libreoffice.org/84124 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- cppcanvas/source/wrapper/implcanvas.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cppcanvas/source/wrapper') diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx index 102902b71a14..c16e06375231 100644 --- a/cppcanvas/source/wrapper/implcanvas.cxx +++ b/cppcanvas/source/wrapper/implcanvas.cxx @@ -65,7 +65,7 @@ namespace cppcanvas void ImplCanvas::setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) { // TODO(T3): not thread-safe. B2DPolyPolygon employs copy-on-write - maClipPolyPolygon.reset( rClipPoly ); + maClipPolyPolygon = rClipPoly; maViewState.Clip.clear(); } -- cgit