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 /writerfilter/source/rtftok | |
| 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 'writerfilter/source/rtftok')
| -rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
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)); |