diff options
author | Noel Grandin <noel@peralex.com> | 2014-11-24 10:39:48 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-11-25 10:09:52 +0200 |
commit | ef4cd4a718d428ccc5c4958545a6af7564f186e4 (patch) | |
tree | 587ae4af28ec3e65b6cfef81820da583be305406 | |
parent | e9251f1f47cf3d1c6475f51a988ff5cee0f03159 (diff) |
loplugin: cstylecast
Change-Id: Ic66f273dcc4b6c2c9867dfb038c420b7bc939986
28 files changed, 122 insertions, 122 deletions
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx index f5e497fe853f..ab0431f572c8 100644 --- a/sw/source/filter/ascii/ascatr.cxx +++ b/sw/source/filter/ascii/ascatr.cxx @@ -219,7 +219,7 @@ static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) if( !bLastNd || ( ( !rWrt.bWriteClipboardDoc && !rWrt.bASCII_NoLastLineEnd ) && !nStrPos && nEnd == nNodeEnd ) ) - rWrt.Strm().WriteUnicodeOrByteText( ((SwASCWriter&)rWrt).GetLineEnd()); + rWrt.Strm().WriteUnicodeOrByteText( static_cast<SwASCWriter&>(rWrt).GetLineEnd()); return rWrt; } diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 049fdb17b8da..6e63fbd907c1 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -2442,7 +2442,7 @@ static Writer& OutCSS1_SvxCrossedOut( Writer& rWrt, const SfxPoolItem& rHt ) // This function only exports Hints! // Otherwise OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink() is called directly. - if( ((SwHTMLWriter&)rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) ) + if( static_cast<SwHTMLWriter&>(rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) ) OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( rWrt, 0, 0, (const SvxCrossedOutItem *)&rHt, 0 ); @@ -2612,7 +2612,7 @@ static Writer& OutCSS1_SvxUnderline( Writer& rWrt, const SfxPoolItem& rHt ) // This function only exports Hints! // Otherwise OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink() is called directly. - if( ((SwHTMLWriter&)rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) ) + if( static_cast<SwHTMLWriter&>(rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) ) OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( rWrt, (const SvxUnderlineItem *)&rHt, 0, 0, 0 ); @@ -2624,7 +2624,7 @@ static Writer& OutCSS1_SvxOverline( Writer& rWrt, const SfxPoolItem& rHt ) // This function only exports Hints! // Otherwise OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink() is called directly. - if( ((SwHTMLWriter&)rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) ) + if( static_cast<SwHTMLWriter&>(rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) ) OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( rWrt, 0, (const SvxOverlineItem *)&rHt, 0, 0 ); @@ -2688,7 +2688,7 @@ static Writer& OutCSS1_SvxBlink( Writer& rWrt, const SfxPoolItem& rHt ) // This function only exports Hints! // Otherwise OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink() is called directly. - if( ((SwHTMLWriter&)rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) ) + if( static_cast<SwHTMLWriter&>(rWrt).IsCSS1Source(CSS1_OUTMODE_HINT) ) OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( rWrt, 0, 0, 0, (const SvxBlinkItem *)&rHt ); diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 74b2829bb8bb..c0a2df838363 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -2208,7 +2208,7 @@ bool SwHTMLParser::GetMarginsFromContextWithNumBul( sal_uInt16& nLeft, short& nIndent ) const { bool bRet = GetMarginsFromContext( nLeft, nRight, nIndent ); - const SwHTMLNumRuleInfo& rInfo = ((SwHTMLParser*)this)->GetNumInfo(); + const SwHTMLNumRuleInfo& rInfo = const_cast<SwHTMLParser*>(this)->GetNumInfo(); if( rInfo.GetDepth() ) { sal_uInt8 nLevel = (sal_uInt8)( (rInfo.GetDepth() <= MAXLEVEL ? rInfo.GetDepth() @@ -2271,7 +2271,7 @@ void SwHTMLParser::EndContextAttrs( _HTMLAttrContext *pContext, bool bRemove ) pAttr->Invalidate(); else if( nChars > MAX_DROPCAP_CHARS ) nChars = MAX_DROPCAP_CHARS; - ((SwFmtDrop&)pAttr->GetItem()).GetChars() = (sal_uInt8)nChars; + static_cast<SwFmtDrop&>(pAttr->GetItem()).GetChars() = (sal_uInt8)nChars; } EndAttr( pAttr ); diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index b680b5e94f05..e21439758f88 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -553,13 +553,13 @@ void SwHTMLParser::EndMarquee() } // den gesammelten Text einfuegen - ((SdrTextObj*)pMarquee)->SetText( aContents ); + static_cast<SdrTextObj*>(pMarquee)->SetText( aContents ); pMarquee->SetMergedItemSetAndBroadcast( pMarquee->GetMergedItemSet() ); if( bFixMarqueeWidth ) { // die Groesse dem Text anpassen. - ((SdrTextObj*)pMarquee)->FitFrameToTextSize(); + static_cast<SdrTextObj*>(pMarquee)->FitFrameToTextSize(); } aContents = ""; diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index d41a69f92db3..eb3a17eb3bb1 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -482,7 +482,7 @@ void SwHTMLParser::NewField() pFld = new SwDocInfoField( (SwDocInfoFieldType *)pType, nSub, aName, nNumFmt ); if( bHasNumValue ) - ((SwDocInfoField*)pFld)->SetValue( dValue ); + static_cast<SwDocInfoField*>(pFld)->SetValue( dValue ); } } break; @@ -543,27 +543,27 @@ void SwHTMLParser::EndField() switch( pField->Which() ) { case RES_DOCINFOFLD: - OSL_ENSURE( ((SwDocInfoField*)pField)->IsFixed(), + OSL_ENSURE( static_cast<SwDocInfoField*>(pField)->IsFixed(), "DokInfo-Feld haette nicht gemerkt werden muessen" ); - ((SwDocInfoField*)pField)->SetExpansion( aContents ); + static_cast<SwDocInfoField*>(pField)->SetExpansion( aContents ); break; case RES_EXTUSERFLD: - OSL_ENSURE( ((SwExtUserField*)pField)->IsFixed(), + OSL_ENSURE( static_cast<SwExtUserField*>(pField)->IsFixed(), "ExtUser-Feld haette nicht gemerkt werden muessen" ); - ((SwExtUserField*)pField)->SetExpansion( aContents ); + static_cast<SwExtUserField*>(pField)->SetExpansion( aContents ); break; case RES_AUTHORFLD: - OSL_ENSURE( ((SwAuthorField*)pField)->IsFixed(), + OSL_ENSURE( static_cast<SwAuthorField*>(pField)->IsFixed(), "Author-Feld haette nicht gemerkt werden muessen" ); - ((SwAuthorField*)pField)->SetExpansion( aContents ); + static_cast<SwAuthorField*>(pField)->SetExpansion( aContents ); break; case RES_FILENAMEFLD: - OSL_ENSURE( ((SwFileNameField*)pField)->IsFixed(), + OSL_ENSURE( static_cast<SwFileNameField*>(pField)->IsFixed(), "FileName-Feld haette nicht gemerkt werden muessen" ); - ((SwFileNameField*)pField)->SetExpansion( aContents ); + static_cast<SwFileNameField*>(pField)->SetExpansion( aContents ); break; } diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index 7672c1b41ffa..4266b85c83b1 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -121,10 +121,10 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, case RES_DATETIMEFLD: pTypeStr = OOO_STRING_SW_HTML_FT_datetime; bNumFmt = true; - if( ((SwDateTimeField*)pFld)->IsFixed() ) + if( static_cast<const SwDateTimeField*>(pFld)->IsFixed() ) { bNumValue = true; - dNumValue = ((SwDateTimeField*)pFld)->GetValue(); + dNumValue = static_cast<const SwDateTimeField*>(pFld)->GetValue(); } break; @@ -451,7 +451,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) // TODO: HTML-Tags are written without entitities, that for, characters // not contained in the destination encoding are lost! OString sTmp(OUStringToOString(rTxt, - ((SwHTMLWriter&)rWrt).eDestEnc)); + static_cast<SwHTMLWriter&>(rWrt).eDestEnc)); rWrt.Strm().WriteCharPtr( sTmp.getStr() ).WriteChar( '>' ); } else if( RES_POSTITFLD == pFldTyp->Which() ) @@ -472,7 +472,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) // TODO: HTML-Tags are written without entitities, that for, // characters not contained in the destination encoding are lost! OString sTmp(OUStringToOString(sComment, - ((SwHTMLWriter&)rWrt).eDestEnc)); + static_cast<SwHTMLWriter&>(rWrt).eDestEnc)); rWrt.Strm().WriteCharPtr( sTmp.getStr() ); bWritten = true; } @@ -488,7 +488,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) // characters not contained in the destination encoding are // lost! OString sTmp(OUStringToOString(sComment, - ((SwHTMLWriter&)rWrt).eDestEnc)); + static_cast<SwHTMLWriter&>(rWrt).eDestEnc)); rWrt.Strm().WriteCharPtr( sTmp.getStr() ); bWritten = true; } @@ -502,7 +502,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) // TODO: ??? sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_comment) .append(' ').append(OUStringToOString(sComment, - ((SwHTMLWriter&)rWrt).eDestEnc)).append(" -->"); + static_cast<SwHTMLWriter&>(rWrt).eDestEnc)).append(" -->"); rWrt.Strm().WriteCharPtr( sOut.getStr() ); } } diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 92608b6b9450..90c6a04d6194 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -583,7 +583,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, (FLY_AS_CHAR == eAnchorId) ) && SfxItemState::SET == rItemSet.GetItemState( RES_VERT_ORIENT, true, &pItem )) { - switch( ((SwFmtVertOrient*)pItem)->GetVertOrient() ) + switch( static_cast<const SwFmtVertOrient*>(pItem)->GetVertOrient() ) { case text::VertOrientation::LINE_TOP: pStr = OOO_STRING_SVTOOLS_HTML_VA_top; break; case text::VertOrientation::CHAR_TOP: @@ -609,16 +609,16 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, SfxItemState::SET == rItemSet.GetItemState( RES_LR_SPACE, true, &pItem )) { aTwipSpc.Width() = - ( ((SvxLRSpaceItem*)pItem)->GetLeft() + - ((SvxLRSpaceItem*)pItem)->GetRight() ) / 2; + ( static_cast<const SvxLRSpaceItem*>(pItem)->GetLeft() + + static_cast<const SvxLRSpaceItem*>(pItem)->GetRight() ) / 2; nDfltLeftMargin = nDfltRightMargin = aTwipSpc.Width(); } if( (nFrmOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) && SfxItemState::SET == rItemSet.GetItemState( RES_UL_SPACE, true, &pItem )) { aTwipSpc.Height() = - ( ((SvxULSpaceItem*)pItem)->GetUpper() + - ((SvxULSpaceItem*)pItem)->GetLower() ) / 2; + ( static_cast<const SvxULSpaceItem*>(pItem)->GetUpper() + + static_cast<const SvxULSpaceItem*>(pItem)->GetLower() ) / 2; nDfltTopMargin = nDfltBottomMargin = (sal_uInt16)aTwipSpc.Height(); } @@ -852,7 +852,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rF (FLY_AS_CHAR == eAnchorId) ) && SfxItemState::SET == rItemSet.GetItemState( RES_VERT_ORIENT, true, &pItem )) { - switch( ((SwFmtVertOrient*)pItem)->GetVertOrient() ) + switch( static_cast<const SwFmtVertOrient*>(pItem)->GetVertOrient() ) { case text::VertOrientation::LINE_TOP: pAlignString = OOO_STRING_SVTOOLS_HTML_VA_top; break; case text::VertOrientation::CHAR_TOP: @@ -877,16 +877,16 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rF SfxItemState::SET == rItemSet.GetItemState( RES_LR_SPACE, true, &pItem )) { aTwipSpc.Width() = - ( ((SvxLRSpaceItem*)pItem)->GetLeft() + - ((SvxLRSpaceItem*)pItem)->GetRight() ) / 2; + ( static_cast<const SvxLRSpaceItem*>(pItem)->GetLeft() + + static_cast<const SvxLRSpaceItem*>(pItem)->GetRight() ) / 2; nDfltLeftMargin = nDfltRightMargin = aTwipSpc.Width(); } if( (nFrameOptions & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) && SfxItemState::SET == rItemSet.GetItemState( RES_UL_SPACE, true, &pItem )) { aTwipSpc.Height() = - ( ((SvxULSpaceItem*)pItem)->GetUpper() + - ((SvxULSpaceItem*)pItem)->GetLower() ) / 2; + ( static_cast<const SvxULSpaceItem*>(pItem)->GetUpper() + + static_cast<const SvxULSpaceItem*>(pItem)->GetLower() ) / 2; nDfltTopMargin = nDfltBottomMargin = (sal_uInt16)aTwipSpc.Height(); } diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 781704f5f20e..e29199623f0f 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -467,7 +467,7 @@ void SwHTMLWriter::OutForm( bool bOn, uno::Any aTmp = xFormPropSet->getPropertyValue( "Name" ); if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && - !((OUString*)aTmp.getValue())->isEmpty() ) + !reinterpret_cast<const OUString*>(aTmp.getValue())->isEmpty() ) { sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\""; Strm().WriteOString( sOut ); @@ -478,7 +478,7 @@ void SwHTMLWriter::OutForm( bool bOn, aTmp = xFormPropSet->getPropertyValue( "TargetURL" ); if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && - !((OUString*)aTmp.getValue())->isEmpty() ) + !reinterpret_cast<const OUString*>(aTmp.getValue())->isEmpty() ) { sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_action) + "=\""; Strm().WriteOString( sOut ); @@ -526,7 +526,7 @@ void SwHTMLWriter::OutForm( bool bOn, aTmp = xFormPropSet->getPropertyValue( "TargetFrame" ); if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get()&& - !((OUString*)aTmp.getValue())->isEmpty() ) + !reinterpret_cast<const OUString*>(aTmp.getValue())->isEmpty() ) { sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_target) + "=\""; Strm().WriteOString( sOut ); @@ -599,7 +599,7 @@ void SwHTMLWriter::OutHiddenControls( aTmp = xPropSet->getPropertyValue( "Name" ); if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && - !((OUString*)aTmp.getValue())->isEmpty() ) + !reinterpret_cast<const OUString*>(aTmp.getValue())->isEmpty() ) { sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\""; Strm().WriteOString( sOut ); @@ -609,7 +609,7 @@ void SwHTMLWriter::OutHiddenControls( } aTmp = xPropSet->getPropertyValue( "HiddenValue" ); if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && - !((OUString*)aTmp.getValue())->isEmpty() ) + !reinterpret_cast<const OUString*>(aTmp.getValue())->isEmpty() ) { sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_value) + "=\""; Strm().WriteOString( sOut ); @@ -792,7 +792,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aTmp = xPropSet->getPropertyValue( "Label" ); if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && - !((OUString*)aTmp.getValue())->isEmpty() ) + !reinterpret_cast<const OUString*>(aTmp.getValue())->isEmpty() ) { sValue = *(OUString*)aTmp.getValue(); } @@ -902,7 +902,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, { aTmp = xPropSet->getPropertyValue( "DefaultText" ); if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && - !((OUString*)aTmp.getValue())->isEmpty() ) + !reinterpret_cast<const OUString*>(aTmp.getValue())->isEmpty() ) { sValue = *(OUString*)aTmp.getValue(); } @@ -949,7 +949,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aTmp = xPropSet->getPropertyValue("Name"); if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && - !((OUString*)aTmp.getValue())->isEmpty() ) + !reinterpret_cast<const OUString*>(aTmp.getValue())->isEmpty() ) { sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\""; rWrt.Strm().WriteOString( sOut ); @@ -979,7 +979,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, { aTmp = xPropSet->getPropertyValue( "ImageURL" ); if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && - !((OUString*)aTmp.getValue())->isEmpty() ) + !reinterpret_cast<const OUString*>(aTmp.getValue())->isEmpty() ) { sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_src) + "=\""; rWrt.Strm().WriteOString( sOut ); @@ -1087,7 +1087,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, { aTmp = xPropSet->getPropertyValue( "FontName" ); if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && - !((OUString*)aTmp.getValue())->isEmpty() ) + !reinterpret_cast<const OUString*>(aTmp.getValue())->isEmpty() ) { vcl::Font aFixedFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_ENGLISH_US, @@ -1247,7 +1247,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, OUString sVal; aTmp = xPropSet->getPropertyValue( "DefaultText" ); if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get()&& - !((OUString*)aTmp.getValue())->isEmpty() ) + !reinterpret_cast<const OUString*>(aTmp.getValue())->isEmpty() ) { sVal = *(OUString*)aTmp.getValue(); } @@ -1270,7 +1270,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, { aTmp = xPropSet->getPropertyValue("Label"); if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && - !((OUString*)aTmp.getValue())->isEmpty() ) + !reinterpret_cast<const OUString*>(aTmp.getValue())->isEmpty() ) { sValue = *(OUString*)aTmp.getValue(); HTMLOutFuncs::Out_String( rWrt.Strm(), sValue, diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index a4e988fab529..98c318d8ffcc 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -955,7 +955,7 @@ void SwHTMLParser::InsertFloatingFrame() sal_uInt16 SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode ) { - SwOLEObj& rObj = ((SwOLENode*)rNode.GetOLENode())->GetOLEObj(); + SwOLEObj& rObj = const_cast<SwOLENode*>(rNode.GetOLENode())->GetOLEObj(); SwHTMLFrmType eType = HTML_FRMTYPE_OLE; diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 4434ddcc3af0..e3adc949ba17 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -287,7 +287,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, // nur Absaetzte betrachten, an denen man was erkennt // Das ist der Fall, wenn die Vorlage eine der Tabellen-Vorlagen // ist oder von einer der beiden abgelitten ist. - const SwFmt *pFmt = &((SwTxtNode*)pNd)->GetAnyFmtColl(); + const SwFmt *pFmt = &static_cast<SwTxtNode*>(pNd)->GetAnyFmtColl(); sal_uInt16 nPoolId = pFmt->GetPoolFmtId(); while( !pFmt->IsDefault() && RES_POOLCOLL_TABLE_HDLN!=nPoolId && diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index be0a7d92e4d6..b660bea40d5e 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -3137,23 +3137,23 @@ extern "C" static int SAL_CALL CSS1PropEntryCompare( const void *pFirst, const void *pSecond) { int nRet; - if( ((CSS1PropEntry*)pFirst)->pFunc ) + if( reinterpret_cast<const CSS1PropEntry*>(pFirst)->pFunc ) { - if( ((CSS1PropEntry*)pSecond)->pFunc ) - nRet = strcmp( ((CSS1PropEntry*)pFirst)->sName , - ((CSS1PropEntry*)pSecond)->sName ); + if( reinterpret_cast<const CSS1PropEntry*>(pSecond)->pFunc ) + nRet = strcmp( reinterpret_cast<const CSS1PropEntry*>(pFirst)->sName , + reinterpret_cast<const CSS1PropEntry*>(pSecond)->sName ); else - nRet = -1 * ((CSS1PropEntry*)pSecond)->pName->compareToAscii( - ((CSS1PropEntry*)pFirst)->sName ); + nRet = -1 * reinterpret_cast<const CSS1PropEntry*>(pSecond)->pName->compareToAscii( + reinterpret_cast<const CSS1PropEntry*>(pFirst)->sName ); } else { - if( ((CSS1PropEntry*)pSecond)->pFunc ) - nRet = ((CSS1PropEntry*)pFirst)->pName->compareToAscii( - ((CSS1PropEntry*)pSecond)->sName ); + if( reinterpret_cast<const CSS1PropEntry*>(pSecond)->pFunc ) + nRet = reinterpret_cast<const CSS1PropEntry*>(pFirst)->pName->compareToAscii( + reinterpret_cast<const CSS1PropEntry*>(pSecond)->sName ); else - nRet = ((CSS1PropEntry*)pFirst)->pName->compareTo( - *((CSS1PropEntry*)pSecond)->pName ); + nRet = reinterpret_cast<const CSS1PropEntry*>(pFirst)->pName->compareTo( + *reinterpret_cast<const CSS1PropEntry*>(pSecond)->pName ); } return nRet; @@ -3189,7 +3189,7 @@ void SvxCSS1Parser::ParseProperty( const OUString& rProperty, sizeof( CSS1PropEntry ), CSS1PropEntryCompare ))) { - (((CSS1PropEntry*)pFound)->pFunc)( pExpr, *pItemSet, *pPropInfo, *this ); + (static_cast<CSS1PropEntry*>(pFound)->pFunc)( pExpr, *pItemSet, *pPropInfo, *this ); } } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 08a04afc24bb..37ad01950afe 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -2562,7 +2562,7 @@ SwViewShell *SwHTMLParser::CallStartAction( SwViewShell *pVSh, bool bChkPtr ) if( pActionViewShell ) { if( pActionViewShell->ISA( SwEditShell ) ) - ((SwEditShell*)pActionViewShell)->StartAction(); + static_cast<SwEditShell*>(pActionViewShell)->StartAction(); else pActionViewShell->StartAction(); } @@ -2594,7 +2594,7 @@ SwViewShell *SwHTMLParser::CallEndAction( bool bChkAction, bool bChkPtr ) SwViewShell *pSh = pActionViewShell; do { if( pSh->IsA( TYPE( SwCrsrShell ) ) ) - ((SwCrsrShell*)pSh)->SttEndDoc(true); + static_cast<SwCrsrShell*>(pSh)->SttEndDoc(true); pSh = (SwViewShell *)pSh->GetNext(); } while( pSh != pActionViewShell ); @@ -2607,7 +2607,7 @@ SwViewShell *SwHTMLParser::CallEndAction( bool bChkAction, bool bChkPtr ) pActionViewShell->LockView( true ); const bool bOldEndActionByVirDev = pActionViewShell->IsEndActionByVirDev(); pActionViewShell->SetEndActionByVirDev( true ); - ((SwEditShell*)pActionViewShell)->EndAction(); + static_cast<SwEditShell*>(pActionViewShell)->EndAction(); pActionViewShell->SetEndActionByVirDev( bOldEndActionByVirDev ); pActionViewShell->LockView( bOldLock ); @@ -2826,7 +2826,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable, { case RES_FLTR_BOOKMARK: // insert bookmark { - const OUString sName( ((SfxStringItem*)pAttr->pItem)->GetValue() ); + const OUString sName( static_cast<SfxStringItem*>(pAttr->pItem)->GetValue() ); IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess(); IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findMark( sName ); if( ppBkmk != pMarkAccess->getAllMarksEnd() && @@ -2886,7 +2886,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable, // ggfs. ein Bookmark anspringen if( RES_TXTATR_INETFMT == nWhich && JUMPTO_MARK == eJumpTo && - sJmpMark == ((SwFmtINetFmt*)pAttr->pItem)->GetName() ) + sJmpMark == static_cast<SwFmtINetFmt*>(pAttr->pItem)->GetName() ) { bChkJumpMark = true; eJumpTo = JUMPTO_NONE; diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index b28ce9fbffef..caf05841d7ce 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -259,7 +259,7 @@ sal_uLong SwHTMLWriter::WriteStream() sal_uInt16 nOldTxtFmtCollCnt = 0, nOldCharFmtCnt = 0; OSL_ENSURE( !pTemplate, "Wo kommt denn die HTML-Vorlage hier her?" ); - pTemplate = ((HTMLReader*)ReadHTML)->GetTemplateDoc(); + pTemplate = static_cast<HTMLReader*>(ReadHTML)->GetTemplateDoc(); if( pTemplate ) { pTemplate->acquire(); diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index ce8aaa66c219..9760f8988bda 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -169,7 +169,7 @@ bool Writer::CopyNextPam( SwPaM ** ppPam ) } // otherwise copy the next value from the next Pam - *ppPam = ((SwPaM*)(*ppPam)->GetNext() ); + *ppPam = static_cast<SwPaM*>((*ppPam)->GetNext() ); *pCurPam->GetPoint() = *(*ppPam)->Start(); *pCurPam->GetMark() = *(*ppPam)->End(); diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index cfa1781afff8..7cd25b955257 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -154,7 +154,7 @@ long SwWriteTable::GetLineHeight( const SwTableBox *pBox ) const long nHeight = 0; if( SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem )) - nHeight = ((SwFmtFrmSize*)pItem)->GetHeight(); + nHeight = static_cast<const SwFmtFrmSize*>(pItem)->GetHeight(); return nHeight; } @@ -590,7 +590,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, long nHeight = 0; if( SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem )) - nHeight = ((SwFmtFrmSize*)pItem)->GetHeight(); + nHeight = static_cast<const SwFmtFrmSize*>(pItem)->GetHeight(); const SvxBrushItem *pBrushItem, *pLineBrush = pParentBrush; if( SfxItemState::SET == rItemSet.GetItemState( RES_BACKGROUND, false, diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 66bc667eb9a3..0bd35111922b 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4006,7 +4006,7 @@ void DocxAttributeOutput::DefaultStyle( sal_uInt16 nStyle ) */ void DocxAttributeOutput::WriteSrcRect(const SdrObject* pSdrObj ) { - uno::Reference< drawing::XShape > xShape( ((SdrObject*)pSdrObj)->getUnoShape(), uno::UNO_QUERY ); + uno::Reference< drawing::XShape > xShape( const_cast<SdrObject*>(pSdrObj)->getUnoShape(), uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY ); OUString sUrl; @@ -4263,7 +4263,7 @@ void DocxAttributeOutput::WriteOLE2Obj( const SdrObject* pSdrObj, SwOLENode& rOL bool DocxAttributeOutput::WriteOLEChart( const SdrObject* pSdrObj, const Size& rSize ) { uno::Reference< chart2::XChartDocument > xChartDoc; - uno::Reference< drawing::XShape > xShape( ((SdrObject*)pSdrObj)->getUnoShape(), uno::UNO_QUERY ); + uno::Reference< drawing::XShape > xShape( const_cast<SdrObject*>(pSdrObj)->getUnoShape(), uno::UNO_QUERY ); if( xShape.is() ) { uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY ); @@ -4288,7 +4288,7 @@ void DocxAttributeOutput::WritePostponedChart() if(m_postponedChart == NULL) return; uno::Reference< chart2::XChartDocument > xChartDoc; - uno::Reference< drawing::XShape > xShape( ((SdrObject*)m_postponedChart)->getUnoShape(), uno::UNO_QUERY ); + uno::Reference< drawing::XShape > xShape( const_cast<SdrObject*>(m_postponedChart)->getUnoShape(), uno::UNO_QUERY ); if( xShape.is() ) { uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY ); @@ -4956,7 +4956,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po bool DocxAttributeOutput::IsDiagram( const SdrObject* sdrObject ) { - uno::Reference< drawing::XShape > xShape( ((SdrObject*)sdrObject)->getUnoShape(), uno::UNO_QUERY ); + uno::Reference< drawing::XShape > xShape( const_cast<SdrObject*>(sdrObject)->getUnoShape(), uno::UNO_QUERY ); if ( !xShape.is() ) return false; @@ -7149,8 +7149,8 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace ) const SfxPoolItem* pItem = m_rExport.HasItem( RES_BOX ); if ( pItem ) { - m_pageMargins.nPageMarginRight = ((SvxBoxItem*)pItem)->CalcLineSpace( BOX_LINE_LEFT ); - m_pageMargins.nPageMarginLeft = ((SvxBoxItem*)pItem)->CalcLineSpace( BOX_LINE_RIGHT ); + m_pageMargins.nPageMarginRight = static_cast<const SvxBoxItem*>(pItem)->CalcLineSpace( BOX_LINE_LEFT ); + m_pageMargins.nPageMarginLeft = static_cast<const SvxBoxItem*>(pItem)->CalcLineSpace( BOX_LINE_RIGHT ); } else m_pageMargins.nPageMarginLeft = m_pageMargins.nPageMarginRight = 0; @@ -7644,7 +7644,7 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox ) const SdrObject* pSdrObj = m_rExport.mpParentFrame->GetFrmFmt().FindRealSdrObject(); if (pSdrObj) { - uno::Reference< drawing::XShape > xShape( ((SdrObject*)pSdrObj)->getUnoShape(), uno::UNO_QUERY ); + uno::Reference< drawing::XShape > xShape( const_cast<SdrObject*>(pSdrObj)->getUnoShape(), uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY ); m_rDrawingML.SetFS(m_pSerializer); m_rDrawingML.WriteBlipFill( xPropertySet, "BackGraphicURL" ); diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index a7dc475c8630..4b122e09d995 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -1111,7 +1111,7 @@ void DocxSdrExport::writeDiagramRels(uno::Reference<xml::dom::XDocument> xDom, void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrmFmt& rFrmFmt, int nAnchorId) { sax_fastparser::FSHelperPtr pFS = m_pImpl->m_pSerializer; - uno::Reference< drawing::XShape > xShape(((SdrObject*)sdrObject)->getUnoShape(), uno::UNO_QUERY); + uno::Reference< drawing::XShape > xShape(const_cast<SdrObject*>(sdrObject)->getUnoShape(), uno::UNO_QUERY); uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); uno::Reference<xml::dom::XDocument> dataDom; diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index a2dd8eee7741..2b534ffcd203 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1125,7 +1125,7 @@ void MSWord_SdrAttrIter::SetCharSet(const EECharAttrib& rAttr, bool bStart) if( bStart ) { - rtl_TextEncoding eChrSet = ((SvxFontItem&)rItem).GetCharSet(); + rtl_TextEncoding eChrSet = static_cast<const SvxFontItem&>(rItem).GetCharSet(); aChrSetArr.push_back( eChrSet ); aChrTxtAtrArr.push_back( &rAttr ); } @@ -1693,19 +1693,19 @@ void SwBasicEscherEx::WriteGrfAttr(const SwNoTxtNode& rNd, if (SfxItemState::SET == rNd.GetSwAttrSet().GetItemState(RES_GRFATR_CONTRAST, true, &pItem)) { - nContrast = ((SfxInt16Item*)pItem)->GetValue(); + nContrast = static_cast<const SfxInt16Item*>(pItem)->GetValue(); } if (SfxItemState::SET == rNd.GetSwAttrSet().GetItemState(RES_GRFATR_LUMINANCE, true, &pItem)) { - nBrightness = ((SfxInt16Item*)pItem)->GetValue(); + nBrightness = static_cast<const SfxInt16Item*>(pItem)->GetValue(); } if (SfxItemState::SET == rNd.GetSwAttrSet().GetItemState(RES_GRFATR_DRAWMODE, true, &pItem)) { - nMode = ((SfxEnumItem*)pItem)->GetValue(); + nMode = static_cast<const SfxEnumItem*>(pItem)->GetValue(); if (nMode == GRAPHICDRAWMODE_WATERMARK) { /* @@ -1758,13 +1758,13 @@ void SwBasicEscherEx::WriteGrfAttr(const SwNoTxtNode& rNd, { const Size aSz( rNd.GetTwipSize() ); sal_Int32 nVal; - if( 0 != ( nVal = ((SwCropGrf*)pItem )->GetLeft() ) ) + if( 0 != ( nVal = static_cast<const SwCropGrf*>(pItem )->GetLeft() ) ) rPropOpt.AddOpt( ESCHER_Prop_cropFromLeft, ToFract16( nVal, aSz.Width()) ); - if( 0 != ( nVal = ((SwCropGrf*)pItem )->GetRight() ) ) + if( 0 != ( nVal = static_cast<const SwCropGrf*>(pItem )->GetRight() ) ) rPropOpt.AddOpt( ESCHER_Prop_cropFromRight, ToFract16( nVal, aSz.Width())); - if( 0 != ( nVal = ((SwCropGrf*)pItem )->GetTop() ) ) + if( 0 != ( nVal = static_cast<const SwCropGrf*>(pItem )->GetTop() ) ) rPropOpt.AddOpt( ESCHER_Prop_cropFromTop, ToFract16( nVal, aSz.Height())); - if( 0 != ( nVal = ((SwCropGrf*)pItem )->GetBottom() ) ) + if( 0 != ( nVal = static_cast<const SwCropGrf*>(pItem )->GetBottom() ) ) rPropOpt.AddOpt( ESCHER_Prop_cropFromBottom, ToFract16( nVal, aSz.Height())); } } @@ -1916,7 +1916,7 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt, const SvxBorderLine* pLine; for( sal_uInt16 n = 0; n < 4; ++n ) - if( 0 != ( pLine = ((SvxBoxItem*)pItem)->GetLine( n )) ) + if( 0 != ( pLine = static_cast<const SvxBoxItem*>(pItem)->GetLine( n )) ) { if( bFirstLine ) { @@ -1971,7 +1971,7 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt, bFirstLine = false; } rPropOpt.AddOpt( aExhperProp[ n ], DrawModelToEmu( - ((SvxBoxItem*)pItem)->GetDistance( n ) )); + static_cast<const SvxBoxItem*>(pItem)->GetDistance( n ) )); } else // MM If there is no line the distance should be set to 0 @@ -2086,9 +2086,9 @@ sal_Int32 SwEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType if (SfxItemState::SET == rFmt.GetItemState(RES_LR_SPACE, true, &pItem)) { rPropOpt.AddOpt( ESCHER_Prop_dxWrapDistLeft, - DrawModelToEmu( ((SvxLRSpaceItem*)pItem)->GetLeft() ) ); + DrawModelToEmu( static_cast<const SvxLRSpaceItem*>(pItem)->GetLeft() ) ); rPropOpt.AddOpt( ESCHER_Prop_dxWrapDistRight, - DrawModelToEmu( ((SvxLRSpaceItem*)pItem)->GetRight() ) ); + DrawModelToEmu( static_cast<const SvxLRSpaceItem*>(pItem)->GetRight() ) ); } else { @@ -2099,9 +2099,9 @@ sal_Int32 SwEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType if (SfxItemState::SET == rFmt.GetItemState(RES_UL_SPACE, true, &pItem)) { rPropOpt.AddOpt( ESCHER_Prop_dyWrapDistTop, - DrawModelToEmu( ((SvxULSpaceItem*)pItem)->GetUpper() ) ); + DrawModelToEmu( static_cast<const SvxULSpaceItem*>(pItem)->GetUpper() ) ); rPropOpt.AddOpt( ESCHER_Prop_dyWrapDistBottom, - DrawModelToEmu( ((SvxULSpaceItem*)pItem)->GetLower() ) ); + DrawModelToEmu( static_cast<const SvxULSpaceItem*>(pItem)->GetLower() ) ); } if (rFmt.GetSurround().IsContour()) diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 9487f885ce22..a5f6c0b04d24 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -2428,9 +2428,9 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) if( SfxItemState::SET == rNode.GetSwAttrSet().GetItemState( RES_UL_SPACE, true, &pItem ) && ( ( !( ND_HAS_PREV_LAYNODE & nPrvNxtNd ) && - ((SvxULSpaceItem*)pItem)->GetUpper()) || + static_cast<const SvxULSpaceItem*>(pItem)->GetUpper()) || ( !( ND_HAS_NEXT_LAYNODE & nPrvNxtNd ) && - ((SvxULSpaceItem*)pItem)->GetLower()) )) + static_cast<const SvxULSpaceItem*>(pItem)->GetLower()) )) { pTmpSet = new SfxItemSet( rNode.GetSwAttrSet() ); SvxULSpaceItem aUL( *(SvxULSpaceItem*)pItem ); @@ -2795,7 +2795,7 @@ bool MSWordExportBase::NoPageBreakSection( const SfxItemSet* pSet ) { bool bNoPageBreak = false; if ( SfxItemState::SET != pSet->GetItemState(RES_PAGEDESC, true, &pI) - || 0 == ((SwFmtPageDesc*)pI)->GetPageDesc() ) + || 0 == static_cast<const SwFmtPageDesc*>(pI)->GetPageDesc() ) { bNoPageBreak = true; } @@ -2842,7 +2842,7 @@ void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode ) else if ( rNd.IsCntntNode() ) { pSet = &rNd.GetCntntNode()->GetSwAttrSet(); - nRstLnNum = ((SwFmtLineNumber&)pSet->Get( + nRstLnNum = static_cast<const SwFmtLineNumber&>(pSet->Get( RES_LINENUMBER )).GetStartValue(); } else diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 5c87dd6e9c2a..a56517a96e2f 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -1438,7 +1438,7 @@ void WW8AttributeOutput::CharEscapement( const SvxEscapementItem& rEscapement ) if ( 0 == b || 0xFF == b ) { - long nHeight = ((SvxFontHeightItem&)m_rWW8Export.GetItem( + long nHeight = static_cast<const SvxFontHeightItem&>(m_rWW8Export.GetItem( RES_CHRATR_FONTSIZE )).GetHeight(); if( m_rWW8Export.bWrtWW8 ) m_rWW8Export.InsUInt16( NS_sprm::LN_CHpsPos ); @@ -3052,7 +3052,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField ) else nScript = i18n::ScriptType::ASIAN; - long nHeight = ((SvxFontHeightItem&)(GetExport().GetItem( + long nHeight = static_cast<const SvxFontHeightItem&>((GetExport().GetItem( GetWhichOfScript(RES_CHRATR_FONTSIZE,nScript)))).GetHeight(); nHeight = (nHeight + 10) / 20; //Font Size in points; @@ -3929,8 +3929,8 @@ void WW8AttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLR ) const SfxPoolItem* pItem = m_rWW8Export.HasItem( RES_BOX ); if ( pItem ) { - nRDist = ((SvxBoxItem*)pItem)->CalcLineSpace( BOX_LINE_LEFT ); - nLDist = ((SvxBoxItem*)pItem)->CalcLineSpace( BOX_LINE_RIGHT ); + nRDist = static_cast<const SvxBoxItem*>(pItem)->CalcLineSpace( BOX_LINE_LEFT ); + nLDist = static_cast<const SvxBoxItem*>(pItem)->CalcLineSpace( BOX_LINE_RIGHT ); } else nLDist = nRDist = 0; diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index ff27a37ab9c1..2836518ece1c 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -209,7 +209,7 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile ) SfxObjectShellLock xDocSh(new SwDocShell(SFX_CREATE_MODE_INTERNAL)); if (xDocSh->DoInitNew(0)) { - SwDoc *pD = ((SwDocShell*)(&xDocSh))->GetDoc(); + SwDoc *pD = static_cast<SwDocShell*>((&xDocSh))->GetDoc(); SwWW8ImplReader* pRdr = new SwWW8ImplReader(pGlossary->nVersion, xStg, &rStrm, *pD, rBlocks.GetBaseURL(), true); diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index ec5564e4ae2a..53f383997e13 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -809,7 +809,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp, if( bCheckTextBoxStory ) { - bool bReusable = (0 != SVBT16ToShort( ((WW8_TXBXS*)pT0)->fReusable )); + bool bReusable = (0 != SVBT16ToShort( static_cast<WW8_TXBXS*>(pT0)->fReusable )); while( bReusable ) { pT->advance(); @@ -818,7 +818,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp, OSL_ENSURE( false, "+Wo ist der Grafik-Text (2-a) ?" ); return false; } - bReusable = (0 != SVBT16ToShort( ((WW8_TXBXS*)pT0)->fReusable )); + bReusable = (0 != SVBT16ToShort( static_cast<WW8_TXBXS*>(pT0)->fReusable )); } } pT->advance(); @@ -1054,7 +1054,7 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj, if( !pNew ) { pNew = new SdrGrafObj; - ((SdrGrafObj*)pNew)->SetGraphic(aGraph); + static_cast<SdrGrafObj*>(pNew)->SetGraphic(aGraph); } GrafikCtor(); @@ -2956,7 +2956,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject, OUString aObjectName(rpObject->GetName()); if (OBJ_OLE2 == SdrObjKind(rpObject->GetObjIdentifier())) - pRetFrmFmt = InsertOle(*((SdrOle2Obj*)rpObject), rFlySet, aGrSet); + pRetFrmFmt = InsertOle(*static_cast<SdrOle2Obj*>(rpObject), rFlySet, aGrSet); else { const SdrGrafObj *pGrf= (const SdrGrafObj*)rpObject; diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index 711f04b15ca9..490dfb51089f 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -642,7 +642,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, if (sal_uInt16(OBJ_OLE2) == pObject->GetObjIdentifier()) { // the size from BLIP, if there is any, should be already set - pRet = InsertOle(*((SdrOle2Obj*)pObject), aAttrSet, aGrSet); + pRet = InsertOle(*static_cast<SdrOle2Obj*>(pObject), aAttrSet, aGrSet); } else { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 61e4b09a0bad..d2d30bebbef6 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1335,7 +1335,7 @@ const SwNumFmt* SwWW8FltControlStack::GetNumFmtFromStack(const SwPosition &rPos, { if (rTxtNode.IsCountedInList()) { - OUString sName(((SfxStringItem*)pItem)->GetValue()); + OUString sName(static_cast<const SfxStringItem*>(pItem)->GetValue()); const SwNumRule *pRule = pDoc->FindNumRulePtr(sName); if (pRule) pRet = GetNumFmtFromSwNumRuleLevel(*pRule, rTxtNode.GetActualListLevel()); @@ -1599,11 +1599,11 @@ bool SwWW8FltRefStack::IsFtnEdnBkmField( sal_uInt16 nSubType; if(pFld && (RES_GETREFFLD == pFld->Which()) && ((REF_FOOTNOTE == (nSubType = pFld->GetSubType())) || (REF_ENDNOTE == nSubType)) - && !((SwGetRefField*)pFld)->GetSetRefName().isEmpty()) + && !static_cast<const SwGetRefField*>(pFld)->GetSetRefName().isEmpty()) { const IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess(); IDocumentMarkAccess::const_iterator_t ppBkmk = - pMarkAccess->findMark( ((SwGetRefField*)pFld)->GetSetRefName() ); + pMarkAccess->findMark( static_cast<const SwGetRefField*>(pFld)->GetSetRefName() ); if(ppBkmk != pMarkAccess->getAllMarksEnd()) { // find Sequence No of corresponding Foot-/Endnote @@ -1650,12 +1650,12 @@ void SwWW8FltRefStack::SetAttrInDoc(const SwPosition& rTmpPos, rBkMrkPos.nContent.GetIndex()-1, RES_TXTATR_FTN ); if( pFtn ) { - sal_uInt16 nRefNo = ((SwTxtFtn*)pFtn)->GetSeqRefNo(); + sal_uInt16 nRefNo = static_cast<SwTxtFtn*>(pFtn)->GetSeqRefNo(); - ((SwGetRefField*)pFld)->SetSeqNo( nRefNo ); + static_cast<SwGetRefField*>(pFld)->SetSeqNo( nRefNo ); if( pFtn->GetFtn().IsEndNote() ) - ((SwGetRefField*)pFld)->SetSubType(REF_ENDNOTE); + static_cast<SwGetRefField*>(pFld)->SetSubType(REF_ENDNOTE); } } } @@ -1887,7 +1887,7 @@ void SwWW8ImplReader::ImportDop() // We want exactly one DefaultTab SvxTabStopItem aNewTab( 1, sal_uInt16(nDefTabSiz), SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP ); - ((SvxTabStop&)aNewTab[0]).GetAdjustment() = SVX_TAB_ADJUST_DEFAULT; + const_cast<SvxTabStop&>(aNewTab[0]).GetAdjustment() = SVX_TAB_ADJUST_DEFAULT; rDoc.GetAttrPool().SetPoolDefaultItem( aNewTab ); @@ -6034,7 +6034,7 @@ sal_uInt16 SwWW8ImplReader::GetAnnotationEndIndex(sal_uInt16 nStart) if (mpAtnStarts->GetData(nStart, nStartAkt, p) && p) { // p is an FBKF, and its first 2 bytes is the ibkl member, which is the end index. - return SVBT16ToShort(*((SVBT16*)p)); + return SVBT16ToShort(*static_cast<SVBT16*>(p)); } return nStart; } diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index b09fec67d5bf..7c5f5f5b05a0 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -291,7 +291,7 @@ SwFrmFmt* SwWW8ImplReader::ImportOle(const Graphic* pGrf, { if (pRet->ISA(SdrOle2Obj)) { - pFmt = InsertOle(*((SdrOle2Obj*)pRet), *pFlySet, *pGrfSet); + pFmt = InsertOle(*static_cast<SdrOle2Obj*>(pRet), *pFlySet, *pGrfSet); SdrObject::Free( pRet ); // das brauchen wir nicht mehr } else diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index bbb8ae3320bf..6276c772b416 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -410,7 +410,7 @@ void SwXMLTextStyleContext_Impl::Finish( bool bOverwrite ) { SwCollCondition aCond( pCondColl, pCond->GetCondition(), pCond->GetSubCondition() ); - ((SwConditionTxtFmtColl*)pColl)->InsertCondition( aCond ); + static_cast<SwConditionTxtFmtColl*>(pColl)->InsertCondition( aCond ); } } } diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index 218422ecf53d..271e337ac05d 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -281,7 +281,7 @@ SwXMLItemSetContext_Impl::~SwXMLItemSetContext_Impl() if( xBackground.Is() ) { const SvxBrushItem& rItem = - ((SwXMLBrushItemImportContext*)&xBackground)->GetItem(); + static_cast<SwXMLBrushItemImportContext*>(&xBackground)->GetItem(); rItemSet.Put( rItem ); } } diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 6e4b8006a76b..a82450903b33 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -1074,7 +1074,7 @@ void SwXMLExport::ExportTable( const SwTableNode& rTblNd ) { // get DDE Field Type (contains the DDE connection) const SwDDEFieldType* pDDEFldType = - ((SwDDETable&)rTbl).GetDDEFldType(); + static_cast<const SwDDETable&>(rTbl).GetDDEFldType(); // connection name AddAttribute( XML_NAMESPACE_OFFICE, XML_NAME, @@ -1113,8 +1113,8 @@ void SwXMLTextParagraphExport::exportTable( const Reference < XTextContent > & rTextContent, bool bAutoStyles, bool _bProgress ) { - bool bOldShowProgress = ((SwXMLExport&)GetExport()).IsShowProgress(); - ((SwXMLExport&)GetExport()).SetShowProgress( _bProgress ); + bool bOldShowProgress = static_cast<SwXMLExport&>(GetExport()).IsShowProgress(); + static_cast<SwXMLExport&>(GetExport()).SetShowProgress( _bProgress ); Reference < XTextTable > xTxtTbl( rTextContent, UNO_QUERY ); OSL_ENSURE( xTxtTbl.is(), "text table missing" ); @@ -1146,16 +1146,16 @@ void SwXMLTextParagraphExport::exportTable( // ALL flags are set at the same time. const bool bExportStyles = ( GetExport().getExportFlags() & EXPORT_STYLES ) != 0; if ( bExportStyles || !pFmt->GetDoc()->IsInHeaderFooter( aIdx ) ) - ((SwXMLExport&)GetExport()).ExportTableAutoStyles( *pTblNd ); + static_cast<SwXMLExport&>(GetExport()).ExportTableAutoStyles( *pTblNd ); } else { - ((SwXMLExport&)GetExport()).ExportTable( *pTblNd ); + static_cast<SwXMLExport&>(GetExport()).ExportTable( *pTblNd ); } } } - ((SwXMLExport&)GetExport()).SetShowProgress( bOldShowProgress ); + static_cast<SwXMLExport&>(GetExport()).SetShowProgress( bOldShowProgress ); } void SwXMLExport::DeleteTableLines() |