Replace deprecated boost::optional::reset(val) with operator =

Change-Id: I7340a561e0df0c781fd834388deb4b9f83800f9b
Reviewed-on: https://gerrit.libreoffice.org/63221
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

5 files changed, 14 insertions, 14 deletions

diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx
index 1955be399fe1..9c7f130c25cd 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/slideshow/source/engine/activities/activitiesfactory.cxx
@@ -403,21 +403,21 @@ AnimationActivitySharedPtr createFromToByActivity(
         ENSURE_OR_THROW(
             extractValue( aTmpValue, rFromAny, rShape, rSlideBounds ),
             "createFromToByActivity(): Could not extract from value" );
-        aFrom.reset(aTmpValue);
+        aFrom = aTmpValue;
     }
     if( rToAny.hasValue() )
     {
         ENSURE_OR_THROW(
             extractValue( aTmpValue, rToAny, rShape, rSlideBounds ),
             "createFromToByActivity(): Could not extract to value" );
-        aTo.reset(aTmpValue);
+        aTo = aTmpValue;
     }
     if( rByAny.hasValue() )
     {
         ENSURE_OR_THROW(
             extractValue( aTmpValue, rByAny, rShape, rSlideBounds ),
             "createFromToByActivity(): Could not extract by value" );
-        aBy.reset(aTmpValue);
+        aBy = aTmpValue;
     }
 
     return AnimationActivitySharedPtr(
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index 1ff72c62e8a1..0b7dae6bc70b 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.cxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx
@@ -390,7 +390,7 @@ AnimationBaseNode::fillCommonParameters() const
     boost::optional<double> aRepeats;
     double nRepeats = 0;
     if( mxAnimateNode->getRepeatCount() >>= nRepeats ) {
-        aRepeats.reset( nRepeats );
+        aRepeats = nRepeats;
     }
     else {
         if( mxAnimateNode->getRepeatDuration() >>= nRepeats ) {
@@ -402,9 +402,9 @@ AnimationBaseNode::fillCommonParameters() const
 
             // convert duration back to repeat counts
             if( bAutoReverse )
-                aRepeats.reset( nRepeats / (2.0 * nDuration) );
+                aRepeats = nRepeats / (2.0 * nDuration);
             else
-                aRepeats.reset( nRepeats / nDuration );
+                aRepeats = nRepeats / nDuration;
         }
         else
         {
@@ -419,7 +419,7 @@ AnimationBaseNode::fillCommonParameters() const
                 {
                     // no indefinite timing, no other values given -
                     // use simple run, i.e. repeat of 1.0
-                    aRepeats.reset( 1.0 );
+                    aRepeats = 1.0;
                 }
             }
         }
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index b10dcda35924..2462ae35aff9 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -557,7 +557,7 @@ namespace slideshow
             {
                 // setup clip poly
                 if( pAttr->isClipValid() )
-                    aClip.reset( pAttr->getClip() );
+                    aClip = pAttr->getClip();
 
                 // emulate global shape alpha by first rendering into
                 // a temp bitmap, and then to screen (this would have
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 31548c27af95..9b7eadb65cd6 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1531,7 +1531,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
                         "setProperty(): User paint overrides invisible mouse" );
 
             // enable user paint
-            maUserPaintColor.reset( unoColor2RGBColor( nColor ) );
+            maUserPaintColor = unoColor2RGBColor(nColor);
             if( mpCurrentSlide && !mpCurrentSlide->isPaintOverlayActive() )
                 mpCurrentSlide->enablePaintOverlay();
 
@@ -1561,7 +1561,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
                         "setProperty(): User paint overrides invisible mouse" );
 
             // enable user paint
-            maEraseAllInk.reset( bEraseAllInk );
+            maEraseAllInk = bEraseAllInk;
             maEventMultiplexer.notifyEraseAllInk( *maEraseAllInk );
         }
 
@@ -1578,7 +1578,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
 
             if(bSwitchPenMode){
             // Switch to Pen Mode
-            maSwitchPenMode.reset( bSwitchPenMode );
+            maSwitchPenMode = bSwitchPenMode;
             maEventMultiplexer.notifySwitchPenMode();
             }
         }
@@ -1594,7 +1594,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
                         "setProperty(): User paint overrides invisible mouse" );
             if(bSwitchEraserMode){
             // switch to Eraser mode
-            maSwitchEraserMode.reset( bSwitchEraserMode );
+            maSwitchEraserMode = bSwitchEraserMode;
             maEventMultiplexer.notifySwitchEraserMode();
             }
         }
@@ -1611,7 +1611,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
                         "setProperty(): User paint overrides invisible mouse" );
 
             // enable user paint
-            maEraseInk.reset( nEraseInk );
+            maEraseInk = nEraseInk;
             maEventMultiplexer.notifyEraseInkWidth( *maEraseInk );
         }
 
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index 2a4566ca647a..75abacdbbfbf 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -1072,7 +1072,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition(
                                 if (pLeavingSlide) {
                                     // only generate, if fade
                                     // effect really needs it.
-                                    leavingSlide.reset( pLeavingSlide );
+                                    leavingSlide = pLeavingSlide;
                                 }
                                 aFadeColor = rTransitionFadeColor;
                                 break;