summaryrefslogtreecommitdiff
path: root/svtools/source/urlobj
diff options
context:
space:
mode:
authorjp <jp@openoffice.org>2001-03-27 13:11:14 +0000
committerjp <jp@openoffice.org>2001-03-27 13:11:14 +0000
commitdf9a1e27fd6b6d22351839f2a8f3aab3ee6a548c (patch)
tree5e152312b21d5c61f6c1ec524d1213bda2b27f22 /svtools/source/urlobj
parent855440e275e4ad550c5162b7bbca80e39613d43e (diff)
Bug #85372#: use alignment of 4
Diffstat (limited to 'svtools/source/urlobj')
-rw-r--r--svtools/source/urlobj/inetimg.cxx28
1 files changed, 4 insertions, 24 deletions
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index ce0d0a4304fa..e51cf668d47c 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: inetimg.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: jp $ $Date: 2001-03-27 13:58:34 $
+ * last change: $Author: jp $ $Date: 2001-03-27 14:11:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -291,7 +291,7 @@ sal_Bool INetImage::Read( SvStream& rIStm, ULONG nFormat )
case SOT_FORMATSTR_ID_NETSCAPE_IMAGE:
{
/*
- --> structure size
+ --> structure size MUST - alignment of 4!
int iSize; // size of all data, including variable length strings
BOOL bIsMap; // For server side maps
INT32 iWidth; // Fixed size data correspond to fields in LO_ImageDataStruct
@@ -310,26 +310,6 @@ sal_Bool INetImage::Read( SvStream& rIStm, ULONG nFormat )
int nLen;
ByteString sData;
-/*
- rIStm >> nLen;
- rIStm.SeekRel( -sizeof( int ));
- sal_Char* pBuf = new sal_Char[ nLen ];
- rIStm.Read( pBuf, nLen );
- ImageData_Impl* pImgData = (ImageData_Impl*)pBuf;
-
- const sal_Char* pStart = (const sal_Char*)pImgData;
- aImageURL = String( (const sal_Char*)&(pImgData->pImageURL[0]),
- eSysCSet );
- if( pImgData->iAltOffset )
- aAlternateText = String( (pStart + pImgData->iAltOffset), eSysCSet );
- if( pImgData->iAnchorOffset )
- aTargetURL = String( (pStart + pImgData->iAnchorOffset), eSysCSet );
-
- aSizePixel.Width() = pImgData->iWidth;
- aSizePixel.Height() = pImgData->iHeight;
- delete pBuf;
-*/
-
nFilePos = rIStm.Tell();
// skip over iSize (int), bIsMao ( BOOL ) alignment of 4 !!!!
rIStm.SeekRel( 8 );
@@ -358,7 +338,7 @@ sal_Bool INetImage::Read( SvStream& rIStm, ULONG nFormat )
}
else if( aTargetURL.Len() )
aTargetURL.Erase();
-/**/
+
bRet = 0 == rIStm.GetError();
}
break;