diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:13:41 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:13:41 +0100 |
| commit | 0ae2d98d1f6d29c80bd1ee830db4c333e4ee1e1d (patch) | |
| tree | d9b77eece17b7b144a4ea50592b639b9f7c87095 /sw/source/filter | |
| parent | 506856ca50e676520bcc80a8b498355663d0388f (diff) | |
More loplugin:cstylecast: sw
auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable
loplugin:cstylecast for some more cases" plus
solenv/clang-format/reformat-formatted-files
Change-Id: I0f49d21dfdf82742f11b27709f74294feb1e419e
Diffstat (limited to 'sw/source/filter')
57 files changed, 679 insertions, 675 deletions
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 4d7c7ad48a2a..1805094a13c8 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -386,9 +386,9 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, if( nMaxFrame < MINLAY ) nMaxFrame = MINLAY; - if( nWidth > (sal_uInt16)nMaxFrame ) + if( nWidth > static_cast<sal_uInt16>(nMaxFrame) ) nWidth = nMaxFrame; - else if( nWidth > (sal_uInt16)nMinFrame ) + else if( nWidth > static_cast<sal_uInt16>(nMinFrame) ) nWidth = nMinFrame; } } diff --git a/sw/source/filter/docx/swdocxreader.cxx b/sw/source/filter/docx/swdocxreader.cxx index 6d0596073868..5a342c9d3f35 100644 --- a/sw/source/filter/docx/swdocxreader.cxx +++ b/sw/source/filter/docx/swdocxreader.cxx @@ -209,7 +209,7 @@ bool SwDOCXReader::MakeEntries( SwDoc *pD, SwTextBlocks &rBlocks ) sal_uInt16 nCurPos = rBlocks.GetIndex( sShortcut ); sal_Int32 nLen = sShortcut.getLength(); - while( (sal_uInt16)-1 != nCurPos ) + while( sal_uInt16(-1) != nCurPos ) { sShortcut = sShortcut.copy( 0, nLen ); // add an Number to it diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 6d19d69ed054..c26e04acbbbf 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -176,7 +176,7 @@ OString lclConvToHex(sal_uInt16 nHex) sal_Char *pStr = aNToABuf + (sizeof(aNToABuf)-1); for( sal_uInt8 n = 0; n < 2; ++n ) { - *(--pStr) = (sal_Char)(nHex & 0xf ) + 48; + *(--pStr) = static_cast<sal_Char>(nHex & 0xf ) + 48; if( *pStr > '9' ) *pStr += 39; nHex >>= 4; @@ -423,18 +423,18 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, if( nBigVal <= LONG_MAX ) { // a long is sufficient - nLongVal = (long)nBigVal; + nLongVal = static_cast<long>(nBigVal); } else { - rOut.append(nBigVal / (sal_Int64)nFac); - if( (nBigVal % (sal_Int64)nFac) != 0 ) + rOut.append(nBigVal / static_cast<sal_Int64>(nFac)); + if( (nBigVal % static_cast<sal_Int64>(nFac)) != 0 ) { rOut.append('.'); - while( nFac > 1 && (nBigVal % (sal_Int64)nFac) != 0 ) + while( nFac > 1 && (nBigVal % static_cast<sal_Int64>(nFac)) != 0 ) { nFac /= 10; - rOut.append((nBigVal / (sal_Int64)nFac) % (sal_Int64)10); + rOut.append((nBigVal / static_cast<sal_Int64>(nFac)) % sal_Int64(10)); } } bOutLongVal = false; @@ -1949,7 +1949,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat nYPos -= aULItem.GetUpper(); if( nYPos < 0 ) { - aULItem.SetUpper( (sal_uInt16)(aULItem.GetUpper() + nYPos) ); + aULItem.SetUpper( static_cast<sal_uInt16>(aULItem.GetUpper() + nYPos) ); nYPos = 0; } } @@ -1965,7 +1965,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat nXPos -= aLRItem.GetLeft(); if( nXPos < 0 ) { - aLRItem.SetLeft( (sal_uInt16)(aLRItem.GetLeft() + nXPos) ); + aLRItem.SetLeft( static_cast<sal_uInt16>(aLRItem.GetLeft() + nXPos) ); nXPos = 0; } } @@ -2696,7 +2696,7 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt, const SfxPoolItem& rHt ) } if( nHeight ) - rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_line_height, (long)nHeight ); + rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_line_height, static_cast<long>(nHeight) ); else if( nPrcHeight && !(nPrcHeight < 115 && rHTMLWrt.m_bParaDotLeaders )) // avoid HTML scrollbars and missing descenders { @@ -2916,7 +2916,7 @@ static Writer& OutCSS1_SvxLRSpace( Writer& rWrt, const SfxPoolItem& rHt ) // max-width = max-width - margin-left for TOC paragraphs with dot leaders if( rHTMLWrt.m_bParaDotLeaders ) - rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_max_width, (long)(DOT_LEADERS_MAX_WIDTH/2.54*72*20) - nLeftMargin ); + rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_max_width, long(DOT_LEADERS_MAX_WIDTH/2.54*72*20) - nLeftMargin ); } @@ -2926,7 +2926,7 @@ static Writer& OutCSS1_SvxLRSpace( Writer& rWrt, const SfxPoolItem& rHt ) } // The LineIndent of the first line might contain the room for numbering - long nFirstLineIndent = (long)rLRItem.GetTextFirstLineOfst() - + long nFirstLineIndent = static_cast<long>(rLRItem.GetTextFirstLineOfst()) - rHTMLWrt.m_nFirstLineIndent; if( rHTMLWrt.m_nDfltFirstLineIndent != nFirstLineIndent ) { @@ -2946,13 +2946,13 @@ static Writer& OutCSS1_SvxULSpace( Writer& rWrt, const SfxPoolItem& rHt ) if( rHTMLWrt.m_nDfltTopMargin != rULItem.GetUpper() ) { rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_margin_top, - (long)rULItem.GetUpper() ); + static_cast<long>(rULItem.GetUpper()) ); } if( rHTMLWrt.m_nDfltBottomMargin != rULItem.GetLower() ) { rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_margin_bottom, - (long)rULItem.GetLower() ); + static_cast<long>(rULItem.GetLower()) ); } return rWrt; diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index de89c4869588..f39989bffb98 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -108,12 +108,12 @@ sal_uInt16 SwHTMLWriter::GetDefListLvl( const OUString& rNm, sal_uInt16 nPoolId sDTDD += " "; if( rNm.startsWith(sDTDD) ) // DefinitionList - term - return (sal_uInt16)rNm.copy( sDTDD.getLength() ).toInt32() | HTML_DLCOLL_DT; + return static_cast<sal_uInt16>(rNm.copy( sDTDD.getLength() ).toInt32()) | HTML_DLCOLL_DT; sDTDD = OOO_STRING_SVTOOLS_HTML_dd " "; if( rNm.startsWith(sDTDD) ) // DefinitionList - definition - return (sal_uInt16)rNm.copy( sDTDD.getLength() ).toInt32() | HTML_DLCOLL_DD; + return static_cast<sal_uInt16>(rNm.copy( sDTDD.getLength() ).toInt32()) | HTML_DLCOLL_DD; return 0; } diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 36686581e1c4..b8aa98f72f68 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -142,7 +142,7 @@ void SwHTMLParser::EndScript() while( bFound ) { m_aBasicModule = "Modul"; - m_aBasicModule += OUString::number( (sal_Int32)(++m_nSBModuleCnt) ); + m_aBasicModule += OUString::number( static_cast<sal_Int32>(++m_nSBModuleCnt) ); bFound = xModLib->hasByName( m_aBasicModule ); } } diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index e66fd1408d09..c61f12ed55e9 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -1467,7 +1467,7 @@ void SwCSS1Parser::FillDropCap( SwFormatDrop& rDrop, if( SfxItemState::SET == rItemSet.GetItemState( RES_CHRATR_FONTSIZE, false, &pItem ) ) { sal_uInt16 nProp = static_cast<const SvxFontHeightItem *>(pItem)->GetProp(); - nLines = (sal_uInt8)((nProp + 50) / 100); + nLines = static_cast<sal_uInt8>((nProp + 50) / 100); if( nLines < 1 ) nLines = 1; else if( nLines > MAX_DROPCAP_LINES ) @@ -1513,7 +1513,7 @@ void SwCSS1Parser::FillDropCap( SwFormatDrop& rDrop, { do { - aName = "first-letter " + OUString::number( (sal_Int32)(++m_nDropCapCnt) ); + aName = "first-letter " + OUString::number( static_cast<sal_Int32>(++m_nDropCapCnt) ); } while( m_pDoc->FindCharFormatByName(aName) ); } @@ -2044,7 +2044,7 @@ void SwHTMLParser::SetVarSize( SvxCSS1PropertyInfo const &rPropInfo, switch( rPropInfo.m_eWidthType ) { case SVX_CSS1_LTYPE_PERCENTAGE: - nPrcWidth = rPropInfo.m_nWidth > 0 ? (sal_uInt8)rPropInfo.m_nWidth : 1; + nPrcWidth = rPropInfo.m_nWidth > 0 ? static_cast<sal_uInt8>(rPropInfo.m_nWidth) : 1; nWidth = MINFLY; break; case SVX_CSS1_LTYPE_TWIP: @@ -2057,7 +2057,7 @@ void SwHTMLParser::SetVarSize( SvxCSS1PropertyInfo const &rPropInfo, switch( rPropInfo.m_eHeightType ) { case SVX_CSS1_LTYPE_PERCENTAGE: - nPrcHeight = rPropInfo.m_nHeight > 0 ? (sal_uInt8)rPropInfo.m_nHeight : 1; + nPrcHeight = rPropInfo.m_nHeight > 0 ? static_cast<sal_uInt8>(rPropInfo.m_nHeight) : 1; break; case SVX_CSS1_LTYPE_TWIP: // Netscape and MS-IE interpreting the height incorrectly as minimum height, @@ -2186,7 +2186,7 @@ void SwHTMLParser::GetMarginsFromContextWithNumBul( sal_uInt16& nLeft, const SwHTMLNumRuleInfo& rInfo = const_cast<SwHTMLParser*>(this)->GetNumInfo(); if( rInfo.GetDepth() ) { - sal_uInt8 nLevel = (sal_uInt8)( (rInfo.GetDepth() <= MAXLEVEL ? rInfo.GetDepth() + sal_uInt8 nLevel = static_cast<sal_uInt8>( (rInfo.GetDepth() <= MAXLEVEL ? rInfo.GetDepth() : MAXLEVEL) - 1 ); const SwNumFormat& rNumFormat = rInfo.GetNumRule()->Get(nLevel); nLeft = nLeft + rNumFormat.GetAbsLSpace(); @@ -2241,7 +2241,7 @@ void SwHTMLParser::EndContextAttrs( HTMLAttrContext *pContext ) pAttr->Invalidate(); else if( nChars > MAX_DROPCAP_CHARS ) nChars = MAX_DROPCAP_CHARS; - static_cast<SwFormatDrop&>(pAttr->GetItem()).GetChars() = (sal_uInt8)nChars; + static_cast<SwFormatDrop&>(pAttr->GetItem()).GetChars() = static_cast<sal_uInt8>(nChars); } EndAttr( pAttr ); diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index 457475246838..f6d64cdf2646 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -94,8 +94,8 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, aTwipSpc = Application::GetDefaultDevice()->PixelToLogic( aTwipSpc, MapMode(MapUnit::MapTwip) ); - nLeftSpace = nRightSpace = (sal_uInt16)aTwipSpc.Width(); - nUpperSpace = nLowerSpace = (sal_uInt16)aTwipSpc.Height(); + nLeftSpace = nRightSpace = static_cast<sal_uInt16>(aTwipSpc.Width()); + nUpperSpace = nLowerSpace = static_cast<sal_uInt16>(aTwipSpc.Height()); } // set left/right border @@ -308,11 +308,11 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) break; case HtmlOptionId::SCROLLAMOUNT: - nAmount = -((sal_Int16)rOption.GetNumber()); + nAmount = - static_cast<sal_Int16>(rOption.GetNumber()); break; case HtmlOptionId::SCROLLDELAY: - nDelay = (sal_uInt16)rOption.GetNumber(); + nDelay = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::WIDTH: @@ -525,7 +525,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) // The global pTable also can't be used, because the marquee can also be // in a sub-table. if( pCurTable && bPrcWidth) - RegisterDrawObjectToTable( pCurTable, m_pMarquee, (sal_uInt8)nWidth ); + RegisterDrawObjectToTable( pCurTable, m_pMarquee, static_cast<sal_uInt8>(nWidth) ); } void SwHTMLParser::EndMarquee() diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index 1a709be3fb7a..0ee651f50568 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -308,7 +308,7 @@ void SwHTMLParser::NewField() pFormatOption->GetEnum( nFormat, aHTMLAuthorFieldFormatTable ); if( bFixed ) { - nFormat = (SwAuthorFormat)((int)nFormat | AF_FIXED); + nFormat = (SwAuthorFormat)(static_cast<int>(nFormat) | AF_FIXED); bInsOnEndTag = true; } @@ -338,7 +338,7 @@ void SwHTMLParser::NewField() nSub = TIMEFLD; pFormatTable = aHTMLTimeFieldFormatTable; if( !aValue.isEmpty() ) - nTime = (sal_uLong)aValue.toInt32(); + nTime = static_cast<sal_uLong>(aValue.toInt32()); } if( !aValue.isEmpty() ) nSub |= FIXEDFLD; @@ -413,7 +413,7 @@ void SwHTMLParser::NewField() short nOff = 0; if( nFormat!=SVX_NUM_CHAR_SPECIAL && !aValue.isEmpty() ) - nOff = (short)aValue.toInt32(); + nOff = static_cast<short>(aValue.toInt32()); else if( nSub == PG_NEXT ) nOff = 1; else if( nSub == PG_PREV ) @@ -437,8 +437,8 @@ void SwHTMLParser::NewField() if( pSubOption->GetEnum( nSub, aHTMLDocInfoFieldSubTable ) ) { sal_uInt16 nExtSub = 0; - if( DI_CREATE==(SwDocInfoSubType)nSub || - DI_CHANGE==(SwDocInfoSubType)nSub ) + if( DI_CREATE==static_cast<SwDocInfoSubType>(nSub) || + DI_CHANGE==static_cast<SwDocInfoSubType>(nSub) ) { nExtSub = DI_SUB_AUTHOR; if( pFormatOption ) @@ -502,7 +502,7 @@ void SwHTMLParser::NewField() pFormatOption->GetEnum( nFormat, aHTMLFileNameFieldFormatTable ); if( bFixed ) { - nFormat = (SwFileNameFormat)((int)nFormat | FF_FIXED); + nFormat = (SwFileNameFormat)(static_cast<int>(nFormat) | FF_FIXED); bInsOnEndTag = true; } diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index 10839a86f691..5d1d22114fb7 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -148,7 +148,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField, else { const OUString& rValue = pField->GetPar2(); - short nValue = (short)rValue.toInt32(); + short nValue = static_cast<short>(rValue.toInt32()); if( (eSubType == PG_NEXT && nValue!=1) || (eSubType == PG_PREV && nValue!=-1) || (eSubType == PG_RANDOM && nValue!=0) ) diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 1760b97bf4f4..68d3046e1eef 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -617,7 +617,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, aTwipSpc.Height() = ( static_cast<const SvxULSpaceItem*>(pItem)->GetUpper() + static_cast<const SvxULSpaceItem*>(pItem)->GetLower() ) / 2; - m_nDfltTopMargin = m_nDfltBottomMargin = (sal_uInt16)aTwipSpc.Height(); + m_nDfltTopMargin = m_nDfltBottomMargin = static_cast<sal_uInt16>(aTwipSpc.Height()); } if( (nFrameOpts & HtmlFrmOpts::Space) && @@ -884,7 +884,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma aTwipSpc.Height() = ( static_cast<const SvxULSpaceItem*>(pItem)->GetUpper() + static_cast<const SvxULSpaceItem*>(pItem)->GetLower() ) / 2; - m_nDfltTopMargin = m_nDfltBottomMargin = (sal_uInt16)aTwipSpc.Height(); + m_nDfltTopMargin = m_nDfltBottomMargin = static_cast<sal_uInt16>(aTwipSpc.Height()); } if( (nFrameOptions & HtmlFrmOpts::Space) && @@ -1346,7 +1346,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat, aPixelBorder.Height() = 0; nBorderWidth = - (sal_uInt16)(aPixelBorder.Width() + aPixelBorder.Height()); + static_cast<sal_uInt16>(aPixelBorder.Width() + aPixelBorder.Height()); } if( pColBorderLine ) @@ -1573,9 +1573,9 @@ static Writer & OutHTML_FrameFormatAsMulticol( Writer& rWrt, { if( nGutter && Application::GetDefaultDevice() ) { - nGutter = (sal_uInt16)Application::GetDefaultDevice() + nGutter = static_cast<sal_uInt16>(Application::GetDefaultDevice() ->LogicToPixel( Size(nGutter,0), - MapMode(MapUnit::MapTwip) ).Width(); + MapMode(MapUnit::MapTwip) ).Width()); } sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_gutter). append("=\"").append(static_cast<sal_Int32>(nGutter)).append("\""); @@ -1879,8 +1879,8 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrameFormat& rFrameFormat, nSize > HTML_PARSPACE && Application::GetDefaultDevice() ) { nSize -= HTML_PARSPACE; - nSize = (sal_Int16)Application::GetDefaultDevice() - ->LogicToPixel( Size(nSize,0), MapMode(MapUnit::MapTwip) ).Width(); + nSize = static_cast<sal_Int16>(Application::GetDefaultDevice() + ->LogicToPixel( Size(nSize,0), MapMode(MapUnit::MapTwip) ).Width()); aSpacer = OStringBuffer(OOO_STRING_SVTOOLS_HTML_spacer). append(' ').append(OOO_STRING_SVTOOLS_HTML_O_type). diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 1c762f262086..71d461ba7bff 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -601,14 +601,14 @@ static void lcl_html_setFixedFontProperty( rPropSet->setPropertyValue("FontStyleName", aTmp ); - aTmp <<= (sal_Int16) aFixedFont.GetFamilyType(); + aTmp <<= static_cast<sal_Int16>(aFixedFont.GetFamilyType()); rPropSet->setPropertyValue("FontFamily", aTmp ); - aTmp <<= (sal_Int16) aFixedFont.GetCharSet(); + aTmp <<= static_cast<sal_Int16>(aFixedFont.GetCharSet()); rPropSet->setPropertyValue("FontCharset", aTmp ); - aTmp <<= (sal_Int16) aFixedFont.GetPitch(); + aTmp <<= static_cast<sal_Int16>(aFixedFont.GetPitch()); rPropSet->setPropertyValue("FontPitch", aTmp ); aTmp <<= float(10.0); @@ -968,8 +968,8 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { - aTmp <<= (sal_Int32)static_cast<const SvxColorItem *>(pItem)->GetValue() - .GetRGBColor(); + aTmp <<= static_cast<sal_Int32>(static_cast<const SvxColorItem *>(pItem)->GetValue() + .GetRGBColor()); rFCompPropSet->setPropertyValue( sPropName, aTmp ); } @@ -1003,19 +1003,19 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( sPropName = "FontFamily"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { - aTmp <<= (sal_Int16)pFontItem->GetFamily() ; + aTmp <<= static_cast<sal_Int16>(pFontItem->GetFamily()) ; rFCompPropSet->setPropertyValue( sPropName, aTmp ); } sPropName = "FontCharset"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { - aTmp <<= (sal_Int16)pFontItem->GetCharSet() ; + aTmp <<= static_cast<sal_Int16>(pFontItem->GetCharSet()) ; rFCompPropSet->setPropertyValue( sPropName, aTmp ); } sPropName = "FontPitch"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { - aTmp <<= (sal_Int16)pFontItem->GetPitch() ; + aTmp <<= static_cast<sal_Int16>(pFontItem->GetPitch()) ; rFCompPropSet->setPropertyValue( sPropName, aTmp ); } } @@ -1036,7 +1036,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( true, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { - aTmp <<= (sal_Int16)static_cast<const SvxPostureItem *>(pItem)->GetPosture(); + aTmp <<= static_cast<sal_Int16>(static_cast<const SvxPostureItem *>(pItem)->GetPosture()); rFCompPropSet->setPropertyValue( sPropName, aTmp ); } @@ -1045,7 +1045,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( true, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { - aTmp <<= (sal_Int16)static_cast<const SvxUnderlineItem *>(pItem)->GetLineStyle(); + aTmp <<= static_cast<sal_Int16>(static_cast<const SvxUnderlineItem *>(pItem)->GetLineStyle()); rFCompPropSet->setPropertyValue( sPropName, aTmp ); } @@ -1054,7 +1054,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( true, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { - aTmp <<= (sal_Int16)static_cast<const SvxCrossedOutItem *>(pItem)->GetStrikeout(); + aTmp <<= static_cast<sal_Int16>(static_cast<const SvxCrossedOutItem *>(pItem)->GetStrikeout()); rFCompPropSet->setPropertyValue( sPropName, aTmp ); } @@ -1145,7 +1145,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( if( text::TextContentAnchorType_AT_PAGE == nAnchorType ) { - aTmp <<= (sal_Int16) 1 ; + aTmp <<= sal_Int16(1) ; xShapePropSet->setPropertyValue("AnchorPageNo", aTmp ); } else @@ -1162,12 +1162,12 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( if( bSetPos ) { - aTmp <<= (sal_Int16)text::HoriOrientation::NONE; + aTmp <<= sal_Int16(text::HoriOrientation::NONE); xShapePropSet->setPropertyValue("HoriOrient", aTmp ); aTmp <<= nXPos ; xShapePropSet->setPropertyValue("HoriOrientPosition", aTmp ); - aTmp <<= (sal_Int16)text::VertOrientation::NONE; + aTmp <<= sal_Int16(text::VertOrientation::NONE); xShapePropSet->setPropertyValue("VertOrient", aTmp ); aTmp <<= nYPos ; xShapePropSet->setPropertyValue("VertOrientPosition", aTmp ); @@ -1441,10 +1441,10 @@ void SwHTMLParser::InsertInput() bDisabled = true; break; case HtmlOptionId::MAXLENGTH: - nMaxLen = (sal_Int16)rOption.GetNumber(); + nMaxLen = static_cast<sal_Int16>(rOption.GetNumber()); break; case HtmlOptionId::SIZE: - nSize = (sal_uInt16)rOption.GetNumber(); + nSize = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::SRC: sImgSrc = rOption.GetString(); @@ -1618,7 +1618,7 @@ void SwHTMLParser::InsertInput() { if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX ) { - aTmp <<= (sal_Int16)nTabIndex ; + aTmp <<= static_cast<sal_Int16>(nTabIndex) ; xPropSet->setPropertyValue("TabIndex", aTmp ); } @@ -1680,7 +1680,7 @@ void SwHTMLParser::InsertInput() aTmp <<= FormButtonType_SUBMIT; xPropSet->setPropertyValue("ButtonType", aTmp ); - aTmp <<= (sal_Int16) 0 ; + aTmp <<= sal_Int16(0) ; xPropSet->setPropertyValue("Border", aTmp ); } @@ -1737,7 +1737,7 @@ void SwHTMLParser::InsertInput() if( HTMLInputType::Password == eType ) { - aTmp <<= (sal_Int16)'*' ; + aTmp <<= sal_Int16('*') ; xPropSet->setPropertyValue("EchoChar", aTmp ); } @@ -1903,10 +1903,10 @@ void SwHTMLParser::NewTextArea() bDisabled = true; break; case HtmlOptionId::ROWS: - nRows = (sal_uInt16)rOption.GetNumber(); + nRows = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::COLS: - nCols = (sal_uInt16)rOption.GetNumber(); + nCols = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::WRAP: nWrap = rOption.GetEnum( aHTMLTextAreaWrapTable, nWrap ); @@ -2010,7 +2010,7 @@ void SwHTMLParser::NewTextArea() if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX ) { - aTmp <<= (sal_Int16)nTabIndex ; + aTmp <<= static_cast<sal_Int16>(nTabIndex) ; xPropSet->setPropertyValue("TabIndex", aTmp ); } @@ -2184,7 +2184,7 @@ void SwHTMLParser::NewSelect() bDisabled = true; break; case HtmlOptionId::SIZE: - m_nSelectEntryCnt = (sal_uInt16)rOption.GetNumber(); + m_nSelectEntryCnt = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::TABINDEX: @@ -2269,7 +2269,7 @@ void SwHTMLParser::NewSelect() if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX ) { - aTmp <<= (sal_Int16)nTabIndex ; + aTmp <<= static_cast<sal_Int16>(nTabIndex) ; xPropSet->setPropertyValue("TabIndex", aTmp ); } @@ -2359,8 +2359,8 @@ void SwHTMLParser::EndSelect() size_t nEntryCnt = m_pFormImpl->GetStringList().size(); if(!m_pFormImpl->GetStringList().empty()) { - Sequence<OUString> aList( (sal_Int32)nEntryCnt ); - Sequence<OUString> aValueList( (sal_Int32)nEntryCnt ); + Sequence<OUString> aList( static_cast<sal_Int32>(nEntryCnt) ); + Sequence<OUString> aValueList( static_cast<sal_Int32>(nEntryCnt) ); OUString *pStrings = aList.getArray(); OUString *pValues = aValueList.getArray(); @@ -2387,11 +2387,11 @@ void SwHTMLParser::EndSelect() m_pFormImpl->GetSelectedList().insert( m_pFormImpl->GetSelectedList().begin(), 0 ); nSelCnt = 1; } - Sequence<sal_Int16> aSelList( (sal_Int32)nSelCnt ); + Sequence<sal_Int16> aSelList( static_cast<sal_Int32>(nSelCnt) ); sal_Int16 *pSels = aSelList.getArray(); for(size_t i = 0; i < nSelCnt; ++i) { - pSels[i] = (sal_Int16)m_pFormImpl->GetSelectedList()[i]; + pSels[i] = static_cast<sal_Int16>(m_pFormImpl->GetSelectedList()[i]); } rPropSet->setPropertyValue("DefaultSelection", Any(aSelList) ); diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 749b01dcf142..b45adf42588f 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -94,7 +94,7 @@ sal_Int32 lcl_html_getEndNoteInfo( SwEndNoteInfo& rInfo, break; case 1: - rInfo.nFootnoteOffset = aPart.isEmpty() ? 0 : (sal_uInt16)aPart.toInt32(); + rInfo.nFootnoteOffset = aPart.isEmpty() ? 0 : static_cast<sal_uInt16>(aPart.toInt32()); break; case 2: @@ -263,13 +263,13 @@ Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const SfxPoolItem& rHt ) OSL_ENSURE( nPos == static_cast<size_t>(rHTMLWrt.m_nFootNote + rHTMLWrt.m_nEndNote), "OutHTML_SwFormatFootnote: wrong position" ); sClass = OOO_STRING_SVTOOLS_HTML_sdendnote_anc; - sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote + OUString::number( (sal_Int32)(++rHTMLWrt.m_nEndNote) ); + sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote + OUString::number( static_cast<sal_Int32>(++rHTMLWrt.m_nEndNote) ); } else { nPos = rHTMLWrt.m_nFootNote; sClass = OOO_STRING_SVTOOLS_HTML_sdfootnote_anc; - sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote + OUString::number( (sal_Int32)(++rHTMLWrt.m_nFootNote)); + sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote + OUString::number( static_cast<sal_Int32>(++rHTMLWrt.m_nFootNote)); } if( !rHTMLWrt.m_pFootEndNotes ) @@ -325,13 +325,13 @@ void SwHTMLWriter::OutFootEndNotes() { sClass = OOO_STRING_SVTOOLS_HTML_sdendnote; sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote; - sFootnoteName += OUString::number((sal_Int32)(++m_nEndNote)); + sFootnoteName += OUString::number(static_cast<sal_Int32>(++m_nEndNote)); } else { sClass = OOO_STRING_SVTOOLS_HTML_sdfootnote; sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote; - sFootnoteName += OUString::number((sal_Int32)(++m_nFootNote)); + sFootnoteName += OUString::number(static_cast<sal_Int32>(++m_nFootNote)); } if( m_bLFPossible ) @@ -416,14 +416,14 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFormatFootnote& rFormatFootnote, { sClass = OOO_STRING_SVTOOLS_HTML_sdendnote_sym; sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote; - sFootnoteName += OUString::number((sal_Int32)m_nEndNote); + sFootnoteName += OUString::number(static_cast<sal_Int32>(m_nEndNote)); pInfo = &pDoc->GetEndNoteInfo(); } else { sClass = OOO_STRING_SVTOOLS_HTML_sdfootnote_sym; sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote; - sFootnoteName += OUString::number((sal_Int32)m_nFootNote); + sFootnoteName += OUString::number(static_cast<sal_Int32>(m_nFootNote)); pInfo = &pDoc->GetFootnoteInfo(); } diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 4f163ec49cf8..d9466e690128 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -376,7 +376,7 @@ void SwHTMLParser::InsertImage() sAltNm = rOption.GetString(); break; case HtmlOptionId::BORDER: - nBorder = (sal_uInt16)rOption.GetNumber(); + nBorder = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::ISMAP: bIsMap = true; @@ -502,8 +502,8 @@ IMAGE_SETEVENT: long nHBorderWidth = 0, nVBorderWidth = 0; if( nBorder ) { - nHBorderWidth = (long)nBorder; - nVBorderWidth = (long)nBorder; + nHBorderWidth = static_cast<long>(nBorder); + nVBorderWidth = static_cast<long>(nBorder); SvxCSS1Parser::PixelToTwip( nVBorderWidth, nHBorderWidth ); ::editeng::SvxBorderLine aHBorderLine( nullptr, nHBorderWidth ); @@ -615,7 +615,7 @@ IMAGE_SETEVENT: // a percentage value if( bPrcWidth ) { - nPrcWidth = (sal_uInt8)nWidth; + nPrcWidth = static_cast<sal_uInt8>(nWidth); nPrcHeight = 255; } else @@ -627,7 +627,7 @@ IMAGE_SETEVENT: { if( bPrcHeight ) { - nPrcHeight = (sal_uInt8)nHeight; + nPrcHeight = static_cast<sal_uInt8>(nHeight); nPrcWidth = 255; } else @@ -642,10 +642,10 @@ IMAGE_SETEVENT: bSetTwipSize = false; if( bPrcWidth ) - nPrcWidth = (sal_uInt8)nWidth; + nPrcWidth = static_cast<sal_uInt8>(nWidth); if( bPrcHeight ) - nPrcHeight = (sal_uInt8)nHeight; + nPrcHeight = static_cast<sal_uInt8>(nHeight); } // set image map diff --git a/sw/source/filter/html/htmlnum.hxx b/sw/source/filter/html/htmlnum.hxx index 2f310206174f..66cd293fca1e 100644 --- a/sw/source/filter/html/htmlnum.hxx +++ b/sw/source/filter/html/htmlnum.hxx @@ -110,7 +110,7 @@ inline void SwHTMLNumRuleInfo::Clear() inline sal_uInt8 SwHTMLNumRuleInfo::GetLevel() const { return - (sal_uInt8)( pNumRule!=nullptr && nDeep != 0 + static_cast<sal_uInt8>( pNumRule!=nullptr && nDeep != 0 ? ( nDeep<=MAXLEVEL ? nDeep-1 : MAXLEVEL - 1 ) : 0 ); } diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx index 4904426730ff..27045823103b 100644 --- a/sw/source/filter/html/htmlnumreader.cxx +++ b/sw/source/filter/html/htmlnumreader.cxx @@ -65,7 +65,7 @@ void SwHTMLParser::NewNumBulList( HtmlTokenId nToken ) // Increment the numbering depth rInfo.IncDepth(); - sal_uInt8 nLevel = (sal_uInt8)( (rInfo.GetDepth() <= MAXLEVEL ? rInfo.GetDepth() + sal_uInt8 nLevel = static_cast<sal_uInt8>( (rInfo.GetDepth() <= MAXLEVEL ? rInfo.GetDepth() : MAXLEVEL) - 1 ); // Create rules if needed @@ -167,7 +167,7 @@ void SwHTMLParser::NewNumBulList( HtmlTokenId nToken ) break; case HtmlOptionId::START: { - sal_uInt16 nStart = (sal_uInt16)rOption.GetNumber(); + sal_uInt16 nStart = static_cast<sal_uInt16>(rOption.GetNumber()); if( bNewNumFormat ) { aNumFormat.SetStart( nStart ); @@ -200,10 +200,10 @@ void SwHTMLParser::NewNumBulList( HtmlTokenId nToken ) } break; case HtmlOptionId::WIDTH: - nWidth = (sal_uInt16)rOption.GetNumber(); + nWidth = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::HEIGHT: - nHeight = (sal_uInt16)rOption.GetNumber(); + nHeight = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::ALIGN: eVertOri = rOption.GetEnum( aHTMLImgVAlignTable, eVertOri ); @@ -271,11 +271,11 @@ void SwHTMLParser::NewNumBulList( HtmlTokenId nToken ) nAbsLSpace < -aPropInfo.m_nLeftMargin ) nAbsLSpace = 0U; else if( aPropInfo.m_nLeftMargin > USHRT_MAX || - (long)nAbsLSpace + + static_cast<long>(nAbsLSpace) + aPropInfo.m_nLeftMargin > USHRT_MAX ) nAbsLSpace = USHRT_MAX; else - nAbsLSpace = nAbsLSpace + (sal_uInt16)aPropInfo.m_nLeftMargin; + nAbsLSpace = nAbsLSpace + static_cast<sal_uInt16>(aPropInfo.m_nLeftMargin); aNumFormat.SetAbsLSpace( nAbsLSpace ); bChangeNumFormat = true; @@ -444,7 +444,7 @@ void SwHTMLParser::NewNumBulListItem( HtmlTokenId nToken ) switch( rOption.GetToken() ) { case HtmlOptionId::VALUE: - nStart = (sal_uInt16)rOption.GetNumber(); + nStart = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::ID: aId = rOption.GetString(); diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx index f363e40f49e3..e230f40f4c2e 100644 --- a/sw/source/filter/html/htmlnumwriter.cxx +++ b/sw/source/filter/html/htmlnumwriter.cxx @@ -270,7 +270,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt, rWrt.Strm().WriteOString( sOut ); if( rWrt.m_bCfgOutStyles ) - OutCSS1_NumBulListStyleOpt( rWrt, *rInfo.GetNumRule(), (sal_uInt8)i ); + OutCSS1_NumBulListStyleOpt( rWrt, *rInfo.GetNumRule(), static_cast<sal_uInt8>(i) ); rWrt.Strm().WriteChar( '>' ); diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 069aeea16efb..a0862890543b 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -137,7 +137,7 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize, // process width if( SVX_CSS1_LTYPE_PERCENTAGE == rCSS1PropInfo.m_eWidthType ) { - nPrcWidth = (sal_uInt8)rCSS1PropInfo.m_nWidth; + nPrcWidth = static_cast<sal_uInt8>(rCSS1PropInfo.m_nWidth); aTwipSz.Width() = rTwipDfltSize.Width(); } else if( SVX_CSS1_LTYPE_TWIP== rCSS1PropInfo.m_eWidthType ) @@ -146,7 +146,7 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize, } else if( bPrcWidth && rPixSize.Width() ) { - nPrcWidth = (sal_uInt8)rPixSize.Width(); + nPrcWidth = static_cast<sal_uInt8>(rPixSize.Width()); if( nPrcWidth > 100 ) nPrcWidth = 100; @@ -164,7 +164,7 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize, // process height if( SVX_CSS1_LTYPE_PERCENTAGE == rCSS1PropInfo.m_eHeightType ) { - nPrcHeight = (sal_uInt8)rCSS1PropInfo.m_nHeight; + nPrcHeight = static_cast<sal_uInt8>(rCSS1PropInfo.m_nHeight); aTwipSz.Height() = rTwipDfltSize.Height(); } else if( SVX_CSS1_LTYPE_TWIP== rCSS1PropInfo.m_eHeightType ) @@ -173,7 +173,7 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize, } else if( bPrcHeight && rPixSize.Height() ) { - nPrcHeight = (sal_uInt8)rPixSize.Height(); + nPrcHeight = static_cast<sal_uInt8>(rPixSize.Height()); if( nPrcHeight > 100 ) nPrcHeight = 100; @@ -209,7 +209,7 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace, Application::GetDefaultDevice()->PixelToLogic( aTwipSpc, MapMode(MapUnit::MapTwip) ); nLeftSpace = nRightSpace = aTwipSpc.Width(); - nUpperSpace = nLowerSpace = (sal_uInt16)aTwipSpc.Height(); + nUpperSpace = nLowerSpace = static_cast<sal_uInt16>(aTwipSpc.Height()); } // set left/right margin @@ -339,23 +339,23 @@ void SwHTMLParser::InsertEmbed() if( USHRT_MAX==aSize.Width() ) { bPrcWidth = (rOption.GetString().indexOf('%') != -1); - aSize.Width() = (long)rOption.GetNumber(); + aSize.Width() = static_cast<long>(rOption.GetNumber()); } break; case HtmlOptionId::HEIGHT: if( USHRT_MAX==aSize.Height() ) { bPrcHeight = (rOption.GetString().indexOf('%') != -1); - aSize.Height() = (long)rOption.GetNumber(); + aSize.Height() = static_cast<long>(rOption.GetNumber()); } break; case HtmlOptionId::HSPACE: if( USHRT_MAX==aSpace.Width() ) - aSpace.Width() = (long)rOption.GetNumber(); + aSpace.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::VSPACE: if( USHRT_MAX==aSpace.Height() ) - aSpace.Height() = (long)rOption.GetNumber(); + aSpace.Height() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::UNKNOWN: if (rOption.GetTokenString().equalsIgnoreAsciiCase( @@ -530,11 +530,11 @@ void SwHTMLParser::NewObject() break; case HtmlOptionId::WIDTH: bPrcWidth = (rOption.GetString().indexOf('%') != -1); - aSize.Width() = (long)rOption.GetNumber(); + aSize.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::HEIGHT: bPrcHeight = (rOption.GetString().indexOf('%') != -1); - aSize.Height() = (long)rOption.GetNumber(); + aSize.Height() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::ALIGN: eVertOri = rOption.GetEnum( aHTMLImgVAlignTable, eVertOri ); @@ -546,10 +546,10 @@ void SwHTMLParser::NewObject() aName = rOption.GetString(); break; case HtmlOptionId::HSPACE: - aSpace.Width() = (long)rOption.GetNumber(); + aSpace.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::VSPACE: - aSpace.Height() = (long)rOption.GetNumber(); + aSpace.Height() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::BORDER: break; @@ -694,17 +694,17 @@ void SwHTMLParser::InsertApplet() break; case HtmlOptionId::WIDTH: bPrcWidth = (rOption.GetString().indexOf('%') != -1); - aSize.Width() = (long)rOption.GetNumber(); + aSize.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::HEIGHT: bPrcHeight = (rOption.GetString().indexOf('%') != -1); - aSize.Height() = (long)rOption.GetNumber(); + aSize.Height() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::HSPACE: - aSpace.Width() = (long)rOption.GetNumber(); + aSpace.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::VSPACE: - aSpace.Height() = (long)rOption.GetNumber(); + aSpace.Height() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::MAYSCRIPT: bMayScript = true; @@ -845,17 +845,17 @@ void SwHTMLParser::InsertFloatingFrame() break; case HtmlOptionId::WIDTH: bPrcWidth = (rOption.GetString().indexOf('%') != -1); - aSize.Width() = (long)rOption.GetNumber(); + aSize.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::HEIGHT: bPrcHeight = (rOption.GetString().indexOf('%') != -1); - aSize.Height() = (long)rOption.GetNumber(); + aSize.Height() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::HSPACE: - aSpace.Width() = (long)rOption.GetNumber(); + aSpace.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::VSPACE: - aSpace.Height() = (long)rOption.GetNumber(); + aSpace.Height() = static_cast<long>(rOption.GetNumber()); break; default: break; } diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 9a23aebaa8f9..1f838edd054c 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -567,7 +567,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) aDir = rOption.GetString(); break; case HtmlOptionId::COLS: - nCols = (sal_uInt16)rOption.GetNumber(); + nCols = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::WIDTH: nWidth = rOption.GetNumber(); @@ -576,7 +576,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) nWidth = 100; break; case HtmlOptionId::GUTTER: - nGutter = (sal_uInt16)rOption.GetNumber(); + nGutter = static_cast<sal_uInt16>(rOption.GetNumber()); break; default: break; } @@ -600,7 +600,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) aItemSet, aPropInfo, &aLang, &aDir ); // Calculate width. - sal_uInt8 nPrcWidth = bPrcWidth ? (sal_uInt8)nWidth : 0; + sal_uInt8 nPrcWidth = bPrcWidth ? static_cast<sal_uInt8>(nWidth) : 0; SwTwips nTwipWidth = 0; if( !bPrcWidth && nWidth && Application::GetDefaultDevice() ) { @@ -695,9 +695,9 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) if( nGutter && Application::GetDefaultDevice() ) { - nGutter = (sal_uInt16)Application::GetDefaultDevice() + nGutter = static_cast<sal_uInt16>(Application::GetDefaultDevice() ->PixelToLogic( Size(nGutter, 0), - MapMode(MapUnit::MapTwip) ).Width(); + MapMode(MapUnit::MapTwip) ).Width()); } SwFormatCol aFormatCol; diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 74a2c0951c98..0c8c72659f3e 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -929,7 +929,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions ) const Color& rBorderColor = pOptions->aBorderColor; - long nBorderOpt = (long)pOptions->nBorder; + long nBorderOpt = static_cast<long>(pOptions->nBorder); long nPWidth = nBorderOpt==USHRT_MAX ? NETSCAPE_DFLT_BORDER : nBorderOpt; long nPHeight = nBorderOpt==USHRT_MAX ? 0 : nBorderOpt; @@ -938,7 +938,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions ) // nBorder tells the width of the border as it's used in the width calculation of NetScape // If pOption->nBorder == USHRT_MAX, there wasn't a BORDER option given // Nonetheless, a 1 pixel wide border will be used for width calculation - m_nBorder = (sal_uInt16)nPWidth; + m_nBorder = static_cast<sal_uInt16>(nPWidth); if( nBorderOpt==USHRT_MAX ) nPWidth = 0; @@ -997,8 +997,8 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions ) nPWidth = pOptions->nHSpace; nPHeight = pOptions->nVSpace; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - m_nHSpace = (sal_uInt16)nPWidth; - m_nVSpace = (sal_uInt16)nPHeight; + m_nHSpace = static_cast<sal_uInt16>(nPWidth); + m_nVSpace = static_cast<sal_uInt16>(nPHeight); m_bColSpec = false; @@ -1313,11 +1313,11 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox, pFrameFormat = pBox->ClaimFrameFormat(); // calculate width of the box - SwTwips nFrameWidth = (SwTwips)m_xLayoutInfo->GetColumn(nCol) - ->GetRelColWidth(); + SwTwips nFrameWidth = static_cast<SwTwips>(m_xLayoutInfo->GetColumn(nCol) + ->GetRelColWidth()); for( sal_uInt16 i=1; i<nColSpan; i++ ) - nFrameWidth += (SwTwips)m_xLayoutInfo->GetColumn(nCol+i) - ->GetRelColWidth(); + nFrameWidth += static_cast<SwTwips>(m_xLayoutInfo->GetColumn(nCol+i) + ->GetRelColWidth()); // Only set the border on edit boxes. // On setting the upper and lower border, keep in mind if @@ -1963,10 +1963,10 @@ void HTMLTable::InsertCell( std::shared_ptr<HTMLTableCnts> const& rCnts, bool bHasNumFormat, sal_uInt32 nNumFormat, bool bHasValue, double nValue, bool bNoWrap ) { - if( !nRowSpan || (sal_uInt32)m_nCurrentRow + nRowSpan > USHRT_MAX ) + if( !nRowSpan || static_cast<sal_uInt32>(m_nCurrentRow) + nRowSpan > USHRT_MAX ) nRowSpan = 1; - if( !nColSpan || (sal_uInt32)m_nCurrentColumn + nColSpan > USHRT_MAX ) + if( !nColSpan || static_cast<sal_uInt32>(m_nCurrentColumn) + nColSpan > USHRT_MAX ) nColSpan = 1; sal_uInt16 nColsReq = m_nCurrentColumn + nColSpan; @@ -2046,7 +2046,7 @@ void HTMLTable::InsertCell( std::shared_ptr<HTMLTableCnts> const& rCnts, // Only set width on the first cell! if( nCellWidth ) { - sal_uInt16 nTmp = bRelWidth ? nCellWidth : (sal_uInt16)aTwipSz.Width(); + sal_uInt16 nTmp = bRelWidth ? nCellWidth : static_cast<sal_uInt16>(aTwipSz.Width()); GetCell( m_nCurrentRow, m_nCurrentColumn ).SetWidth( nTmp, bRelWidth ); } @@ -2180,7 +2180,7 @@ void HTMLTable::InsertCol( sal_uInt16 nSpan, sal_uInt16 nColWidth, bool bRelWidt for( i=m_nCurrentColumn; i<nColsReq; i++ ) { HTMLTableColumn& rCol = m_aColumns[i]; - sal_uInt16 nTmp = bRelWidth ? nColWidth : (sal_uInt16)aTwipSz.Width(); + sal_uInt16 nTmp = bRelWidth ? nColWidth : static_cast<sal_uInt16>(aTwipSz.Width()); rCol.SetWidth( nTmp, bRelWidth ); rCol.SetAdjust( eAdjust ); rCol.SetVertOri( eVertOrient ); @@ -2395,7 +2395,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, { pFrameFormat->LockModify(); SwFormatFrameSize aFrameSize( pFrameFormat->GetFrameSize() ); - aFrameSize.SetWidthPercent( (sal_uInt8)m_nWidth ); + aFrameSize.SetWidthPercent( static_cast<sal_uInt8>(m_nWidth) ); pFrameFormat->SetFormatAttr( aFrameSize ); pFrameFormat->UnlockModify(); } @@ -2528,7 +2528,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, sal_uInt32 nMin = m_xLayoutInfo->GetMin(); if( nMin > USHRT_MAX ) nMin = USHRT_MAX; - SwFormatFrameSize aFlyFrameSize( ATT_VAR_SIZE, (SwTwips)nMin, MINLAY ); + SwFormatFrameSize aFlyFrameSize( ATT_VAR_SIZE, static_cast<SwTwips>(nMin), MINLAY ); aFlyFrameSize.SetWidthPercent( 100 ); m_pContext->GetFrameFormat()->SetFormatAttr( aFlyFrameSize ); bIsInFlyFrame = false; @@ -2544,7 +2544,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, sal_uInt32 nMax = m_xLayoutInfo->GetMax(); if( nMax > USHRT_MAX ) nMax = USHRT_MAX; - SwFormatFrameSize aFlyFrameSize( ATT_VAR_SIZE, (SwTwips)nMax, MINLAY ); + SwFormatFrameSize aFlyFrameSize( ATT_VAR_SIZE, static_cast<SwTwips>(nMax), MINLAY ); m_pContext->GetFrameFormat()->SetFormatAttr( aFlyFrameSize ); bIsInFlyFrame = false; } @@ -2571,7 +2571,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, SdrObject *pObj = (*m_pResizeDrawObjects)[i]; sal_uInt16 nRow = (*m_pDrawObjectPrcWidths)[3*i]; sal_uInt16 nCol = (*m_pDrawObjectPrcWidths)[3*i+1]; - sal_uInt8 nPrcWidth = (sal_uInt8)(*m_pDrawObjectPrcWidths)[3*i+2]; + sal_uInt8 nPrcWidth = static_cast<sal_uInt8>((*m_pDrawObjectPrcWidths)[3*i+2]); SwHTMLTableLayoutCell *pLayoutCell = m_xLayoutInfo->GetCell( nRow, nCol ); @@ -2579,7 +2579,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, sal_uInt16 nWidth2, nDummy; m_xLayoutInfo->GetAvail( nCol, nColSpan, nWidth2, nDummy ); - nWidth2 = static_cast< sal_uInt16 >(((long)m_nWidth * nPrcWidth) / 100); + nWidth2 = static_cast< sal_uInt16 >((static_cast<long>(m_nWidth) * nPrcWidth) / 100); SwHTMLParser::ResizeDrawObject( pObj, nWidth2 ); } @@ -2611,7 +2611,7 @@ void HTMLTable::RegisterDrawObject( SdrObject *pObj, sal_uInt8 nPrcWidth ) m_pDrawObjectPrcWidths = new std::vector<sal_uInt16>; m_pDrawObjectPrcWidths->push_back( m_nCurrentRow ); m_pDrawObjectPrcWidths->push_back( m_nCurrentColumn ); - m_pDrawObjectPrcWidths->push_back( (sal_uInt16)nPrcWidth ); + m_pDrawObjectPrcWidths->push_back( static_cast<sal_uInt16>(nPrcWidth) ); } void HTMLTable::MakeParentContents() @@ -3026,10 +3026,10 @@ CellSaveStruct::CellSaveStruct( SwHTMLParser& rParser, HTMLTable const *pCurTabl m_aId = rOption.GetString(); break; case HtmlOptionId::COLSPAN: - m_nColSpan = (sal_uInt16)rOption.GetNumber(); + m_nColSpan = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::ROWSPAN: - m_nRowSpan = (sal_uInt16)rOption.GetNumber(); + m_nRowSpan = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::ALIGN: m_eAdjust = rOption.GetEnum( aHTMLPAlignTable, m_eAdjust ); @@ -3038,13 +3038,13 @@ CellSaveStruct::CellSaveStruct( SwHTMLParser& rParser, HTMLTable const *pCurTabl m_eVertOri = rOption.GetEnum( aHTMLTableVAlignTable, m_eVertOri ); break; case HtmlOptionId::WIDTH: - m_nWidth = (sal_uInt16)rOption.GetNumber(); // Just for Netscape + m_nWidth = static_cast<sal_uInt16>(rOption.GetNumber()); // Just for Netscape m_bPrcWidth = (rOption.GetString().indexOf('%') != -1); if( m_bPrcWidth && m_nWidth>100 ) m_nWidth = 100; break; case HtmlOptionId::HEIGHT: - m_nHeight = (sal_uInt16)rOption.GetNumber(); // Just for Netscape + m_nHeight = static_cast<sal_uInt16>(rOption.GetNumber()); // Just for Netscape if( rOption.GetString().indexOf('%') != -1) m_nHeight = 0; // don't consider % attributes break; @@ -4427,10 +4427,10 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, InsertBookmark( rOption.GetString() ); break; case HtmlOptionId::SPAN: - pSaveStruct->nColGrpSpan = (sal_uInt16)rOption.GetNumber(); + pSaveStruct->nColGrpSpan = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::WIDTH: - pSaveStruct->nColGrpWidth = (sal_uInt16)rOption.GetNumber(); + pSaveStruct->nColGrpWidth = static_cast<sal_uInt16>(rOption.GetNumber()); pSaveStruct->bRelColGrpWidth = (rOption.GetString().indexOf('*') != -1); break; @@ -4509,10 +4509,10 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, InsertBookmark( rOption.GetString() ); break; case HtmlOptionId::SPAN: - nColSpan = (sal_uInt16)rOption.GetNumber(); + nColSpan = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::WIDTH: - nColWidth = (sal_uInt16)rOption.GetNumber(); + nColWidth = static_cast<sal_uInt16>(rOption.GetNumber()); bRelColWidth = (rOption.GetString().indexOf('*') != -1); break; @@ -4866,24 +4866,24 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, aId = rOption.GetString(); break; case HtmlOptionId::COLS: - nCols = (sal_uInt16)rOption.GetNumber(); + nCols = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::WIDTH: - nWidth = (sal_uInt16)rOption.GetNumber(); + nWidth = static_cast<sal_uInt16>(rOption.GetNumber()); bPrcWidth = (rOption.GetString().indexOf('%') != -1); if( bPrcWidth && nWidth>100 ) nWidth = 100; break; case HtmlOptionId::HEIGHT: - nHeight = (sal_uInt16)rOption.GetNumber(); + nHeight = static_cast<sal_uInt16>(rOption.GetNumber()); if( rOption.GetString().indexOf('%') != -1 ) nHeight = 0; // don't use % attributes break; case HtmlOptionId::CELLPADDING: - nCellPadding = (sal_uInt16)rOption.GetNumber(); + nCellPadding = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::CELLSPACING: - nCellSpacing = (sal_uInt16)rOption.GetNumber(); + nCellSpacing = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::ALIGN: { @@ -4902,7 +4902,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, !rOption.GetString().equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_border)) { - nBorder = (sal_uInt16)rOption.GetNumber(); + nBorder = static_cast<sal_uInt16>(rOption.GetNumber()); } else nBorder = 1; @@ -4950,10 +4950,10 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, aDir = rOption.GetString(); break; case HtmlOptionId::HSPACE: - nHSpace = (sal_uInt16)rOption.GetNumber(); + nHSpace = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::VSPACE: - nVSpace = (sal_uInt16)rOption.GetNumber(); + nVSpace = static_cast<sal_uInt16>(rOption.GetNumber()); break; default: break; } @@ -5324,7 +5324,7 @@ std::shared_ptr<HTMLTable> SwHTMLParser::BuildTable(SvxAdjust eParentAdjust, } // Process SwTable - sal_uInt16 nBrowseWidth = (sal_uInt16)GetCurrentBrowseWidth(); + sal_uInt16 nBrowseWidth = static_cast<sal_uInt16>(GetCurrentBrowseWidth()); xSaveStruct->MakeTable(nBrowseWidth, *m_pPam->GetPoint(), m_xDoc.get()); } diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index a603499d688c..e4a745f1ca35 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -113,7 +113,7 @@ void SwHTMLWrtTable::Pixelize( sal_uInt16& rValue ) if( !aSz.Width() ) aSz.Width() = 1; aSz = Application::GetDefaultDevice()->PixelToLogic( aSz, MapMode(MapUnit::MapTwip) ); - rValue = (sal_uInt16)aSz.Width(); + rValue = static_cast<sal_uInt16>(aSz.Width()); } } @@ -905,7 +905,7 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode, const SwFormatFrameSize& rFrameSize = pFormat->GetFrameSize(); long nWidth = rFrameSize.GetSize().Width(); sal_uInt8 nPrcWidth = rFrameSize.GetWidthPercent(); - sal_uInt16 nBaseWidth = (sal_uInt16)nWidth; + sal_uInt16 nBaseWidth = static_cast<sal_uInt16>(nWidth); sal_Int16 eTabHoriOri = pFormat->GetHoriOrient().GetHoriOrient(); diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index 13c46fc0b5c1..3afa5f73ad7b 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -39,8 +39,8 @@ #define LOOP_CHECK_RESTART \ nOldInPos = SAL_MAX_INT32; #define LOOP_CHECK_CHECK( where ) \ - OSL_ENSURE( nOldInPos!=nInPos || cNextCh==(sal_Unicode)EOF, where ); \ - if( nOldInPos==nInPos && cNextCh!=(sal_Unicode)EOF ) \ + OSL_ENSURE( nOldInPos!=nInPos || cNextCh==sal_Unicode(EOF), where ); \ + if( nOldInPos==nInPos && cNextCh!=sal_Unicode(EOF) ) \ break; \ else \ nOldInPos = nInPos; @@ -76,7 +76,7 @@ sal_Unicode CSS1Parser::GetNextChar() if( nInPos >= aIn.getLength() ) { bEOF = true; - return (sal_Unicode)EOF; + return sal_Unicode(EOF); } sal_Unicode c = aIn[nInPos]; @@ -570,7 +570,7 @@ CSS1Token CSS1Parser::GetNextToken() bWhiteSpace = true; break; - case (sal_Unicode)EOF: + case sal_Unicode(EOF): if( IsEOF() ) { eState = CSS1_PAR_ACCEPTED; @@ -1352,9 +1352,9 @@ bool CSS1Expression::GetColor( Color &rColor ) const if( bRet && nColor!=SAL_MAX_UINT32 ) { - rColor.SetRed( (sal_uInt8)((nColor & 0x00ff0000UL) >> 16) ); - rColor.SetGreen( (sal_uInt8)((nColor & 0x0000ff00UL) >> 8) ); - rColor.SetBlue( (sal_uInt8)(nColor & 0x000000ffUL) ); + rColor.SetRed( static_cast<sal_uInt8>((nColor & 0x00ff0000UL) >> 16) ); + rColor.SetGreen( static_cast<sal_uInt8>((nColor & 0x0000ff00UL) >> 8) ); + rColor.SetBlue( static_cast<sal_uInt8>(nColor & 0x000000ffUL) ); } return bRet; diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx index 30b24ddbeb00..69d1b9c6894f 100644 --- a/sw/source/filter/html/parcss1.hxx +++ b/sw/source/filter/html/parcss1.hxx @@ -150,12 +150,12 @@ inline void CSS1Expression::Set( CSS1Token eTyp, const OUString &rVal, inline sal_uInt32 CSS1Expression::GetULength() const { - return nValue < 0. ? 0UL : (sal_uInt32)(nValue + .5); + return nValue < 0. ? 0UL : static_cast<sal_uInt32>(nValue + .5); } inline sal_Int32 CSS1Expression::GetSLength() const { - return (sal_Int32)(nValue + (nValue < 0. ? -.5 : .5 )); + return static_cast<sal_Int32>(nValue + (nValue < 0. ? -.5 : .5 )); } /** Parser of a style element/option diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index c8049583e65b..ce3651553e0c 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -1020,10 +1020,10 @@ static void ParseCSS1_font_size( const CSS1Expression *pExpr, double fHeight = pExpr->GetNumber(); if (fHeight < SAL_MAX_INT32/2.0 && fHeight > SAL_MIN_INT32/2.0) { - long nPHeight = (long)fHeight; + long nPHeight = static_cast<long>(fHeight); long nPWidth = 0; SvxCSS1Parser::PixelToTwip(nPWidth, nPHeight); - nHeight = (sal_uLong)nPHeight; + nHeight = static_cast<sal_uLong>(nPHeight); } else { @@ -1033,7 +1033,7 @@ static void ParseCSS1_font_size( const CSS1Expression *pExpr, break; case CSS1_PERCENTAGE: // only for drop caps! - nPropHeight = (sal_uInt16)pExpr->GetNumber(); + nPropHeight = static_cast<sal_uInt16>(pExpr->GetNumber()); break; case CSS1_IDENT: { @@ -1180,7 +1180,7 @@ static void ParseCSS1_font_weight( const CSS1Expression *pExpr, break; case CSS1_NUMBER: { - sal_uInt16 nWeight = (sal_uInt16)pExpr->GetNumber(); + sal_uInt16 nWeight = static_cast<sal_uInt16>(pExpr->GetNumber()); SvxWeightItem aWeight( nWeight>400 ? WEIGHT_BOLD : WEIGHT_NORMAL, aItemIds.nWeight ); if( rParser.IsSetWesternProps() ) @@ -1485,7 +1485,7 @@ static void ParseCSS1_background( const CSS1Expression *pExpr, // only distinguish between 0 and !0. Therefore pixel // can be handled like all other units. - sal_uLong nLength = (sal_uLong)pExpr->GetNumber(); + sal_uLong nLength = static_cast<sal_uLong>(pExpr->GetNumber()); if( !bHori ) { ePos = nLength ? GPOS_MM : GPOS_LT; @@ -1503,7 +1503,7 @@ static void ParseCSS1_background( const CSS1Expression *pExpr, { // the percentage is converted to an enum - sal_uInt16 nPerc = (sal_uInt16)pExpr->GetNumber(); + sal_uInt16 nPerc = static_cast<sal_uInt16>(pExpr->GetNumber()); if( !bHori ) { ePos = nPerc < 25 ? GPOS_LT @@ -1649,30 +1649,30 @@ static void ParseCSS1_line_height( const CSS1Expression *pExpr, switch( pExpr->GetType() ) { case CSS1_LENGTH: - nHeight = (sal_uInt16)pExpr->GetULength(); + nHeight = static_cast<sal_uInt16>(pExpr->GetULength()); break; case CSS1_PIXLENGTH: { double fHeight = pExpr->GetNumber(); if (fHeight < SAL_MAX_INT32/2.0 && fHeight > SAL_MIN_INT32/2.0) { - long nPHeight = (long)fHeight; + long nPHeight = static_cast<long>(fHeight); long nPWidth = 0; SvxCSS1Parser::PixelToTwip(nPWidth, nPHeight); - nHeight = (sal_uInt16)nPHeight; + nHeight = static_cast<sal_uInt16>(nPHeight); } } break; case CSS1_PERCENTAGE: { - sal_uInt16 nPHeight = (sal_uInt16)pExpr->GetNumber(); - nPropHeight = nPHeight <= 200 ? (sal_uInt8)nPHeight : 200; + sal_uInt16 nPHeight = static_cast<sal_uInt16>(pExpr->GetNumber()); + nPropHeight = nPHeight <= 200 ? static_cast<sal_uInt8>(nPHeight) : 200; } break; case CSS1_NUMBER: { - sal_uInt16 nPHeight = (sal_uInt16)(pExpr->GetNumber() * 100); - nPropHeight = nPHeight <= 200 ? (sal_uInt8)nPHeight : 200; + sal_uInt16 nPHeight = static_cast<sal_uInt16>(pExpr->GetNumber() * 100); + nPropHeight = nPHeight <= 200 ? static_cast<sal_uInt8>(nPHeight) : 200; } break; default: @@ -1768,7 +1768,7 @@ static void ParseCSS1_font( const CSS1Expression *pExpr, } else { - eWeight = (sal_uInt16)pExpr->GetNumber() > 400 ? WEIGHT_BOLD + eWeight = static_cast<sal_uInt16>(pExpr->GetNumber()) > 400 ? WEIGHT_BOLD : WEIGHT_NORMAL; } @@ -1846,16 +1846,16 @@ static void ParseCSS1_letter_spacing( const CSS1Expression *pExpr, switch( pExpr->GetType() ) { case CSS1_LENGTH: - rItemSet.Put( SvxKerningItem( (short)pExpr->GetSLength(), + rItemSet.Put( SvxKerningItem( static_cast<short>(pExpr->GetSLength()), aItemIds.nKerning ) ); break; case CSS1_PIXLENGTH: { - long nPWidth = (long)pExpr->GetNumber(); + long nPWidth = static_cast<long>(pExpr->GetNumber()); long nPHeight = 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - rItemSet.Put( SvxKerningItem( (short)nPWidth, aItemIds.nKerning ) ); + rItemSet.Put( SvxKerningItem( static_cast<short>(nPWidth), aItemIds.nKerning ) ); } break; @@ -1863,7 +1863,7 @@ static void ParseCSS1_letter_spacing( const CSS1Expression *pExpr, if( pExpr->GetNumber() == 0 ) { // normally unnecessary, but we are tolerant - rItemSet.Put( SvxKerningItem( (short)0, aItemIds.nKerning ) ); + rItemSet.Put( SvxKerningItem( short(0), aItemIds.nKerning ) ); } break; @@ -1871,7 +1871,7 @@ static void ParseCSS1_letter_spacing( const CSS1Expression *pExpr, case CSS1_STRING: // As a precaution also MS-IE if( pExpr->GetString().equalsIgnoreAsciiCase( "normal" ) ) { - rItemSet.Put( SvxKerningItem( (short)0, aItemIds.nKerning ) ); + rItemSet.Put( SvxKerningItem( short(0), aItemIds.nKerning ) ); } break; default: @@ -2018,7 +2018,7 @@ static void ParseCSS1_text_indent( const CSS1Expression *pExpr, switch( pExpr->GetType() ) { case CSS1_LENGTH: - nIndent = (short)pExpr->GetSLength(); + nIndent = static_cast<short>(pExpr->GetSLength()); bSet = true; break; case CSS1_PIXLENGTH: @@ -2026,10 +2026,10 @@ static void ParseCSS1_text_indent( const CSS1Expression *pExpr, double fWidth = pExpr->GetNumber(); if (fWidth < SAL_MAX_INT32/2.0 && fWidth > SAL_MIN_INT32/2.0) { - long nPWidth = (long)fWidth; + long nPWidth = static_cast<long>(fWidth); long nPHeight = 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - nIndent = (short)nPWidth; + nIndent = static_cast<short>(nPWidth); bSet = true; } } @@ -2080,7 +2080,7 @@ static void ParseCSS1_margin_left( const CSS1Expression *pExpr, break; case CSS1_PIXLENGTH: { - nLeft = (long)pExpr->GetNumber(); + nLeft = static_cast<long>(pExpr->GetNumber()); long nPHeight = 0; SvxCSS1Parser::PixelToTwip( nLeft, nPHeight ); bSet = true; @@ -2103,13 +2103,13 @@ static void ParseCSS1_margin_left( const CSS1Expression *pExpr, &pItem ) ) { SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem*>(pItem) ); - aLRItem.SetTextLeft( (sal_uInt16)nLeft ); + aLRItem.SetTextLeft( static_cast<sal_uInt16>(nLeft) ); rItemSet.Put( aLRItem ); } else { SvxLRSpaceItem aLRItem( aItemIds.nLRSpace ); - aLRItem.SetTextLeft( (sal_uInt16)nLeft ); + aLRItem.SetTextLeft( static_cast<sal_uInt16>(nLeft) ); rItemSet.Put( aLRItem ); } rPropInfo.m_bLeftMargin = true; @@ -2135,7 +2135,7 @@ static void ParseCSS1_margin_right( const CSS1Expression *pExpr, break; case CSS1_PIXLENGTH: { - nRight = (long)pExpr->GetNumber(); + nRight = static_cast<long>(pExpr->GetNumber()); long nPHeight = 0; SvxCSS1Parser::PixelToTwip( nRight, nPHeight ); bSet = true; @@ -2158,13 +2158,13 @@ static void ParseCSS1_margin_right( const CSS1Expression *pExpr, &pItem ) ) { SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem*>(pItem) ); - aLRItem.SetRight( (sal_uInt16)nRight ); + aLRItem.SetRight( static_cast<sal_uInt16>(nRight) ); rItemSet.Put( aLRItem ); } else { SvxLRSpaceItem aLRItem( aItemIds.nLRSpace ); - aLRItem.SetRight( (sal_uInt16)nRight ); + aLRItem.SetRight( static_cast<sal_uInt16>(nRight) ); rItemSet.Put( aLRItem ); } rPropInfo.m_bRightMargin = true; @@ -2187,18 +2187,18 @@ static void ParseCSS1_margin_top( const CSS1Expression *pExpr, long nTmp = pExpr->GetSLength(); if( nTmp < 0 ) nTmp = 0; - nUpper = (sal_uInt16)nTmp; + nUpper = static_cast<sal_uInt16>(nTmp); bSet = true; } break; case CSS1_PIXLENGTH: { long nPWidth = 0; - long nPHeight = (long)pExpr->GetNumber(); + long nPHeight = static_cast<long>(pExpr->GetNumber()); if( nPHeight < 0 ) nPHeight = 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - nUpper = (sal_uInt16)nPHeight; + nUpper = static_cast<sal_uInt16>(nPHeight); bSet = true; } break; @@ -2245,18 +2245,18 @@ static void ParseCSS1_margin_bottom( const CSS1Expression *pExpr, long nTmp = pExpr->GetSLength(); if( nTmp < 0 ) nTmp = 0; - nLower = (sal_uInt16)nTmp; + nLower = static_cast<sal_uInt16>(nTmp); bSet = true; } break; case CSS1_PIXLENGTH: { long nPWidth = 0; - long nPHeight = (long)pExpr->GetNumber(); + long nPHeight = static_cast<long>(pExpr->GetNumber()); if( nPHeight < 0 ) nPHeight = 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - nLower = (sal_uInt16)nPHeight; + nLower = static_cast<sal_uInt16>(nPHeight); bSet = true; } break; @@ -2315,7 +2315,7 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr, double fMargin = pExpr->GetNumber(); if (fMargin < SAL_MAX_INT32/2.0 && fMargin > SAL_MIN_INT32/2.0) { - nMargin = (long)fMargin; + nMargin = static_cast<long>(fMargin); long nPWidth = 0; SvxCSS1Parser::PixelToTwip( nPWidth, nMargin ); bSetThis = true; @@ -2386,18 +2386,18 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr, { SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem*>(pItem) ); if( bSetMargins[3] ) - aLRItem.SetLeft( (sal_uInt16)nMargins[3] ); + aLRItem.SetLeft( static_cast<sal_uInt16>(nMargins[3]) ); if( bSetMargins[1] ) - aLRItem.SetRight( (sal_uInt16)nMargins[1] ); + aLRItem.SetRight( static_cast<sal_uInt16>(nMargins[1]) ); rItemSet.Put( aLRItem ); } else { SvxLRSpaceItem aLRItem( aItemIds.nLRSpace ); if( bSetMargins[3] ) - aLRItem.SetLeft( (sal_uInt16)nMargins[3] ); + aLRItem.SetLeft( static_cast<sal_uInt16>(nMargins[3]) ); if( bSetMargins[1] ) - aLRItem.SetRight( (sal_uInt16)nMargins[1] ); + aLRItem.SetRight( static_cast<sal_uInt16>(nMargins[1]) ); rItemSet.Put( aLRItem ); } } @@ -2415,18 +2415,18 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr, { SvxULSpaceItem aULItem( *static_cast<const SvxULSpaceItem*>(pItem) ); if( bSetMargins[0] ) - aULItem.SetUpper( (sal_uInt16)nMargins[0] ); + aULItem.SetUpper( static_cast<sal_uInt16>(nMargins[0]) ); if( bSetMargins[2] ) - aULItem.SetLower( (sal_uInt16)nMargins[2] ); + aULItem.SetLower( static_cast<sal_uInt16>(nMargins[2]) ); rItemSet.Put( aULItem ); } else { SvxULSpaceItem aULItem( aItemIds.nULSpace ); if( bSetMargins[0] ) - aULItem.SetUpper( (sal_uInt16)nMargins[0] ); + aULItem.SetUpper( static_cast<sal_uInt16>(nMargins[0]) ); if( bSetMargins[2] ) - aULItem.SetLower( (sal_uInt16)nMargins[2] ); + aULItem.SetLower( static_cast<sal_uInt16>(nMargins[2]) ); rItemSet.Put( aULItem ); } @@ -2453,20 +2453,20 @@ static bool ParseCSS1_padding_xxx( const CSS1Expression *pExpr, nTmp = 0; else if( nTmp > USHRT_MAX-1 ) nTmp = USHRT_MAX-1; - nDist = (sal_uInt16)nTmp; + nDist = static_cast<sal_uInt16>(nTmp); bSet = true; } break; case CSS1_PIXLENGTH: { - long nPWidth = (long)pExpr->GetNumber(); + long nPWidth = static_cast<long>(pExpr->GetNumber()); long nPHeight = 0; if( nPWidth < 0 ) nPWidth = 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); if( nPWidth > USHRT_MAX-1 ) nPWidth = USHRT_MAX-1; - nDist = (sal_uInt16)nPWidth; + nDist = static_cast<sal_uInt16>(nPWidth); bSet = true; } break; @@ -2592,7 +2592,7 @@ static void ParseCSS1_border_xxx( const CSS1Expression *pExpr, break; case CSS1_LENGTH: - nWidth = (sal_uInt16)pExpr->GetULength(); + nWidth = static_cast<sal_uInt16>(pExpr->GetULength()); break; case CSS1_PIXLENGTH: @@ -2606,7 +2606,7 @@ static void ParseCSS1_border_xxx( const CSS1Expression *pExpr, long nPWidth = bHori ? 0 : fWidth; long nPHeight = bHori ? fWidth : 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - nWidth = (sal_uInt16)(bHori ? nPHeight : nPWidth); + nWidth = static_cast<sal_uInt16>(bHori ? nPHeight : nPWidth); } else nWidth = 1; @@ -2667,18 +2667,18 @@ static void ParseCSS1_border_xxx_width( const CSS1Expression *pExpr, break; case CSS1_LENGTH: - nWidth = (sal_uInt16)pExpr->GetULength(); + nWidth = static_cast<sal_uInt16>(pExpr->GetULength()); break; case CSS1_PIXLENGTH: { bool bHori = nWhichLine == SvxBoxItemLine::TOP || nWhichLine == SvxBoxItemLine::BOTTOM; - long nWidthL = (long)pExpr->GetNumber(); + long nWidthL = static_cast<long>(pExpr->GetNumber()); long nPWidth = bHori ? 0 : nWidthL; long nPHeight = bHori ? nWidthL : 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - nWidth = (sal_uInt16)(bHori ? nPHeight : nPWidth); + nWidth = static_cast<sal_uInt16>(bHori ? nPHeight : nPWidth); } break; @@ -2887,7 +2887,7 @@ static void ParseCSS1_length( const CSS1Expression *pExpr, double fLength = pExpr->GetNumber(); if (fLength < SAL_MAX_INT32/2.0 && fLength > SAL_MIN_INT32/2.0) { - long nWidthL = (long)fLength; + long nWidthL = static_cast<long>(fLength); long nPWidth = bHori ? 0 : nWidthL; long nPHeight = bHori ? nWidthL : 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); @@ -2898,7 +2898,7 @@ static void ParseCSS1_length( const CSS1Expression *pExpr, break; case CSS1_PERCENTAGE: - rLength = (long)pExpr->GetNumber(); + rLength = static_cast<long>(pExpr->GetNumber()); if( rLength > 100 ) rLength = 100; rLengthType = SVX_CSS1_LTYPE_PERCENTAGE; @@ -2972,7 +2972,7 @@ static void ParseCSS1_size( const CSS1Expression *pExpr, case CSS1_PIXLENGTH: { - long nPHeight = (long)pExpr->GetNumber(); + long nPHeight = static_cast<long>(pExpr->GetNumber()); long nPWidth = n==0 ? nPHeight : 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); rPropInfo.m_nHeight = nPHeight; @@ -3055,7 +3055,7 @@ static void ParseCSS1_widows( const CSS1Expression *pExpr, if( CSS1_NUMBER == pExpr->GetType() ) { sal_uInt8 nVal = pExpr->GetNumber() <= 255 - ? (sal_uInt8)pExpr->GetNumber() + ? static_cast<sal_uInt8>(pExpr->GetNumber()) : 255; SvxWidowsItem aWidowsItem( nVal, aItemIds.nWidows ); rItemSet.Put( aWidowsItem ); @@ -3070,7 +3070,7 @@ static void ParseCSS1_orphans( const CSS1Expression *pExpr, if( CSS1_NUMBER == pExpr->GetType() ) { sal_uInt8 nVal = pExpr->GetNumber() <= 255 - ? (sal_uInt8)pExpr->GetNumber() + ? static_cast<sal_uInt8>(pExpr->GetNumber()) : 255; SvxOrphansItem aOrphansItem( nVal, aItemIds.nOrphans ); rItemSet.Put( aOrphansItem ); diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 92e87c8fef1d..9215f4f35dcc 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -226,8 +226,8 @@ ErrCode HTMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam, co pStrm->ResetError(); else if( SvParserState::Accepted != eState ) { - const OUString sErr(OUString::number((sal_Int32)xParser->GetLineNr()) - + "," + OUString::number((sal_Int32)xParser->GetLinePos())); + const OUString sErr(OUString::number(static_cast<sal_Int32>(xParser->GetLineNr())) + + "," + OUString::number(static_cast<sal_Int32>(xParser->GetLinePos()))); // use the stream as transport for error number nRet = *new StringErrorInfo( ERR_FORMAT_ROWCOL, sErr, @@ -3542,7 +3542,7 @@ void SwHTMLParser::NewBasefontAttr() switch( rOption.GetToken() ) { case HtmlOptionId::SIZE: - nSize = (sal_uInt16)rOption.GetNumber(); + nSize = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::ID: aId = rOption.GetString(); @@ -3651,14 +3651,14 @@ void SwHTMLParser::NewFontAttr( HtmlTokenId nToken ) '-' == rOption.GetString()[0] ) nSSize = o3tl::saturating_add<sal_Int32>(nBaseSize, rOption.GetSNumber()); else - nSSize = (sal_Int32)rOption.GetNumber(); + nSSize = static_cast<sal_Int32>(rOption.GetNumber()); if( nSSize < 1 ) nSSize = 1; else if( nSSize > 7 ) nSSize = 7; - nSize = (sal_uInt16)nSSize; + nSize = static_cast<sal_uInt16>(nSSize); nFontHeight = m_aFontHeights[nSize-1]; } break; @@ -4832,12 +4832,12 @@ void SwHTMLParser::InsertSpacer() case HtmlOptionId::WIDTH: // First only save as pixel value! bPrcWidth = (rOption.GetString().indexOf('%') != -1); - aSize.Width() = (long)rOption.GetNumber(); + aSize.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::HEIGHT: // First only save as pixel value! bPrcHeight = (rOption.GetString().indexOf('%') != -1); - aSize.Height() = (long)rOption.GetNumber(); + aSize.Height() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::SIZE: // First only save as pixel value! @@ -4920,12 +4920,12 @@ void SwHTMLParser::InsertSpacer() { SvxULSpaceItem aULSpace( static_cast<const SvxULSpaceItem&>(pTextNode ->SwContentNode::GetAttr( RES_UL_SPACE )) ); - aULSpace.SetLower( aULSpace.GetLower() + (sal_uInt16)nSize ); + aULSpace.SetLower( aULSpace.GetLower() + static_cast<sal_uInt16>(nSize) ); pTextNode->SetAttr( aULSpace ); } else { - NewAttr(m_xAttrTab, &m_xAttrTab->pULSpace, SvxULSpaceItem(0, (sal_uInt16)nSize, RES_UL_SPACE)); + NewAttr(m_xAttrTab, &m_xAttrTab->pULSpace, SvxULSpaceItem(0, static_cast<sal_uInt16>(nSize), RES_UL_SPACE)); EndAttr( m_xAttrTab->pULSpace, false ); AppendTextNode(); // Don't change spacing! @@ -4951,7 +4951,7 @@ void SwHTMLParser::InsertSpacer() short nIndent = 0; GetMarginsFromContextWithNumBul( nLeft, nRight, nIndent ); - nIndent = nIndent + (short)nSize; + nIndent = nIndent + static_cast<short>(nSize); SvxLRSpaceItem aLRItem( RES_LR_SPACE ); aLRItem.SetTextLeft( nLeft ); @@ -4963,7 +4963,7 @@ void SwHTMLParser::InsertSpacer() } else { - NewAttr(m_xAttrTab, &m_xAttrTab->pKerning, SvxKerningItem( (short)nSize, RES_CHRATR_KERNING )); + NewAttr(m_xAttrTab, &m_xAttrTab->pKerning, SvxKerningItem( static_cast<short>(nSize), RES_CHRATR_KERNING )); OUString aTmp( ' ' ); m_xDoc->getIDocumentContentOperations().InsertString( *m_pPam, aTmp ); EndAttr( m_xAttrTab->pKerning ); @@ -4978,7 +4978,7 @@ sal_uInt16 SwHTMLParser::ToTwips( sal_uInt16 nPixel ) { long nTwips = Application::GetDefaultDevice()->PixelToLogic( Size( nPixel, nPixel ), MapMode( MapUnit::MapTwip ) ).Width(); - return nTwips <= USHRT_MAX ? (sal_uInt16)nTwips : USHRT_MAX; + return nTwips <= USHRT_MAX ? static_cast<sal_uInt16>(nTwips) : USHRT_MAX; } else return nPixel; @@ -5203,11 +5203,11 @@ void SwHTMLParser::InsertHorzRule() aId = rOption.GetString(); break; case HtmlOptionId::SIZE: - nSize = (sal_uInt16)rOption.GetNumber(); + nSize = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::WIDTH: bPrcWidth = (rOption.GetString().indexOf('%') != -1); - nWidth = (sal_uInt16)rOption.GetNumber(); + nWidth = static_cast<sal_uInt16>(rOption.GetNumber()); if( bPrcWidth && nWidth>=100 ) { // the default case are 100% lines (no attributes necessary) @@ -5259,7 +5259,7 @@ void SwHTMLParser::InsertHorzRule() if( nSize ) { long nPWidth = 0; - long nPHeight = (long)nSize; + long nPHeight = static_cast<long>(nSize); SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); if ( !bNoShade ) { @@ -5292,12 +5292,12 @@ void SwHTMLParser::InsertHorzRule() { // fake length and alignment of line above paragraph indents long nBrowseWidth = GetCurrentBrowseWidth(); - nWidth = bPrcWidth ? (sal_uInt16)((nWidth*nBrowseWidth) / 100) - : ToTwips( (sal_uInt16)nBrowseWidth ); + nWidth = bPrcWidth ? static_cast<sal_uInt16>((nWidth*nBrowseWidth) / 100) + : ToTwips( static_cast<sal_uInt16>(nBrowseWidth) ); if( nWidth < MINLAY ) nWidth = MINLAY; - const SwFormatColl *pColl = ((long)nWidth < nBrowseWidth) ? GetCurrFormatColl() : nullptr; + const SwFormatColl *pColl = (static_cast<long>(nWidth) < nBrowseWidth) ? GetCurrFormatColl() : nullptr; if (pColl) { SvxLRSpaceItem aLRItem( pColl->GetLRSpace() ); @@ -5306,16 +5306,16 @@ void SwHTMLParser::InsertHorzRule() switch( eAdjust ) { case SvxAdjust::Right: - aLRItem.SetTextLeft( (sal_uInt16)nDist ); + aLRItem.SetTextLeft( static_cast<sal_uInt16>(nDist) ); break; case SvxAdjust::Left: - aLRItem.SetRight( (sal_uInt16)nDist ); + aLRItem.SetRight( static_cast<sal_uInt16>(nDist) ); break; case SvxAdjust::Center: default: nDist /= 2; - aLRItem.SetTextLeft( (sal_uInt16)nDist ); - aLRItem.SetRight( (sal_uInt16)nDist ); + aLRItem.SetTextLeft( static_cast<sal_uInt16>(nDist) ); + aLRItem.SetRight( static_cast<sal_uInt16>(nDist) ); break; } diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 3213ab5ef868..9bc01910c409 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -632,8 +632,8 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, { if( nGutter && Application::GetDefaultDevice() ) { - nGutter = (sal_uInt16)Application::GetDefaultDevice() - ->LogicToPixel( Size(nGutter, 0), MapMode(MapUnit::MapTwip) ).Width(); + nGutter = static_cast<sal_uInt16>(Application::GetDefaultDevice() + ->LogicToPixel( Size(nGutter, 0), MapMode(MapUnit::MapTwip) ).Width()); } sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_gutter "=\"" + OString::number(nGutter) + "\""); } diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 96a6f1906ca2..d223e488c4ca 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -139,11 +139,11 @@ namespace o3tl { // bit 3,4,5 #define CSS1_OUTMODE_SPAN_NO_OFF 0x0000U -#define CSS1_OUTMODE_SPAN_TAG_OFF ((sal_uInt16)(0x0001U << 3)) -#define CSS1_OUTMODE_STYLE_OPT_OFF ((sal_uInt16)(0x0002U << 3)) -#define CSS1_OUTMODE_RULE_OFF ((sal_uInt16)(0x0003U << 3)) +#define CSS1_OUTMODE_SPAN_TAG_OFF (sal_uInt16(0x0001U << 3)) +#define CSS1_OUTMODE_STYLE_OPT_OFF (sal_uInt16(0x0002U << 3)) +#define CSS1_OUTMODE_RULE_OFF (sal_uInt16(0x0003U << 3)) #define CSS1_OUTMODE_SPAN_TAG1_OFF ((sal_uInt16)(0x0004U << 3)) -#define CSS1_OUTMODE_ANY_OFF ((sal_uInt16)(0x0007U << 3)) +#define CSS1_OUTMODE_ANY_OFF (sal_uInt16(0x0007U << 3)) #define CSS1_OUTMODE_ONOFF(a) (CSS1_OUTMODE_##a##_ON|CSS1_OUTMODE_##a##_OFF) #define CSS1_OUTMODE_SPAN_TAG CSS1_OUTMODE_ONOFF(SPAN_TAG) @@ -153,31 +153,31 @@ namespace o3tl { // the following flags specify what should be outputted // bit 6,7,8,9 #define CSS1_OUTMODE_TEMPLATE 0x0000U -#define CSS1_OUTMODE_BODY ((sal_uInt16)(0x0001U << 6)) -#define CSS1_OUTMODE_PARA ((sal_uInt16)(0x0002U << 6)) -#define CSS1_OUTMODE_HINT ((sal_uInt16)(0x0003U << 6)) -#define CSS1_OUTMODE_FRAME ((sal_uInt16)(0x0004U << 6)) -#define CSS1_OUTMODE_TABLE ((sal_uInt16)(0x0005U << 6)) -#define CSS1_OUTMODE_TABLEBOX ((sal_uInt16)(0x0006U << 6)) -#define CSS1_OUTMODE_DROPCAP ((sal_uInt16)(0x0007U << 6)) -#define CSS1_OUTMODE_SECTION ((sal_uInt16)(0x0008U << 6)) -#define CSS1_OUTMODE_SOURCE ((sal_uInt16)(0x000fU << 6)) +#define CSS1_OUTMODE_BODY (sal_uInt16(0x0001U << 6)) +#define CSS1_OUTMODE_PARA (sal_uInt16(0x0002U << 6)) +#define CSS1_OUTMODE_HINT (sal_uInt16(0x0003U << 6)) +#define CSS1_OUTMODE_FRAME (sal_uInt16(0x0004U << 6)) +#define CSS1_OUTMODE_TABLE (sal_uInt16(0x0005U << 6)) +#define CSS1_OUTMODE_TABLEBOX (sal_uInt16(0x0006U << 6)) +#define CSS1_OUTMODE_DROPCAP (sal_uInt16(0x0007U << 6)) +#define CSS1_OUTMODE_SECTION (sal_uInt16(0x0008U << 6)) +#define CSS1_OUTMODE_SOURCE (sal_uInt16(0x000fU << 6)) // bit 10 -#define CSS1_OUTMODE_ENCODE ((sal_uInt16)(0x0001U << 10)) +#define CSS1_OUTMODE_ENCODE (sal_uInt16(0x0001U << 10)) // bit 11,12,13 // don't care about script #define CSS1_OUTMODE_ANY_SCRIPT 0x0000U // no cjk or ctl items -#define CSS1_OUTMODE_WESTERN ((sal_uInt16)(0x0001U << 11)) +#define CSS1_OUTMODE_WESTERN (sal_uInt16(0x0001U << 11)) // no western or ctl items -#define CSS1_OUTMODE_CJK ((sal_uInt16)(0x0002U << 11)) +#define CSS1_OUTMODE_CJK (sal_uInt16(0x0002U << 11)) // no western or cjk items -#define CSS1_OUTMODE_CTL ((sal_uInt16)(0x0003U << 11)) +#define CSS1_OUTMODE_CTL (sal_uInt16(0x0003U << 11)) // no western, cjk or ctl items -#define CSS1_OUTMODE_NO_SCRIPT ((sal_uInt16)(0x0004U << 11)) -#define CSS1_OUTMODE_SCRIPT ((sal_uInt16)(0x0007U << 11)) +#define CSS1_OUTMODE_NO_SCRIPT (sal_uInt16(0x0004U << 11)) +#define CSS1_OUTMODE_SCRIPT (sal_uInt16(0x0007U << 11)) // the HTML writer struct HTMLControl @@ -489,7 +489,7 @@ public: sal_Int32 GetLineLen() { - return (sal_Int32)(Strm().Tell()-m_nLastLFPos); + return static_cast<sal_Int32>(Strm().Tell()-m_nLastLFPos); } void OutNewLine( bool bCheck=false ); diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index 5af4efe89ffb..5332a1c307b9 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -191,7 +191,7 @@ const SvxBrushItem *SwWriteTable::GetLineBrush( const SwTableBox *pBox, void SwWriteTable::MergeBorders( const SvxBorderLine* pBorderLine, bool bTable ) { - if( (sal_uInt32)-1 == m_nBorderColor ) + if( sal_uInt32(-1) == m_nBorderColor ) { Color aGrayColor( COL_GRAY ); if( !pBorderLine->GetColor().IsRGBEqual( aGrayColor ) ) @@ -335,15 +335,15 @@ sal_uInt16 SwWriteTable::GetAbsWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) con nWidth -= GetLeftSpace( nCol ) + GetRightSpace( nCol, nColSpan ); OSL_ENSURE( nWidth > 0, "Column Width <= 0. OK?" ); - return nWidth > 0 ? (sal_uInt16)nWidth : 0; + return nWidth > 0 ? static_cast<sal_uInt16>(nWidth) : 0; } sal_uInt16 SwWriteTable::GetRelWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) const { long nWidth = GetRawWidth( nCol, nColSpan ); - return (sal_uInt16)(long)Fraction( nWidth*256 + GetBaseWidth()/2, - GetBaseWidth() ); + return static_cast<sal_uInt16>(static_cast<long>(Fraction( nWidth*256 + GetBaseWidth()/2, + GetBaseWidth() ))); } sal_uInt16 SwWriteTable::GetPrcWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) const @@ -352,8 +352,8 @@ sal_uInt16 SwWriteTable::GetPrcWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) con // Looks funny, but is nothing more than // [(100 * nWidth) + .5] without rounding errors - return (sal_uInt16)(long)Fraction( nWidth*100 + GetBaseWidth()/2, - GetBaseWidth() ); + return static_cast<sal_uInt16>(static_cast<long>(Fraction( nWidth*100 + GetBaseWidth()/2, + GetBaseWidth() ))); } long SwWriteTable::GetAbsHeight(long nRawHeight, size_t const nRow, @@ -656,7 +656,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, // The new table model may have true row span attributes const long nAttrRowSpan = pBox->getRowSpan(); if ( 1 < nAttrRowSpan ) - nRowSpan = (sal_uInt16)nAttrRowSpan; + nRowSpan = static_cast<sal_uInt16>(nAttrRowSpan); else if ( nAttrRowSpan < 1 ) nRowSpan = 0; @@ -726,7 +726,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, SwWriteTable::SwWriteTable(const SwTable* pTable, const SwTableLines& rLines, long nWidth, sal_uInt32 nBWidth, bool bRel, sal_uInt16 nMaxDepth, sal_uInt16 nLSub, sal_uInt16 nRSub, sal_uInt32 nNumOfRowsToRepeat) - : m_pTable(pTable), m_nBorderColor((sal_uInt32)-1), m_nCellSpacing(0), m_nCellPadding(0), m_nBorder(0), + : m_pTable(pTable), m_nBorderColor(sal_uInt32(-1)), m_nCellSpacing(0), m_nCellPadding(0), m_nBorder(0), m_nInnerBorder(0), m_nBaseWidth(nBWidth), m_nHeadEndRow(USHRT_MAX), m_nLeftSub(nLSub), m_nRightSub(nRSub), m_nTabWidth(nWidth), m_bRelWidths(bRel), m_bUseLayoutHeights(true), @@ -759,7 +759,7 @@ SwWriteTable::SwWriteTable(const SwTable* pTable, const SwTableLines& rLines, lo } SwWriteTable::SwWriteTable(const SwTable* pTable, const SwHTMLTableLayout *pLayoutInfo) - : m_pTable(pTable), m_nBorderColor((sal_uInt32)-1), m_nCellSpacing(0), m_nCellPadding(0), m_nBorder(0), + : m_pTable(pTable), m_nBorderColor(sal_uInt32(-1)), m_nCellSpacing(0), m_nCellPadding(0), m_nBorder(0), m_nInnerBorder(0), m_nBaseWidth(pLayoutInfo->GetWidthOption()), m_nHeadEndRow(0), m_nLeftSub(0), m_nRightSub(0), m_nTabWidth(pLayoutInfo->GetWidthOption()), m_bRelWidths(pLayoutInfo->HasPrcWidthOption()), m_bUseLayoutHeights(false), diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 2a1dc9c68bdb..8bde2be39ada 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -6891,7 +6891,7 @@ void DocxAttributeOutput::CharAutoKern( const SvxAutoKernItem& rAutoKern ) { // auto kerning is bound to a minimum font size in Word - but is just a boolean in Writer :-( // kerning is based on half-point sizes, so 2 enables kerning for fontsize 1pt or higher. (1 is treated as size 12, and 0 is treated as disabled.) - const OString sFontSize = OString::number( (sal_uInt32) rAutoKern.GetValue() * 2 ); + const OString sFontSize = OString::number( static_cast<sal_uInt32>(rAutoKern.GetValue()) * 2 ); m_pSerializer->singleElementNS(XML_w, XML_kern, FSNS( XML_w, XML_val ), sFontSize.getStr(), FSEND ); } @@ -7909,8 +7909,8 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace ) else m_pageMargins.nPageMarginLeft = m_pageMargins.nPageMarginRight = 0; - m_pageMargins.nPageMarginLeft = m_pageMargins.nPageMarginLeft + (sal_uInt16)rLRSpace.GetLeft(); - m_pageMargins.nPageMarginRight = m_pageMargins.nPageMarginRight + (sal_uInt16)rLRSpace.GetRight(); + m_pageMargins.nPageMarginLeft = m_pageMargins.nPageMarginLeft + static_cast<sal_uInt16>(rLRSpace.GetLeft()); + m_pageMargins.nPageMarginRight = m_pageMargins.nPageMarginRight + static_cast<sal_uInt16>(rLRSpace.GetRight()); AddToAttrList( m_pSectionSpacingAttrList, 2, FSNS( XML_w, XML_left ), OString::number( m_pageMargins.nPageMarginLeft ).getStr(), @@ -8258,7 +8258,7 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush ) { // Calculate opacity value // Consider oox/source/vml/vmlformatting.cxx : decodeColor() function. - double fOpacity = (double)(*oAlpha) * 65535 / ::oox::drawingml::MAX_PERCENT; + double fOpacity = static_cast<double>(*oAlpha) * 65535 / ::oox::drawingml::MAX_PERCENT; OUString sOpacity = OUString::number(fOpacity) + "f"; AddToAttrList( m_rExport.SdrExporter().getFlyFillAttrList(), XML_opacity, OUStringToOString(sOpacity, RTL_TEXTENCODING_UTF8).getStr() ); @@ -8568,7 +8568,7 @@ void DocxAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCo for ( sal_uInt16 n = 0; n < nCols; ++n ) { FastAttributeList *pColAttrList = FastSerializerHelper::createAttrList(); - sal_uInt16 nWidth = rCol.CalcPrtColWidth( n, ( sal_uInt16 ) nPageSize ); + sal_uInt16 nWidth = rCol.CalcPrtColWidth( n, static_cast<sal_uInt16>(nPageSize) ); pColAttrList->add( FSNS( XML_w, XML_w ), OString::number( nWidth ).getStr( ) ); diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index b8c4f47dfc63..ee18a6fbcd6e 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -98,12 +98,12 @@ void lclMovePositionWithRotation(awt::Point& aPos, const Size& rSize, sal_Int64 while (nRotation > 9000) nRotation = (18000 - (nRotation % 18000)); - double fVal = (double)nRotation * F_PI18000; + double fVal = static_cast<double>(nRotation) * F_PI18000; double fCos = cos(fVal); double fSin = sin(fVal); - double nWidthHalf = (double)rSize.Width() / 2; - double nHeightHalf = (double)rSize.Height() / 2; + double nWidthHalf = static_cast<double>(rSize.Width()) / 2; + double nHeightHalf = static_cast<double>(rSize.Height()) / 2; double nXDiff = fSin * nHeightHalf + fCos * nWidthHalf - nWidthHalf; double nYDiff = fSin * nWidthHalf + fCos * nHeightHalf - nHeightHalf; @@ -1009,7 +1009,8 @@ void DocxSdrExport::writeDMLEffectLst(const SwFrameFormat& rFrameFormat) return; // Distance is measured diagonally from corner - double nShadowDist = sqrt((double)aShadowItem.GetWidth() * aShadowItem.GetWidth() * 2.0); + double nShadowDist + = sqrt(static_cast<double>(aShadowItem.GetWidth()) * aShadowItem.GetWidth() * 2.0); OString aShadowDist(OString::number(TwipsToEMU(nShadowDist))); OString aShadowColor = msfilter::util::ConvertColor(aShadowItem.GetColor()); OString aShadowAlpha = lcl_ConvertTransparency(aShadowItem.GetColor()); diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 882243ff9d06..770ae936c824 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -165,7 +165,7 @@ static OString OutTBLBorderLine(RtfExport const& rExport, const editeng::SvxBord } aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRCF); - aRet.append((sal_Int32)rExport.GetColor(pLine->GetColor())); + aRet.append(static_cast<sal_Int32>(rExport.GetColor(pLine->GetColor()))); } return aRet.makeStringAndClear(); } @@ -177,7 +177,7 @@ static OString OutBorderLine(RtfExport const& rExport, const editeng::SvxBorderL OStringBuffer aRet; aRet.append(OutTBLBorderLine(rExport, pLine, pStr)); aRet.append(OOO_STRING_SVTOOLS_RTF_BRSP); - aRet.append((sal_Int32)nDist); + aRet.append(static_cast<sal_Int32>(nDist)); if (eShadowLocation == SvxShadowLocation::BottomRight) aRet.append(LO_STRING_SVTOOLS_RTF_BRDRSH); return aRet.makeStringAndClear(); @@ -630,19 +630,19 @@ void RtfAttributeOutput::Redline(const SwRedlineData* pRedline) { m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVISED); m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVAUTH); - m_aRun->append( - (sal_Int32)m_rExport.GetRedline(SW_MOD()->GetRedlineAuthor(pRedline->GetAuthor()))); + m_aRun->append(static_cast<sal_Int32>( + m_rExport.GetRedline(SW_MOD()->GetRedlineAuthor(pRedline->GetAuthor())))); m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVDTTM); } else if (pRedline->GetType() == nsRedlineType_t::REDLINE_DELETE) { m_aRun->append(OOO_STRING_SVTOOLS_RTF_DELETED); m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVAUTHDEL); - m_aRun->append( - (sal_Int32)m_rExport.GetRedline(SW_MOD()->GetRedlineAuthor(pRedline->GetAuthor()))); + m_aRun->append(static_cast<sal_Int32>( + m_rExport.GetRedline(SW_MOD()->GetRedlineAuthor(pRedline->GetAuthor())))); m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVDTTMDEL); } - m_aRun->append((sal_Int32)sw::ms::DateTime2DTTM(pRedline->GetTimeStamp())); + m_aRun->append(static_cast<sal_Int32>(sw::ms::DateTime2DTTM(pRedline->GetTimeStamp()))); m_aRun->append(' '); } @@ -659,7 +659,7 @@ void RtfAttributeOutput::ParagraphStyle(sal_uInt16 nStyle) OString* pStyle = m_rExport.GetStyle(nStyle); OStringBuffer aStyle; aStyle.append(OOO_STRING_SVTOOLS_RTF_S); - aStyle.append((sal_Int32)nStyle); + aStyle.append(static_cast<sal_Int32>(nStyle)); if (pStyle) aStyle.append(pStyle->getStr()); if (!m_bBufferSectionHeaders) @@ -675,7 +675,7 @@ void RtfAttributeOutput::TableInfoCell( if (m_nTableDepth > 1) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ITAP); - m_aStyles.append((sal_Int32)m_nTableDepth); + m_aStyles.append(static_cast<sal_Int32>(m_nTableDepth)); } m_bWroteCellInfo = true; } @@ -715,9 +715,9 @@ void RtfAttributeOutput::TableDefinition( for (int i = 0; i < 4; ++i) { m_aRowDefs.append(aRowPadUnits[i]); - m_aRowDefs.append((sal_Int32)3); + m_aRowDefs.append(sal_Int32(3)); m_aRowDefs.append(aRowPadNames[i]); - m_aRowDefs.append((sal_Int32)rBox.GetDistance(aBorders[i])); + m_aRowDefs.append(static_cast<sal_Int32>(rBox.GetDistance(aBorders[i]))); } // The cell-dependent properties @@ -740,7 +740,7 @@ void RtfAttributeOutput::TableDefinition( // value of nSz is needed. nSz += pCellFormat->GetFrameSize().GetWidth(); m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_CELLX); - m_aRowDefs.append((sal_Int32)(pFormat->GetLRSpace().GetLeft() + nSz)); + m_aRowDefs.append(static_cast<sal_Int32>(pFormat->GetLRSpace().GetLeft() + nSz)); } } @@ -783,9 +783,9 @@ void RtfAttributeOutput::TableDefaultBorders( if (rBox.GetDistance(aBorders[i])) { m_aRowDefs.append(aCellPadUnits[i]); - m_aRowDefs.append((sal_Int32)3); + m_aRowDefs.append(sal_Int32(3)); m_aRowDefs.append(aCellPadNames[i]); - m_aRowDefs.append((sal_Int32)rBox.GetDistance(aBorders[i])); + m_aRowDefs.append(static_cast<sal_Int32>(rBox.GetDistance(aBorders[i]))); } } } @@ -806,7 +806,7 @@ void RtfAttributeOutput::TableBackgrounds( if (!rBack.GetColor().GetTransparency()) { m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_CLCBPAT); - m_aRowDefs.append((sal_Int32)m_rExport.GetColor(rBack.GetColor())); + m_aRowDefs.append(static_cast<sal_Int32>(m_rExport.GetColor(rBack.GetColor()))); } } } @@ -936,7 +936,7 @@ void RtfAttributeOutput::TableOrientation( case text::HoriOrientation::NONE: case text::HoriOrientation::LEFT_AND_WIDTH: aTableAdjust.append(OOO_STRING_SVTOOLS_RTF_TRLEFT); - aTableAdjust.append((sal_Int32)pFormat->GetLRSpace().GetLeft()); + aTableAdjust.append(static_cast<sal_Int32>(pFormat->GetLRSpace().GetLeft())); break; default: break; @@ -1026,7 +1026,7 @@ void RtfAttributeOutput::EndTableCell() { m_aAfterRuns.append(OOO_STRING_SVTOOLS_RTF_INTBL); m_aAfterRuns.append(OOO_STRING_SVTOOLS_RTF_ITAP); - m_aAfterRuns.append((sal_Int32)m_nTableDepth); + m_aAfterRuns.append(static_cast<sal_Int32>(m_nTableDepth)); } if (m_nTableDepth > 1) m_aAfterRuns.append(OOO_STRING_SVTOOLS_RTF_NESTCELL); @@ -1148,16 +1148,16 @@ void RtfAttributeOutput::StartStyle(const OUString& rName, StyleType eType, sal_ m_aStylesheet.append(OOO_STRING_SVTOOLS_RTF_S); else m_aStylesheet.append(OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_CS); - m_aStylesheet.append((sal_Int32)nId); + m_aStylesheet.append(static_cast<sal_Int32>(nId)); if (nBase != 0x0FFF) { m_aStylesheet.append(OOO_STRING_SVTOOLS_RTF_SBASEDON); - m_aStylesheet.append((sal_Int32)nBase); + m_aStylesheet.append(static_cast<sal_Int32>(nBase)); } m_aStylesheet.append(OOO_STRING_SVTOOLS_RTF_SNEXT); - m_aStylesheet.append((sal_Int32)nNext); + m_aStylesheet.append(static_cast<sal_Int32>(nNext)); if (bAutoUpdate) m_aStylesheet.append(OOO_STRING_SVTOOLS_RTF_SAUTOUPD); @@ -1191,9 +1191,9 @@ void RtfAttributeOutput::OutlineNumbering(sal_uInt8 nLvl) nLvl = WW8ListManager::nMaxLevel - 1; m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ILVL); - m_aStyles.append((sal_Int32)nLvl); + m_aStyles.append(static_cast<sal_Int32>(nLvl)); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_OUTLINELEVEL); - m_aStyles.append((sal_Int32)nLvl); + m_aStyles.append(static_cast<sal_Int32>(nLvl)); } void RtfAttributeOutput::PageBreakBefore(bool bBreak) @@ -1236,7 +1236,7 @@ void RtfAttributeOutput::EndSection() void RtfAttributeOutput::SectionFormProtection(bool bProtected) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED); - m_aSectionBreaks.append((sal_Int32)!bProtected); + m_aSectionBreaks.append(static_cast<sal_Int32>(!bProtected)); } void RtfAttributeOutput::SectionLineNumbering(sal_uLong /*nRestartNo*/, @@ -1291,7 +1291,7 @@ void RtfAttributeOutput::SectionPageNumbering( if (oPageRestartNumber) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_PGNSTARTS); - m_aSectionBreaks.append((sal_Int32)oPageRestartNumber.get()); + m_aSectionBreaks.append(static_cast<sal_Int32>(oPageRestartNumber.get())); m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_PGNRESTART); } @@ -1686,7 +1686,7 @@ void RtfAttributeOutput::WriteHeaderFooter_Impl(const SwFrameFormat& rFormat, bo m_aSectionHeaders.append(bHeader ? OOO_STRING_SVTOOLS_RTF_HEADERY : OOO_STRING_SVTOOLS_RTF_FOOTERY); m_aSectionHeaders.append( - (sal_Int32)m_rExport.m_pAktPageDesc->GetMaster().GetULSpace().GetUpper()); + static_cast<sal_Int32>(m_rExport.m_pAktPageDesc->GetMaster().GetULSpace().GetUpper())); if (bTitlepg) m_aSectionHeaders.append(OOO_STRING_SVTOOLS_RTF_TITLEPG); m_aSectionHeaders.append('{'); @@ -2052,10 +2052,10 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi sal_Int16 nTemp = 0; xPropSet->getPropertyValue("DefaultState") >>= nTemp; m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFDEFRES); - m_aRun->append((sal_Int32)nTemp); + m_aRun->append(static_cast<sal_Int32>(nTemp)); xPropSet->getPropertyValue("State") >>= nTemp; m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFRES); - m_aRun->append((sal_Int32)nTemp); + m_aRun->append(static_cast<sal_Int32>(nTemp)); m_aRun->append("}}"); @@ -2075,18 +2075,18 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_DATAFIELD " "); for (int i = 0; i < 8; i++) - aBuf.append((sal_Char)0x00); + aBuf.append(sal_Char(0x00)); xPropSet->getPropertyValue("Name") >>= aTmp; aStr = OUStringToOString(aTmp, m_rExport.m_eCurrentEncoding); - aBuf.append((sal_Char)aStr.getLength()); + aBuf.append(static_cast<sal_Char>(aStr.getLength())); aBuf.append(aStr); - aBuf.append((sal_Char)0x00); + aBuf.append(sal_Char(0x00)); xPropSet->getPropertyValue("DefaultText") >>= aTmp; aStr = OUStringToOString(aTmp, m_rExport.m_eCurrentEncoding); - aBuf.append((sal_Char)aStr.getLength()); + aBuf.append(static_cast<sal_Char>(aStr.getLength())); aBuf.append(aStr); for (int i = 0; i < 11; i++) - aBuf.append((sal_Char)0x00); + aBuf.append(sal_Char(0x00)); aStr = aBuf.makeStringAndClear(); pStr = aStr.getStr(); for (int i = 0; i < aStr.getLength(); i++, pStr++) @@ -2143,7 +2143,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi { m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFDEFRES); // a dropdown list can have only one 'selected item by default' - m_aRun->append((sal_Int32)aIntSeq[0]); + m_aRun->append(static_cast<sal_Int32>(aIntSeq[0])); } xPropSet->getPropertyValue("SelectedItems") >>= aIntSeq; @@ -2151,7 +2151,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi { m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFRES); // a dropdown list can have only one 'currently selected item' - m_aRun->append((sal_Int32)aIntSeq[0]); + m_aRun->append(static_cast<sal_Int32>(aIntSeq[0])); } sName = "Name"; @@ -2232,8 +2232,8 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi } break; default: - SAL_INFO("sw.rtf", - OSL_THIS_FUNC << ": unknown type (" << (int)rFrame.GetWriterType() << ")"); + SAL_INFO("sw.rtf", OSL_THIS_FUNC << ": unknown type (" + << static_cast<int>(rFrame.GetWriterType()) << ")"); break; } } @@ -2250,9 +2250,9 @@ void RtfAttributeOutput::CharCaseMap(const SvxCaseMapItem& rCaseMap) break; default: // Something that rtf does not support m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SCAPS); - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CAPS); - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); break; } } @@ -2262,14 +2262,14 @@ void RtfAttributeOutput::CharColor(const SvxColorItem& rColor) const Color aColor(rColor.GetValue()); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CF); - m_aStyles.append((sal_Int32)m_rExport.GetColor(aColor)); + m_aStyles.append(static_cast<sal_Int32>(m_rExport.GetColor(aColor))); } void RtfAttributeOutput::CharContour(const SvxContourItem& rContour) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_OUTL); if (!rContour.GetValue()) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharCrossedOut(const SvxCrossedOutItem& rCrossedOut) @@ -2278,11 +2278,11 @@ void RtfAttributeOutput::CharCrossedOut(const SvxCrossedOutItem& rCrossedOut) { case STRIKEOUT_NONE: m_aStyles.append(OOO_STRING_SVTOOLS_RTF_STRIKE); - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); break; case STRIKEOUT_DOUBLE: m_aStyles.append(OOO_STRING_SVTOOLS_RTF_STRIKED); - m_aStyles.append((sal_Int32)1); + m_aStyles.append(sal_Int32(1)); break; default: m_aStyles.append(OOO_STRING_SVTOOLS_RTF_STRIKE); @@ -2332,7 +2332,7 @@ void RtfAttributeOutput::CharEscapement(const SvxEscapementItem& rEscapement) m_aStyles.append('{'); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_IGNORE); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_UPDNPROP); - m_aStyles.append((sal_Int32)nProp); + m_aStyles.append(static_cast<sal_Int32>(nProp)); m_aStyles.append('}'); m_aStyles.append(pUpDn); @@ -2344,7 +2344,7 @@ void RtfAttributeOutput::CharEscapement(const SvxEscapementItem& rEscapement) * 100% Escapement */ - m_aStyles.append((sal_Int32)((long(nEsc) * nH) + 500) / 1000); + m_aStyles.append(static_cast<sal_Int32>((long(nEsc) * nH) + 500) / 1000); // 500 to round !! } @@ -2352,7 +2352,7 @@ void RtfAttributeOutput::CharFont(const SvxFontItem& rFont) { m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_LOCH); m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_F); - m_aStylesEnd.append((sal_Int32)m_rExport.m_aFontHelper.GetId(rFont)); + m_aStylesEnd.append(static_cast<sal_Int32>(m_rExport.m_aFontHelper.GetId(rFont))); if (!m_rExport.HasItem(RES_CHRATR_CJK_FONT) && !m_rExport.HasItem(RES_CHRATR_CTL_FONT)) { @@ -2360,7 +2360,7 @@ void RtfAttributeOutput::CharFont(const SvxFontItem& rFont) // just for the loch range. m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_HICH); m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_AF); - m_aStylesEnd.append((sal_Int32)m_rExport.m_aFontHelper.GetId(rFont)); + m_aStylesEnd.append(static_cast<sal_Int32>(m_rExport.m_aFontHelper.GetId(rFont))); } // FIXME: this may be a tad expensive... but the charset needs to be @@ -2379,15 +2379,15 @@ void RtfAttributeOutput::CharFontSize(const SvxFontHeightItem& rFontSize) { case RES_CHRATR_FONTSIZE: m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_FS); - m_aStylesEnd.append((sal_Int32)(rFontSize.GetHeight() / 10)); + m_aStylesEnd.append(static_cast<sal_Int32>(rFontSize.GetHeight() / 10)); break; case RES_CHRATR_CJK_FONTSIZE: m_aStyles.append(OOO_STRING_SVTOOLS_RTF_FS); - m_aStyles.append((sal_Int32)(rFontSize.GetHeight() / 10)); + m_aStyles.append(static_cast<sal_Int32>(rFontSize.GetHeight() / 10)); break; case RES_CHRATR_CTL_FONTSIZE: m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AFS); - m_aStyles.append((sal_Int32)(rFontSize.GetHeight() / 10)); + m_aStyles.append(static_cast<sal_Int32>(rFontSize.GetHeight() / 10)); break; } } @@ -2396,9 +2396,9 @@ void RtfAttributeOutput::CharKerning(const SvxKerningItem& rKerning) { // in quarter points then in twips m_aStyles.append(OOO_STRING_SVTOOLS_RTF_EXPND); - m_aStyles.append((sal_Int32)(rKerning.GetValue() / 5)); + m_aStyles.append(static_cast<sal_Int32>(rKerning.GetValue() / 5)); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_EXPNDTW); - m_aStyles.append((sal_Int32)(rKerning.GetValue())); + m_aStyles.append(static_cast<sal_Int32>(rKerning.GetValue())); } void RtfAttributeOutput::CharLanguage(const SvxLanguageItem& rLanguage) @@ -2407,15 +2407,18 @@ void RtfAttributeOutput::CharLanguage(const SvxLanguageItem& rLanguage) { case RES_CHRATR_LANGUAGE: m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_LANG); - m_aStylesEnd.append((sal_Int32) static_cast<sal_uInt16>(rLanguage.GetLanguage())); + m_aStylesEnd.append( + static_cast<sal_Int32>(static_cast<sal_uInt16>(rLanguage.GetLanguage()))); break; case RES_CHRATR_CJK_LANGUAGE: m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LANGFE); - m_aStyles.append((sal_Int32) static_cast<sal_uInt16>(rLanguage.GetLanguage())); + m_aStyles.append( + static_cast<sal_Int32>(static_cast<sal_uInt16>(rLanguage.GetLanguage()))); break; case RES_CHRATR_CTL_LANGUAGE: m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ALANG); - m_aStyles.append((sal_Int32) static_cast<sal_uInt16>(rLanguage.GetLanguage())); + m_aStyles.append( + static_cast<sal_Int32>(static_cast<sal_uInt16>(rLanguage.GetLanguage()))); break; } } @@ -2424,14 +2427,14 @@ void RtfAttributeOutput::CharPosture(const SvxPostureItem& rPosture) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_I); if (rPosture.GetPosture() == ITALIC_NONE) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharShadow(const SvxShadowedItem& rShadow) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SHAD); if (!rShadow.GetValue()) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharUnderline(const SvxUnderlineItem& rUnderline) @@ -2504,7 +2507,7 @@ void RtfAttributeOutput::CharUnderline(const SvxUnderlineItem& rUnderline) // NEEDSWORK looks like here rUnderline.GetColor() is always black, // even if the color in the odt is for example green... m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ULC); - m_aStyles.append((sal_Int32)m_rExport.GetColor(rUnderline.GetColor())); + m_aStyles.append(static_cast<sal_Int32>(m_rExport.GetColor(rUnderline.GetColor()))); } } @@ -2512,19 +2515,19 @@ void RtfAttributeOutput::CharWeight(const SvxWeightItem& rWeight) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_B); if (rWeight.GetWeight() != WEIGHT_BOLD) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharAutoKern(const SvxAutoKernItem& rAutoKern) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_KERNING); - m_aStyles.append((sal_Int32)(rAutoKern.GetValue() ? 1 : 0)); + m_aStyles.append(static_cast<sal_Int32>(rAutoKern.GetValue() ? 1 : 0)); } void RtfAttributeOutput::CharAnimatedText(const SvxBlinkItem& rBlink) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ANIMTEXT); - m_aStyles.append((sal_Int32)(rBlink.GetValue() ? 2 : 0)); + m_aStyles.append(static_cast<sal_Int32>(rBlink.GetValue() ? 2 : 0)); } void RtfAttributeOutput::CharBackground(const SvxBrushItem& rBrush) @@ -2532,7 +2535,7 @@ void RtfAttributeOutput::CharBackground(const SvxBrushItem& rBrush) if (!rBrush.GetColor().GetTransparency()) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CHCBPAT); - m_aStyles.append((sal_Int32)m_rExport.GetColor(rBrush.GetColor())); + m_aStyles.append(static_cast<sal_Int32>(m_rExport.GetColor(rBrush.GetColor()))); } } @@ -2540,7 +2543,7 @@ void RtfAttributeOutput::CharFontCJK(const SvxFontItem& rFont) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_DBCH); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AF); - m_aStyles.append((sal_Int32)m_rExport.m_aFontHelper.GetId(rFont)); + m_aStyles.append(static_cast<sal_Int32>(m_rExport.m_aFontHelper.GetId(rFont))); } void RtfAttributeOutput::CharFontSizeCJK(const SvxFontHeightItem& rFontSize) @@ -2557,21 +2560,21 @@ void RtfAttributeOutput::CharPostureCJK(const SvxPostureItem& rPosture) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_I); if (rPosture.GetPosture() == ITALIC_NONE) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharWeightCJK(const SvxWeightItem& rWeight) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_B); if (rWeight.GetWeight() != WEIGHT_BOLD) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharFontCTL(const SvxFontItem& rFont) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_DBCH); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AF); - m_aStyles.append((sal_Int32)m_rExport.m_aFontHelper.GetId(rFont)); + m_aStyles.append(static_cast<sal_Int32>(m_rExport.m_aFontHelper.GetId(rFont))); } void RtfAttributeOutput::CharFontSizeCTL(const SvxFontHeightItem& rFontSize) @@ -2588,14 +2591,14 @@ void RtfAttributeOutput::CharPostureCTL(const SvxPostureItem& rPosture) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AI); if (rPosture.GetPosture() == ITALIC_NONE) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharWeightCTL(const SvxWeightItem& rWeight) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AB); if (rWeight.GetWeight() != WEIGHT_BOLD) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharBidiRTL(const SfxPoolItem& /*rItem*/) {} @@ -2605,7 +2608,7 @@ void RtfAttributeOutput::CharIdctHint(const SfxPoolItem& /*rItem*/) {} void RtfAttributeOutput::CharRotate(const SvxCharRotateItem& rRotate) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_HORZVERT); - m_aStyles.append((sal_Int32)(rRotate.IsFitToLine() ? 1 : 0)); + m_aStyles.append(static_cast<sal_Int32>(rRotate.IsFitToLine() ? 1 : 0)); } void RtfAttributeOutput::CharEmphasisMark(const SvxEmphasisMarkItem& rEmphasisMark) @@ -2643,14 +2646,14 @@ void RtfAttributeOutput::CharTwoLines(const SvxTwoLinesItem& rTwoLines) nType = 1; m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TWOINONE); - m_aStyles.append((sal_Int32)nType); + m_aStyles.append(static_cast<sal_Int32>(nType)); } } void RtfAttributeOutput::CharScaleWidth(const SvxCharScaleWidthItem& rScaleWidth) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CHARSCALEX); - m_aStyles.append((sal_Int32)rScaleWidth.GetValue()); + m_aStyles.append(static_cast<sal_Int32>(rScaleWidth.GetValue())); } void RtfAttributeOutput::CharRelief(const SvxCharReliefItem& rRelief) @@ -2677,7 +2680,7 @@ void RtfAttributeOutput::CharHidden(const SvxCharHiddenItem& rHidden) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_V); if (!rHidden.GetValue()) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharBorder(const editeng::SvxBorderLine* pAllBorder, @@ -2718,7 +2721,7 @@ void RtfAttributeOutput::TextCharFormat(const SwFormatCharFormat& rCharFormat) { sal_uInt16 nStyle = m_rExport.GetId(rCharFormat.GetCharFormat()); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CS); - m_aStyles.append((sal_Int32)nStyle); + m_aStyles.append(static_cast<sal_Int32>(nStyle)); OString* pString = m_rExport.GetStyle(nStyle); if (pString) m_aStyles.append(*pString); @@ -2777,9 +2780,9 @@ void RtfAttributeOutput::TextFootnote_Impl(const SwFormatFootnote& rFootnote) void RtfAttributeOutput::ParaLineSpacing_Impl(short nSpace, short nMulti) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SL); - m_aStyles.append((sal_Int32)nSpace); + m_aStyles.append(static_cast<sal_Int32>(nSpace)); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SLMULT); - m_aStyles.append((sal_Int32)nMulti); + m_aStyles.append(static_cast<sal_Int32>(nMulti)); } void RtfAttributeOutput::ParaAdjust(const SvxAdjustItem& rAdjust) @@ -2873,7 +2876,7 @@ void RtfAttributeOutput::ParaTabStop(const SvxTabStopItem& rTabStop) if (pAdjStr) m_aStyles.append(pAdjStr); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TX); - m_aStyles.append((sal_Int32)(rTS.GetTabPos() + nOffset)); + m_aStyles.append(static_cast<sal_Int32>(rTS.GetTabPos() + nOffset)); } else { @@ -2946,7 +2949,7 @@ void RtfAttributeOutput::ParaNumRule_Impl(const SwTextNode* pTextNd, sal_Int32 n m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ILVL); if (nLvl > 8) // RTF knows only 9 levels { - m_aStyles.append((sal_Int32)8); + m_aStyles.append(sal_Int32(8)); m_aStyles.append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SOUTLVL); m_aStyles.append(nLvl); m_aStyles.append('}'); @@ -2957,7 +2960,7 @@ void RtfAttributeOutput::ParaNumRule_Impl(const SwTextNode* pTextNd, sal_Int32 n else m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB "}"); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LS); - m_aStyles.append((sal_Int32)m_rExport.GetId(*pRule) + 1); + m_aStyles.append(static_cast<sal_Int32>(m_rExport.GetId(*pRule)) + 1); m_aStyles.append(' '); } FormatLRSpace(aLR); @@ -3016,9 +3019,9 @@ void RtfAttributeOutput::FormatFrameSize(const SwFormatFrameSize& rSize) if (m_rExport.m_bOutPageDescs) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_PGWSXN); - m_aSectionBreaks.append((sal_Int32)rSize.GetWidth()); + m_aSectionBreaks.append(static_cast<sal_Int32>(rSize.GetWidth())); m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_PGHSXN); - m_aSectionBreaks.append((sal_Int32)rSize.GetHeight()); + m_aSectionBreaks.append(static_cast<sal_Int32>(rSize.GetHeight())); if (!m_bBufferSectionBreaks) m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr()); } @@ -3038,12 +3041,12 @@ void RtfAttributeOutput::FormatLRSpace(const SvxLRSpaceItem& rLRSpace) if (rLRSpace.GetLeft()) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGLSXN); - m_aSectionBreaks.append((sal_Int32)rLRSpace.GetLeft()); + m_aSectionBreaks.append(static_cast<sal_Int32>(rLRSpace.GetLeft())); } if (rLRSpace.GetRight()) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGRSXN); - m_aSectionBreaks.append((sal_Int32)rLRSpace.GetRight()); + m_aSectionBreaks.append(static_cast<sal_Int32>(rLRSpace.GetRight())); } if (!m_bBufferSectionBreaks) m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr()); @@ -3051,15 +3054,15 @@ void RtfAttributeOutput::FormatLRSpace(const SvxLRSpaceItem& rLRSpace) else { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LI); - m_aStyles.append((sal_Int32)rLRSpace.GetTextLeft()); + m_aStyles.append(static_cast<sal_Int32>(rLRSpace.GetTextLeft())); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_RI); - m_aStyles.append((sal_Int32)rLRSpace.GetRight()); + m_aStyles.append(static_cast<sal_Int32>(rLRSpace.GetRight())); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LIN); - m_aStyles.append((sal_Int32)rLRSpace.GetTextLeft()); + m_aStyles.append(static_cast<sal_Int32>(rLRSpace.GetTextLeft())); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_RIN); - m_aStyles.append((sal_Int32)rLRSpace.GetRight()); + m_aStyles.append(static_cast<sal_Int32>(rLRSpace.GetRight())); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_FI); - m_aStyles.append((sal_Int32)rLRSpace.GetTextFirstLineOfst()); + m_aStyles.append(static_cast<sal_Int32>(rLRSpace.GetTextFirstLineOfst())); } } else if (m_rExport.m_bRTFFlySyntax) @@ -3087,23 +3090,23 @@ void RtfAttributeOutput::FormatULSpace(const SvxULSpaceItem& rULSpace) if (aDistances.dyaTop) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGTSXN); - m_aSectionBreaks.append((sal_Int32)aDistances.dyaTop); + m_aSectionBreaks.append(static_cast<sal_Int32>(aDistances.dyaTop)); } if (aDistances.HasHeader()) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_HEADERY); - m_aSectionBreaks.append((sal_Int32)aDistances.dyaHdrTop); + m_aSectionBreaks.append(static_cast<sal_Int32>(aDistances.dyaHdrTop)); } if (aDistances.dyaBottom) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGBSXN); - m_aSectionBreaks.append((sal_Int32)aDistances.dyaBottom); + m_aSectionBreaks.append(static_cast<sal_Int32>(aDistances.dyaBottom)); } if (aDistances.HasFooter()) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_FOOTERY); - m_aSectionBreaks.append((sal_Int32)aDistances.dyaHdrBottom); + m_aSectionBreaks.append(static_cast<sal_Int32>(aDistances.dyaHdrBottom)); } if (!m_bBufferSectionBreaks) m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr()); @@ -3167,7 +3170,7 @@ void RtfAttributeOutput::FormatSurround(const SwFormatSurround& rSurround) eSurround = css::text::WrapTextMode_PARALLEL; RTFSurround aMC(bGold, static_cast<sal_uInt8>(eSurround)); m_aRunText->append(OOO_STRING_SVTOOLS_RTF_FLYMAINCNT); - m_aRunText->append((sal_Int32)aMC.GetValue()); + m_aRunText->append(static_cast<sal_Int32>(aMC.GetValue())); } else if (m_rExport.m_bOutFlyFrameAttrs && m_rExport.m_bRTFFlySyntax) { @@ -3338,7 +3341,7 @@ void RtfAttributeOutput::FormatBackground(const SvxBrushItem& rBrush) else if (!rBrush.GetColor().GetTransparency()) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CBPAT); - m_aStyles.append((sal_Int32)m_rExport.GetColor(rBrush.GetColor())); + m_aStyles.append(static_cast<sal_Int32>(m_rExport.GetColor(rBrush.GetColor()))); } } @@ -3614,7 +3617,7 @@ void RtfAttributeOutput::PostitField(const SwField* pField) m_aRunText->append('}'); } m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_ATNDATE " "); - m_aRunText->append((sal_Int32)sw::ms::DateTime2DTTM(rPField.GetDateTime())); + m_aRunText->append(static_cast<sal_Int32>(sw::ms::DateTime2DTTM(rPField.GetDateTime()))); m_aRunText->append('}'); if (const OutlinerParaObject* pObject = rPField.GetTextObject()) m_rExport.SdrExporter().WriteOutliner(*pObject, TXT_ATN); @@ -3873,9 +3876,9 @@ static OString ExportPICT(const SwFlyFrameFormat* pFlyFrameFormat, const Size& r //first, how much has the original been scaled to get the //final rendered size aRet.append(OOO_STRING_SVTOOLS_RTF_PICSCALEX); - aRet.append((sal_Int32)((100 * rRendered.Width()) / nXCroppedSize)); + aRet.append(static_cast<sal_Int32>((100 * rRendered.Width()) / nXCroppedSize)); aRet.append(OOO_STRING_SVTOOLS_RTF_PICSCALEY); - aRet.append((sal_Int32)((100 * rRendered.Height()) / nYCroppedSize)); + aRet.append(static_cast<sal_Int32>((100 * rRendered.Height()) / nYCroppedSize)); aRet.append(OOO_STRING_SVTOOLS_RTF_PICCROPL); aRet.append(rCr.GetLeft()); @@ -3887,19 +3890,19 @@ static OString ExportPICT(const SwFlyFrameFormat* pFlyFrameFormat, const Size& r aRet.append(rCr.GetBottom()); aRet.append(OOO_STRING_SVTOOLS_RTF_PICW); - aRet.append((sal_Int32)rMapped.Width()); + aRet.append(static_cast<sal_Int32>(rMapped.Width())); aRet.append(OOO_STRING_SVTOOLS_RTF_PICH); - aRet.append((sal_Int32)rMapped.Height()); + aRet.append(static_cast<sal_Int32>(rMapped.Height())); aRet.append(OOO_STRING_SVTOOLS_RTF_PICWGOAL); - aRet.append((sal_Int32)rOrig.Width()); + aRet.append(static_cast<sal_Int32>(rOrig.Width())); aRet.append(OOO_STRING_SVTOOLS_RTF_PICHGOAL); - aRet.append((sal_Int32)rOrig.Height()); + aRet.append(static_cast<sal_Int32>(rOrig.Height())); aRet.append(pBLIPType); if (bIsWMF) { - aRet.append((sal_Int32)8); + aRet.append(sal_Int32(8)); StripMetafileHeader(pGraphicAry, nSize); } aRet.append(SAL_NEWLINE_STRING); diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index 83c1b0b08185..b65b50be104e 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -172,7 +172,8 @@ void RtfSdrExport::Commit(EscherPropertyContainer& rProps, const tools::Rectangl break; } if (nWrapType) - m_aShapeStyle.append(OOO_STRING_SVTOOLS_RTF_SHPWR).append((sal_Int32)nWrapType); + m_aShapeStyle.append(OOO_STRING_SVTOOLS_RTF_SHPWR) + .append(static_cast<sal_Int32>(nWrapType)); } break; case ESCHER_Prop_fillColor: @@ -282,7 +283,7 @@ void RtfSdrExport::Commit(EscherPropertyContainer& rProps, const tools::Rectangl // number of segments sal_uInt16 nSegments = impl_GetUInt16(pSegmentIt); sal_Int32 nVertices = 0; - aSegmentInfo.append("2;").append((sal_Int32)nSegments); + aSegmentInfo.append("2;").append(static_cast<sal_Int32>(nSegments)); pSegmentIt += 4; for (; nSegments; --nSegments) @@ -295,7 +296,7 @@ void RtfSdrExport::Commit(EscherPropertyContainer& rProps, const tools::Rectangl unsigned char nSegmentType = (nSeg & 0xE000) >> 13; unsigned short nSegmentCount = nSeg & 0x03FF; - aSegmentInfo.append(';').append((sal_Int32)nSeg); + aSegmentInfo.append(';').append(static_cast<sal_Int32>(nSeg)); switch (nSegmentType) { case msopathLineTo: diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index b87573d9bfa4..c6d50ac73a1e 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -621,7 +621,7 @@ namespace sw for(a = 0; a < rPolyPoly.Count(); a++) { - nPointCount += (sal_uInt32)rPolyPoly[a].GetSize(); + nPointCount += static_cast<sal_uInt32>(rPolyPoly[a].GetSize()); } if(nPointCount > 0x0000ffff) @@ -630,7 +630,7 @@ namespace sw nPointCount = 0x0000ffff; } - tools::Polygon aRetval((sal_uInt16)nPointCount); + tools::Polygon aRetval(static_cast<sal_uInt16>(nPointCount)); sal_uInt32 nAppendIndex(0); for(a = 0; a < rPolyPoly.Count(); a++) @@ -639,7 +639,7 @@ namespace sw for(sal_uInt16 b(0); nAppendIndex <= nPointCount && b < rCandidate.GetSize(); b++) { - aRetval[(sal_uInt16)nAppendIndex++] = rCandidate[b]; + aRetval[static_cast<sal_uInt16>(nAppendIndex++)] = rCandidate[b]; } } diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 0fdb886e5a13..d8756282b0f0 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1990,7 +1990,7 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrameFormat& rFormat, const sal_uInt16 nCstScale = 635; // unit scale between AOO and MS Word const sal_uInt32 nShadowType = 131074; // shadow type of ms word. need to set the default value. - sal_uInt32 nColor = (sal_uInt32)(pSI->GetColor().GetColor()) ; + sal_uInt32 nColor = static_cast<sal_uInt32>(pSI->GetColor().GetColor()) ; sal_Int32 nOffX = pSI->GetWidth() * nCstScale; sal_Int32 nOffY = pSI->GetWidth() * nCstScale; diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 5619ff7639f9..b49a86aa1ba4 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -1343,7 +1343,7 @@ void AttributeOutputBase::TOXMark( const SwTextNode& rNode, const SwTOXMark& rAt break; case TOX_USER: - sText += "\" \\f \"" + OUString((sal_Char)( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) )); + sText += "\" \\f \"" + OUString(static_cast<sal_Char>( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) )); SAL_FALLTHROUGH; case TOX_CONTENT: { diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 49bf605bae2d..3065a98a82a4 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -457,9 +457,9 @@ void MSWordExportBase::AbstractNumberingDefinitions() sal_Int32 nFnd = sNumStr.indexOf( sSrch ); if( -1 != nFnd ) { - *pLvlPos = (sal_uInt8)(nFnd + rFormat.GetPrefix().getLength() + 1 ); + *pLvlPos = static_cast<sal_uInt8>(nFnd + rFormat.GetPrefix().getLength() + 1 ); ++pLvlPos; - sNumStr = sNumStr.replaceAt( nFnd, 1, OUString((char)i) ); + sNumStr = sNumStr.replaceAt( nFnd, 1, OUString(static_cast<char>(i)) ); } } // #i86652# diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 812167721fbe..51fad2582a4e 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -379,7 +379,7 @@ OString const & MSWordStyles::GetStyleId(sal_uInt16 nId) const static void impl_SkipOdd( ww::bytes* pO, std::size_t nTableStrmTell ) { if ( ( nTableStrmTell + pO->size() ) & 1 ) // start on even - pO->push_back( (sal_uInt8)0 ); // Address + pO->push_back( sal_uInt8(0) ); // Address } void WW8AttributeOutput::EndStyle() @@ -437,7 +437,7 @@ void WW8AttributeOutput::StartStyle( const OUString& rName, StyleType eType, sal // write names SwWW8Writer::InsUInt16( *m_rWW8Export.pO, rName.getLength() ); // length SwWW8Writer::InsAsString16( *m_rWW8Export.pO, rName ); - m_rWW8Export.pO->push_back( (sal_uInt8)0 ); // Despite P-String 0 at the end! + m_rWW8Export.pO->push_back( sal_uInt8(0) ); // Despite P-String 0 at the end! } void MSWordStyles::SetStyleDefaults( const SwFormat& rFormat, bool bPap ) @@ -639,7 +639,7 @@ void WW8AttributeOutput::StartStyles() sal_uLong nCurPos = m_rWW8Export.pTableStrm->Tell(); if ( nCurPos & 1 ) // start on even { - m_rWW8Export.pTableStrm->WriteChar( (char)0 ); // Address + m_rWW8Export.pTableStrm->WriteChar( char(0) ); // Address ++nCurPos; } rFib.m_fcStshfOrig = rFib.m_fcStshf = nCurPos; @@ -715,7 +715,7 @@ wwFont::wwFont(const OUString &rFamilyName, FontPitch ePitch, FontFamily eFamily memset(maWW8_FFN, 0, sizeof(maWW8_FFN)); - maWW8_FFN[0] = (sal_uInt8)( 6 - 1 + 0x22 + ( 2 * ( 1 + msFamilyNm.getLength() ) )); + maWW8_FFN[0] = static_cast<sal_uInt8>( 6 - 1 + 0x22 + ( 2 * ( 1 + msFamilyNm.getLength() ) )); if (mbAlt) maWW8_FFN[0] = static_cast< sal_uInt8 >(maWW8_FFN[0] + 2 * ( 1 + msAltNm.getLength())); @@ -1323,9 +1323,9 @@ void WW8AttributeOutput::SectFootnoteEndnotePr() m_rWW8Export.InsUInt16( NS_sprm::sprmSRncFtn ); switch( rInfo.eNum ) { - case FTNNUM_PAGE: m_rWW8Export.pO->push_back( (sal_uInt8) /*rncRstPage*/ 2 ); break; - case FTNNUM_CHAPTER: m_rWW8Export.pO->push_back( (sal_uInt8) /*rncRstSect*/ 1 ); break; - default: m_rWW8Export.pO->push_back( (sal_uInt8) /*rncCont*/ 0 ); break; + case FTNNUM_PAGE: m_rWW8Export.pO->push_back( sal_uInt8/*rncRstPage*/ (2) ); break; + case FTNNUM_CHAPTER: m_rWW8Export.pO->push_back( sal_uInt8/*rncRstSect*/ (1) ); break; + default: m_rWW8Export.pO->push_back( sal_uInt8/*rncCont*/ (0) ); break; } } @@ -1361,7 +1361,7 @@ void WW8AttributeOutput::SectionLineNumbering( sal_uLong nRestartNo, const SwLin if ( nRestartNo ) { SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSLnnMin ); - SwWW8Writer::InsUInt16( *m_rWW8Export.pO, (sal_uInt16)nRestartNo - 1 ); + SwWW8Writer::InsUInt16( *m_rWW8Export.pO, static_cast<sal_uInt16>(nRestartNo) - 1 ); } } @@ -2252,7 +2252,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp, // Commented text ranges as bookmarks (SttbfAtnBkmk) rFib.m_fcSttbfAtnbkmk = nFcStart; - SwWW8Writer::WriteShort( *rWrt.pTableStrm, (sal_Int16)(sal_uInt16)0xFFFF ); // SttbfAtnBkmk.fExtend + SwWW8Writer::WriteShort( *rWrt.pTableStrm, sal_Int16(sal_uInt16(0xFFFF)) ); // SttbfAtnBkmk.fExtend SwWW8Writer::WriteShort( *rWrt.pTableStrm, aRangeStartPos.size() ); // SttbfAtnBkmk.cData SwWW8Writer::WriteShort( *rWrt.pTableStrm, 0xA ); // SttbfAtnBkmk.cbExtra @@ -2379,7 +2379,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp, "Impossible"); sal_uInt16 nFndPos = static_cast< sal_uInt16 >(aIter - aStrArr.begin()); OUString sInitials( aIter->second ); - sal_uInt8 nInitialsLen = (sal_uInt8)sInitials.getLength(); + sal_uInt8 nInitialsLen = static_cast<sal_uInt8>(sInitials.getLength()); if ( nInitialsLen > 9 ) { sInitials = sInitials.copy( 0, 9 ); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 4a3086511b59..c5f1429262f7 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -230,9 +230,9 @@ void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const OUString& rNm) if (aResult.second) { BKMK aBK(false,rNm); - BKMKCP* pBKCP = new BKMKCP((long)nStartCp,aBK); + BKMKCP* pBKCP = new BKMKCP(static_cast<long>(nStartCp),aBK); aSttCps.insert(std::pair<long,BKMKCP*>(nStartCp,pBKCP)); - aResult.first->second = (long)nStartCp; + aResult.first->second = static_cast<long>(nStartCp); } else { @@ -243,7 +243,7 @@ void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const OUString& rNm) { if (aItr->second->second.first) nStartCp--; - aItr->second->first = (long)nStartCp; + aItr->second->first = static_cast<long>(nStartCp); break; } } @@ -309,7 +309,7 @@ void WW8_WrtBookmarks::MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo) { if (aItr->second) { - if (aItr->second->first == (long)nFrom) + if (aItr->second->first == static_cast<long>(nFrom)) { aItr->second->second.first = true; aItr->second->first = nTo; @@ -464,7 +464,7 @@ static void WriteDop( WW8Export& rWrt ) // write default TabStop const SvxTabStopItem& rTabStop = DefaultItemGet<SvxTabStopItem>(*rWrt.m_pDoc, RES_PARATR_TABSTOP); - rDop.dxaTab = (sal_uInt16)rTabStop[0].GetTabPos(); + rDop.dxaTab = static_cast<sal_uInt16>(rTabStop[0].GetTabPos()); // Zoom factor and type SwViewShell *pViewShell(rWrt.m_pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()); @@ -538,7 +538,7 @@ static void WriteDop( WW8Export& rWrt ) // and also for the Headers and Footers rDop.cWordsFootnoteEnd = rDStat.nWord; rDop.cChFootnoteEdn = rDStat.nChar; - rDop.cPgFootnoteEdn = (sal_Int16)rDStat.nPage; + rDop.cPgFootnoteEdn = static_cast<sal_Int16>(rDStat.nPage); rDop.cParasFootnoteEdn = rDStat.nPara; rDop.cLinesFootnoteEdn = rDStat.nPara; @@ -1046,7 +1046,7 @@ void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short nVarLen,const sal_uInt8* pS void WW8_WrPlcPn::WriteFkps() { - nFkpStartPage = (sal_uInt16) ( SwWW8Writer::FillUntil( rWrt.Strm() ) >> 9 ); + nFkpStartPage = static_cast<sal_uInt16>( SwWW8Writer::FillUntil( rWrt.Strm() ) >> 9 ); for(const std::unique_ptr<WW8_WrFkp> & rp : m_Fkps) { @@ -1133,10 +1133,10 @@ sal_uInt8 WW8_WrFkp::SearchSameSprm( sal_uInt16 nVarLen, const sal_uInt8* pSprms sal_uInt8 nStart = pOfs[i * nItemSize]; if( nStart ) { // has Sprms - const sal_uInt8* p = pFkp + ( (sal_uInt16)nStart << 1 ); + const sal_uInt8* p = pFkp + ( static_cast<sal_uInt16>(nStart) << 1 ); if( ( CHP == ePlc ? (*p++ == nVarLen) - : (((sal_uInt16)*p++ << 1 ) == (( nVarLen+1) & 0xfffe)) ) + : ((static_cast<sal_uInt16>(*p++) << 1 ) == (( nVarLen+1) & 0xfffe)) ) && !memcmp( p, pSprms, nVarLen ) ) return nStart; // found it } @@ -1156,7 +1156,7 @@ sal_uInt8 *WW8_WrFkp::CopyLastSprms(sal_uInt8 &rLen) sal_uInt8 nStart = *(pStart + (nIMax-1) * nItemSize); - const sal_uInt8* p = pFkp + ( (sal_uInt16)nStart << 1 ); + const sal_uInt8* p = pFkp + ( static_cast<sal_uInt16>(nStart) << 1 ); if (!*p) p++; @@ -1210,22 +1210,22 @@ bool WW8_WrFkp::Append( WW8_FC nEndFc, sal_uInt16 nVarLen, const sal_uInt8* pSpr nPos &= 0xFFFE; // Pos for Sprms ( gerade Pos ) } - if( (sal_uInt16)nPos <= ( nIMax + 2U ) * 4U + ( nIMax + 1U ) * nItemSize ) + if( static_cast<sal_uInt16>(nPos) <= ( nIMax + 2U ) * 4U + ( nIMax + 1U ) * nItemSize ) // does it fits after the CPs and offsets? return false; // no reinterpret_cast<sal_Int32*>(pFkp)[nIMax + 1] = nEndFc; // insert FC - nOldVarLen = (sal_uInt8)nVarLen; + nOldVarLen = static_cast<sal_uInt8>(nVarLen); if( nVarLen && !nOldP ) { // insert it for real nOldStartGrp = nStartGrp; nStartGrp = nPos; - pOfs[nIMax * nItemSize] = (sal_uInt8)( nStartGrp >> 1 ); + pOfs[nIMax * nItemSize] = static_cast<sal_uInt8>( nStartGrp >> 1 ); // insert (start-of-data >> 1) sal_uInt8 nCnt = static_cast< sal_uInt8 >(CHP == ePlc - ? ( nVarLen < 256 ) ? (sal_uInt8) nVarLen : 255 + ? ( nVarLen < 256 ) ? static_cast<sal_uInt8>(nVarLen) : 255 : ( ( nVarLen + 1 ) >> 1 )); pFkp[ nOffset ] = nCnt; // Enter data length @@ -1288,7 +1288,7 @@ void WW8_WrFkp::MergeToNew( short& rVarLen, sal_uInt8 *& rpNewSprms ) sal_uInt8 nStart = pOfs[ (nIMax-1) * nItemSize ]; if( nStart ) { // has Sprms - sal_uInt8* p = pFkp + ( (sal_uInt16)nStart << 1 ); + sal_uInt8* p = pFkp + ( static_cast<sal_uInt16>(nStart) << 1 ); // old and new equal? Then copy only one into the new sprms if( nOldVarLen == rVarLen && !memcmp( p+1, rpNewSprms, nOldVarLen )) @@ -1384,7 +1384,7 @@ void WW8_WrPct::WritePc( WW8Export& rWrt ) sal_uLong nOldPos, nEndPos; nPctStart = rWrt.pTableStrm->Tell(); // Start piece table - rWrt.pTableStrm->WriteChar( ( char )0x02 ); // Status byte PCT + rWrt.pTableStrm->WriteChar( char(0x02) ); // Status byte PCT nOldPos = nPctStart + 1; // remember Position SwWW8Writer::WriteLong( *rWrt.pTableStrm, 0 ); // then the length @@ -1426,7 +1426,7 @@ void WW8_WrPct::SetParaBreak() WW8_CP WW8_WrPct::Fc2Cp( sal_uLong nFc ) const { - OSL_ENSURE( nFc >= (sal_uLong)nOldFc, "FilePos lies in front of last piece" ); + OSL_ENSURE( nFc >= static_cast<sal_uLong>(nOldFc), "FilePos lies in front of last piece" ); OSL_ENSURE( ! m_Pcts.empty(), "Fc2Cp no piece available" ); nFc -= nOldFc; @@ -1627,7 +1627,7 @@ void WW8Export::OutGrfBullets(const ww8::Frame & rFrame) m_pChpPlc->AppendFkpEntry( Strm().Tell(), pO->size(), pO->data() ); pO->clear(); // if links... - WriteChar( (char)1 ); + WriteChar( char(1) ); sal_uInt8 aArr[ 22 ]; sal_uInt8* pArr = aArr; @@ -2010,14 +2010,14 @@ void WW8AttributeOutput::TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pT { /* Cell */ m_rWW8Export.InsUInt16( NS_sprm::sprmPFInTable ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x1 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x1) ); m_rWW8Export.InsUInt16( NS_sprm::sprmPItap ); m_rWW8Export.InsUInt32( nDepth ); if ( nDepth > 1 && pTableTextNodeInfoInner->isEndOfCell() ) { m_rWW8Export.InsUInt16( NS_sprm::sprmPFInnerTableCell ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x1 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x1) ); } } } @@ -2032,12 +2032,12 @@ void WW8AttributeOutput::TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTa if ( pTableTextNodeInfoInner->isEndOfLine() ) { m_rWW8Export.InsUInt16( NS_sprm::sprmPFInTable ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x1 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x1) ); if ( nDepth == 1 ) { m_rWW8Export.InsUInt16( NS_sprm::sprmPFTtp ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x1 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x1) ); } m_rWW8Export.InsUInt16( NS_sprm::sprmPItap ); @@ -2046,9 +2046,9 @@ void WW8AttributeOutput::TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTa if ( nDepth > 1 ) { m_rWW8Export.InsUInt16( NS_sprm::sprmPFInnerTableCell ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x1 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x1) ); m_rWW8Export.InsUInt16( NS_sprm::sprmPFInnerTtp ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x1 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x1) ); } TableDefinition( pTableTextNodeInfoInner ); @@ -2199,7 +2199,7 @@ void WW8AttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTab if ( nHeight ) { m_rWW8Export.InsUInt16( NS_sprm::sprmTDyaRowHeight ); - m_rWW8Export.InsUInt16( (sal_uInt16)nHeight ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(nHeight) ); } } @@ -2428,8 +2428,8 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t if ( nWidthPercent > 0 && nWidthPercent <= 600 ) { m_rWW8Export.InsUInt16( NS_sprm::sprmTTableWidth ); - m_rWW8Export.pO->push_back( (sal_uInt8) /*ftsPercent*/ 2 ); - m_rWW8Export.InsUInt16( (sal_uInt16) nWidthPercent * 50 ); + m_rWW8Export.pO->push_back( sal_uInt8/*ftsPercent*/ (2) ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(nWidthPercent) * 50 ); } } @@ -2584,7 +2584,7 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t sal_uInt8 nBoxes = rTabBoxes.size(); m_rWW8Export.InsUInt16( NS_sprm::sprmTDefTableShd80 ); - m_rWW8Export.pO->push_back( (sal_uInt8)(nBoxes * 2) ); // Len + m_rWW8Export.pO->push_back( static_cast<sal_uInt8>(nBoxes * 2) ); // Len for ( sal_uInt8 n = 0; n < nBoxes; n++ ) { @@ -2780,7 +2780,7 @@ void MSWordExportBase::WriteText() if (bNeedExportBreakHere) //#120140# End of check { - ReplaceCr( (char)0xc ); // indicator for Page/Section-Break + ReplaceCr( char(0xc) ); // indicator for Page/Section-Break const SwSectionFormat* pParentFormat = rSect.GetFormat()->GetParent(); if ( !pParentFormat ) diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 36e8adb98f8a..31f4a501a019 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -394,7 +394,7 @@ void WW8Export::OutGrf(const ww8::Frame &rFrame) FieldFlags::Start | FieldFlags::CmdStart | FieldFlags::CmdEnd ); } - WriteChar( (char)1 ); // paste graphic symbols in the main text + WriteChar( char(1) ); // paste graphic symbols in the main text sal_uInt8 aArr[ 18 ]; sal_uInt8* pArr = aArr; @@ -425,7 +425,7 @@ void WW8Export::OutGrf(const ww8::Frame &rFrame) nHeight-=nFontHeight/20; Set_UInt16( pArr, NS_sprm::sprmCHpsPos ); - Set_UInt16( pArr, -((sal_Int16)nHeight)); + Set_UInt16( pArr, - static_cast<sal_Int16>(nHeight)); } } } @@ -452,7 +452,7 @@ void WW8Export::OutGrf(const ww8::Frame &rFrame) ( (eAn == RndStdIds::FLY_AT_PARA) || (eAn == RndStdIds::FLY_AT_PAGE) ) ) { - WriteChar( (char)0x0d ); // close the surrounding frame with CR + WriteChar( char(0x0d) ); // close the surrounding frame with CR static sal_uInt8 nSty[2] = { 0, 0 }; pO->insert( pO->end(), nSty, nSty+2 ); // Style #0 @@ -497,12 +497,12 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const ww8::Frame &rFly, == pAttrSet->GetItemState(RES_GRFATR_CROPGRF, false, &pItem))) { const SwCropGrf& rCr = *static_cast<const SwCropGrf*>(pItem); - nCropL = (sal_Int16)rCr.GetLeft(); - nCropR = (sal_Int16)rCr.GetRight(); - nCropT = (sal_Int16)rCr.GetTop(); - nCropB = (sal_Int16)rCr.GetBottom(); - nXSizeAdd = nXSizeAdd - (sal_Int16)( rCr.GetLeft() + rCr.GetRight() ); - nYSizeAdd = nYSizeAdd - (sal_Int16)( rCr.GetTop() + rCr.GetBottom() ); + nCropL = static_cast<sal_Int16>(rCr.GetLeft()); + nCropR = static_cast<sal_Int16>(rCr.GetRight()); + nCropT = static_cast<sal_Int16>(rCr.GetTop()); + nCropB = static_cast<sal_Int16>(rCr.GetBottom()); + nXSizeAdd = nXSizeAdd - static_cast<sal_Int16>( rCr.GetLeft() + rCr.GetRight() ); + nYSizeAdd = nYSizeAdd - static_cast<sal_Int16>( rCr.GetTop() + rCr.GetBottom() ); } Size aGrTwipSz(rFly.GetSize()); @@ -600,7 +600,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const ww8::Frame &rFly, if ( !bIsSubstitutedSize ) { const double fVal = nWidth * 1000.0 / (aGrTwipSz.Width() + nXSizeAdd ); - Set_UInt16( pArr, (sal_uInt16)::rtl::math::round(fVal) ); + Set_UInt16( pArr, static_cast<sal_uInt16>(::rtl::math::round(fVal)) ); } else { @@ -617,7 +617,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const ww8::Frame &rFly, if ( !bIsSubstitutedSize ) { const double fVal = nHeight * 1000.0 / (aGrTwipSz.Height() + nYSizeAdd); - Set_UInt16( pArr, (sal_uInt16)::rtl::math::round(fVal) ); + Set_UInt16( pArr, static_cast<sal_uInt16>(::rtl::math::round(fVal)) ); } else { @@ -731,7 +731,7 @@ void SwWW8WrGrf::WritePICBulletFHeader(SvStream& rStrm, const Graphic &rGrf, if( aGrTwipSz.Width() + nXSizeAdd ) // set mx { double fVal = nWidth * 1000.0 / (aGrTwipSz.Width() + nXSizeAdd); - Set_UInt16( pArr, (sal_uInt16)::rtl::math::round(fVal) ); + Set_UInt16( pArr, static_cast<sal_uInt16>(::rtl::math::round(fVal)) ); } else pArr += 2; @@ -739,7 +739,7 @@ void SwWW8WrGrf::WritePICBulletFHeader(SvStream& rStrm, const Graphic &rGrf, if( aGrTwipSz.Height() + nYSizeAdd ) // set my { double fVal = nHeight * 1000.0 / (aGrTwipSz.Height() + nYSizeAdd); - Set_UInt16( pArr, (sal_uInt16)::rtl::math::round(fVal) ); + Set_UInt16( pArr, static_cast<sal_uInt16>(::rtl::math::round(fVal)) ); } else pArr += 2; diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 41a22c8bf29b..1d04d2b3e8b5 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -945,7 +945,7 @@ void WW8AttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) if( m_rWW8Export.m_pDoc->GetDocumentType() != SwDoc::DOCTYPE_MSWORD ) { m_rWW8Export.InsUInt16( NS_sprm::sprmCFBiDi ); - m_rWW8Export.pO->push_back( (sal_uInt8)1 ); + m_rWW8Export.pO->push_back( sal_uInt8(1) ); } } @@ -953,7 +953,7 @@ void WW8AttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) if (nScript == i18n::ScriptType::COMPLEX && !bIsRTL) { m_rWW8Export.InsUInt16( NS_sprm::sprmCFComplexScripts ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x81 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x81) ); m_rWW8Export.pDop->bUseThaiLineBreakingRules = true; } } @@ -1342,19 +1342,19 @@ void WW8AttributeOutput::CharLanguage( const SvxLanguageItem& rLanguage ) { // use sprmCRgLid0_80 rather than sprmCLid m_rWW8Export.InsUInt16( nId ); - m_rWW8Export.InsUInt16( (sal_uInt16)rLanguage.GetLanguage() ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(rLanguage.GetLanguage()) ); // Word 2000 and above apparently require both old and new versions of // these sprms to be set, without it spellchecking doesn't work if ( nId == NS_sprm::sprmCRgLid0_80 ) { m_rWW8Export.InsUInt16( NS_sprm::sprmCRgLid0 ); - m_rWW8Export.InsUInt16( (sal_uInt16)rLanguage.GetLanguage() ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(rLanguage.GetLanguage()) ); } else if ( nId == NS_sprm::sprmCRgLid1_80 ) { m_rWW8Export.InsUInt16( NS_sprm::sprmCRgLid1 ); - m_rWW8Export.InsUInt16( (sal_uInt16)rLanguage.GetLanguage() ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(rLanguage.GetLanguage()) ); } } } @@ -1390,7 +1390,7 @@ void WW8AttributeOutput::CharEscapement( const SvxEscapementItem& rEscapement ) RES_CHRATR_FONTSIZE )).GetHeight(); m_rWW8Export.InsUInt16( NS_sprm::sprmCHpsPos ); - m_rWW8Export.InsUInt16( (short)(( nHeight * nEsc + 500 ) / 1000 )); + m_rWW8Export.InsUInt16( static_cast<short>(( nHeight * nEsc + 500 ) / 1000 )); if( 100 != nProp || !b ) { @@ -1420,7 +1420,7 @@ void WW8AttributeOutput::CharFontSize( const SvxFontHeightItem& rHeight ) { m_rWW8Export.InsUInt16( nId ); - m_rWW8Export.InsUInt16( (sal_uInt16)(( rHeight.GetHeight() + 5 ) / 10 ) ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(( rHeight.GetHeight() + 5 ) / 10 ) ); } } @@ -1443,15 +1443,15 @@ void WW8AttributeOutput::CharRelief( const SvxCharReliefItem& rRelief ) if( nId ) { m_rWW8Export.InsUInt16( nId ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x81 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x81) ); } else { // switch both flags off m_rWW8Export.InsUInt16( NS_sprm::sprmCFEmboss ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x0 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x0) ); m_rWW8Export.InsUInt16( NS_sprm::sprmCFImprint ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x0 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x0) ); } } @@ -1461,7 +1461,7 @@ void WW8AttributeOutput::CharBidiRTL( const SfxPoolItem& rHt ) if( rAttr.GetValue() == 1 ) { m_rWW8Export.InsUInt16(0x85a); - m_rWW8Export.pO->push_back((sal_uInt8)1); + m_rWW8Export.pO->push_back(sal_uInt8(1)); } } @@ -1469,7 +1469,7 @@ void WW8AttributeOutput::CharIdctHint( const SfxPoolItem& rHt ) { const SfxInt16Item& rAttr = static_cast<const SfxInt16Item&>(rHt); m_rWW8Export.InsUInt16(0x286F); - m_rWW8Export.pO->push_back((sal_uInt8)(rAttr.GetValue())); + m_rWW8Export.pO->push_back(static_cast<sal_uInt8>(rAttr.GetValue())); } void WW8AttributeOutput::CharRotate( const SvxCharRotateItem& rRotate ) @@ -1485,8 +1485,8 @@ void WW8AttributeOutput::CharRotate( const SvxCharRotateItem& rRotate ) // here corrupts the table, hence !m_rWW8Export.bIsInTable m_rWW8Export.InsUInt16( NS_sprm::sprmCFELayout ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x06 ); //len 6 - m_rWW8Export.pO->push_back( (sal_uInt8)0x01 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x06) ); //len 6 + m_rWW8Export.pO->push_back( sal_uInt8(0x01) ); m_rWW8Export.InsUInt16( rRotate.IsFitToLine() ? 1 : 0 ); static const sal_uInt8 aZeroArr[ 3 ] = { 0, 0, 0 }; @@ -1658,11 +1658,11 @@ static void InsertSpecialChar( WW8Export& rWrt, sal_uInt8 c, // write attributes of hyperlink character 0x01 SwWW8Writer::InsUInt16( aItems, NS_sprm::sprmCFFldVanish ); - aItems.push_back( (sal_uInt8)0x81 ); + aItems.push_back( sal_uInt8(0x81) ); SwWW8Writer::InsUInt16( aItems, NS_sprm::sprmCPicLocation ); SwWW8Writer::InsUInt32( aItems, nLinkPosInDataStrm ); SwWW8Writer::InsUInt16( aItems, NS_sprm::sprmCFData ); - aItems.push_back( (sal_uInt8)0x01 ); + aItems.push_back( sal_uInt8(0x01) ); } //Technically we should probably Remove all attribs @@ -2283,7 +2283,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) if( TOX_USER == pTOX->GetType() ) { sStr += "\""; - sStr += OUString((sal_Char)( 'A' + GetExport( ).GetId( *pTOX->GetTOXType() ) )); + sStr += OUString(static_cast<sal_Char>( 'A' + GetExport( ).GetId( *pTOX->GetTOXType() ) )); sStr += sEntryEnd; } } @@ -2336,7 +2336,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) } } - sal_uInt8 nMaxMSAutoEvaluate = nPosOfLowestNonStandardLvl < nTOXLvl ? nPosOfLowestNonStandardLvl : (sal_uInt8)nTOXLvl; + sal_uInt8 nMaxMSAutoEvaluate = nPosOfLowestNonStandardLvl < nTOXLvl ? nPosOfLowestNonStandardLvl : static_cast<sal_uInt8>(nTOXLvl); //output \o 1-X where X is the highest normal outline style to be included in the toc if ( nMaxMSAutoEvaluate ) @@ -3448,8 +3448,8 @@ void WW8AttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines ) if ( rTwoLines.GetValue() ) { m_rWW8Export.InsUInt16( NS_sprm::sprmCFELayout ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x06 ); //len 6 - m_rWW8Export.pO->push_back( (sal_uInt8)0x02 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x06) ); //len 6 + m_rWW8Export.pO->push_back( sal_uInt8(0x02) ); sal_Unicode cStart = rTwoLines.GetStartBracket(); sal_Unicode cEnd = rTwoLines.GetEndBracket(); @@ -3579,7 +3579,7 @@ void WW8AttributeOutput::FormatFrameSize( const SwFormatFrameSize& rSize ) { //"sprmPDxaWidth" m_rWW8Export.InsUInt16( NS_sprm::sprmPDxaWidth ); - m_rWW8Export.InsUInt16( (sal_uInt16)rSize.GetWidth() ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(rSize.GetWidth()) ); } if ( rSize.GetHeight() ) @@ -3591,8 +3591,8 @@ void WW8AttributeOutput::FormatFrameSize( const SwFormatFrameSize& rSize ) switch ( rSize.GetHeightSizeType() ) { case ATT_VAR_SIZE: break; - case ATT_FIX_SIZE: nH = (sal_uInt16)rSize.GetHeight() & 0x7fff; break; - default: nH = (sal_uInt16)rSize.GetHeight() | 0x8000; break; + case ATT_FIX_SIZE: nH = static_cast<sal_uInt16>(rSize.GetHeight()) & 0x7fff; break; + default: nH = static_cast<sal_uInt16>(rSize.GetHeight()) | 0x8000; break; } m_rWW8Export.InsUInt16( nH ); } @@ -3914,7 +3914,7 @@ void WW8AttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLR ) // sprmPDxaFromText10 m_rWW8Export.InsUInt16( NS_sprm::LN_PDxaFromText10 ); // use average, since WW only knows one value - m_rWW8Export.InsUInt16( (sal_uInt16) ( ( rLR.GetLeft() + rLR.GetRight() ) / 2 ) ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>( ( rLR.GetLeft() + rLR.GetRight() ) / 2 ) ); } else if ( m_rWW8Export.m_bOutPageDescs ) // PageDescs { @@ -3927,8 +3927,8 @@ void WW8AttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLR ) } else nLDist = nRDist = 0; - nLDist = nLDist + (sal_uInt16)rLR.GetLeft(); - nRDist = nRDist + (sal_uInt16)rLR.GetRight(); + nLDist = nLDist + static_cast<sal_uInt16>(rLR.GetLeft()); + nRDist = nRDist + static_cast<sal_uInt16>(rLR.GetRight()); // sprmSDxaLeft m_rWW8Export.InsUInt16( NS_sprm::sprmSDxaLeft ); @@ -3942,11 +3942,11 @@ void WW8AttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLR ) { // normal paragraphs // sprmPDxaLeft m_rWW8Export.InsUInt16( 0x845E ); //asian version ? - m_rWW8Export.InsUInt16( (sal_uInt16)rLR.GetTextLeft() ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(rLR.GetTextLeft()) ); // sprmPDxaRight m_rWW8Export.InsUInt16( 0x845D ); //asian version ? - m_rWW8Export.InsUInt16( (sal_uInt16)rLR.GetRight() ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(rLR.GetRight()) ); // sprmPDxaLeft1 m_rWW8Export.InsUInt16( 0x8460 ); //asian version ? @@ -3963,7 +3963,7 @@ void WW8AttributeOutput::FormatULSpace( const SvxULSpaceItem& rUL ) // sprmPDyaFromText m_rWW8Export.InsUInt16( NS_sprm::sprmPDyaFromText ); // use average, since WW only knows one value - m_rWW8Export.InsUInt16( (sal_uInt16) ( ( rUL.GetUpper() + rUL.GetLower() ) / 2 ) ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>( ( rUL.GetUpper() + rUL.GetLower() ) / 2 ) ); } else if ( m_rWW8Export.m_bOutPageDescs ) // Page-UL { @@ -4007,7 +4007,7 @@ void WW8AttributeOutput::FormatULSpace( const SvxULSpaceItem& rUL ) if (rUL.GetContext()) { m_rWW8Export.InsUInt16(NS_sprm::sprmPFContextualSpacing); - m_rWW8Export.pO->push_back( (sal_uInt8)rUL.GetContext() ); + m_rWW8Export.pO->push_back( static_cast<sal_uInt8>(rUL.GetContext()) ); } } } @@ -4035,7 +4035,7 @@ void WW8AttributeOutput::FormatVertOrientation( const SwFormatVertOrient& rFlyVe switch( rFlyVert.GetVertOrient() ) { case text::VertOrientation::NONE: - nPos = (short)rFlyVert.GetPos(); + nPos = static_cast<short>(rFlyVert.GetPos()); break; case text::VertOrientation::CENTER: case text::VertOrientation::LINE_CENTER: @@ -4073,7 +4073,7 @@ void WW8AttributeOutput::FormatHorizOrientation( const SwFormatHoriOrient& rFlyH switch( rFlyHori.GetHoriOrient() ) { case text::HoriOrientation::NONE: - nPos = (short)rFlyHori.GetPos(); + nPos = static_cast<short>(rFlyHori.GetPos()); if( !nPos ) nPos = 1; // WW: 0 is reserved break; @@ -4465,7 +4465,7 @@ void WW8AttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol m_rWW8Export.pO->push_back( static_cast<sal_uInt8>(n) ); m_rWW8Export.InsUInt16( rCol. CalcPrtColWidth( n, - ( sal_uInt16 ) nPageSize ) ); + static_cast<sal_uInt16>(nPageSize) ) ); if ( n + 1 != nCols ) { @@ -4529,11 +4529,11 @@ void AttributeOutputBase::FormatColumns( const SwFormatCol& rCol ) // look if all columns are equal bool bEven = true; sal_uInt16 n; - sal_uInt16 nColWidth = rCol.CalcPrtColWidth( 0, (sal_uInt16)nPageSize ); + sal_uInt16 nColWidth = rCol.CalcPrtColWidth( 0, static_cast<sal_uInt16>(nPageSize) ); for ( n = 1; n < nCols; n++ ) { short nDiff = nColWidth - - rCol.CalcPrtColWidth( n, (sal_uInt16)nPageSize ); + rCol.CalcPrtColWidth( n, static_cast<sal_uInt16>(nPageSize) ); if ( nDiff > 10 || nDiff < -10 ) // Tolerance: 10 tw { @@ -4584,10 +4584,10 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing ) default: break; case SvxLineSpaceRule::Fix: // Fix - nSpace = -(short)rSpacing.GetLineHeight(); + nSpace = -static_cast<short>(rSpacing.GetLineHeight()); break; case SvxLineSpaceRule::Min: // At least - nSpace = (short)rSpacing.GetLineHeight(); + nSpace = static_cast<short>(rSpacing.GetLineHeight()); break; case SvxLineSpaceRule::Auto: { @@ -4612,13 +4612,13 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing ) OSL_ENSURE( pSet, "No attrset for lineheight :-(" ); if ( pSet ) { - nSpace = nSpace + (short)( AttrSetToLineHeight( GetExport().m_pDoc->getIDocumentSettingAccess(), + nSpace = nSpace + static_cast<short>( AttrSetToLineHeight( GetExport().m_pDoc->getIDocumentSettingAccess(), *pSet, *Application::GetDefaultDevice(), nScript ) ); } } else // Proportional { - nSpace = (short)( ( 240L * rSpacing.GetPropLineSpace() ) / 100L ); + nSpace = static_cast<short>( ( 240L * rSpacing.GetPropLineSpace() ) / 100L ); nMulti = 1; break; } @@ -5444,7 +5444,7 @@ const SwRedlineData* AttributeOutputBase::GetParagraphMarkerRedline( const SwTex // Maybe add here a check that also the start & end of the redline is the entire paragraph if ( ( uStartNodeIndex == uEndNodeIndex - 1 ) && - ( uStartCharIndex == (sal_uLong)rNode.Len() ) && + ( uStartCharIndex == static_cast<sal_uLong>(rNode.Len()) ) && ( uEndCharIndex == 0) ) { diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index d980d393d5d3..9c9e54f1ebef 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -156,7 +156,7 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, sal_Int32 nStart = 0; sal_uInt16 nCurPos = rBlocks.GetIndex( sShortcut ); sal_Int32 nLen = sShortcut.getLength(); - while( (sal_uInt16)-1 != nCurPos ) + while( sal_uInt16(-1) != nCurPos ) { sShortcut = sShortcut.copy( 0, nLen ); sShortcut += OUString::number(++nStart); // add an Number to it diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 34298b2cbfeb..c79f447b1a90 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -147,7 +147,7 @@ Color WW8TransCol(SVBT32 nWC) if (nWC[3] & 0x1) { // Special color gray - sal_uInt8 u = (sal_uInt8)( (sal_uLong)( 200 - nWC[0] ) * 256 / 200 ); + sal_uInt8 u = static_cast<sal_uInt8>( static_cast<sal_uLong>( 200 - nWC[0] ) * 256 / 200 ); return Color(u, u, u); } @@ -254,12 +254,12 @@ static void SetFill( SfxItemSet& rSet, WW8_DP_FILL& rFill ) { // Brush -> color mix Color aB( WW8TransCol( rFill.dlpcBg ) ); Color aF( WW8TransCol( rFill.dlpcFg ) ); - aB.SetRed( (sal_uInt8)( ( (sal_uLong)aF.GetRed() * nPatA[nPat] - + (sal_uLong)aB.GetRed() * ( 100 - nPatA[nPat] ) ) / 100 ) ); - aB.SetGreen( (sal_uInt8)( ( (sal_uLong)aF.GetGreen() * nPatA[nPat] - + (sal_uLong)aB.GetGreen() * ( 100 - nPatA[nPat] ) ) / 100 ) ); - aB.SetBlue( (sal_uInt8)( ( (sal_uLong)aF.GetBlue() * nPatA[nPat] - + (sal_uLong)aB.GetBlue() * ( 100 - nPatA[nPat] ) ) / 100 ) ); + aB.SetRed( static_cast<sal_uInt8>( ( static_cast<sal_uLong>(aF.GetRed()) * nPatA[nPat] + + static_cast<sal_uLong>(aB.GetRed()) * ( 100 - nPatA[nPat] ) ) / 100 ) ); + aB.SetGreen( static_cast<sal_uInt8>( ( static_cast<sal_uLong>(aF.GetGreen()) * nPatA[nPat] + + static_cast<sal_uLong>(aB.GetGreen()) * ( 100 - nPatA[nPat] ) ) / 100 ) ); + aB.SetBlue( static_cast<sal_uInt8>( ( static_cast<sal_uLong>(aF.GetBlue()) * nPatA[nPat] + + static_cast<sal_uLong>(aB.GetBlue()) * ( 100 - nPatA[nPat] ) ) / 100 ) ); rSet.Put( XFillColorItem( OUString(), aB ) ); } } @@ -313,13 +313,13 @@ SdrObject* SwWW8ImplReader::ReadLine(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet Point& rP0 = aP[0]; Point& rP1 = aP[1]; - rP0.X() = (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2; - rP0.Y() = (sal_Int16)SVBT16ToShort( pHd->ya ) + m_nDrawYOfs2; + rP0.X() = static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )) + m_nDrawXOfs2; + rP0.Y() = static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )) + m_nDrawYOfs2; rP1 = rP0; - rP0.X() += (sal_Int16)SVBT16ToShort( aLine.xaStart ); - rP0.Y() += (sal_Int16)SVBT16ToShort( aLine.yaStart ); - rP1.X() += (sal_Int16)SVBT16ToShort( aLine.xaEnd ); - rP1.Y() += (sal_Int16)SVBT16ToShort( aLine.yaEnd ); + rP0.X() += static_cast<sal_Int16>(SVBT16ToShort( aLine.xaStart )); + rP0.Y() += static_cast<sal_Int16>(SVBT16ToShort( aLine.yaStart )); + rP1.X() += static_cast<sal_Int16>(SVBT16ToShort( aLine.xaEnd )); + rP1.Y() += static_cast<sal_Int16>(SVBT16ToShort( aLine.yaEnd )); } ::basegfx::B2DPolygon aPolygon; @@ -340,11 +340,11 @@ SdrObject* SwWW8ImplReader::ReadRect(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet if( !ReadGrafStart( static_cast<void*>(&aRect), sizeof( aRect ), pHd, rSet ) ) return nullptr; - Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2, - (sal_Int16)SVBT16ToShort( pHd->ya ) + m_nDrawYOfs2 ); + Point aP0( static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )) + m_nDrawXOfs2, + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )) + m_nDrawYOfs2 ); Point aP1( aP0 ); - aP1.X() += (sal_Int16)SVBT16ToShort( pHd->dxa ); - aP1.Y() += (sal_Int16)SVBT16ToShort( pHd->dya ); + aP1.X() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dxa )); + aP1.Y() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dya )); SdrObject* pObj = new SdrRectObj( tools::Rectangle( aP0, aP1 ) ); @@ -361,11 +361,11 @@ SdrObject* SwWW8ImplReader::ReadElipse(WW8_DPHEAD const * pHd, SfxAllItemSet &rS if( !ReadGrafStart( static_cast<void*>(&aElipse), sizeof( aElipse ), pHd, rSet ) ) return nullptr; - Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2, - (sal_Int16)SVBT16ToShort( pHd->ya ) + m_nDrawYOfs2 ); + Point aP0( static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )) + m_nDrawXOfs2, + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )) + m_nDrawYOfs2 ); Point aP1( aP0 ); - aP1.X() += (sal_Int16)SVBT16ToShort( pHd->dxa ); - aP1.Y() += (sal_Int16)SVBT16ToShort( pHd->dya ); + aP1.X() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dxa )); + aP1.Y() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dya )); SdrObject* pObj = new SdrCircObj( OBJ_CIRC, tools::Rectangle( aP0, aP1 ) ); @@ -382,21 +382,21 @@ SdrObject* SwWW8ImplReader::ReadArc(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet) if( !ReadGrafStart( static_cast<void*>(&aArc), sizeof( aArc ), pHd, rSet ) ) return nullptr; - Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2, - (sal_Int16)SVBT16ToShort( pHd->ya ) + m_nDrawYOfs2 ); + Point aP0( static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )) + m_nDrawXOfs2, + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )) + m_nDrawYOfs2 ); Point aP1( aP0 ); - aP1.X() += (sal_Int16)SVBT16ToShort( pHd->dxa ) * 2; - aP1.Y() += (sal_Int16)SVBT16ToShort( pHd->dya ) * 2; + aP1.X() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dxa )) * 2; + aP1.Y() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dya )) * 2; short nA[] = { 2, 3, 1, 0 }; short nW = nA[ ( ( aArc.fLeft & 1 ) << 1 ) + ( aArc.fUp & 1 ) ]; if( !aArc.fLeft ){ - aP0.Y() -= (sal_Int16)SVBT16ToShort( pHd->dya ); - aP1.Y() -= (sal_Int16)SVBT16ToShort( pHd->dya ); + aP0.Y() -= static_cast<sal_Int16>(SVBT16ToShort( pHd->dya )); + aP1.Y() -= static_cast<sal_Int16>(SVBT16ToShort( pHd->dya )); } if( aArc.fUp ){ - aP0.X() -= (sal_Int16)SVBT16ToShort( pHd->dxa ); - aP1.X() -= (sal_Int16)SVBT16ToShort( pHd->dxa ); + aP0.X() -= static_cast<sal_Int16>(SVBT16ToShort( pHd->dxa )); + aP1.X() -= static_cast<sal_Int16>(SVBT16ToShort( pHd->dxa )); } SdrObject* pObj = new SdrCircObj( OBJ_SECT, tools::Rectangle( aP0, aP1 ), @@ -428,9 +428,9 @@ SdrObject* SwWW8ImplReader::ReadPolyLine(WW8_DPHEAD const * pHd, SfxAllItemSet & for (sal_uInt16 i=0; i<nCount; ++i) { aPt.X() = SVBT16ToShort( xP[i << 1] ) + m_nDrawXOfs2 - + (sal_Int16)SVBT16ToShort( pHd->xa ); + + static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )); aPt.Y() = SVBT16ToShort( xP[( i << 1 ) + 1] ) + m_nDrawYOfs2 - + (sal_Int16)SVBT16ToShort( pHd->ya ); + + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )); aP[i] = aPt; } xP.reset(); @@ -1214,17 +1214,17 @@ SdrObject* SwWW8ImplReader::ReadTextBox(WW8_DPHEAD const * pHd, SfxAllItemSet &r if( !ReadGrafStart( static_cast<void*>(&aTextB), sizeof( aTextB ), pHd, rSet ) ) return nullptr; - Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2, - (sal_Int16)SVBT16ToShort( pHd->ya ) + m_nDrawYOfs2 ); + Point aP0( static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )) + m_nDrawXOfs2, + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )) + m_nDrawYOfs2 ); Point aP1( aP0 ); - aP1.X() += (sal_Int16)SVBT16ToShort( pHd->dxa ); - aP1.Y() += (sal_Int16)SVBT16ToShort( pHd->dya ); + aP1.X() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dxa )); + aP1.Y() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dya )); SdrRectObj* pObj = new SdrRectObj( OBJ_TEXT, tools::Rectangle( aP0, aP1 ) ); pObj->SetModel( m_pDrawModel ); pObj->NbcSetSnapRect(tools::Rectangle(aP0, aP1)); - Size aSize( (sal_Int16)SVBT16ToShort( pHd->dxa ) , - (sal_Int16)SVBT16ToShort( pHd->dya ) ); + Size aSize( static_cast<sal_Int16>(SVBT16ToShort( pHd->dxa )) , + static_cast<sal_Int16>(SVBT16ToShort( pHd->dya )) ); long nStartCpFly,nEndCpFly; bool bContainsGraphics; @@ -1271,30 +1271,30 @@ SdrObject* SwWW8ImplReader::ReadCaptionBox(WW8_DPHEAD const * pHd, SfxAllItemSet return nullptr; } - sal_uInt8 nTyp = (sal_uInt8)nCount - 1; + sal_uInt8 nTyp = static_cast<sal_uInt8>(nCount) - 1; if( nTyp == 1 && SVBT16ToShort( xP[0] ) == SVBT16ToShort( xP[2] ) ) nTyp = 0; - Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + - (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.xa ) + m_nDrawXOfs2, - (sal_Int16)SVBT16ToShort( pHd->ya ) - + (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.ya ) + m_nDrawYOfs2 ); + Point aP0( static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )) + + static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadTxbx.xa )) + m_nDrawXOfs2, + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )) + + static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadTxbx.ya )) + m_nDrawYOfs2 ); Point aP1( aP0 ); - aP1.X() += (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.dxa ); - aP1.Y() += (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.dya ); - Point aP2( (sal_Int16)SVBT16ToShort( pHd->xa ) - + (sal_Int16)SVBT16ToShort( aCallB.dpheadPolyLine.xa ) - + m_nDrawXOfs2 + (sal_Int16)SVBT16ToShort( xP[0] ), - (sal_Int16)SVBT16ToShort( pHd->ya ) - + (sal_Int16)SVBT16ToShort( aCallB.dpheadPolyLine.ya ) - + m_nDrawYOfs2 + (sal_Int16)SVBT16ToShort( xP[1] ) ); + aP1.X() += static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadTxbx.dxa )); + aP1.Y() += static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadTxbx.dya )); + Point aP2( static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )) + + static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadPolyLine.xa )) + + m_nDrawXOfs2 + static_cast<sal_Int16>(SVBT16ToShort( xP[0] )), + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )) + + static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadPolyLine.ya )) + + m_nDrawYOfs2 + static_cast<sal_Int16>(SVBT16ToShort( xP[1] )) ); xP.reset(); SdrCaptionObj* pObj = new SdrCaptionObj( tools::Rectangle( aP0, aP1 ), aP2 ); pObj->SetModel( m_pDrawModel ); pObj->NbcSetSnapRect(tools::Rectangle(aP0, aP1)); - Size aSize( (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.dxa ), - (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.dya ) ); + Size aSize( static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadTxbx.dxa )), + static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadTxbx.dya )) ); bool bEraseThisObject; InsertTxbxText(pObj, &aSize, 0, 0, 0, nullptr, false, bEraseThisObject ); @@ -1320,12 +1320,12 @@ SdrObject *SwWW8ImplReader::ReadGroup(WW8_DPHEAD const * pHd, SfxAllItemSet &rSe nGrouped = (sal_Int16)OSL_SWAPWORD( nGrouped ); #endif - m_nDrawXOfs = m_nDrawXOfs + (sal_Int16)SVBT16ToShort( pHd->xa ); - m_nDrawYOfs = m_nDrawYOfs + (sal_Int16)SVBT16ToShort( pHd->ya ); + m_nDrawXOfs = m_nDrawXOfs + static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )); + m_nDrawYOfs = m_nDrawYOfs + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )); SdrObject* pObj = new SdrObjGroup; - short nLeft = (sal_Int16)SVBT16ToShort( pHd->cb ) - sizeof( WW8_DPHEAD ); + short nLeft = static_cast<sal_Int16>(SVBT16ToShort( pHd->cb )) - sizeof( WW8_DPHEAD ); for (int i = 0; i < nGrouped; i++) { SfxAllItemSet aSet(m_pDrawModel->GetItemPool()); @@ -1340,8 +1340,8 @@ SdrObject *SwWW8ImplReader::ReadGroup(WW8_DPHEAD const * pHd, SfxAllItemSet &rSe } } - m_nDrawXOfs = m_nDrawXOfs - (sal_Int16)SVBT16ToShort( pHd->xa ); - m_nDrawYOfs = m_nDrawYOfs - (sal_Int16)SVBT16ToShort( pHd->ya ); + m_nDrawXOfs = m_nDrawXOfs - static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )); + m_nDrawYOfs = m_nDrawYOfs - static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )); return pObj; } @@ -1699,13 +1699,13 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject const * pSdrObj, // set distances from box's border to text contained within the box if( 0 < rInnerDist.Left() ) - aBox.SetDistance( (sal_uInt16)rInnerDist.Left(), SvxBoxItemLine::LEFT ); + aBox.SetDistance( static_cast<sal_uInt16>(rInnerDist.Left()), SvxBoxItemLine::LEFT ); if( 0 < rInnerDist.Top() ) - aBox.SetDistance( (sal_uInt16)rInnerDist.Top(), SvxBoxItemLine::TOP ); + aBox.SetDistance( static_cast<sal_uInt16>(rInnerDist.Top()), SvxBoxItemLine::TOP ); if( 0 < rInnerDist.Right() ) - aBox.SetDistance( (sal_uInt16)rInnerDist.Right(), SvxBoxItemLine::RIGHT ); + aBox.SetDistance( static_cast<sal_uInt16>(rInnerDist.Right()), SvxBoxItemLine::RIGHT ); if( 0 < rInnerDist.Bottom() ) - aBox.SetDistance( (sal_uInt16)rInnerDist.Bottom(), SvxBoxItemLine::BOTTOM ); + aBox.SetDistance( static_cast<sal_uInt16>(rInnerDist.Bottom()), SvxBoxItemLine::BOTTOM ); bool bFixSize = !(WW8ITEMVALUE(rOldSet, SDRATTR_TEXT_AUTOGROWHEIGHT, SdrOnOffItem)); @@ -1869,7 +1869,7 @@ void SwWW8ImplReader::AdjustLRWrapForWordMargins( if (rRecord.nXAlign == 1) { if ((nXRelTo == 0) || (nXRelTo == 2)) - rLR.SetLeft((sal_uInt16)0); + rLR.SetLeft(sal_uInt16(0)); } // Right adjustments - if horizontally aligned to right of @@ -1877,19 +1877,19 @@ void SwWW8ImplReader::AdjustLRWrapForWordMargins( if (rRecord.nXAlign == 3) { if ((nXRelTo == 0) || (nXRelTo == 2)) - rLR.SetRight((sal_uInt16)0); + rLR.SetRight(sal_uInt16(0)); } // Inside margin, remove left wrapping if ((rRecord.nXAlign == 4) && (nXRelTo == 0)) { - rLR.SetLeft((sal_uInt16)0); + rLR.SetLeft(sal_uInt16(0)); } // Outside margin, remove left wrapping if ((rRecord.nXAlign == 5) && (nXRelTo == 0)) { - rLR.SetRight((sal_uInt16)0); + rLR.SetRight(sal_uInt16(0)); } } @@ -1907,7 +1907,7 @@ void SwWW8ImplReader::AdjustULWrapForWordMargins( if (rRecord.nYAlign == 1) { if ((nYRelTo == 0) || (nYRelTo == 1)) - rUL.SetUpper((sal_uInt16)0); + rUL.SetUpper(sal_uInt16(0)); } // Bottom adjustment - remove bottom wrapping if aligned to page or @@ -1915,12 +1915,12 @@ void SwWW8ImplReader::AdjustULWrapForWordMargins( if (rRecord.nYAlign == 3) { if ((nYRelTo == 0) || (nYRelTo == 1)) - rUL.SetLower((sal_uInt16)0); + rUL.SetLower(sal_uInt16(0)); } // Remove top margin if aligned vertically inside margin if ((rRecord.nYAlign == 4) && (nYRelTo == 0)) - rUL.SetUpper((sal_uInt16)0); + rUL.SetUpper(sal_uInt16(0)); } void SwWW8ImplReader::MapWrapIntoFlyFormat(SvxMSDffImportRec const * pRecord, @@ -2920,7 +2920,7 @@ SwFlyFrameFormat* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject, deleted and useless. */ m_xMSDffManager->StoreShapeOrder(pF->nSpId, - (((sal_uLong)pRecord->aTextId.nTxBxS) << 16) + + (static_cast<sal_uLong>(pRecord->aTextId.nTxBxS) << 16) + pRecord->aTextId.nSequence, nullptr, pRetFrameFormat); // The Contact object has to be inserted into the draw page, so diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index 04f5d1b33626..8a4f11102fb6 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -358,7 +358,7 @@ SwFlyFrameFormat* SwWW8ImplReader::MakeGrafNotInContent(const WW8PicDesc& rPD, sal_Int32 nNetHeight = nHeight + rPD.nCT + rPD.nCB; if (m_xSFlyPara->nLineSpace && m_xSFlyPara->nLineSpace > nNetHeight) m_xSFlyPara->nYPos = - (sal_uInt16)( m_xSFlyPara->nYPos + m_xSFlyPara->nLineSpace - nNetHeight ); + static_cast<sal_uInt16>( m_xSFlyPara->nYPos + m_xSFlyPara->nLineSpace - nNetHeight ); WW8FlySet aFlySet(*this, m_xWFlyPara.get(), m_xSFlyPara.get(), true); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 7d16cb4449d2..e875205ae5c9 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -971,8 +971,8 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, if ( nTextId ) { - pImpRec->aTextId.nTxBxS = (sal_uInt16)( nTextId >> 16 ); - pImpRec->aTextId.nSequence = (sal_uInt16)nTextId; + pImpRec->aTextId.nTxBxS = static_cast<sal_uInt16>( nTextId >> 16 ); + pImpRec->aTextId.nSequence = static_cast<sal_uInt16>(nTextId); } pImpRec->nDxWrapDistLeft = GetPropertyValue( @@ -1060,7 +1060,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, && (rObjData.nCalledByGroup < 2) ) ) StoreShapeOrder( pImpRec->nShapeId, - ( ( (sal_uLong)pImpRec->aTextId.nTxBxS ) << 16 ) + ( static_cast<sal_uLong>(pImpRec->aTextId.nTxBxS) << 16 ) + pImpRec->aTextId.nSequence, pObj ); } else @@ -2793,7 +2793,7 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCharSet() { if (!m_aFontSrcCharSets.empty()) eSrcCharSet = m_aFontSrcCharSets.top(); - if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0 && (size_t)m_nCharFormat < m_vColl.size() ) + if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0 && static_cast<size_t>(m_nCharFormat) < m_vColl.size() ) eSrcCharSet = m_vColl[m_nCharFormat].GetCharSet(); if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && StyleExists(m_nAktColl) && m_nAktColl < m_vColl.size()) eSrcCharSet = m_vColl[m_nAktColl].GetCharSet(); @@ -2817,7 +2817,7 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCJKCharSet() { if (!m_aFontSrcCJKCharSets.empty()) eSrcCharSet = m_aFontSrcCJKCharSets.top(); - if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0 && (size_t)m_nCharFormat < m_vColl.size() ) + if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0 && static_cast<size_t>(m_nCharFormat) < m_vColl.size() ) eSrcCharSet = m_vColl[m_nCharFormat].GetCJKCharSet(); if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW && StyleExists(m_nAktColl) && m_nAktColl < m_vColl.size()) eSrcCharSet = m_vColl[m_nAktColl].GetCJKCharSet(); @@ -2918,7 +2918,7 @@ bool SwWW8ImplReader::LangUsesHindiNumbers(LanguageType nLang) { bool bResult = false; - switch ((sal_uInt16)nLang) + switch (static_cast<sal_uInt16>(nLang)) { case 0x1401: // Arabic(Algeria) case 0x3c01: // Arabic(Bahrain) @@ -3583,7 +3583,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) case 0x15: if( !m_bSpec ) // Juristenparagraph { - cp_set::iterator aItr = m_aTOXEndCps.find((WW8_CP)nPosCp); + cp_set::iterator aItr = m_aTOXEndCps.find(static_cast<WW8_CP>(nPosCp)); if (aItr == m_aTOXEndCps.end()) cInsert = u'\x00a7'; else @@ -4117,9 +4117,9 @@ bool SwWW8ImplReader::ReadText(WW8_CP nStartCp, WW8_CP nTextLen, ManTypes nType) if ((nCrCount++ & 0x40) == 0 && nType == MAN_MAINTEXT && l <= nTextLen) { if (nTextLen < WW8_CP_MAX/100) - m_nProgress = (sal_uInt16)(l * 100 / nTextLen); + m_nProgress = static_cast<sal_uInt16>(l * 100 / nTextLen); else - m_nProgress = (sal_uInt16)(l / nTextLen * 100); + m_nProgress = static_cast<sal_uInt16>(l / nTextLen * 100); m_xProgress->Update(m_nProgress); // Update } } diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index ef14cddc3787..5dd7b386bb2c 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -702,7 +702,7 @@ static void SetBaseAnlv(SwNumFormat &rNum, WW8_ANLV const &rAV, sal_uInt8 nSwLev rNum.SetNumAdjust( eAdjA[ rAV.aBits1 & 0x3] ); rNum.SetCharTextDistance( SVBT16ToShort( rAV.dxaSpace ) ); - sal_Int16 nIndent = std::abs((sal_Int16)SVBT16ToShort( rAV.dxaIndent )); + sal_Int16 nIndent = std::abs(static_cast<sal_Int16>(SVBT16ToShort( rAV.dxaIndent ))); if( rAV.aBits1 & 0x08 ) //fHang { rNum.SetFirstLineOffset( -nIndent ); @@ -1250,7 +1250,7 @@ void WW8TabBandDesc::ReadDef(bool bVer67, const sal_uInt8* pS, short nLen) const sal_uInt8* pT = &pS[1]; for (int i = 0; i <= nCols; i++, pT+=2) - nCenter[i] = (sal_Int16)SVBT16ToShort( pT ); // X-borders + nCenter[i] = static_cast<sal_Int16>(SVBT16ToShort( pT )); // X-borders if( nCols != nOldCols ) // different column count { @@ -1432,7 +1432,7 @@ void WW8TabBandDesc::ProcessSprmTDxaCol(const sal_uInt8* pParamsTDxaCol) { sal_uInt8 nitcFirst= pParamsTDxaCol[0]; // first col to be changed sal_uInt8 nitcLim = pParamsTDxaCol[1]; // (last col to be changed)+1 - short nDxaCol = (sal_Int16)SVBT16ToShort( pParamsTDxaCol + 2 ); + short nDxaCol = static_cast<sal_Int16>(SVBT16ToShort( pParamsTDxaCol + 2 )); for( int i = nitcFirst; (i < nitcLim) && (i < nWwCols); i++ ) { @@ -1975,10 +1975,10 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) : m_bIsBiDi = SVBT16ToShort(pParams) != 0; break; case sprmTDxaGapHalf: - pNewBand->nGapHalf = (sal_Int16)SVBT16ToShort( pParams ); + pNewBand->nGapHalf = static_cast<sal_Int16>(SVBT16ToShort( pParams )); break; case sprmTDyaRowHeight: - pNewBand->nLineHeight = (sal_Int16)SVBT16ToShort( pParams ); + pNewBand->nLineHeight = static_cast<sal_Int16>(SVBT16ToShort( pParams )); m_bClaimLineFormat = true; break; case sprmTDefTable: @@ -1997,7 +1997,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) : // parameter (meaning the left-most position) and then // shift the whole table to that margin (see below) { - short nDxaNew = (sal_Int16)SVBT16ToShort( pParams ); + short nDxaNew = static_cast<sal_Int16>(SVBT16ToShort( pParams )); if( nDxaNew < nTabeDxaNew ) nTabeDxaNew = nDxaNew; } @@ -2393,7 +2393,7 @@ void WW8TabDesc::CalcDefaults() sal_uInt16 j = ( pR->bLEmptyCol ) ? 1 : 0; for (i = 0; i < pR->nWwCols; ++i) { - pR->nTransCell[i] = (sal_Int8)j; + pR->nTransCell[i] = static_cast<sal_Int8>(j); if ( pR->nCenter[i] < pR->nCenter[i+1] ) { pR->bExist[i] = true; @@ -2422,8 +2422,8 @@ void WW8TabDesc::CalcDefaults() pR->nTransCell[n] = pR->nTransCell[k]; } - pR->nTransCell[i++] = (sal_Int8)(j++); // Can exceed by 2 among other - pR->nTransCell[i] = (sal_Int8)j; // things because of bREmptyCol + pR->nTransCell[i++] = static_cast<sal_Int8>(j++); // Can exceed by 2 among other + pR->nTransCell[i] = static_cast<sal_Int8>(j); // things because of bREmptyCol pR->nSwCols = pR->nSwCols + nAddCols; if( pR->nSwCols < nMinCols ) @@ -2665,9 +2665,9 @@ void WW8TabDesc::MergeCells() // start a new merge group if appropriate - OSL_ENSURE(nRow < (sal_uInt16)m_pTabLines->size(), + OSL_ENSURE(nRow < static_cast<sal_uInt16>(m_pTabLines->size()), "Too few lines, table ended early"); - if (nRow >= (sal_uInt16)m_pTabLines->size()) + if (nRow >= static_cast<sal_uInt16>(m_pTabLines->size())) return; m_pTabLine = (*m_pTabLines)[ nRow ]; m_pTabBoxes = &m_pTabLine->GetTabBoxes(); @@ -2788,7 +2788,7 @@ void WW8TabDesc::ParkPaM() { SwTableBox *pTabBox2 = nullptr; short nRow = m_nAktRow + 1; - if (nRow < (sal_uInt16)m_pTabLines->size()) + if (nRow < static_cast<sal_uInt16>(m_pTabLines->size())) { if (SwTableLine *pLine = (*m_pTabLines)[nRow]) { @@ -2949,7 +2949,7 @@ bool WW8TabDesc::IsValidCell(short nCol) const { return (static_cast<size_t>(nCol) < SAL_N_ELEMENTS(m_pActBand->bExist)) && m_pActBand->bExist[nCol] && - (sal_uInt16)m_nAktRow < m_pTabLines->size(); + static_cast<sal_uInt16>(m_nAktRow) < m_pTabLines->size(); } bool WW8TabDesc::InFirstParaInCell() const @@ -2992,7 +2992,7 @@ void WW8TabDesc::SetPamInCell(short nWwCol, bool bPam) sal_uInt16 nCol = m_pActBand->transCell(nWwCol); - if ((sal_uInt16)m_nAktRow >= m_pTabLines->size()) + if (static_cast<sal_uInt16>(m_nAktRow) >= m_pTabLines->size()) { OSL_ENSURE(false, "Actual row bigger than expected." ); if (bPam) @@ -3254,7 +3254,7 @@ void WW8TabDesc::AdjustNewBand() InsertCells( m_pActBand->nSwCols - m_nDefaultSwCols ); SetPamInCell( 0, false); - OSL_ENSURE( m_pTabBoxes && m_pTabBoxes->size() == (sal_uInt16)m_pActBand->nSwCols, + OSL_ENSURE( m_pTabBoxes && m_pTabBoxes->size() == static_cast<sal_uInt16>(m_pActBand->nSwCols), "Wrong column count in table" ); if( m_bClaimLineFormat ) diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 8dc161d582d4..9acf6575441a 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -565,8 +565,8 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, std::unique_ptr<SfxItemSet for(int i=0;i<4;++i) rParaSprms.push_back(*pBegin++); short nDxaLeft = SVBT16ToShort(aSprm.pSprm); - aLVL.nDxaLeft = (0 < nDxaLeft) ? (sal_uInt16)nDxaLeft - : (sal_uInt16)(-nDxaLeft); + aLVL.nDxaLeft = (0 < nDxaLeft) ? static_cast<sal_uInt16>(nDxaLeft) + : static_cast<sal_uInt16>(-nDxaLeft); } // "sprmPDxaLeft1" pap.dxaLeft1;dxa;word; @@ -636,8 +636,8 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, std::unique_ptr<SfxItemSet if (bDoAdjust) { aLVL.nDxaLeft = (0 < nTabPos) - ? (sal_uInt16)nTabPos - : (sal_uInt16)(-nTabPos); + ? static_cast<sal_uInt16>(nTabPos) + : static_cast<sal_uInt16>(-nTabPos); aLVL.nDxaLeft1 = nDesired - aLVL.nDxaLeft; } @@ -710,7 +710,7 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, std::unique_ptr<SfxItemSet // 5. convert read values into Writer syntax if( 0 <= aLVL.nStartAt ) - nStartNo = (sal_uInt16)aLVL.nStartAt; + nStartNo = static_cast<sal_uInt16>(aLVL.nStartAt); switch( aLVL.nNFC ) { @@ -2010,7 +2010,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData, } else { - m_nLFOPosition = (sal_uInt16)nData-1; + m_nLFOPosition = static_cast<sal_uInt16>(nData)-1; /* If we are a ww8+ style with ww7- style lists then there is a bizarre broken word bug where when the list is removed from a para @@ -2283,7 +2283,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, OUString aNm; if (xPropSetInfo->hasPropertyByName(aNm = "TextColor")) { - aTmp <<= (sal_Int32)static_cast<const SvxColorItem*>(pItem)->GetValue().GetColor(); + aTmp <<= static_cast<sal_Int32>(static_cast<const SvxColorItem*>(pItem)->GetValue().GetColor()); rPropSet->setPropertyValue(aNm, aTmp); } } @@ -2300,17 +2300,17 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, } if (xPropSetInfo->hasPropertyByName(aNm = "FontFamily")) { - aTmp <<= (sal_Int16)pFontItem->GetFamily(); + aTmp <<= static_cast<sal_Int16>(pFontItem->GetFamily()); rPropSet->setPropertyValue( aNm, aTmp ); } if (xPropSetInfo->hasPropertyByName(aNm = "FontCharset")) { - aTmp <<= (sal_Int16)pFontItem->GetCharSet(); + aTmp <<= static_cast<sal_Int16>(pFontItem->GetCharSet()); rPropSet->setPropertyValue( aNm, aTmp ); } if (xPropSetInfo->hasPropertyByName(aNm = "FontPitch")) { - aTmp <<= (sal_Int16)pFontItem->GetPitch(); + aTmp <<= static_cast<sal_Int16>(pFontItem->GetPitch()); rPropSet->setPropertyValue( aNm, aTmp ); } @@ -2327,7 +2327,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, { Size aSize( aFont.GetFontSize().Width(), static_cast<const SvxFontHeightItem*>(pItem)->GetHeight() ); - aTmp <<= ((float)aSize.Height()) / 20.0; + aTmp <<= static_cast<float>(aSize.Height()) / 20.0; aFont.SetFontSize(OutputDevice::LogicToLogic(aSize, MapMode(MapUnit::MapTwip), MapMode(MapUnit::Map100thMM))); @@ -2341,17 +2341,17 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, break; case RES_CHRATR_UNDERLINE: - aTmp <<= (sal_Int16)(static_cast<const SvxUnderlineItem*>(pItem)->GetLineStyle()); + aTmp <<= static_cast<sal_Int16>(static_cast<const SvxUnderlineItem*>(pItem)->GetLineStyle()); aFont.SetUnderline(static_cast<const SvxUnderlineItem*>(pItem)->GetLineStyle()); break; case RES_CHRATR_CROSSEDOUT: - aTmp <<= (sal_Int16)( static_cast<const SvxCrossedOutItem*>(pItem)->GetStrikeout() ); + aTmp <<= static_cast<sal_Int16>( static_cast<const SvxCrossedOutItem*>(pItem)->GetStrikeout() ); aFont.SetStrikeout( static_cast<const SvxCrossedOutItem*>(pItem)->GetStrikeout() ); break; case RES_CHRATR_POSTURE: - aTmp <<= (sal_Int16)( static_cast<const SvxPostureItem*>(pItem)->GetPosture() ); + aTmp <<= static_cast<sal_Int16>( static_cast<const SvxPostureItem*>(pItem)->GetPosture() ); aFont.SetItalic( static_cast<const SvxPostureItem*>(pItem)->GetPosture() ); break; @@ -2494,7 +2494,7 @@ bool WW8FormulaCheckBox::Import(const uno::Reference < aTmp <<= msName; xPropSet->setPropertyValue("Name", aTmp ); - aTmp <<= (sal_Int16)mnChecked; + aTmp <<= static_cast<sal_Int16>(mnChecked); xPropSet->setPropertyValue("DefaultState", aTmp); if (!msToolTip.isEmpty()) @@ -2550,7 +2550,7 @@ bool SwMSConvertControls::InsertControl( xShapePropSet->setPropertyValue("AnchorType", uno::Any((sal_Int16)nTemp) ); - xShapePropSet->setPropertyValue("VertOrient", uno::Any((sal_Int16)text::VertOrientation::TOP) ); + xShapePropSet->setPropertyValue("VertOrient", uno::Any(sal_Int16(text::VertOrientation::TOP)) ); uno::Reference< text::XText > xDummyTextRef; uno::Reference< text::XTextRange > xTextRg = diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 27c49f859786..21cfb299c8e2 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -3581,7 +3581,7 @@ static void lcl_ImportTox(SwDoc &rDoc, SwPaM const &rPaM, const OUString &rStr, // if NO String just ignore the \l if( !sParams.isEmpty() && sParams[0]>'0' && sParams[0]<='9' ) { - nLevel = (sal_uInt16)sParams.toInt32(); + nLevel = static_cast<sal_uInt16>(sParams.toInt32()); } } break; diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 95356895f1aa..7b5947ec34b6 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -839,7 +839,7 @@ void wwSectionManager::CreateSep(const long nTextPos) aLastSection = maSegments.back(); //Here - sal_uInt16 nLIdx = ( ( (sal_uInt16)mrReader.m_xWwFib->m_lid & 0xff ) == 0x9 ) ? 1 : 0; + sal_uInt16 nLIdx = ( ( static_cast<sal_uInt16>(mrReader.m_xWwFib->m_lid) & 0xff ) == 0x9 ) ? 1 : 0; //BEGIN read section values wwSection aNewSection(*mrReader.m_pPaM->GetPoint()); @@ -1542,7 +1542,7 @@ inline bool SetValSprm( sal_Int16* pVar, WW8PLCFx_Cp_FKP* pPap, sal_uInt16 nId ) { SprmResult aS = pPap->HasSprm(nId); if (aS.pSprm && aS.nRemainingData >= 2) - *pVar = (sal_Int16)SVBT16ToShort(aS.pSprm); + *pVar = static_cast<sal_Int16>(SVBT16ToShort(aS.pSprm)); return aS.pSprm != nullptr; } @@ -1550,7 +1550,7 @@ inline bool SetValSprm( sal_Int16* pVar, const WW8RStyle* pStyle, sal_uInt16 nId { SprmResult aS = pStyle->HasParaSprm(nId); if (aS.pSprm && aS.nRemainingData >= 2) - *pVar = (sal_Int16)SVBT16ToShort(aS.pSprm); + *pVar = static_cast<sal_Int16>(SVBT16ToShort(aS.pSprm)); return aS.pSprm != nullptr; } @@ -1898,7 +1898,7 @@ bToggelPos(false) nLoMgn = 0; break; // down default: - nYPos = rWW.nSp27 + (short)nIniFlyDy; + nYPos = rWW.nSp27 + static_cast<short>(nIniFlyDy); break; // corrections from ini file } @@ -1924,7 +1924,7 @@ bToggelPos(false) bToggelPos = true; break; // outside default: - nXPos = rWW.nSp26 + (short)nIniFlyDx; + nXPos = rWW.nSp26 + static_cast<short>(nIniFlyDx); break; // corrections from ini file } @@ -3362,7 +3362,7 @@ void SwWW8ImplReader::Read_SubSuperProp( sal_uInt16, const sal_uInt8* pData, sho nPos2 = 100; if( nPos2 < -100 ) nPos2 = -100; - SvxEscapementItem aEs( (short)nPos2, 100, RES_CHRATR_ESCAPEMENT ); + SvxEscapementItem aEs( static_cast<short>(nPos2), 100, RES_CHRATR_ESCAPEMENT ); NewAttr( aEs ); } @@ -3914,7 +3914,7 @@ void SwWW8ImplReader::Read_CColl( sal_uInt16, const sal_uInt8* pData, short nLen } NewAttr( SwFormatCharFormat( static_cast<SwCharFormat*>(m_vColl[nId].m_pFormat) ) ); - m_nCharFormat = (short) nId; + m_nCharFormat = static_cast<short>(nId); } /* @@ -3939,7 +3939,7 @@ void SwWW8ImplReader::Read_FontKern( sal_uInt16, const sal_uInt8* pData, short n return; } sal_Int16 nAutoKern = SVBT16ToShort( pData ); // Kerning in Twips - NewAttr(SvxAutoKernItem((bool)nAutoKern, RES_CHRATR_AUTOKERN)); + NewAttr(SvxAutoKernItem(static_cast<bool>(nAutoKern), RES_CHRATR_AUTOKERN)); } void SwWW8ImplReader::Read_CharShadow( sal_uInt16, const sal_uInt8* pData, short nLen ) @@ -4235,15 +4235,15 @@ void SwWW8ImplReader::Read_LineSpace( sal_uInt16, const sal_uInt8* pData, short // as discussed with AMA, the limit is nonsensical if( n>200 ) n = 200; // SW_UI maximum - aLSpc.SetPropLineSpace( (sal_uInt8)n ); + aLSpc.SetPropLineSpace( static_cast<sal_uInt8>(n) ); const SvxFontHeightItem* pH = static_cast<const SvxFontHeightItem*>( GetFormatAttr( RES_CHRATR_FONTSIZE )); - nSpaceTw = (sal_uInt16)( n * pH->GetHeight() / 100 ); + nSpaceTw = static_cast<sal_uInt16>( n * pH->GetHeight() / 100 ); } else // Fixed / Minimum { // for negative space, the distance is "exact", otherwise "at least" - nSpaceTw = (sal_uInt16)nSpace; + nSpaceTw = static_cast<sal_uInt16>(nSpace); aLSpc.SetLineHeight( nSpaceTw ); aLSpc.SetLineSpaceRule( eLnSpc); } @@ -4900,16 +4900,16 @@ void SwWW8ImplReader::Read_Border(sal_uInt16 , const sal_uInt8*, short nLen) GetBorderDistance( aBrcs, aInnerDist ); if (nBorder & (1 << WW8_LEFT)) - aBox.SetDistance( (sal_uInt16)aInnerDist.Left(), SvxBoxItemLine::LEFT ); + aBox.SetDistance( static_cast<sal_uInt16>(aInnerDist.Left()), SvxBoxItemLine::LEFT ); if (nBorder & (1 << WW8_TOP)) - aBox.SetDistance( (sal_uInt16)aInnerDist.Top(), SvxBoxItemLine::TOP ); + aBox.SetDistance( static_cast<sal_uInt16>(aInnerDist.Top()), SvxBoxItemLine::TOP ); if (nBorder & (1 << WW8_RIGHT)) - aBox.SetDistance( (sal_uInt16)aInnerDist.Right(), SvxBoxItemLine::RIGHT ); + aBox.SetDistance( static_cast<sal_uInt16>(aInnerDist.Right()), SvxBoxItemLine::RIGHT ); if (nBorder & (1 << WW8_BOT)) - aBox.SetDistance( (sal_uInt16)aInnerDist.Bottom(), SvxBoxItemLine::BOTTOM ); + aBox.SetDistance( static_cast<sal_uInt16>(aInnerDist.Bottom()), SvxBoxItemLine::BOTTOM ); NewAttr( aBox ); diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 0ac70ba1be37..a881fab5be0c 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1010,8 +1010,8 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p) if (IsSevenMinus(GetFIBVersion())) { - aShortSprm[0] = (sal_uInt8)( ( nPrm & 0xfe) >> 1 ); - aShortSprm[1] = (sal_uInt8)( nPrm >> 8 ); + aShortSprm[0] = static_cast<sal_uInt8>( ( nPrm & 0xfe) >> 1 ); + aShortSprm[1] = static_cast<sal_uInt8>( nPrm >> 8 ); p->nSprmsLen = nPrm ? 2 : 0; // length // store Position of internal mini storage in Data Pointer @@ -1021,7 +1021,7 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p) { p->pMemPos = nullptr; p->nSprmsLen = 0; - sal_uInt8 nSprmListIdx = (sal_uInt8)((nPrm & 0xfe) >> 1); + sal_uInt8 nSprmListIdx = static_cast<sal_uInt8>((nPrm & 0xfe) >> 1); if( nSprmListIdx ) { // process Sprm Id Matching as explained in MS Documentation @@ -1107,9 +1107,9 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p) if( nSprmId ) { // move Sprm Id and Sprm Param to internal mini storage: - aShortSprm[0] = (sal_uInt8) ( nSprmId & 0x00ff) ; - aShortSprm[1] = (sal_uInt8)( ( nSprmId & 0xff00) >> 8 ); - aShortSprm[2] = (sal_uInt8)( nPrm >> 8 ); + aShortSprm[0] = static_cast<sal_uInt8>( nSprmId & 0x00ff) ; + aShortSprm[1] = static_cast<sal_uInt8>( ( nSprmId & 0xff00) >> 8 ); + aShortSprm[2] = static_cast<sal_uInt8>( nPrm >> 8 ); // store Sprm Length in member: p->nSprmsLen = nPrm ? 3 : 0; @@ -1365,7 +1365,7 @@ short WW8_BRCVer9::DetermineBorderProperties(short *pSpace) const short nMSTotalWidth; //Specification in 8ths of a point, 1 Point = 20 Twips, so by 2.5 - nMSTotalWidth = (short)dptLineWidth() * 20 / 8; + nMSTotalWidth = static_cast<short>(dptLineWidth()) * 20 / 8; //Figure out the real size of the border according to word switch (brcType()) @@ -1418,7 +1418,7 @@ short WW8_BRCVer9::DetermineBorderProperties(short *pSpace) const } if (pSpace) - *pSpace = (short)dptSpace() * 20; // convert from points to twips + *pSpace = static_cast<short>(dptSpace()) * 20; // convert from points to twips return nMSTotalWidth; } @@ -4247,7 +4247,7 @@ void WW8PLCFx_Book::SetIdx2(sal_uInt32 nI) if( nIMax ) { pBook[1]->SetIdx( nI & 0x7fffffff ); - nIsEnd = (sal_uInt16)( ( nI >> 31 ) & 1 ); // 0 or 1 + nIsEnd = static_cast<sal_uInt16>( ( nI >> 31 ) & 1 ); // 0 or 1 } } @@ -6213,7 +6213,7 @@ void WW8Fib::WriteHeader(SvStream& rStrm) Set_UInt16( pData, m_wIdent ); Set_UInt16( pData, m_nFib ); Set_UInt16( pData, m_nProduct ); - Set_UInt16( pData, (sal_uInt16)m_lid ); + Set_UInt16( pData, static_cast<sal_uInt16>(m_lid) ); Set_UInt16( pData, m_pnNext ); sal_uInt16 nBits16 = 0; @@ -6269,7 +6269,7 @@ void WW8Fib::WriteHeader(SvStream& rStrm) Set_UInt16( pData, m_wMagicCreatedPrivate ); Set_UInt16( pData, m_wMagicRevisedPrivate ); pData += 9 * sizeof( sal_Int16 ); - Set_UInt16( pData, (sal_uInt16)m_lidFE ); + Set_UInt16( pData, static_cast<sal_uInt16>(m_lidFE) ); Set_UInt16( pData, m_clw ); } @@ -6417,10 +6417,10 @@ void WW8Fib::Write(SvStream& rStrm) if( !bVer8 ) { pData += 1*sizeof( sal_Int16); - Set_UInt16( pData, (sal_uInt16)m_pnChpFirst ); - Set_UInt16( pData, (sal_uInt16)m_pnPapFirst ); - Set_UInt16( pData, (sal_uInt16)m_cpnBteChp ); - Set_UInt16( pData, (sal_uInt16)m_cpnBtePap ); + Set_UInt16( pData, static_cast<sal_uInt16>(m_pnChpFirst) ); + Set_UInt16( pData, static_cast<sal_uInt16>(m_pnPapFirst) ); + Set_UInt16( pData, static_cast<sal_uInt16>(m_cpnBteChp) ); + Set_UInt16( pData, static_cast<sal_uInt16>(m_cpnBtePap) ); } Set_UInt32( pData, m_fcPlcfdoaMom ); // only at Ver67, in Ver8 unused @@ -6493,8 +6493,8 @@ void WW8Fib::Write(SvStream& rStrm) Set_UInt32( pData, m_lcbPlcfTch ); pData += 0x3FA - 0x38A; - Set_UInt16( pData, (sal_uInt16)0x0002); - Set_UInt16( pData, (sal_uInt16)0x00D9); + Set_UInt16( pData, sal_uInt16(0x0002)); + Set_UInt16( pData, sal_uInt16(0x00D9)); pData += 0x41A - 0x3FE; Set_UInt32( pData, m_fcAtrdExtra ); @@ -6529,7 +6529,7 @@ rtl_TextEncoding WW8Fib::GetFIBCharset(sal_uInt16 chs, LanguageType nLidLocale) OSL_ENSURE(chs <= 0x100, "overflowed winword charset set"); if (chs == 0x0100) return RTL_TEXTENCODING_APPLE_ROMAN; - if (chs == 0 && (sal_uInt16)nLidLocale >= 999) + if (chs == 0 && static_cast<sal_uInt16>(nLidLocale) >= 999) { /* nLidLocale: diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index b6f89d346316..bcf4311491c0 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -295,8 +295,8 @@ struct WW8_BRC // BoRder Code (WW8 version) aBits1[0] = _dptLineWidth; aBits1[1] = _brcType; aBits2[0] = _ico; - aBits2[1] = _dptSpace | ((sal_uInt8)_fShadow << 5) - | ((sal_uInt8)_fFrame << 6); + aBits2[1] = _dptSpace | (static_cast<sal_uInt8>(_fShadow) << 5) + | (static_cast<sal_uInt8>(_fFrame) << 6); } // Convert BRC from WW6 to WW8 format explicit WW8_BRC(const WW8_BRCVer6& brcVer6); @@ -346,8 +346,8 @@ struct WW8_BRCVer9 // BoRder Code (WW9 version) UInt32ToSVBT32(_cv, aBits1); aBits2[0] = _dptLineWidth; aBits2[1] = _brcType; - aBits2[2] = _dptSpace | ((sal_uInt8)_fShadow << 5) - | ((sal_uInt8)_fFrame << 6); + aBits2[2] = _dptSpace | (static_cast<sal_uInt8>(_fShadow) << 5) + | (static_cast<sal_uInt8>(_fFrame) << 6); aBits2[3] = 0; } // Convert BRC from WW8 to WW9 format @@ -582,10 +582,10 @@ private: public: WW8_SHD() : maBits(0) {} - sal_uInt8 GetFore() const { return (sal_uInt8)( maBits & 0x1f); } - sal_uInt8 GetBack() const { return (sal_uInt8)((maBits >> 5 ) & 0x1f); } + sal_uInt8 GetFore() const { return static_cast<sal_uInt8>( maBits & 0x1f); } + sal_uInt8 GetBack() const { return static_cast<sal_uInt8>((maBits >> 5 ) & 0x1f); } sal_uInt8 GetStyle(bool bVer67) const - { return (sal_uInt8)((maBits >> 10) & ( bVer67 ? 0x1f : 0x3f ) ); } + { return static_cast<sal_uInt8>((maBits >> 10) & ( bVer67 ? 0x1f : 0x3f ) ); } sal_uInt16 GetValue() const { return maBits; } diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index dd1f4269c9a6..01831bd6826f 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -469,7 +469,7 @@ void SwXMLExport::ExportContent_() if (xPropSet.is()) { Any aAny = xPropSet->getPropertyValue( "TwoDigitYear" ); - aAny <<= (sal_Int16)1930; + aAny <<= sal_Int16(1930); sal_Int16 nYear = 0; aAny >>= nYear; diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index ed6b8fdca1fa..6c2d08571f14 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -106,8 +106,7 @@ void SwXMLExport::ExportFormat( const SwFormat& rFormat, enum XMLTokenEnum eFami rFormat.GetAttrSet().GetItemState( RES_BOXATR_FORMAT, false, &pItem ) ) { - sal_Int32 nFormat = (sal_Int32) - static_cast<const SwTableBoxNumFormat *>(pItem)->GetValue(); + sal_Int32 nFormat = static_cast<sal_Int32>(static_cast<const SwTableBoxNumFormat *>(pItem)->GetValue()); if ( (nFormat != -1) && (nFormat != static_cast<sal_Int32>(getSwDefaultTextFormat())) ) { diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 0a837a0bfcda..d4e9344d6b8a 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -286,10 +286,10 @@ bool SvXMLImportItemMapper::PutXMLValue( switch( nMemberId ) { case MID_L_MARGIN: - rLRSpace.SetTextLeft( nAbs, (sal_uInt16)nProp ); + rLRSpace.SetTextLeft( nAbs, static_cast<sal_uInt16>(nProp) ); break; case MID_R_MARGIN: - rLRSpace.SetRight( nAbs, (sal_uInt16)nProp ); + rLRSpace.SetRight( nAbs, static_cast<sal_uInt16>(nProp) ); break; } } @@ -307,7 +307,7 @@ bool SvXMLImportItemMapper::PutXMLValue( bOk = rUnitConverter.convertMeasureToCore(nAbs, rValue, -0x7fff, 0x7fff ); - rLRSpace.SetTextFirstLineOfst( (short)nAbs, (sal_uInt16)nProp ); + rLRSpace.SetTextFirstLineOfst( static_cast<short>(nAbs), static_cast<sal_uInt16>(nProp) ); } break; @@ -341,10 +341,10 @@ bool SvXMLImportItemMapper::PutXMLValue( switch( nMemberId ) { case MID_UP_MARGIN: - rULSpace.SetUpper( (sal_uInt16)nAbs, (sal_uInt16)nProp ); + rULSpace.SetUpper( static_cast<sal_uInt16>(nAbs), static_cast<sal_uInt16>(nProp) ); break; case MID_LO_MARGIN: - rULSpace.SetLower( (sal_uInt16)nAbs, (sal_uInt16)nProp ); + rULSpace.SetLower( static_cast<sal_uInt16>(nAbs), static_cast<sal_uInt16>(nProp) ); break; default: OSL_FAIL("unknown MemberId"); @@ -456,16 +456,16 @@ bool SvXMLImportItemMapper::PutXMLValue( if( nMemberId == LEFT_BORDER_PADDING || nMemberId == ALL_BORDER_PADDING ) - rBox.SetDistance( (sal_uInt16)nTemp, SvxBoxItemLine::LEFT ); + rBox.SetDistance( static_cast<sal_uInt16>(nTemp), SvxBoxItemLine::LEFT ); if( nMemberId == RIGHT_BORDER_PADDING || nMemberId == ALL_BORDER_PADDING ) - rBox.SetDistance( (sal_uInt16)nTemp, SvxBoxItemLine::RIGHT ); + rBox.SetDistance( static_cast<sal_uInt16>(nTemp), SvxBoxItemLine::RIGHT ); if( nMemberId == TOP_BORDER_PADDING || nMemberId == ALL_BORDER_PADDING ) - rBox.SetDistance( (sal_uInt16)nTemp, SvxBoxItemLine::TOP ); + rBox.SetDistance( static_cast<sal_uInt16>(nTemp), SvxBoxItemLine::TOP ); if( nMemberId == BOTTOM_BORDER_PADDING || nMemberId == ALL_BORDER_PADDING ) - rBox.SetDistance( (sal_uInt16)nTemp, SvxBoxItemLine::BOTTOM); + rBox.SetDistance( static_cast<sal_uInt16>(nTemp), SvxBoxItemLine::BOTTOM); break; case ALL_BORDER: @@ -792,7 +792,7 @@ bool SvXMLImportItemMapper::PutXMLValue( // "auto" as "0" for tables - now that we support a real offset // 0, this fake "0" MUST NOT be imported as offset 0! if( bOk && nVal > 0 ) - rPageDesc.SetNumOffset( (sal_uInt16)nVal ); + rPageDesc.SetNumOffset( static_cast<sal_uInt16>(nVal) ); } } break; @@ -870,7 +870,7 @@ bool SvXMLImportItemMapper::PutXMLValue( else if( nValue > 100 ) nValue = 100; - rFrameSize.SetWidthPercent( (sal_Int8)nValue ); + rFrameSize.SetWidthPercent( static_cast<sal_Int8>(nValue) ); } } break; @@ -905,7 +905,7 @@ bool SvXMLImportItemMapper::PutXMLValue( else if( nValue > USHRT_MAX ) nValue = USHRT_MAX; - rFrameSize.SetWidth( (sal_uInt16)nValue ); + rFrameSize.SetWidth( static_cast<sal_uInt16>(nValue) ); rFrameSize.SetHeightSizeType( ATT_VAR_SIZE ); bOk = true; } @@ -921,9 +921,9 @@ bool SvXMLImportItemMapper::PutXMLValue( if( bOk ) { if( bSetWidth ) - rFrameSize.SetWidth( (sal_uInt16)nValue ); + rFrameSize.SetWidth( static_cast<sal_uInt16>(nValue) ); if( bSetHeight ) - rFrameSize.SetHeight( (sal_uInt16)nValue ); + rFrameSize.SetHeight( static_cast<sal_uInt16>(nValue) ); if( bSetSizeType ) rFrameSize.SetHeightSizeType( eSizeType ); } diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index a4d23808bbaf..7272cd5ae31b 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -134,7 +134,7 @@ bool sw_frmitems_parseXMLBorder( const OUString& rValue, else if( !rHasWidth && rUnitConverter.convertMeasureToCore(nTemp, aToken, 0, USHRT_MAX)) { - rWidth = (sal_uInt16)nTemp; + rWidth = static_cast<sal_uInt16>(nTemp); rHasWidth = true; } else diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx index b4d5d8189b9d..0cc6a161197b 100644 --- a/sw/source/filter/xml/xmlmeta.cxx +++ b/sw/source/filter/xml/xmlmeta.cxx @@ -147,7 +147,7 @@ void SwXMLImport::SetStatistics( // and autostyles. sal_Int32 nProgressReference = 250; if( nTokens & XML_TOK_META_STAT_PARA ) - nProgressReference = (sal_Int32)aDocStat.nPara; + nProgressReference = static_cast<sal_Int32>(aDocStat.nPara); else if ( nTokens & XML_TOK_META_STAT_PAGE ) o3tl::checked_multiply<sal_Int32>(aDocStat.nPage, 10, nProgressReference); ProgressBarHelper* pProgress = GetProgressBarHelper(); diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index d68d5e06148a..4077ce852723 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -88,9 +88,9 @@ struct SwXMLTableColumnCmpWidth_Impl { bool operator()( SwXMLTableColumn_Impl* const& lhs, SwXMLTableColumn_Impl* const& rhs ) const { - sal_Int32 n = (sal_Int32)lhs->GetWidthOpt() - (sal_Int32)rhs->GetWidthOpt(); + sal_Int32 n = static_cast<sal_Int32>(lhs->GetWidthOpt()) - static_cast<sal_Int32>(rhs->GetWidthOpt()); if( !n ) - n = (sal_Int32)lhs->GetRelWidth() - (sal_Int32)rhs->GetRelWidth(); + n = static_cast<sal_Int32>(lhs->GetRelWidth()) - static_cast<sal_Int32>(rhs->GetRelWidth()); return n < 0; } }; @@ -296,7 +296,7 @@ static OUString lcl_xmltble_appendBoxPrefix(const OUString& rNamePrefix, if( bTop ) { OUString sTmp; - sw_GetTableBoxColStr( (sal_uInt16)nCol, sTmp ); + sw_GetTableBoxColStr( static_cast<sal_uInt16>(nCol), sTmp ); return rNamePrefix + "." + sTmp + OUString::number(nRow + 1); } return rNamePrefix @@ -543,7 +543,7 @@ void SwXMLExport::ExportTableColumnStyle( const SwXMLTableColumn_Impl& rCol ) } if( rCol.GetRelWidth() ) { - sValue.append( (sal_Int32)rCol.GetRelWidth() ); + sValue.append( static_cast<sal_Int32>(rCol.GetRelWidth()) ); sValue.append( '*' ); AddAttribute( XML_NAMESPACE_STYLE, XML_REL_COLUMN_WIDTH, sValue.makeStringAndClear() ); diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 7025f9efb2f1..f1738423c6b4 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -470,13 +470,13 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl( GetImport().GetTextImport()->SetCellParaStyleDefault(rValue); break; case XML_TOK_TABLE_NUM_COLS_SPANNED: - nColSpan = (sal_uInt32)std::max<sal_Int32>(1, rValue.toInt32()); + nColSpan = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32())); break; case XML_TOK_TABLE_NUM_ROWS_SPANNED: - nRowSpan = (sal_uInt32)std::max<sal_Int32>(1, rValue.toInt32()); + nRowSpan = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32())); break; case XML_TOK_TABLE_NUM_COLS_REPEATED: - nColRepeat = (sal_uInt32)std::max<sal_Int32>(1, rValue.toInt32()); + nColRepeat = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32())); break; case XML_TOK_TABLE_FORMULA: { @@ -751,7 +751,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl( if( IsXMLToken( aLocalName, XML_STYLE_NAME ) ) aStyleName = rValue; else if( IsXMLToken( aLocalName, XML_NUMBER_COLUMNS_REPEATED ) ) - nColRep = (sal_uInt32)std::max<sal_Int32>(1, rValue.toInt32()); + nColRep = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32())); else if( IsXMLToken( aLocalName, XML_DEFAULT_CELL_STYLE_NAME ) ) aDfltCellStyleName = rValue; } @@ -891,7 +891,7 @@ SwXMLTableRowContext_Impl::SwXMLTableRowContext_Impl( SwXMLImport& rImport, } else if( IsXMLToken( aLocalName, XML_NUMBER_ROWS_REPEATED ) ) { - nRowRepeat = (sal_uInt32)std::max<sal_Int32>(1, rValue.toInt32()); + nRowRepeat = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32())); } else if( IsXMLToken( aLocalName, XML_DEFAULT_CELL_STYLE_NAME ) ) { @@ -2400,12 +2400,12 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) } if( nRelWidth != m_nWidth && nRelWidth && nCols ) { - double n = (double)m_nWidth / (double)nRelWidth; + double n = static_cast<double>(m_nWidth) / static_cast<double>(nRelWidth); nRelWidth = 0; for( colIter = m_aColumnWidths.begin(); colIter < m_aColumnWidths.end() - 1; ++colIter) { - sal_Int32 nW = (sal_Int32)( colIter->width * n); - colIter->width = (sal_uInt16)nW; + sal_Int32 nW = static_cast<sal_Int32>( colIter->width * n); + colIter->width = static_cast<sal_uInt16>(nW); nRelWidth += nW; } m_aColumnWidths.back().width = (m_nWidth-nRelWidth); @@ -2420,7 +2420,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) // The absolute space that is available for all columns with a // relative width. sal_Int32 nAbsForRelWidth = - m_nWidth > nAbsWidth ? m_nWidth - nAbsWidth : (sal_Int32)0L; + m_nWidth > nAbsWidth ? m_nWidth - nAbsWidth : sal_Int32(0L); // The relative width that has to be distributed in addition to // equally widthed columns. @@ -2430,7 +2430,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) // minimum widthed columns. sal_Int32 nMinAbs = nRelCols * MINLAY; sal_Int32 nExtraAbs = - nAbsForRelWidth > nMinAbs ? nAbsForRelWidth - nMinAbs : (sal_Int32)0L; + nAbsForRelWidth > nMinAbs ? nAbsForRelWidth - nMinAbs : sal_Int32(0L); bool bMin = false; // Do all columns get the mininum width? bool bMinExtra = false; // Do all columns get the minimum width plus @@ -2665,7 +2665,7 @@ void SwXMLTableContext::MakeTable() else { m_nWidth = pSize->GetWidth(); - if( m_nWidth < (sal_Int32)GetColumnCount() * MINLAY ) + if( m_nWidth < static_cast<sal_Int32>(GetColumnCount()) * MINLAY ) { m_nWidth = GetColumnCount() * MINLAY; } diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 3e9016dabc70..2324d667cb39 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -134,10 +134,10 @@ static void lcl_addOutplaceProperties( *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_TOP ), Any(sal_Int32(0)) ); pStates++; - *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_WIDTH ), Any((sal_Int32)aSize.Width()) ); + *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_WIDTH ), Any(static_cast<sal_Int32>(aSize.Width())) ); pStates++; - *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_HEIGHT ), Any((sal_Int32)aSize.Height()) ); + *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_HEIGHT ), Any(static_cast<sal_Int32>(aSize.Height())) ); } } |