From 7e32cd9a543d3cb42eb2531e23b1165907b6a22a Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Wed, 11 Oct 2006 08:27:13 +0000 Subject: 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 --- sd/source/ui/app/optsitem.cxx | 8 ++++---- 1 file 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 @@ -4,9 +4,9 @@ * * $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. @@ -129,7 +129,7 @@ void SdOptionsGeneric::Init() const { if( !mbInit ) { - SdOptionsGeneric* pThis = (SdOptionsGeneric*) this; + SdOptionsGeneric* pThis = const_cast(this); if( !mpCfgItem ) pThis->mpCfgItem = new SdOptionsItem( *this, maSubTree ); @@ -167,7 +167,7 @@ void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const if( aNames.getLength() && ( aValues.getLength() == aNames.getLength() ) ) { - if( ( (SdOptionsGeneric*) this )->WriteData( aValues.getArray() ) ) + if( (const_cast(this))->WriteData( aValues.getArray() ) ) rCfgItem.PutProperties( aNames, aValues ); else { -- cgit v1.2.3