diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-05-04 06:08:32 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-05-04 06:08:32 +0200 |
| commit | 681db8e3a2c727a1c30fb597a50b265857040094 (patch) | |
| tree | 09b38dc7fdca19c32b0afeb1d6532eacfb2f8d00 | |
| parent | Revert "Remove unused parts" (diff) | |
| download | binfilter-681db8e3a2c727a1c30fb597a50b265857040094.tar.gz binfilter-681db8e3a2c727a1c30fb597a50b265857040094.zip | |
fdo#48253: Expand SAL_CONST_CAST
Change-Id: Id50acb05c4616ba735dbbbad8fe866ae8c8ef459
| -rw-r--r-- | binfilter/bf_sch/source/core/sch_chtmode4.cxx | 4 | ||||
| -rw-r--r-- | binfilter/bf_so3/source/persist/transprt.cxx | 2 | ||||
| -rw-r--r-- | binfilter/bf_svtools/source/items1/svt_ctypeitm.cxx | 4 | ||||
| -rw-r--r-- | binfilter/inc/bf_svtools/ilstitem.hxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/binfilter/bf_sch/source/core/sch_chtmode4.cxx b/binfilter/bf_sch/source/core/sch_chtmode4.cxx index 0cb69c449..bee767a92 100644 --- a/binfilter/bf_sch/source/core/sch_chtmode4.cxx +++ b/binfilter/bf_sch/source/core/sch_chtmode4.cxx @@ -111,7 +111,7 @@ namespace binfilter { /*N*/ long nEndRow = GetRowCount(); /*N*/ for( long nRow = 0; nRow < nEndRow; nRow++ ) /*N*/ { -/*N*/ SfxItemSet &rAttr = SAL_CONST_CAST( SfxItemSet&, GetDataRowAttr( (short)nRow )); +/*N*/ SfxItemSet &rAttr = (const_cast< SfxItemSet& >( GetDataRowAttr( (short)nRow ))); /*N*/ /*N*/ rAttr.Put( SvxChartDataDescrItem( eDescr )); /*N*/ rAttr.Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_SYM, bSym )); @@ -119,7 +119,7 @@ namespace binfilter { /*N*/ } /*N*/ else /*N*/ { -/*N*/ SfxItemSet &rAttr = SAL_CONST_CAST( SfxItemSet&, GetDataRowAttr( (short)nRowToChange )); +/*N*/ SfxItemSet &rAttr = (const_cast< SfxItemSet& >( GetDataRowAttr( (short)nRowToChange ))); /*N*/ /*N*/ rAttr.Put( SvxChartDataDescrItem( eDescr )); /*N*/ rAttr.Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_SYM, bSym )); diff --git a/binfilter/bf_so3/source/persist/transprt.cxx b/binfilter/bf_so3/source/persist/transprt.cxx index 5f09c41ef..ed5f85aad 100644 --- a/binfilter/bf_so3/source/persist/transprt.cxx +++ b/binfilter/bf_so3/source/persist/transprt.cxx @@ -567,7 +567,7 @@ ErrCode UcbTransportLockBytes::ReadAt ( *pRead = ULONG(nSize); sal_uInt32 nRead = SAL_MAX(m_nRead, nPos + nSize); - SAL_CONST_CAST(UcbTransportLockBytes*, this)->m_nRead = nRead; + (const_cast< UcbTransportLockBytes* >(this))->m_nRead = nRead; return ERRCODE_NONE; } diff --git a/binfilter/bf_svtools/source/items1/svt_ctypeitm.cxx b/binfilter/bf_svtools/source/items1/svt_ctypeitm.cxx index 2ea232ce4..1d65a4300 100644 --- a/binfilter/bf_svtools/source/items1/svt_ctypeitm.cxx +++ b/binfilter/bf_svtools/source/items1/svt_ctypeitm.cxx @@ -158,7 +158,7 @@ SfxItemPresentation CntContentTypeItem::GetPresentation( DBG_ASSERT(pIntlWrapper, "CntContentTypeItem::GetPresentation(): No IntlWrapper"); if (pIntlWrapper) - SAL_CONST_CAST(CntContentTypeItem *, this)->_aPresentation + (const_cast< CntContentTypeItem * >(this))->_aPresentation = INetContentTypes::GetPresentation(GetEnumValue(), pIntlWrapper-> getLocale()); @@ -181,7 +181,7 @@ INetContentType CntContentTypeItem::GetEnumValue() const { // Not yet initialized... Get enum value for string content type. - CntContentTypeItem* pVarThis = SAL_CONST_CAST( CntContentTypeItem*, this ); + CntContentTypeItem* pVarThis = (const_cast< CntContentTypeItem* >(this)); pVarThis->_eType = INetContentTypes::GetContentType( GetValue() ); } diff --git a/binfilter/inc/bf_svtools/ilstitem.hxx b/binfilter/inc/bf_svtools/ilstitem.hxx index ab547b98a..96f0ab0d9 100644 --- a/binfilter/inc/bf_svtools/ilstitem.hxx +++ b/binfilter/inc/bf_svtools/ilstitem.hxx @@ -57,7 +57,7 @@ public: ::com::sun::star::uno::Sequence < sal_Int32 > GetSequence() { return m_aList; } ::com::sun::star::uno::Sequence < sal_Int32 > GetConstSequence() const - { return SAL_CONST_CAST(SfxIntegerListItem *, this)->GetSequence(); } + { return (const_cast< SfxIntegerListItem * >(this))->GetSequence(); } virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; |