diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 15:02:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 15:02:49 +0000 |
| commit | 9f465a0917add3997758bdfd9d9172b72a1f3e27 (patch) | |
| tree | 0029a4e74b88f105a3cc87eff93363fb06e61c1b /rsc | |
| parent | 6b828034bd8f2033013ebd3469359bfeafb49307 (diff) | |
INTEGRATION: CWS vcl80 (1.6.30); FILE MERGED
2007/07/10 09:38:49 pl 1.6.30.1: #i79411# coverity warnings (thanks cmc)
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/res/rscstr.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx index 6803482f2266..e584e8b9d115 100644 --- a/rsc/source/res/rscstr.cxx +++ b/rsc/source/res/rscstr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: rscstr.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-17 16:03:01 $ + * last change: $Author: hr $ $Date: 2007-07-31 16:02:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -266,10 +266,6 @@ BOOL RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ if( !bStrEmpty || !bDefStrEmpty ){ return FALSE; } - else if( !(bStrEmpty || bDefStrEmpty) ){ - if( strcmp( pData->pStr, pDefData->pStr ) ) - return FALSE; - } return TRUE; } } @@ -388,7 +384,7 @@ ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, } else { - if( ((RscStringInst *)rInst.pData)->pStr ) + if( ((RscStringInst *)rInst.pData)->pStr && pTC ) { char * pStr = RscChar::MakeUTF8( ((RscStringInst *)rInst.pData)->pStr, pTC->GetSourceCharSet() ); |