diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-09 15:52:14 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-10 09:16:53 +0100 |
| commit | e3560f4770487c8d38463fb4a9a63325abc385f9 (patch) | |
| tree | cc2ea6d5d18de966e4677ebfd846c1bf5ec5c216 /slideshow/source/engine/activities | |
| parent | 77e3cb338f576757fd875bc60952ac22530f6a7a (diff) | |
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>
Diffstat (limited to 'slideshow/source/engine/activities')
| -rw-r--r-- | slideshow/source/engine/activities/activitiesfactory.cxx | 6 |
1 files changed, 3 insertions, 3 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( |