summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 20:20:28 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 20:20:28 +0000
commit3af323c6bf24598136ef615d7b6fda1d5b16f40f (patch)
treefbc38890c182a4a50df06c928060f8e23db52245 /svtools
parent88b1f70d2d9a1482b7cc2444cb9c270a618fe5c9 (diff)
INTEGRATION: CWS warnings01 (1.5.60); FILE MERGED
2005/11/15 19:25:41 pl 1.5.60.1: #i55991# removed warnings
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/misc/imap.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 3ecc175f1e7f..036d9c4d4be7 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: imap.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 16:18:59 $
+ * last change: $Author: hr $ $Date: 2006-06-19 21:20:28 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -48,7 +48,7 @@
#include "imappoly.hxx"
-DBG_NAME( ImageMap );
+DBG_NAME( ImageMap )
#define SCALEPOINT(aPT,aFracX,aFracY) (aPT).X()=((aPT).X()*(aFracX).GetNumerator())/(aFracX).GetDenominator(); \
@@ -1310,7 +1310,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, USHORT nCount, const String& rB
void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const
{
IMapCompat* pCompat;
- String aName( GetName() );
+ String aImageName( GetName() );
String aDummy;
USHORT nOldFormat = rOStm.GetNumberFormatInt();
UINT16 nCount = (UINT16) GetIMapObjectCount();
@@ -1321,10 +1321,10 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const
// MagicCode schreiben
rOStm << IMAPMAGIC;
rOStm << GetVersion();
- rOStm.WriteByteString( ByteString( aName, eEncoding ) );
+ rOStm.WriteByteString( ByteString( aImageName, eEncoding ) );
rOStm.WriteByteString( ByteString( aDummy, eEncoding ) );
rOStm << nCount;
- rOStm.WriteByteString( ByteString( aName, eEncoding ) );
+ rOStm.WriteByteString( ByteString( aImageName, eEncoding ) );
pCompat = new IMapCompat( rOStm, STREAM_WRITE );