diff options
author | Oliver Bolte <obo@openoffice.org> | 2006-10-11 08:27:13 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2006-10-11 08:27:13 +0000 |
commit | 7e32cd9a543d3cb42eb2531e23b1165907b6a22a (patch) | |
tree | 75df0e0f05fb44132282c3f532cf2503f46d7ced | |
parent | 3005d6a0a885a58780d24bbe76ad69d096d02816 (diff) |
INTEGRATION: CWS cmcfixes28 (1.35.14); FILE MERGED
2006/09/27 09:58:27 cmc 1.35.14.1: #i69905# use const_cast instead of C style ones to avoid gcc confusion about casting
-rw-r--r-- | sd/source/ui/app/optsitem.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 87e4a67825b7..31bed1b73ea7 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -1,15 +1,15 @@ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: optsitem.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: kz $ $Date: 2006-10-06 09:51:32 $ + * last change: $Author: obo $ $Date: 2006-10-11 09:27:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * * * GNU Lesser General Public License Version 2.1 @@ -126,13 +126,13 @@ SdOptionsGeneric::SdOptionsGeneric( USHORT nConfigId, const OUString& rSubTree ) // ----------------------------------------------------------------------------- void SdOptionsGeneric::Init() const { if( !mbInit ) { - SdOptionsGeneric* pThis = (SdOptionsGeneric*) this; + SdOptionsGeneric* pThis = const_cast<SdOptionsGeneric*>(this); if( !mpCfgItem ) pThis->mpCfgItem = new SdOptionsItem( *this, maSubTree ); const Sequence< OUString > aNames( GetPropertyNames() ); const Sequence< Any > aValues = mpCfgItem->GetProperties( aNames ); @@ -164,13 +164,13 @@ void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const { const Sequence< OUString > aNames( GetPropertyNames() ); Sequence< Any > aValues( aNames.getLength() ); if( aNames.getLength() && ( aValues.getLength() == aNames.getLength() ) ) { - if( ( (SdOptionsGeneric*) this )->WriteData( aValues.getArray() ) ) + if( (const_cast<SdOptionsGeneric*>(this))->WriteData( aValues.getArray() ) ) rCfgItem.PutProperties( aNames, aValues ); else { DBG_ERROR( "PutProperties failed" ); } } |