diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-26 15:31:55 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-26 15:33:38 +0100 |
| commit | 6f3c52bb37f52f57fea6479f1da6c1828fbd85fe (patch) | |
| tree | d8e6db66db4c28335a62fbec4a282541ae083a85 /sw/source/core/layout/atrfrm.cxx | |
| parent | 5429049e3b8fd12e84aca83be7ca19e52920f672 (diff) | |
const_cast: convert some C-style casts and remove some redundant ones
Change-Id: Icb14a036ea9d7636359b6bc5e0af17568c0d54cb
Diffstat (limited to 'sw/source/core/layout/atrfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 7efebc117838..fbe2e323b54c 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -451,7 +451,7 @@ SwFmtHeader::SwFmtHeader( SwFrmFmt *pHeaderFmt ) SwFmtHeader::SwFmtHeader( const SwFmtHeader &rCpy ) : SfxPoolItem( RES_HEADER ), - SwClient( (SwModify*)rCpy.GetRegisteredIn() ), + SwClient( const_cast<SwModify*>(rCpy.GetRegisteredIn()) ), bActive( rCpy.IsActive() ) { } @@ -496,7 +496,7 @@ SwFmtFooter::SwFmtFooter( SwFrmFmt *pFooterFmt ) SwFmtFooter::SwFmtFooter( const SwFmtFooter &rCpy ) : SfxPoolItem( RES_FOOTER ), - SwClient( (SwModify*)rCpy.GetRegisteredIn() ), + SwClient( const_cast<SwModify*>(rCpy.GetRegisteredIn()) ), bActive( rCpy.IsActive() ) { } @@ -582,7 +582,7 @@ void SwFmtCntnt::dumpAsXml(xmlTextWriterPtr pWriter) const // Partially implemented inline in hxx SwFmtPageDesc::SwFmtPageDesc( const SwFmtPageDesc &rCpy ) : SfxPoolItem( RES_PAGEDESC ), - SwClient( (SwPageDesc*)rCpy.GetPageDesc() ), + SwClient( const_cast<SwPageDesc*>(rCpy.GetPageDesc()) ), oNumOffset( rCpy.oNumOffset ), nDescNameIdx( rCpy.nDescNameIdx ), pDefinedIn( 0 ) @@ -591,7 +591,7 @@ SwFmtPageDesc::SwFmtPageDesc( const SwFmtPageDesc &rCpy ) SwFmtPageDesc::SwFmtPageDesc( const SwPageDesc *pDesc ) : SfxPoolItem( RES_PAGEDESC ), - SwClient( (SwPageDesc*)pDesc ), + SwClient( const_cast<SwPageDesc*>(pDesc) ), nDescNameIdx( 0xFFFF ), // IDX_NO_VALUE pDefinedIn( 0 ) { @@ -2583,9 +2583,9 @@ void SwFrmFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) } } else if( RES_HEADER == nWhich ) - pH = const_cast<SwFmtHeader*>(static_cast<const SwFmtHeader*>(pNew)); + pH = static_cast<const SwFmtHeader*>(pNew); else if( RES_FOOTER == nWhich ) - pF = const_cast<SwFmtFooter*>(static_cast<const SwFmtFooter*>(pNew)); + pF = static_cast<const SwFmtFooter*>(pNew); if( pH && pH->IsActive() && !pH->GetHeaderFmt() ) { //If he doesn't have one, I'll add one |