diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-06 10:12:29 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-10 12:23:42 +0100 |
| commit | 065edb4c8e91170017df482843d0c3eb8d4db114 (patch) | |
| tree | 1d030ec9868a56b375a563c9d6e6d81c6115d717 /writerfilter/source/rtftok/rtfsdrimport.cxx | |
| parent | 0b34a5dd39e177ba99cd21b639d67ac8123b8458 (diff) | |
tdf#120703 PVS: V547 Expression is always true/false
Change-Id: I0b3c407331bfa1fa0c5003250d327d4f26de3643
Reviewed-on: https://gerrit.libreoffice.org/63235
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'writerfilter/source/rtftok/rtfsdrimport.cxx')
| -rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 670410023dc2..9a7b980ba09d 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -476,19 +476,11 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap // The coordinates are in an (x,y) form. aToken = aToken.copy(1, aToken.getLength() - 2); sal_Int32 nI = 0; - boost::optional<sal_Int32> oX; - boost::optional<sal_Int32> oY; - do - { - OUString aPoint = aToken.getToken(0, ',', nI); - if (!oX) - oX = aPoint.toInt32(); - else - oY = aPoint.toInt32(); - } while (nI >= 0); + sal_Int32 nX = aToken.getToken(0, ',', nI).toInt32(); + sal_Int32 nY = (nI >= 0) ? aToken.getToken(0, ',', nI).toInt32() : 0; drawing::EnhancedCustomShapeParameterPair aPair; - aPair.First.Value <<= *oX; - aPair.Second.Value <<= *oY; + aPair.First.Value <<= nX; + aPair.Second.Value <<= nY; aCoordinates.push_back(aPair); } } while (nCharIndex >= 0); @@ -829,19 +821,11 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap // The coordinates are in an (x,y) form. aToken = aToken.copy(1, aToken.getLength() - 2); sal_Int32 nI = 0; - boost::optional<sal_Int32> oX; - boost::optional<sal_Int32> oY; - do - { - OUString aPoint = aToken.getToken(0, ',', nI); - if (!oX) - oX = aPoint.toInt32(); - else - oY = aPoint.toInt32(); - } while (nI >= 0); + sal_Int32 nX = aToken.getToken(0, ',', nI).toInt32(); + sal_Int32 nY = (nI >= 0) ? aToken.getToken(0, ',', nI).toInt32() : 0; RTFSprms aPathAttributes; - aPathAttributes.set(NS_ooxml::LN_CT_Point2D_x, new RTFValue(*oX)); - aPathAttributes.set(NS_ooxml::LN_CT_Point2D_y, new RTFValue(*oY)); + aPathAttributes.set(NS_ooxml::LN_CT_Point2D_x, new RTFValue(nX)); + aPathAttributes.set(NS_ooxml::LN_CT_Point2D_y, new RTFValue(nY)); aPolygonSprms.set(NS_ooxml::LN_CT_WrapPath_lineTo, new RTFValue(aPathAttributes), RTFOverwrite::NO_APPEND); } |