diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 13:45:23 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 13:45:23 +0000 |
| commit | 87fcca8138798ef5d8a6c766bae5a8ba34be8cfe (patch) | |
| tree | 1479a0f5118d24c0bf71b7ff718fd3213dad9f73 /xmloff/source/style/HatchStyle.cxx | |
| parent | ccb556ab0b8142c15aad257ffdf99fa7b53851de (diff) | |
INTEGRATION: CWS sb59 (1.13.6); FILE MERGED
2006/08/09 12:53:54 sb 1.13.6.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'xmloff/source/style/HatchStyle.cxx')
| -rw-r--r-- | xmloff/source/style/HatchStyle.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index af466de13667..e6cd71a95a8b 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -4,9 +4,9 @@ * * $RCSfile: HatchStyle.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: obo $ $Date: 2006-09-17 10:43:34 $ + * last change: $Author: obo $ $Date: 2006-10-12 14:45:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -177,14 +177,16 @@ sal_Bool XMLHatchStyleImport::importXML( case XML_TOK_HATCH_STYLE: { sal_uInt16 eValue; - if( (bHasStyle = rUnitConverter.convertEnum( eValue, rStrValue, pXML_HatchStyle_Enum )) ) + bHasStyle = rUnitConverter.convertEnum( eValue, rStrValue, pXML_HatchStyle_Enum ); + if( bHasStyle ) aHatch.Style = (drawing::HatchStyle) eValue; } break; case XML_TOK_HATCH_COLOR: { Color aColor; - if( (bHasColor = rUnitConverter.convertColor( aColor, rStrValue )) ) + bHasColor = rUnitConverter.convertColor( aColor, rStrValue ); + if( bHasColor ) aHatch.Color = (sal_Int32)( aColor.GetColor() ); } break; |