diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-04 20:51:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-05 09:12:45 +0000 |
| commit | be446eb6055ccc60565045e0aaf05794d3a6cda8 (patch) | |
| tree | b4eb1e3aaca43d5d06afb2f4736459bfb6165440 | |
| parent | d7ea9b443701268f137483e008d0514236a88b91 (diff) | |
silence some BAD_SHIFTs
Change-Id: I2a669aff0a8a63eb4b16600344cea9f601d5e68a
Reviewed-on: https://gerrit.libreoffice.org/31601
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 8c017ec260df..c498cdb862e4 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -2521,7 +2521,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt //////////////////////// handle (POLAR) we will convert the adjustment value from a fixed float to double // checking the last used adjustment handle, so we can determine how many handles are to allocate - sal_Int32 i = DFF_Prop_adjust10Value; + sal_uInt32 i = DFF_Prop_adjust10Value; while ( ( i >= DFF_Prop_adjustValue ) && !IsProperty( i ) ) i--; sal_Int32 nAdjustmentValues = ( i - DFF_Prop_adjustValue ) + 1; diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index de95bc54a296..cad1a1529bc9 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -2129,7 +2129,7 @@ sal_uInt16 SdrObjEditView::GetSelectionLevel() const nLevel = 0; for( sal_uInt16 nPara = nStartPara; nPara <= nEndPara; nPara++ ) { - sal_uInt16 nParaDepth = 1 << pTextEditOutliner->GetDepth( nPara ); + sal_uInt16 nParaDepth = 1 << static_cast<sal_uInt16>(pTextEditOutliner->GetDepth(nPara)); if( !(nLevel & nParaDepth) ) nLevel += nParaDepth; } |