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>

3 files changed, 15 insertions, 15 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 7d802249b2f4..16158a46fabf 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1031,7 +1031,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
         break;
         case NS_ooxml::LN_CT_Background_color:
             if (m_pImpl->GetSettingsTable()->GetDisplayBackgroundShape())
-                m_pImpl->m_oBackgroundColor.reset(nIntValue);
+                m_pImpl->m_oBackgroundColor = nIntValue;
         break;
         case NS_ooxml::LN_CT_PageNumber_start:
             if (pSectionContext != nullptr)
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index a8d90962c4cc..b1b08b72c8d2 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -451,7 +451,7 @@ void DomainMapperTableManager::startLevel( )
     boost::optional<sal_Int32> oCurrentWidth;
     if (m_bPushCurrentWidth && !m_aCellWidths.empty() && !m_aCellWidths.back()->empty())
     {
-        oCurrentWidth.reset(m_aCellWidths.back()->back());
+        oCurrentWidth = m_aCellWidths.back()->back();
         m_aCellWidths.back()->pop_back();
     }
 
@@ -491,7 +491,7 @@ void DomainMapperTableManager::endLevel( )
     // Do the same trick as in startLevel(): pop the value that was pushed too early.
     boost::optional<sal_Int32> oCurrentWidth;
     if (m_bPushCurrentWidth && !m_aCellWidths.empty() && !m_aCellWidths.back()->empty())
-        oCurrentWidth.reset(m_aCellWidths.back()->back());
+        oCurrentWidth = m_aCellWidths.back()->back();
     m_aCellWidths.pop_back( );
     // And push it back to the right level.
     if (oCurrentWidth && !m_aCellWidths.empty() && !m_aCellWidths.back()->empty())
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index b38330ca26c8..670410023dc2 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -482,9 +482,9 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
                     {
                         OUString aPoint = aToken.getToken(0, ',', nI);
                         if (!oX)
-                            oX.reset(aPoint.toInt32());
+                            oX = aPoint.toInt32();
                         else
-                            oY.reset(aPoint.toInt32());
+                            oY = aPoint.toInt32();
                     } while (nI >= 0);
                     drawing::EnhancedCustomShapeParameterPair aPair;
                     aPair.First.Value <<= *oX;
@@ -693,21 +693,21 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
             }
         }
         else if (rProperty.first == "groupLeft")
-            oGroupLeft.reset(convertTwipToMm100(rProperty.second.toInt32()));
+            oGroupLeft = convertTwipToMm100(rProperty.second.toInt32());
         else if (rProperty.first == "groupTop")
-            oGroupTop.reset(convertTwipToMm100(rProperty.second.toInt32()));
+            oGroupTop = convertTwipToMm100(rProperty.second.toInt32());
         else if (rProperty.first == "groupRight")
-            oGroupRight.reset(convertTwipToMm100(rProperty.second.toInt32()));
+            oGroupRight = convertTwipToMm100(rProperty.second.toInt32());
         else if (rProperty.first == "groupBottom")
-            oGroupBottom.reset(convertTwipToMm100(rProperty.second.toInt32()));
+            oGroupBottom = convertTwipToMm100(rProperty.second.toInt32());
         else if (rProperty.first == "relLeft")
-            oRelLeft.reset(convertTwipToMm100(rProperty.second.toInt32()));
+            oRelLeft = convertTwipToMm100(rProperty.second.toInt32());
         else if (rProperty.first == "relTop")
-            oRelTop.reset(convertTwipToMm100(rProperty.second.toInt32()));
+            oRelTop = convertTwipToMm100(rProperty.second.toInt32());
         else if (rProperty.first == "relRight")
-            oRelRight.reset(convertTwipToMm100(rProperty.second.toInt32()));
+            oRelRight = convertTwipToMm100(rProperty.second.toInt32());
         else if (rProperty.first == "relBottom")
-            oRelBottom.reset(convertTwipToMm100(rProperty.second.toInt32()));
+            oRelBottom = convertTwipToMm100(rProperty.second.toInt32());
         else if (rProperty.first == "fBehindDocument")
             bOpaque = !rProperty.second.toInt32();
         else if (rProperty.first == "pctHoriz" || rProperty.first == "pctVert")
@@ -835,9 +835,9 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
                     {
                         OUString aPoint = aToken.getToken(0, ',', nI);
                         if (!oX)
-                            oX.reset(aPoint.toInt32());
+                            oX = aPoint.toInt32();
                         else
-                            oY.reset(aPoint.toInt32());
+                            oY = aPoint.toInt32();
                     } while (nI >= 0);
                     RTFSprms aPathAttributes;
                     aPathAttributes.set(NS_ooxml::LN_CT_Point2D_x, new RTFValue(*oX));