diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-08-15 13:16:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-08-15 13:16:13 +0000 |
| commit | 7eba412ca57c76ff3ab42c1f8a183bbf555f442c (patch) | |
| tree | 6828b89b44ef9b86e71db06be284d0b80707471d | |
| parent | 5c33a826f81ccca3ea829e7f7840571b693ee9ea (diff) | |
INTEGRATION: CWS pflin11 (1.13.22); FILE MERGED
2008/08/05 09:52:43 pflin 1.13.22.1: fix for i91911
| -rw-r--r-- | basic/source/sbx/sbxvalue.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index a93574577b27..03b3cbca0e6f 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: sbxvalue.cxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.14 $ * * This file is part of OpenOffice.org. * @@ -309,7 +309,7 @@ SbxValue& SbxValue::operator=( const SbxValue& r ) { // string -> byte array if( IsFixed() && (aData.eType == SbxOBJECT) - && aData.pObj && ( aData.pObj->GetType() & (SbxARRAY | SbxBYTE) ) + && aData.pObj && ( aData.pObj->GetType() == (SbxARRAY | SbxBYTE) ) && (r.aData.eType == SbxSTRING) ) { String aStr = r.GetString(); @@ -319,7 +319,7 @@ SbxValue& SbxValue::operator=( const SbxValue& r ) } // byte array -> string if( r.IsFixed() && (r.aData.eType == SbxOBJECT) - && r.aData.pObj && ( r.aData.pObj->GetType() & (SbxARRAY | SbxBYTE) ) + && r.aData.pObj && ( r.aData.pObj->GetType() == (SbxARRAY | SbxBYTE) ) && (aData.eType == SbxSTRING) ) { SbxBase* pObj = r.GetObject(); |