diff options
Diffstat (limited to 'sw/source/filter')
-rw-r--r-- | sw/source/filter/basflt/fltshell.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/html/htmltab.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8num.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index c98211ef32c3..96d2422a5060 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -722,7 +722,7 @@ SfxPoolItem* SwFltControlStack::GetFmtStackAttr(sal_uInt16 nWhich, sal_uInt16 * { if (pPos) *pPos = nSize; - return (SfxPoolItem*)rEntry.pAttr; // Ok, so stop + return rEntry.pAttr; // Ok, so stop } } return 0; @@ -739,7 +739,7 @@ const SfxPoolItem* SwFltControlStack::GetOpenStackAttr(const SwPosition& rPos, s SwFltStackEntry &rEntry = maEntries[--nSize]; if (rEntry.bOpen && rEntry.pAttr->Which() == nWhich && rEntry.m_aMkPos == aFltPos) { - return (SfxPoolItem*)rEntry.pAttr; + return rEntry.pAttr; } } return 0; diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index f85ae7fa776f..5eb03147a750 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -537,7 +537,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, false ); rHWrt.aTxtCollInfos.insert( pFmtInfo ); if( rHWrt.aScriptParaStyles.count( rFmt.GetName() ) ) - ((SwHTMLFmtInfo *)pFmtInfo)->bScriptDependent = true; + pFmtInfo->bScriptDependent = true; } // Jetzt wird festgelegt, was aufgrund des Tokens so moeglich ist @@ -1627,7 +1627,7 @@ const SwHTMLFmtInfo *HTMLEndPosLst::GetFmtInfo( const SwFmt& rFmt, bOutStyles ); rFmtInfos.insert( pFmtInfo ); if ( rScriptTxtStyles.count( rFmt.GetName() ) ) - ((SwHTMLFmtInfo *)pFmtInfo)->bScriptDependent = true; + pFmtInfo->bScriptDependent = true; } return pFmtInfo; @@ -1905,7 +1905,7 @@ void HTMLEndPosLst::Insert( const SfxItemSet& rItemSet, void HTMLEndPosLst::Insert( const SwDrawFrmFmt& rFmt, sal_Int32 nPos, SwHTMLFmtInfos& rFmtInfos ) { - const SdrObject* pTextObj = (const SdrObject*) SwHTMLWriter::GetMarqueeTextObj( rFmt ); + const SdrObject* pTextObj = SwHTMLWriter::GetMarqueeTextObj( rFmt ); if( pTextObj ) { diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 050fd7f7a720..cc1ac7fa435a 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -2536,8 +2536,8 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, } else { - pLineFmt = (SwTableLineFmt*)pTopTable->pLineFmt; - pBoxFmt = (SwTableBoxFmt*)pTopTable->pBoxFmt; + pLineFmt = pTopTable->pLineFmt; + pBoxFmt = pTopTable->pBoxFmt; } // ggf. muessen fuer Tabellen in Tabellen "Filler"-Zellen eingefuegt diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index bc14531c74f7..b1b9c36e16ef 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -618,7 +618,7 @@ void WW8Export::OutputOlst( const SwNumRule& rRule ) WW8_OLST aOlst; memset( &aOlst, 0, sizeof(aOlst) ); sal_uInt8* pC = aOlst.rgch; - sal_uInt8* pChars = (sal_uInt8*)pC; + sal_uInt8* pChars = pC; sal_uInt16 nCharLen = 64; for (sal_uInt16 j = 0; j < WW8ListManager::nMaxLevel; j++ ) // 9 variable ANLVs diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 129beb314f27..09184f03cd10 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -1128,7 +1128,7 @@ bool WW8_WrFkp::Combine() memcpy( pFkp + ( nIMax + 1 ) * 4, pOfs, nIMax * nItemSize ); delete[] pOfs; pOfs = 0; - ((sal_uInt8*)pFkp)[511] = nIMax; + pFkp[511] = nIMax; bCombined = true; #if defined OSL_BIGENDIAN // only the FCs will be rotated here diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 1192fd434343..a01a99e8ba0b 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -3323,7 +3323,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr ) SwPaM aRegion(*m_pPaM, m_pPaM); OSL_ENSURE(SwDoc::GetCurTOX(*aRegion.GetPoint()), "Misunderstood how toc works"); - if (SwTOXBase* pBase2 = (SwTOXBase*)SwDoc::GetCurTOX(*aRegion.GetPoint())) + if (SwTOXBase* pBase2 = SwDoc::GetCurTOX(*aRegion.GetPoint())) { pBase2->SetMSTOCExpression(rStr); |