diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-05-17 23:53:41 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-18 16:33:19 +0200 |
| commit | 76cec6c3fd8fbddf2df706b3a26f38b11b2f0d83 (patch) | |
| tree | 11e6a0aa66a4fd384a1c7c8a86d78685218448c9 | |
| parent | 5729da18a1852d842bd7de05d9d7fdcbec1e9ad5 (diff) | |
work around spurious signed overflow warnings
g++ (GCC) 4.7.0 20120507 (Red Hat 4.7.0-5:
/com/sun/star/uno/Sequence.hxx:178:10: error: assuming signed overflow
does not occur when assuming that (X - c) > X is always false
[-Werror=strict-overflow]
| -rw-r--r-- | writerfilter/source/dmapper/NumberingManager.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 334ee9cf80cf..68a3251e1953 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -578,8 +578,8 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, // attributes of the symbol and apply it to the numbering level OUString sStyle = rDMapper.getOrCreateCharStyle( aStyleProps ); aLvlProps.realloc( aLvlProps.getLength() + 1); - aLvlProps[aLvlProps.getLength() - 1].Name = aPropNameSupplier.GetName( PROP_CHAR_STYLE_NAME ); - aLvlProps[aLvlProps.getLength() - 1].Value <<= sStyle; + aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 1].Name = aPropNameSupplier.GetName( PROP_CHAR_STYLE_NAME ); + aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 1].Value <<= sStyle; } // Get the prefix / suffix / Parent numbering @@ -596,18 +596,18 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, sText, nLevel, rPrefix, rSuffix ); aLvlProps.realloc( aLvlProps.getLength( ) + 4 ); - aLvlProps[ aLvlProps.getLength( ) - 4 ] = MAKE_PROPVAL( PROP_PREFIX, rPrefix ); - aLvlProps[ aLvlProps.getLength( ) - 3 ] = MAKE_PROPVAL( PROP_SUFFIX, rSuffix ); - aLvlProps[ aLvlProps.getLength( ) - 2 ] = MAKE_PROPVAL( PROP_PARENT_NUMBERING, nParentNum ); + aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 4] = MAKE_PROPVAL( PROP_PREFIX, rPrefix ); + aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 3] = MAKE_PROPVAL( PROP_SUFFIX, rSuffix ); + aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 2] = MAKE_PROPVAL( PROP_PARENT_NUMBERING, nParentNum ); - aLvlProps[ aLvlProps.getLength( ) - 1 ] = MAKE_PROPVAL( PROP_POSITION_AND_SPACE_MODE, + aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 1] = MAKE_PROPVAL( PROP_POSITION_AND_SPACE_MODE, sal_Int16( text::PositionAndSpaceMode::LABEL_ALIGNMENT ) ); StyleSheetEntryPtr pParaStyle = pAbsLevel->GetParaStyle( ); if( pParaStyle.get()) { aLvlProps.realloc( aLvlProps.getLength() + 1 ); - aLvlProps[aLvlProps.getLength( ) - 1] = MAKE_PROPVAL( PROP_PARAGRAPH_STYLE_NAME, + aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 1] = MAKE_PROPVAL( PROP_PARAGRAPH_STYLE_NAME, pParaStyle->sConvertedStyleName ); } @@ -623,7 +623,7 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, xOutlines->getChapterNumberingRules( ); aLvlProps.realloc( aLvlProps.getLength() + 1 ); - aLvlProps[aLvlProps.getLength( ) - 1] = MAKE_PROPVAL( PROP_HEADING_STYLE_NAME, + aLvlProps[sal::static_int_cast<sal_uInt32>(aLvlProps.getLength()) - 1] = MAKE_PROPVAL( PROP_HEADING_STYLE_NAME, pParaStyle->sConvertedStyleName ); xOutlineRules->replaceByIndex( nLevel, uno::makeAny( aLvlProps ) ); |