mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS uno2 (1.7.6); FILE MERGED

Browse Source 
2003/04/11 14:20:42 ab 1.7.6.1: #108672# Basic Modules > 64K
This commit is contained in:
Rüdiger Timm
2003-04-23 15:55:53 +00:00
parent 762183207f
commit 34e66c8360
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
basic/source/classes/image.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: image.cxx,v $ * $RCSfile: image.cxx,v $
* *
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* last change: $Author: hr $ $Date: 2003-03-18 16:28:30 $ * last change: $Author: rt $ $Date: 2003-04-23 16:55:53 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -194,9 +194,13 @@ BOOL SbiImage::Load( SvStream& r )
//r >> aComment; //r >> aComment;
break; break;
case B_SOURCE: case B_SOURCE:
r.ReadByteString( aSource, eCharSet ); {
String aTmp;
r.ReadByteString( aTmp, eCharSet );
aOUSource = aTmp;
//r >> aSource; //r >> aSource;
break; break;
}
case B_PCODE: case B_PCODE:
if( bBadVer ) break; if( bBadVer ) break;
pCode = new char[ nLen ]; pCode = new char[ nLen ];
@@ -284,10 +288,16 @@ BOOL SbiImage::Save( SvStream& r )
SbiCloseRecord( r, nPos ); SbiCloseRecord( r, nPos );
} }
// Source? // Source?
if( aSource.Len() && SbiGood( r ) ) if( aOUSource.getLength() && SbiGood( r ) )
{ {
nPos = SbiOpenRecord( r, B_SOURCE, 1 ); nPos = SbiOpenRecord( r, B_SOURCE, 1 );
r.WriteByteString( aSource, eCharSet ); String aTmp;
sal_Int32 nLen = aOUSource.getLength();
if( nLen > STRING_MAXLEN )
aTmp = aOUSource.copy( 0, STRING_MAXLEN - 1 );
else
aTmp = aOUSource;
r.WriteByteString( aTmp, eCharSet );
//r << aSource; //r << aSource;
SbiCloseRecord( r, nPos ); SbiCloseRecord( r, nPos );
} }