wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity

INTEGRATION: CWS ab14fixes (1.11.18); FILE MERGED

Browse Source 
2005/02/24 09:55:10 ab 1.11.18.1: #i42467# Changed SbiImage::GetString() to allow Strings containing a 0 char
This commit is contained in:
Rüdiger Timm
2005-03-29 10:47:59 +00:00
parent 3987754917
commit 039dbbcb96
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,9 +2,9 @@
*
* $RCSfile: image.cxx,v $
*
* $Revision: 1.11 $
* $Revision: 1.12 $
*
* last change: $Author: rt $ $Date: 2004-11-15 16:34:02 $
* last change: $Author: rt $ $Date: 2005-03-29 11:47:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -444,9 +444,27 @@ String SbiImage::GetString( short nId ) const
{
if( nId && nId <= nStrings )
{
USHORT nOff = pStringOff[ --nId ];
String aStr( pStrings + nOff );
return aStr;
USHORT nOff = pStringOff[ nId - 1 ];
sal_Unicode* pStr = pStrings + nOff;
// #i42467: Special treatment for vbNullChar
if( *pStr == 0 )
{
USHORT nNextOff = (nId < nStrings) ? pStringOff[ nId ] : nStringOff;
USHORT nLen = nNextOff - nOff - 1;
if( nLen == 1 )
{
// Force length 1 and make char 0 afterwards
String aNullCharStr( String::CreateFromAscii( " " ) );
aNullCharStr.SetChar( 0, 0 );
return aNullCharStr;
}
}
else
{
String aStr( pStr );
return aStr;
}
}
return String();
}