From 856b938afd1a7dc66cb079b1b70fd90d1634c177 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 15 Jan 2018 09:06:01 +0100 Subject: More loplugin:cstylecast: editeng Change-Id: I58978e5376ff1b91fa6dddbd308c923b3f3ab0ec --- editeng/source/editeng/eehtml.cxx | 4 +- editeng/source/editeng/impedit3.cxx | 2 +- editeng/source/editeng/impedit4.cxx | 4 +- editeng/source/items/borderline.cxx | 4 +- editeng/source/items/frmitems.cxx | 48 ++++++++++----------- editeng/source/items/justifyitem.cxx | 16 +++---- editeng/source/items/numitem.cxx | 16 +++---- editeng/source/items/paraitem.cxx | 40 ++++++++--------- editeng/source/items/textitem.cxx | 74 ++++++++++++++++---------------- editeng/source/items/writingmodeitem.cxx | 10 ++--- editeng/source/uno/unofdesc.cxx | 14 +++--- editeng/source/uno/unofield.cxx | 12 +++--- editeng/source/uno/unoipset.cxx | 2 +- editeng/source/uno/unonrule.cxx | 4 +- 14 files changed, 125 insertions(+), 125 deletions(-) (limited to 'editeng') diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 44f21112d828..8e56f488f316 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -485,7 +485,7 @@ void EditHTMLParser::NextToken( HtmlTokenId nToken ) else if ( !isOffToken(nToken) ) { DBG_ASSERT( !isOffToken( nToken ), "No Start-Token ?!" ); - SkipGroup( static_cast((int)nToken + 1) ); + SkipGroup( static_cast(static_cast(nToken) + 1) ); } } } @@ -801,7 +801,7 @@ void EditHTMLParser::HeadingStart( HtmlTokenId nToken ) ImpInsertParaBreak(); sal_uInt16 nId = sal::static_int_cast< sal_uInt16 >( - 1 + ( ( (int)nToken - (int)HtmlTokenId::HEAD1_ON ) / 2 ) ); + 1 + ( ( static_cast(nToken) - int(HtmlTokenId::HEAD1_ON) ) / 2 ) ); DBG_ASSERT( (nId >= 1) && (nId <= 9), "HeadingStart: ID can not be correct!" ); ImpSetStyleSheet( nId ); } diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 7b048386c0e0..f81e1f7fd46e 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -2434,7 +2434,7 @@ void ImpEditEngine::CreateTextPortions( ParaPortion* pParaPortion, sal_Int32& rS if ( mpIMEInfos && mpIMEInfos->nLen && mpIMEInfos->pAttribs && ( mpIMEInfos->aPos.GetNode() == pNode ) ) { - ExtTextInputAttr nLastAttr = (ExtTextInputAttr)0xFFFF; + ExtTextInputAttr nLastAttr = ExtTextInputAttr(0xFFFF); for( sal_Int32 n = 0; n < mpIMEInfos->nLen; n++ ) { if ( mpIMEInfos->pAttribs[n] != nLastAttr ) diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 01a94950bee7..06e07e849cd4 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -998,7 +998,7 @@ EditTextObject* ImpEditEngine::CreateTextObject( EditSelection aSel, SfxItemPool EditTextObject* pTxtObj = new EditTextObject(pPool); pTxtObj->SetVertical( IsVertical(), IsTopToBottom()); MapUnit eMapUnit = aEditDoc.GetItemPool().GetMetric( DEF_METRIC ); - pTxtObj->mpImpl->SetMetric( (sal_uInt16) eMapUnit ); + pTxtObj->mpImpl->SetMetric( static_cast(eMapUnit) ); if ( pTxtObj->mpImpl->IsOwnerOfPool() ) pTxtObj->mpImpl->GetPool()->SetDefaultMetric( eMapUnit ); @@ -1196,7 +1196,7 @@ EditSelection ImpEditEngine::InsertTextObject( const EditTextObject& rTextObject MapUnit eSourceUnit = MapUnit(), eDestUnit = MapUnit(); if (rTextObject.mpImpl->HasMetric()) { - eSourceUnit = (MapUnit)rTextObject.mpImpl->GetMetric(); + eSourceUnit = static_cast(rTextObject.mpImpl->GetMetric()); eDestUnit = aEditDoc.GetItemPool().GetMetric( DEF_METRIC ); if ( eSourceUnit != eDestUnit ) bConvertMetricOfItems = true; diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index 2694cac0720d..70b768a0acc4 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -636,9 +636,9 @@ OUString SvxBorderLine::GetValueString(MapUnit eSrcUnit, }; OUString aStr = "(" + ::GetColorString( aColor ) + OUString(cpDelim); - if ( (int)m_nStyle < int(SAL_N_ELEMENTS(aStyleIds)) ) + if ( static_cast(m_nStyle) < int(SAL_N_ELEMENTS(aStyleIds)) ) { - const char* pResId = aStyleIds[(int)m_nStyle]; + const char* pResId = aStyleIds[static_cast(m_nStyle)]; aStr += EditResId(pResId); } else diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index d88f17f00c5f..96785fef5c83 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -112,7 +112,7 @@ namespace .WriteUInt16( l.GetDistance() ); if (version >= BORDER_LINE_WITH_STYLE_VERSION) - stream.WriteUInt16( (sal_uInt16)l.GetBorderLineStyle() ); + stream.WriteUInt16( static_cast(l.GetBorderLineStyle()) ); return stream; } @@ -130,7 +130,7 @@ namespace stream.ReadUInt16( nStyle ); SvxBorderLine border(&aColor); - border.GuessLinesWidths((SvxBorderLineStyle)nStyle, nOutline, nInline, nDistance); + border.GuessLinesWidths(static_cast(nStyle), nOutline, nInline, nDistance); return border; } @@ -1113,7 +1113,7 @@ bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Int16 nVal = 0; bRet = (rVal >>= nVal); - aShadow.Location = (table::ShadowLocation) nVal; + aShadow.Location = static_cast(nVal); } break; @@ -1242,7 +1242,7 @@ bool SvxShadowItem::GetPresentation OUString(cpDelim) + GetMetricText( static_cast(nWidth), eCoreUnit, ePresUnit, &rIntl ) + OUString(cpDelim) + - EditResId(RID_SVXITEMS_SHADOW[(int)eLocation]); + EditResId(RID_SVXITEMS_SHADOW[static_cast(eLocation)]); return true; } case SfxItemPresentation::Complete: @@ -1260,7 +1260,7 @@ bool SvxShadowItem::GetPresentation GetMetricText( static_cast(nWidth), eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)) + OUString(cpDelim) + - EditResId(RID_SVXITEMS_SHADOW[(int)eLocation]); + EditResId(RID_SVXITEMS_SHADOW[static_cast(eLocation)]); return true; } default: ; // prevent warning @@ -1271,7 +1271,7 @@ bool SvxShadowItem::GetPresentation SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteSChar( (sal_uInt8)GetLocation() ) + rStrm.WriteSChar( static_cast(GetLocation()) ) .WriteUInt16( GetWidth() ) .WriteBool( aShadowColor.GetTransparency() > 0 ); WriteColor( rStrm, GetColor() ); @@ -1306,31 +1306,31 @@ SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const ReadColor( rStrm, aColor ); ReadColor( rStrm, aFillColor ).ReadSChar( nStyle ); aColor.SetTransparency(bTrans ? 0xff : 0); - return new SvxShadowItem( Which(), &aColor, _nWidth, (SvxShadowLocation)cLoc ); + return new SvxShadowItem( Which(), &aColor, _nWidth, static_cast(cLoc) ); } sal_uInt16 SvxShadowItem::GetValueCount() const { - return (sal_uInt16)SvxShadowLocation::End; // SvxShadowLocation::BottomRight + 1 + return sal_uInt16(SvxShadowLocation::End); // SvxShadowLocation::BottomRight + 1 } OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const { - static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_SHADOW) == (size_t)SvxShadowLocation::End, "unexpected size"); - assert(nPos < (sal_uInt16)SvxShadowLocation::End && "enum overflow!"); + static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_SHADOW) == size_t(SvxShadowLocation::End), "unexpected size"); + assert(nPos < sal_uInt16(SvxShadowLocation::End) && "enum overflow!"); return EditResId(RID_SVXITEMS_SHADOW[nPos]); } sal_uInt16 SvxShadowItem::GetEnumValue() const { - return (sal_uInt16)GetLocation(); + return static_cast(GetLocation()); } void SvxShadowItem::SetEnumValue( sal_uInt16 nVal ) { - SetLocation( (SvxShadowLocation)nVal ); + SetLocation( static_cast(nVal) ); } void SvxShadowItem::dumpAsXml(xmlTextWriterPtr pWriter) const @@ -1339,8 +1339,8 @@ void SvxShadowItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("aShadowColor"), BAD_CAST(aShadowColor.AsRGBHexString().toUtf8().getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nWidth"), BAD_CAST(OString::number(nWidth).getStr())); - xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eLocation"), BAD_CAST(OString::number((int)eLocation).getStr())); - xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(EditResId(RID_SVXITEMS_SHADOW[(int)eLocation]).toUtf8().getStr())); + xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eLocation"), BAD_CAST(OString::number(static_cast(eLocation)).getStr())); + xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(EditResId(RID_SVXITEMS_SHADOW[static_cast(eLocation)]).toUtf8().getStr())); xmlTextWriterEndElement(pWriter); } @@ -1558,7 +1558,7 @@ SvxBoxItem::LineToSvxLine(const css::table::BorderLine2& rLine, SvxBorderLine& r SvxBorderLineStyle const nStyle = (rLine.LineStyle < 0 || BORDER_LINE_STYLE_MAX < rLine.LineStyle) ? SvxBorderLineStyle::SOLID // default - : (SvxBorderLineStyle)rLine.LineStyle; + : static_cast(rLine.LineStyle); rSvxLine.SetBorderLineStyle( nStyle ); @@ -2645,8 +2645,8 @@ OUString SvxFormatBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const RID_SVXITEMS_BREAK_PAGE_AFTER, RID_SVXITEMS_BREAK_PAGE_BOTH }; - static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_BREAK) == (size_t)SvxBreak::End, "unexpected size"); - assert(nPos < (sal_uInt16)SvxBreak::End && "enum overflow!"); + static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_BREAK) == size_t(SvxBreak::End), "unexpected size"); + assert(nPos < sal_uInt16(SvxBreak::End) && "enum overflow!"); return EditResId(RID_SVXITEMS_BREAK[nPos]); } @@ -2677,7 +2677,7 @@ bool SvxFormatBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ if(!(rVal >>= nValue)) return false; - nBreak = (style::BreakType) nValue; + nBreak = static_cast(nValue); } SvxBreak eBreak = SvxBreak::NONE; @@ -2729,13 +2729,13 @@ SfxPoolItem* SvxFormatBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) rStrm.ReadSChar( eBreak ); if( FMTBREAK_NOAUTO > nVersion ) rStrm.ReadSChar( bDummy ); - return new SvxFormatBreakItem( (SvxBreak)eBreak, Which() ); + return new SvxFormatBreakItem( static_cast(eBreak), Which() ); } sal_uInt16 SvxFormatBreakItem::GetValueCount() const { - return (sal_uInt16)SvxBreak::End; // SvxBreak::PageBoth + 1 + return sal_uInt16(SvxBreak::End); // SvxBreak::PageBoth + 1 } @@ -3124,7 +3124,7 @@ SvxBrushItem::SvxBrushItem(SvStream& rStream, sal_uInt16 nVersion, sal_uInt16 _n rStream.ReadSChar( nPos ); - eGraphicPos = (SvxGraphicPosition)nPos; + eGraphicPos = static_cast(nPos); } } @@ -3208,7 +3208,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const rVal <<= SvxBrushItem::TransparencyToPercent(aColor.GetTransparency()); break; case MID_GRAPHIC_POSITION: - rVal <<= (style::GraphicLocation)static_cast(eGraphicPos); + rVal <<= static_cast(static_cast(eGraphicPos)); break; case MID_GRAPHIC: @@ -3292,9 +3292,9 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) sal_Int32 nValue = 0; if ( !( rVal >>= nValue ) ) return false; - eLocation = (style::GraphicLocation)nValue; + eLocation = static_cast(nValue); } - SetGraphicPos( (SvxGraphicPosition)(sal_uInt16)eLocation ); + SetGraphicPos( static_cast(static_cast(eLocation)) ); } break; diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index 6036ffc0fe26..f940950bede4 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -56,7 +56,7 @@ bool SvxHorJustifyItem::GetPresentation MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper&) const { - rText = GetValueText( (sal_uInt16)GetValue() ); + rText = GetValueText( static_cast(GetValue()) ); return true; } @@ -97,7 +97,7 @@ bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const case SvxCellHorJustify::Right: nAdjust = style::ParagraphAdjust_RIGHT; break; case SvxCellHorJustify::Block: nAdjust = style::ParagraphAdjust_BLOCK; break; } - rVal <<= (sal_Int16)nAdjust; // as sal_Int16 + rVal <<= static_cast(nAdjust); // as sal_Int16 } break; } @@ -117,7 +117,7 @@ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) sal_Int32 nValue = 0; if(!(rVal >>= nValue)) return false; - eUno = (table::CellHoriJustify)nValue; + eUno = static_cast(nValue); } SvxCellHorJustify eSvx = SvxCellHorJustify::Standard; switch (eUno) @@ -141,7 +141,7 @@ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return false; SvxCellHorJustify eSvx = SvxCellHorJustify::Standard; - switch ((style::ParagraphAdjust)nVal) + switch (static_cast(nVal)) { // STRETCH is treated as BLOCK case style::ParagraphAdjust_LEFT: eSvx = SvxCellHorJustify::Left; break; @@ -160,7 +160,7 @@ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) OUString SvxHorJustifyItem::GetValueText( sal_uInt16 nVal ) { - DBG_ASSERT( nVal <= (sal_uInt16)SvxCellHorJustify::Repeat, "enum overflow!" ); + DBG_ASSERT( nVal <= sal_uInt16(SvxCellHorJustify::Repeat), "enum overflow!" ); return EditResId(RID_SVXITEMS_HORJUST_STANDARD + nVal); } @@ -175,13 +175,13 @@ SfxPoolItem* SvxHorJustifyItem::Create( SvStream& rStream, sal_uInt16 ) const { sal_uInt16 nVal; rStream.ReadUInt16( nVal ); - return new SvxHorJustifyItem( (SvxCellHorJustify)nVal, Which() ); + return new SvxHorJustifyItem( static_cast(nVal), Which() ); } sal_uInt16 SvxHorJustifyItem::GetValueCount() const { - return (sal_uInt16)SvxCellHorJustify::Repeat + 1; // Last Enum value + 1 + return sal_uInt16(SvxCellHorJustify::Repeat) + 1; // Last Enum value + 1 } @@ -311,7 +311,7 @@ SfxPoolItem* SvxVerJustifyItem::Create( SvStream& rStream, sal_uInt16 ) const { sal_uInt16 nVal; rStream.ReadUInt16( nVal ); - return new SvxVerJustifyItem( (SvxCellVerJustify)nVal, Which() ); + return new SvxVerJustifyItem( static_cast(nVal), Which() ); } diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 8d55c282ba26..c57c44df6a10 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -190,8 +190,8 @@ SvxNumberFormat::SvxNumberFormat( SvStream &rStream ) sal_Int32 nTmp32(0); rStream.ReadUInt16( nTmp16 ); // Version number - rStream.ReadUInt16( nTmp16 ); SetNumberingType( (SvxNumType)nTmp16 ); - rStream.ReadUInt16( nTmp16 ); eNumAdjust = ( SvxAdjust )nTmp16; + rStream.ReadUInt16( nTmp16 ); SetNumberingType( static_cast(nTmp16) ); + rStream.ReadUInt16( nTmp16 ); eNumAdjust = static_cast(nTmp16); rStream.ReadUInt16( nTmp16 ); nInclUpperLevels = nTmp16; rStream.ReadUInt16( nStart ); rStream.ReadUInt16( nTmp16 ); cBullet = static_cast(nTmp16); @@ -230,8 +230,8 @@ SvxNumberFormat::SvxNumberFormat( SvStream &rStream ) rStream.ReadUInt16( nBulletRelSize ); rStream.ReadUInt16( nTmp16 ); SetShowSymbol( nTmp16 ); - rStream.ReadUInt16( nTmp16 ); mePositionAndSpaceMode = ( SvxNumPositionAndSpaceMode )nTmp16; - rStream.ReadUInt16( nTmp16 ); meLabelFollowedBy = ( LabelFollowedBy )nTmp16; + rStream.ReadUInt16( nTmp16 ); mePositionAndSpaceMode = static_cast(nTmp16); + rStream.ReadUInt16( nTmp16 ); meLabelFollowedBy = static_cast(nTmp16); rStream.ReadInt32( nTmp32 ); mnListtabPos = nTmp32; rStream.ReadInt32( nTmp32 ); mnFirstLineIndent = nTmp32; rStream.ReadInt32( nTmp32 ); mnIndentAt = nTmp32; @@ -255,7 +255,7 @@ void SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pConverte rStream.WriteUInt16( NUMITEM_VERSION_04 ); rStream.WriteUInt16( GetNumberingType() ); - rStream.WriteUInt16( (sal_uInt16)eNumAdjust ); + rStream.WriteUInt16( static_cast(eNumAdjust) ); rStream.WriteUInt16( nInclUpperLevels ); rStream.WriteUInt16( nStart ); rStream.WriteUInt16( cBullet ); @@ -630,7 +630,7 @@ SvxNumRule::SvxNumRule( SvStream &rStream ) // first nFeatureFlags of old Versions rStream.ReadUInt16( nTmp16 ); nFeatureFlags = static_cast(nTmp16); rStream.ReadUInt16( nTmp16 ); bContinuousNumbering = nTmp16; - rStream.ReadUInt16( nTmp16 ); eNumberingType = ( SvxNumRuleType )nTmp16; + rStream.ReadUInt16( nTmp16 ); eNumberingType = static_cast(nTmp16); for (sal_uInt16 i = 0; i < SVX_MAX_NUM; i++) { @@ -688,8 +688,8 @@ void SvxNumRule::dumpAsXml(struct _xmlTextWriter* pWriter) const xmlTextWriterStartElement(pWriter, BAD_CAST("SvxNumRule")); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("levelCount"), BAD_CAST(OUString::number(nLevelCount).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("continuousNumbering"), BAD_CAST(OUString::boolean(bContinuousNumbering).getStr())); - xmlTextWriterWriteAttribute(pWriter, BAD_CAST("numberingType"), BAD_CAST(OUString::number((int)eNumberingType).getStr())); - xmlTextWriterWriteAttribute(pWriter, BAD_CAST("featureFlags"), BAD_CAST(OUString::number((int)nFeatureFlags).getStr())); + xmlTextWriterWriteAttribute(pWriter, BAD_CAST("numberingType"), BAD_CAST(OUString::number(static_cast(eNumberingType)).getStr())); + xmlTextWriterWriteAttribute(pWriter, BAD_CAST("featureFlags"), BAD_CAST(OUString::number(static_cast(nFeatureFlags)).getStr())); for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++) { if(aFmts[i]) diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index d45f7fc2a4e6..39240e00f577 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -244,7 +244,7 @@ bool SvxLineSpacingItem::GetPresentation sal_uInt16 SvxLineSpacingItem::GetValueCount() const { - return (sal_uInt16)SvxSpecialLineSpace::End; // SvxSpecialLineSpace::TwoLines + 1 + return sal_uInt16(SvxSpecialLineSpace::End); // SvxSpecialLineSpace::TwoLines + 1 } @@ -252,7 +252,7 @@ OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const { //! load strings from resource OUString aText; - switch ( (SvxSpecialLineSpace)nPos ) + switch ( static_cast(nPos) ) { case SvxSpecialLineSpace::User: aText = "User"; @@ -282,13 +282,13 @@ sal_uInt16 SvxLineSpacingItem::GetEnumValue() const case 200: nVal = SvxSpecialLineSpace::TwoLines; break; default: nVal = SvxSpecialLineSpace::User; break; } - return (sal_uInt16)nVal; + return static_cast(nVal); } void SvxLineSpacingItem::SetEnumValue( sal_uInt16 nVal ) { - switch ( (SvxSpecialLineSpace)nVal ) + switch ( static_cast(nVal) ) { case SvxSpecialLineSpace::OneLine: nPropLineSpace = 100; break; case SvxSpecialLineSpace::OnePointFiveLines: nPropLineSpace = 150; break; @@ -323,8 +323,8 @@ bool SvxAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const nMemberId &= ~CONVERT_TWIPS; switch( nMemberId ) { - case MID_PARA_ADJUST : rVal <<= (sal_Int16)GetAdjust(); break; - case MID_LAST_LINE_ADJUST : rVal <<= (sal_Int16)GetLastBlock(); break; + case MID_PARA_ADJUST : rVal <<= static_cast(GetAdjust()); break; + case MID_LAST_LINE_ADJUST : rVal <<= static_cast(GetLastBlock()); break; case MID_EXPAND_SINGLE : { rVal <<= bOneBlock; @@ -347,7 +347,7 @@ bool SvxAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) ::cppu::enum2int(eVal,rVal); if(eVal >= 0 && eVal <= 4) { - SvxAdjust eAdjust = (SvxAdjust)eVal; + SvxAdjust eAdjust = static_cast(eVal); if(MID_LAST_LINE_ADJUST == nMemberId && eAdjust != SvxAdjust::Left && eAdjust != SvxAdjust::Block && @@ -383,7 +383,7 @@ bool SvxAdjustItem::GetPresentation { case SfxItemPresentation::Nameless: case SfxItemPresentation::Complete: - rText = GetValueTextByPos( (sal_uInt16)GetAdjust() ); + rText = GetValueTextByPos( static_cast(GetAdjust()) ); return true; default: ;//prevent warning } @@ -393,7 +393,7 @@ bool SvxAdjustItem::GetPresentation sal_uInt16 SvxAdjustItem::GetValueCount() const { - return (sal_uInt16)SvxAdjust::End; // SvxAdjust::BlockLine + 1 + return sal_uInt16(SvxAdjust::End); // SvxAdjust::BlockLine + 1 } OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const @@ -406,20 +406,20 @@ OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const RID_SVXITEMS_ADJUST_CENTER, RID_SVXITEMS_ADJUST_BLOCKLINE }; - static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_ADJUST) - 1 == (size_t)SvxAdjust::BlockLine, "unexpected size"); - assert(nPos <= (sal_uInt16)SvxAdjust::BlockLine && "enum overflow!"); + static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_ADJUST) - 1 == size_t(SvxAdjust::BlockLine), "unexpected size"); + assert(nPos <= sal_uInt16(SvxAdjust::BlockLine) && "enum overflow!"); return EditResId(RID_SVXITEMS_ADJUST[nPos]); } sal_uInt16 SvxAdjustItem::GetEnumValue() const { - return (sal_uInt16)GetAdjust(); + return static_cast(GetAdjust()); } void SvxAdjustItem::SetEnumValue( sal_uInt16 nVal ) { - SetAdjust( (SvxAdjust)nVal ); + SetAdjust( static_cast(nVal) ); } @@ -434,7 +434,7 @@ SfxPoolItem* SvxAdjustItem::Create(SvStream& rStrm, sal_uInt16 nVersion) const { char eAdjustment; rStrm.ReadChar( eAdjustment ); - SvxAdjustItem *pRet = new SvxAdjustItem( (SvxAdjust)eAdjustment, Which() ); + SvxAdjustItem *pRet = new SvxAdjustItem( static_cast(eAdjustment), Which() ); if( nVersion >= ADJUST_LASTBLOCK_VERSION ) { sal_Int8 nFlags; @@ -449,7 +449,7 @@ SfxPoolItem* SvxAdjustItem::Create(SvStream& rStrm, sal_uInt16 nVersion) const SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const { - rStrm.WriteChar( (char)GetAdjust() ); + rStrm.WriteChar( static_cast(GetAdjust()) ); if ( nItemVersion >= ADJUST_LASTBLOCK_VERSION ) { sal_Int8 nFlags = 0; @@ -837,7 +837,7 @@ bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Int32 nVal = 0; if (rAnySeq[1] >>= nVal) - aSeq[n].Alignment = (css::style::TabAlign) nVal; + aSeq[n].Alignment = static_cast(nVal); else return false; } @@ -1188,7 +1188,7 @@ bool SvxForbiddenRuleItem::GetPresentation( SvxParaVertAlignItem::SvxParaVertAlignItem( Align nValue, const sal_uInt16 nW ) - : SfxUInt16Item( nW, (sal_uInt16)nValue ) + : SfxUInt16Item( nW, static_cast(nValue) ) { } @@ -1223,7 +1223,7 @@ bool SvxParaVertAlignItem::GetPresentation( bool SvxParaVertAlignItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { - rVal <<= (sal_Int16)GetValue(); + rVal <<= static_cast(GetValue()); return true; } @@ -1231,9 +1231,9 @@ bool SvxParaVertAlignItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { sal_Int16 nVal = sal_Int16(); - if((rVal >>= nVal) && nVal >=0 && nVal <= (sal_uInt16)Align::Bottom ) + if((rVal >>= nVal) && nVal >=0 && nVal <= sal_uInt16(Align::Bottom) ) { - SetValue( (Align)nVal ); + SetValue( static_cast(nVal) ); return true; } else diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index bb2e6d65a013..7d8120b3f02d 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -254,9 +254,9 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId) aFamilyName = aFontDescriptor.Name; aStyleName = aFontDescriptor.StyleName; - eFamily = (FontFamily)aFontDescriptor.Family; + eFamily = static_cast(aFontDescriptor.Family); eTextEncoding = static_cast(aFontDescriptor.CharSet); - ePitch = (FontPitch)aFontDescriptor.Pitch; + ePitch = static_cast(aFontDescriptor.Pitch); } break; case MID_FONT_FAMILY_NAME : @@ -280,7 +280,7 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId) sal_Int16 nFamily = sal_Int16(); if(!(rVal >>= nFamily)) return false; - eFamily = (FontFamily)nFamily; + eFamily = static_cast(nFamily); } break; case MID_FONT_CHAR_SET : @@ -296,7 +296,7 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId) sal_Int16 nPitch = sal_Int16(); if(!(rVal >>= nPitch)) return false; - ePitch = (FontPitch)nPitch; + ePitch = static_cast(nPitch); } break; } @@ -393,8 +393,8 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const } - return new SvxFontItem( (FontFamily)_eFamily, aName, aStyle, - (FontPitch)eFontPitch, static_cast(eFontTextEncoding), Which() ); + return new SvxFontItem( static_cast(_eFamily), aName, aStyle, + static_cast(eFontPitch), static_cast(eFontTextEncoding), Which() ); } @@ -454,7 +454,7 @@ SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nPosture; rStrm.ReadUChar( nPosture ); - return new SvxPostureItem( (FontItalic)nPosture, Which() ); + return new SvxPostureItem( static_cast(nPosture), Which() ); } @@ -475,7 +475,7 @@ OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= sal_uInt16(ITALIC_NORMAL), "enum overflow!" ); - FontItalic eItalic = (FontItalic)nPos; + FontItalic eItalic = static_cast(nPos); const char* pId = nullptr; switch ( eItalic ) @@ -521,7 +521,7 @@ bool SvxPostureItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if(!(rVal >>= nValue)) return false; - eSlant = (awt::FontSlant)nValue; + eSlant = static_cast(nValue); } SetValue(vcl::unohelper::ConvertFontSlant(eSlant)); } @@ -602,7 +602,7 @@ SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nWeight; rStrm.ReadUChar( nWeight ); - return new SvxWeightItem( (FontWeight)nWeight, Which() ); + return new SvxWeightItem( static_cast(nWeight), Which() ); } bool SvxWeightItem::GetPresentation @@ -712,7 +712,7 @@ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) rStrm.WriteUInt16( GetHeight() ); if( FONTHEIGHT_UNIT_VERSION <= nItemVersion ) - rStrm.WriteUInt16( GetProp() ).WriteUInt16( (sal_uInt16)GetPropUnit() ); + rStrm.WriteUInt16( GetProp() ).WriteUInt16( static_cast(GetPropUnit()) ); else { // When exporting to the old versions the relative information is lost @@ -747,7 +747,7 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm, { sal_uInt16 nTmp; rStrm.ReadUInt16( nTmp ); - nPropUnit = (MapUnit)nTmp; + nPropUnit = static_cast(nTmp); } SvxFontHeightItem* pItem = new SvxFontHeightItem( nsize, 100, Which() ); @@ -1080,7 +1080,7 @@ void SvxFontHeightItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("height"), BAD_CAST(OString::number(nHeight).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("prop"), BAD_CAST(OString::number(nProp).getStr())); - xmlTextWriterWriteAttribute(pWriter, BAD_CAST("propUnit"), BAD_CAST(OString::number((int)ePropUnit).getStr())); + xmlTextWriterWriteAttribute(pWriter, BAD_CAST("propUnit"), BAD_CAST(OString::number(static_cast(ePropUnit)).getStr())); xmlTextWriterEndElement(pWriter); } @@ -1133,7 +1133,7 @@ SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nState; rStrm.ReadUChar( nState ); - return new SvxTextLineItem( (FontLineStyle)nState, Which() ); + return new SvxTextLineItem( static_cast(nState), Which() ); } @@ -1195,7 +1195,7 @@ bool SvxTextLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if(!(rVal >>= nValue)) bRet = false; else - SetValue((FontLineStyle)nValue); + SetValue(static_cast(nValue)); } break; case MID_TL_COLOR: @@ -1246,7 +1246,7 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nState; rStrm.ReadUChar( nState ); - return new SvxUnderlineItem( (FontLineStyle)nState, Which() ); + return new SvxUnderlineItem( static_cast(nState), Which() ); } @@ -1297,7 +1297,7 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nState; rStrm.ReadUChar( nState ); - return new SvxOverlineItem( (FontLineStyle)nState, Which() ); + return new SvxOverlineItem( static_cast(nState), Which() ); } @@ -1379,7 +1379,7 @@ SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 eCross; rStrm.ReadUChar( eCross ); - return new SvxCrossedOutItem( (FontStrikeout)eCross, Which() ); + return new SvxCrossedOutItem( static_cast(eCross), Which() ); } @@ -1440,7 +1440,7 @@ bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) sal_Int32 nValue = 0; if(!(rVal >>= nValue)) return false; - SetValue((FontStrikeout)nValue); + SetValue(static_cast(nValue)); } break; } @@ -1912,7 +1912,7 @@ SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const sal_uInt16 nId ) : sal_uInt16 SvxCaseMapItem::GetValueCount() const { - return (sal_uInt16)SvxCaseMap::End; // SvxCaseMap::SmallCaps + 1 + return sal_uInt16(SvxCaseMap::End); // SvxCaseMap::SmallCaps + 1 } @@ -1930,7 +1930,7 @@ bool SvxCaseMapItem::GetPresentation OUString& rText, const IntlWrapper& /*rIntl*/ ) const { - rText = GetValueTextByPos( (sal_uInt16)GetValue() ); + rText = GetValueTextByPos( static_cast(GetValue()) ); return true; } @@ -1945,8 +1945,8 @@ OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const RID_SVXITEMS_CASEMAP_KAPITAELCHEN }; - static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_CASEMAP) == (size_t)SvxCaseMap::End, "must match"); - assert(nPos < (sal_uInt16)SvxCaseMap::End && "enum overflow!"); + static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_CASEMAP) == size_t(SvxCaseMap::End), "must match"); + assert(nPos < sal_uInt16(SvxCaseMap::End) && "enum overflow!"); return EditResId(RID_SVXITEMS_CASEMAP[nPos]); } @@ -2034,7 +2034,7 @@ SfxPoolItem* SvxEscapementItem::Clone( SfxItemPool * ) const sal_uInt16 SvxEscapementItem::GetValueCount() const { - return (sal_uInt16)SvxEscapement::End; // SvxEscapement::Subscript + 1 + return sal_uInt16(SvxEscapement::End); // SvxEscapement::Subscript + 1 } @@ -2067,24 +2067,24 @@ OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const RID_SVXITEMS_ESCAPEMENT_SUB }; - static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_ESCAPEMENT) == (size_t)SvxEscapement::End, "must match"); - assert(nPos < (sal_uInt16)SvxEscapement::End && "enum overflow!"); + static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_ESCAPEMENT) == size_t(SvxEscapement::End), "must match"); + assert(nPos < sal_uInt16(SvxEscapement::End) && "enum overflow!"); return EditResId(RID_SVXITEMS_ESCAPEMENT[nPos]); } sal_uInt16 SvxEscapementItem::GetEnumValue() const { if ( nEsc < 0 ) - return (sal_uInt16)SvxEscapement::Subscript; + return sal_uInt16(SvxEscapement::Subscript); else if ( nEsc > 0 ) - return (sal_uInt16)SvxEscapement::Superscript; - return (sal_uInt16)SvxEscapement::Off; + return sal_uInt16(SvxEscapement::Superscript); + return sal_uInt16(SvxEscapement::Off); } void SvxEscapementItem::SetEnumValue( sal_uInt16 nVal ) { - SetEscapement( (SvxEscapement)nVal ); + SetEscapement( static_cast(nVal) ); } bool SvxEscapementItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const @@ -2320,7 +2320,7 @@ bool SvxBlinkItem::GetPresentation SvxEmphasisMarkItem::SvxEmphasisMarkItem( const FontEmphasisMark nValue, const sal_uInt16 nId ) - : SfxUInt16Item( nId, (sal_uInt16)nValue ) + : SfxUInt16Item( nId, static_cast(nValue) ) { } @@ -2351,7 +2351,7 @@ bool SvxEmphasisMarkItem::GetPresentation FontEmphasisMark nVal = GetEmphasisMark(); rText = EditResId(RID_SVXITEMS_EMPHASIS[ - (sal_uInt16)static_cast( nVal & FontEmphasisMark::Style )]); + static_cast(static_cast( nVal & FontEmphasisMark::Style ))]); const char* pId = ( FontEmphasisMark::PosAbove & nVal ) ? RID_SVXITEMS_EMPHASIS_ABOVE_POS : ( FontEmphasisMark::PosBelow & nVal ) @@ -2412,7 +2412,7 @@ bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case FontEmphasis::ACCENT_BELOW: nMark = FontEmphasisMark::Accent|FontEmphasisMark::PosBelow; break; default: return false; } - SetValue( (sal_Int16)nMark ); + SetValue( static_cast(nMark) ); } break; } @@ -2839,7 +2839,7 @@ bool SvxCharReliefItem::GetPresentation OUString& rText, const IntlWrapper& /*rIntl*/ ) const { - rText = GetValueTextByPos( (sal_uInt16)GetValue() ); + rText = GetValueTextByPos( static_cast(GetValue()) ); return true; } @@ -2854,8 +2854,8 @@ bool SvxCharReliefItem::PutValue( const css::uno::Any& rVal, { sal_Int16 nVal = -1; rVal >>= nVal; - if(nVal >= 0 && nVal <= (sal_Int16)FontRelief::Engraved) - SetValue( (FontRelief)nVal ); + if(nVal >= 0 && nVal <= sal_Int16(FontRelief::Engraved)) + SetValue( static_cast(nVal) ); else bRet = false; } @@ -2875,7 +2875,7 @@ bool SvxCharReliefItem::QueryValue( css::uno::Any& rVal, switch( nMemberId ) { case MID_RELIEF: - rVal <<= (sal_Int16)GetValue(); + rVal <<= static_cast(GetValue()); break; default: bRet = false; diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index 52e4bcaeef92..d4cd8a385d3b 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star::text; SvxWritingModeItem::SvxWritingModeItem( WritingMode eValue, sal_uInt16 _nWhich ) - : SfxUInt16Item( _nWhich, (sal_uInt16)eValue ) + : SfxUInt16Item( _nWhich, static_cast(eValue) ) { } @@ -59,7 +59,7 @@ bool SvxWritingModeItem::GetPresentation( SfxItemPresentation /*ePres*/, OUString &rText, const IntlWrapper& ) const { - rText = EditResId(getFrmDirResId((int)GetValue())); + rText = EditResId(getFrmDirResId(static_cast(GetValue()))); return true; } @@ -75,13 +75,13 @@ bool SvxWritingModeItem::PutValue( const css::uno::Any& rVal, sal_uInt8 ) if( bRet ) { - nVal = (sal_Int32)eMode; + nVal = static_cast(eMode); } } if( bRet ) { - switch( (WritingMode)nVal ) + switch( static_cast(nVal) ) { case WritingMode_LR_TB: case WritingMode_RL_TB: @@ -107,7 +107,7 @@ bool SvxWritingModeItem::QueryValue( css::uno::Any& rVal, SvxWritingModeItem& SvxWritingModeItem::operator=( const SvxWritingModeItem& rItem ) { - SetValue( (sal_uInt16)rItem.GetValue() ); + SetValue( static_cast(rItem.GetValue()) ); return *this; } diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx index b906326a9d55..611b59226f40 100644 --- a/editeng/source/uno/unofdesc.cxx +++ b/editeng/source/uno/unofdesc.cxx @@ -43,15 +43,15 @@ void SvxUnoFontDescriptor::ConvertToFont( const awt::FontDescriptor& rDesc, vcl: rFont.SetFamilyName( rDesc.Name ); rFont.SetStyleName( rDesc.StyleName ); rFont.SetFontSize( Size( rDesc.Width, rDesc.Height ) ); - rFont.SetFamily( (FontFamily)rDesc.Family ); + rFont.SetFamily( static_cast(rDesc.Family) ); rFont.SetCharSet( static_cast(rDesc.CharSet) ); - rFont.SetPitch( (FontPitch)rDesc.Pitch ); + rFont.SetPitch( static_cast(rDesc.Pitch) ); rFont.SetOrientation( static_cast(rDesc.Orientation*10) ); rFont.SetKerning( rDesc.Kerning ? FontKerning::FontSpecific : FontKerning::NONE ); rFont.SetWeight( vcl::unohelper::ConvertFontWeight(rDesc.Weight) ); - rFont.SetItalic( (FontItalic)rDesc.Slant ); - rFont.SetUnderline( (FontLineStyle)rDesc.Underline ); - rFont.SetStrikeout( (FontStrikeout)rDesc.Strikeout ); + rFont.SetItalic( static_cast(rDesc.Slant) ); + rFont.SetUnderline( static_cast(rDesc.Underline) ); + rFont.SetStrikeout( static_cast(rDesc.Strikeout) ); rFont.SetWordLineMode( rDesc.WordLineMode ); } @@ -81,9 +81,9 @@ void SvxUnoFontDescriptor::FillItemSet( const awt::FontDescriptor& rDesc, SfxIte SvxFontItem aFontItem( EE_CHAR_FONTINFO ); aFontItem.SetFamilyName( rDesc.Name); aFontItem.SetStyleName( rDesc.StyleName); - aFontItem.SetFamily( (FontFamily)rDesc.Family); + aFontItem.SetFamily( static_cast(rDesc.Family)); aFontItem.SetCharSet( rDesc.CharSet ); - aFontItem.SetPitch( (FontPitch)rDesc.Pitch); + aFontItem.SetPitch( static_cast(rDesc.Pitch)); rSet.Put(aFontItem); } diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 1d76f285edf6..7cac637b05f5 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -422,7 +422,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() pData = new SvxDateField( aDate, mpImpl->mbBoolean1?SvxDateType::Fix:SvxDateType::Var ); if( mpImpl->mnInt32 >= static_cast(SvxDateFormat::AppDefault) && mpImpl->mnInt32 <= static_cast(SvxDateFormat::F) ) - static_cast(pData)->SetFormat( (SvxDateFormat)mpImpl->mnInt32 ); + static_cast(pData)->SetFormat( static_cast(mpImpl->mnInt32) ); } else { @@ -433,7 +433,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() if( static_cast(mpImpl->mnInt32) >= SvxTimeFormat::AppDefault && static_cast(mpImpl->mnInt32) <= SvxTimeFormat::HH12_MM_SS_00_AMPM ) - static_cast(pData)->SetFormat( (SvxTimeFormat)mpImpl->mnInt32 ); + static_cast(pData)->SetFormat( static_cast(mpImpl->mnInt32) ); } else { @@ -449,7 +449,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() static_cast(pData)->SetTargetFrame( mpImpl->msString2 ); if( static_cast(mpImpl->mnInt16) >= SvxURLFormat::AppDefault && static_cast(mpImpl->mnInt16) <= SvxURLFormat::Repr ) - static_cast(pData)->SetFormat( (SvxURLFormat)mpImpl->mnInt16 ); + static_cast(pData)->SetFormat( static_cast(mpImpl->mnInt16) ); break; case text::textfield::Type::PAGE: @@ -514,7 +514,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() else if( static_cast(mpImpl->mnInt16) >= SvxAuthorFormat::FullName && static_cast(mpImpl->mnInt16) <= SvxAuthorFormat::ShortName ) { - static_cast(pData)->SetFormat( (SvxAuthorFormat) mpImpl->mnInt16 ); + static_cast(pData)->SetFormat( static_cast(mpImpl->mnInt16) ); } break; @@ -523,8 +523,8 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() case text::textfield::Type::MEASURE: { SdrMeasureFieldKind eKind = SdrMeasureFieldKind::Value; - if( mpImpl->mnInt16 == (sal_Int16)SdrMeasureFieldKind::Unit || mpImpl->mnInt16 == (sal_Int16)SdrMeasureFieldKind::Rotate90Blanks ) - eKind = (SdrMeasureFieldKind) mpImpl->mnInt16; + if( mpImpl->mnInt16 == sal_Int16(SdrMeasureFieldKind::Unit) || mpImpl->mnInt16 == sal_Int16(SdrMeasureFieldKind::Rotate90Blanks) ) + eKind = static_cast(mpImpl->mnInt16); pData = new SdrMeasureField( eKind); break; } diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 3db1c4f2ff8a..862a4f5caed5 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -298,7 +298,7 @@ void SvxUnoConvertToMM( const MapUnit eSourceMapUnit, uno::Any & rMetric ) throw rMetric <<= static_cast(TWIPS_TO_MM(*o3tl::forceAccess(rMetric))); break; default: - SAL_WARN("editeng", "AW: Missing unit translation to 100th mm, " << OString::number((sal_Int32)rMetric.getValueTypeClass())); + SAL_WARN("editeng", "AW: Missing unit translation to 100th mm, " << OString::number(static_cast(rMetric.getValueTypeClass()))); } break; } diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 5a3b4a738e45..0860a8cd4de2 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -79,7 +79,7 @@ SvxAdjust ConvertUnoAdjust( unsigned short nAdjust ) unsigned short ConvertUnoAdjust( SvxAdjust eAdjust ) { - DBG_ASSERT( (int)eAdjust <= 6, "Enum has changed! [CL]" ); + DBG_ASSERT( static_cast(eAdjust) <= 6, "Enum has changed! [CL]" ); return aSvxToUnoAdjust[eAdjust]; } @@ -282,7 +282,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence=0 ) { - aFmt.SetNumberingType((SvxNumType)nSet); + aFmt.SetNumberingType(static_cast(nSet)); continue; } } -- cgit