diff options
Diffstat (limited to 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/rtfexport.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8num.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index e49d52e9b1be..718d5527fe94 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -209,7 +209,7 @@ void RtfExport::BuildNumbering() SwNumRule* pRule; --n; if (n == rListTbl.size()) - pRule = (SwNumRule*)m_pDoc->GetOutlineNumRule(); + pRule = m_pDoc->GetOutlineNumRule(); else { pRule = rListTbl[ n ]; diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 106df4478dad..bc14531c74f7 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -95,7 +95,7 @@ sal_uInt16 MSWordExportBase::GetId( const SwNumRule& rNumRule ) if ( !bOutlineRuleAdded ) { // still need to paste the OutlineRule - SwNumRule* pR = (SwNumRule*)m_pDoc->GetOutlineNumRule(); + SwNumRule* pR = m_pDoc->GetOutlineNumRule(); m_pUsedNumTbl->push_back( pR ); } } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index ebf8095e6e37..95f0f30f7025 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4046,7 +4046,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType) if(m_pAktItemSet && !pFmt) { OUString sPrefix(OUStringBuffer("WW8Dropcap").append(m_nDropCap++).makeStringAndClear()); - pNewSwCharFmt = m_rDoc.MakeCharFmt(sPrefix, (SwCharFmt*)m_rDoc.GetDfltCharFmt()); + pNewSwCharFmt = m_rDoc.MakeCharFmt(sPrefix, m_rDoc.GetDfltCharFmt()); m_pAktItemSet->ClearItem(RES_CHRATR_ESCAPEMENT); pNewSwCharFmt->SetFmtAttr( *m_pAktItemSet ); } diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index b269eccb5edb..63c84f0046a0 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -1053,7 +1053,7 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule, + "z" + OUString::number( nLevel ) ); // const Wegcasten - pFmt = rDoc.MakeCharFmt(aName, (SwCharFmt*)rDoc.GetDfltCharFmt()); + pFmt = rDoc.MakeCharFmt(aName, rDoc.GetDfltCharFmt()); bNewCharFmtCreated = true; // Attribute reinsetzen pFmt->SetFmtAttr( *pThisLevelItemSet ); @@ -1080,7 +1080,7 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule, const OUString aName( (!sPrefix.isEmpty() ? sPrefix : rNumRule.GetName()) + "z" + OUString::number( nLevel ) ); - pFmt = rDoc.MakeCharFmt(aName, (SwCharFmt*)rDoc.GetDfltCharFmt()); + pFmt = rDoc.MakeCharFmt(aName, rDoc.GetDfltCharFmt()); bNewCharFmtCreated = true; rCharFmt[ nLevel ] = pFmt; aNumFmt.SetCharFmt( pFmt ); diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 0d11bd9ff2b6..1192fd434343 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2654,7 +2654,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam) //Take this as the base name SwStyleNameMapper::FillUIName(RES_POOLCHR_RUBYTEXT,aNm); aNm+=OUString::number(m_aRubyCharFmts.size()+1); - pFmt = m_rDoc.MakeCharFmt(aNm,(SwCharFmt*)m_rDoc.GetDfltCharFmt()); + pFmt = m_rDoc.MakeCharFmt(aNm, m_rDoc.GetDfltCharFmt()); SvxFontHeightItem aHeightItem(nFontSize*10, 100, RES_CHRATR_FONTSIZE); SvxFontItem aFontItem(FAMILY_DONTKNOW,sFontName, OUString(), PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT); |