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 <sbergman@redhat.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx
index 3a3279cee306..3ebd7dc5f688 100644
--- a/slideshow/source/engine/animatedsprite.cxx
+++ b/slideshow/source/engine/animatedsprite.cxx
@@ -156,7 +156,7 @@ namespace slideshow
 
         void AnimatedSprite::movePixel( const ::basegfx::B2DPoint& rNewPos )
         {
-            maPosPixel.reset( rNewPos );
+            maPosPixel = rNewPos;
             mpSprite->movePixel( rNewPos );
         }
 
@@ -168,7 +168,7 @@ namespace slideshow
 
         void AnimatedSprite::clip( const ::basegfx::B2DPolyPolygon& rClip )
         {
-            maClip.reset( rClip );
+            maClip = rClip;
             mpSprite->setClipPixel( rClip );
         }
 
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index fa0b99344cc0..0bad87a71055 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -281,7 +281,7 @@ namespace slideshow
 
                     // setup cached values to defaults (might fail to
                     // retrieve true bounds below)
-                    maCurrentShapeUnitBounds.reset( aDefaultBounds );
+                    maCurrentShapeUnitBounds = aDefaultBounds;
 
                     // TODO(P2): the subset of the master shape (that from
                     // which the subsets are subtracted) changes
@@ -345,7 +345,7 @@ namespace slideshow
                             ::basegfx::B2DRange( 0.0, 0.0,
                                                  1.0, 1.0 ));
 
-                        maCurrentShapeUnitBounds.reset( aTotalBounds );
+                        maCurrentShapeUnitBounds = aTotalBounds;
                     }
                 }