diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-14 14:27:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-14 18:22:43 +0200 |
| commit | 21e84c0935926e6c2a0bf772d41a4c41df70fd7a (patch) | |
| tree | 5058e7de0656788c468221dafe137ca92b95d2c6 /filter | |
| parent | 3bb1f0b3a8f71807c221fda22433571f9a0497d2 (diff) | |
ofz#7671 Undefined-shift
Change-Id: Ibcd35914bac8799e6b0d48b5c7413b6ad11b9498
Reviewed-on: https://gerrit.libreoffice.org/52871
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index e958c813068c..82db02739223 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -1932,7 +1932,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt if (bImport) { uno::Sequence< beans::PropertyValues > aHandles( nNumElem ); - for ( sal_uInt16 i = 0; i < nNumElem; i++ ) + for (sal_uInt32 i = 0; i < nNumElem; ++i) { PropVec aHandlePropVec; sal_uInt32 nFlagsTmp(0); @@ -1987,7 +1987,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt if ( nCenterY == 2 ) nCenterY = nCoordHeight / 2; if ( ( nPositionY >= 0x256 ) || ( nPositionY <= 0x107 ) ) // position y - nAdjustmentsWhichNeedsToBeConverted |= ( 1 << i ); + nAdjustmentsWhichNeedsToBeConverted |= ( 1U << i ); EnhancedCustomShapeParameterPair aPolar; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPolar.First, nCenterX, bool( nFlags & SvxMSDffHandleFlags::CENTER_X_IS_SPECIAL ), true ); EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPolar.Second, nCenterY, bool( nFlags & SvxMSDffHandleFlags::CENTER_Y_IS_SPECIAL ), false ); @@ -2104,14 +2104,14 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( rObjData.eShapeType ); if ( pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles ) { - sal_Int32 i, nCnt = pDefCustomShape->nHandles; + sal_uInt32 i, nCnt = pDefCustomShape->nHandles; const SvxMSDffHandle* pData = pDefCustomShape->pHandles; for ( i = 0; i < nCnt; i++, pData++ ) { if ( pData->nFlags & SvxMSDffHandleFlags::POLAR ) { if ( ( pData->nPositionY >= 0x256 ) || ( pData->nPositionY <= 0x107 ) ) - nAdjustmentsWhichNeedsToBeConverted |= ( 1 << i ); + nAdjustmentsWhichNeedsToBeConverted |= ( 1U << i ); } } } |