diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-09 10:30:18 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-09 10:30:18 +0000 |
| commit | f9c8ed60efb7feaf9ba359c963a3694170275f67 (patch) | |
| tree | 0739e1bbcb1556df14f3fea29d3944fc8737718c /goodies | |
| parent | 2e1ce5eb587f360970cddfb8890bed18867bc5a8 (diff) | |
INTEGRATION: CWS ooo20040815 (1.2.234); FILE MERGED
2004/08/04 13:04:57 waratah 1.2.234.1: #i32569# correct assignment bug in if clause
add a few initialisations
add a few clauses to case statements to be explicit that nothing happens
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/filter.vcl/icgm/actimpr.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/goodies/source/filter.vcl/icgm/actimpr.cxx b/goodies/source/filter.vcl/icgm/actimpr.cxx index c3d2f80fe570..f93848287ddd 100644 --- a/goodies/source/filter.vcl/icgm/actimpr.cxx +++ b/goodies/source/filter.vcl/icgm/actimpr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: actimpr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: sj $ $Date: 2000-12-15 12:21:54 $ + * last change: $Author: hr $ $Date: 2004-09-09 11:30:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -281,9 +281,9 @@ void CGMImpressOutAct::ImplSetFillBundle() drawing::LineStyle eLS; drawing::FillStyle eFS; - sal_uInt32 nEdgeColor; + sal_uInt32 nEdgeColor = 0; EdgeType eEdgeType; - double fEdgeWidth; + double fEdgeWidth = 0; sal_uInt32 nFillColor; FillInteriorStyle eFillStyle; @@ -347,7 +347,7 @@ void CGMImpressOutAct::ImplSetFillBundle() case FIS_GEOPATTERN : { - if ( mpCGM->pElement->eTransparency = T_ON ) + if ( mpCGM->pElement->eTransparency == T_ON ) nFillColor = mpCGM->pElement->nAuxiliaryColor; eFS = drawing::FillStyle_NONE; } @@ -920,7 +920,10 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha case TAV_NORMAL : aTextPos.Y -= ( mpCGM->pElement->nCharacterHeight * 1.5 ); case TAV_TOP : - break; + break; + case TAV_CAP: + case TAV_CONT: + break; // -Wall these two were not here. } if ( nWidth < 0 ) |