diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-04-06 18:32:23 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-04-06 18:32:23 +0200 |
| commit | 1933e2fb022a974a6814469698ba5d3bdc30919a (patch) | |
| tree | 976767efaee3bdf0216a856d604452c56d2ee800 /oox | |
| parent | 97a50f27ed06fc5d257c595c0bfffba57ddb511f (diff) | |
Improved loplugin:redundantcast, static_cast on arithmetic types: oox
Change-Id: I5febd0b28bc3e8beca1034ca151406af1e2034d9
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/customshapepresetdata.cxx | 12 | ||||
| -rw-r--r-- | oox/source/drawingml/textbodyproperties.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx index 4773eef57c52..4788e297c50a 100644 --- a/oox/source/drawingml/customshapepresetdata.cxx +++ b/oox/source/drawingml/customshapepresetdata.cxx @@ -129,25 +129,25 @@ awt::Rectangle lcl_parseRectangle(const OString& rValue) static const char aExpectedXPrefix[] = "X = (long) "; assert(aToken.startsWith(aExpectedXPrefix)); sal_Int32 nIndex = strlen(aExpectedXPrefix); - aRectangle.X = static_cast<sal_Int32>(aToken.getToken(0, ',', nIndex).toInt32()); + aRectangle.X = aToken.getToken(0, ',', nIndex).toInt32(); static const char aExpectedYPrefix[] = " Y = (long) "; aToken = aToken.copy(nIndex); assert(aToken.startsWith(aExpectedYPrefix)); nIndex = strlen(aExpectedYPrefix); - aRectangle.Y = static_cast<sal_Int32>(aToken.getToken(0, ',', nIndex).toInt32()); + aRectangle.Y = aToken.getToken(0, ',', nIndex).toInt32(); static const char aExpectedWidthPrefix[] = " Width = (long) "; aToken = aToken.copy(nIndex); assert(aToken.startsWith(aExpectedWidthPrefix)); nIndex = strlen(aExpectedWidthPrefix); - aRectangle.Width = static_cast<sal_Int32>(aToken.getToken(0, ',', nIndex).toInt32()); + aRectangle.Width = aToken.getToken(0, ',', nIndex).toInt32(); static const char aExpectedHeightPrefix[] = " Height = (long) "; aToken = aToken.copy(nIndex); assert(aToken.startsWith(aExpectedHeightPrefix)); nIndex = strlen(aExpectedHeightPrefix); - aRectangle.Height = static_cast<sal_Int32>(aToken.copy(nIndex).toInt32()); + aRectangle.Height = aToken.copy(nIndex).toInt32(); return aRectangle; } @@ -160,13 +160,13 @@ awt::Size lcl_parseSize(const OString& rValue) static const char aExpectedWidthPrefix[] = "Width = (long) "; assert(aToken.startsWith(aExpectedWidthPrefix)); sal_Int32 nIndex = strlen(aExpectedWidthPrefix); - aSize.Width = static_cast<sal_Int32>(aToken.getToken(0, ',', nIndex).toInt32()); + aSize.Width = aToken.getToken(0, ',', nIndex).toInt32(); static const char aExpectedHeightPrefix[] = " Height = (long) "; aToken = aToken.copy(nIndex); assert(aToken.startsWith(aExpectedHeightPrefix)); nIndex = strlen(aExpectedHeightPrefix); - aSize.Height = static_cast<sal_Int32>(aToken.copy(nIndex).toInt32()); + aSize.Height = aToken.copy(nIndex).toInt32(); return aSize; } diff --git a/oox/source/drawingml/textbodyproperties.cxx b/oox/source/drawingml/textbodyproperties.cxx index d409a924a5d5..c9914fd3af7e 100644 --- a/oox/source/drawingml/textbodyproperties.cxx +++ b/oox/source/drawingml/textbodyproperties.cxx @@ -89,7 +89,7 @@ void TextBodyProperties::pushRotationAdjustments() if( moInsets[i] ) maPropertyMap.setProperty( aProps[ nOff ], static_cast< sal_Int32 >( *moInsets[i] + nVal )); else if( nVal ) - maPropertyMap.setProperty( aProps[ nOff ], static_cast< sal_Int32 >( nVal )); + maPropertyMap.setProperty( aProps[ nOff ], nVal ); nOff = (nOff+1) % n; } |