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 | |||
@@ -4,9 +4,9 @@ | |||
4 | * | 4 | * |
5 | * $RCSfile: optsitem.cxx,v $ | 5 | * $RCSfile: optsitem.cxx,v $ |
6 | * | 6 | * |
7 | * $Revision: 1.36 $ | 7 | * $Revision: 1.37 $ |
8 | * | 8 | * |
9 | * last change: $Author: kz $ $Date: 2006-10-06 09:51:32 $ | 9 | * last change: $Author: obo $ $Date: 2006-10-11 09:27:13 $ |
10 | * | 10 | * |
11 | * The Contents of this file are made available subject to | 11 | * The Contents of this file are made available subject to |
12 | * the terms of GNU Lesser General Public License Version 2.1. | 12 | * the terms of GNU Lesser General Public License Version 2.1. |
@@ -129,7 +129,7 @@ void SdOptionsGeneric::Init() const | |||
129 | { | 129 | { |
130 | if( !mbInit ) | 130 | if( !mbInit ) |
131 | { | 131 | { |
132 | SdOptionsGeneric* pThis = (SdOptionsGeneric*) this; | 132 | SdOptionsGeneric* pThis = const_cast<SdOptionsGeneric*>(this); |
133 | 133 | ||
134 | if( !mpCfgItem ) | 134 | if( !mpCfgItem ) |
135 | pThis->mpCfgItem = new SdOptionsItem( *this, maSubTree ); | 135 | pThis->mpCfgItem = new SdOptionsItem( *this, maSubTree ); |
@@ -167,7 +167,7 @@ void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const | |||
167 | 167 | ||
168 | if( aNames.getLength() && ( aValues.getLength() == aNames.getLength() ) ) | 168 | if( aNames.getLength() && ( aValues.getLength() == aNames.getLength() ) ) |
169 | { | 169 | { |
170 | if( ( (SdOptionsGeneric*) this )->WriteData( aValues.getArray() ) ) | 170 | if( (const_cast<SdOptionsGeneric*>(this))->WriteData( aValues.getArray() ) ) |
171 | rCfgItem.PutProperties( aNames, aValues ); | 171 | rCfgItem.PutProperties( aNames, aValues ); |
172 | else | 172 | else |
173 | { | 173 | { |