diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-13 11:05:45 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-13 13:15:03 +0200 |
| commit | b076bb1da6a370bcba7394d7349c73311130e335 (patch) | |
| tree | a14cae2ed5d528d825ca2f5db16dadf2f9ae88f9 | |
| parent | 6fc3c9a50dfb555ab806fa6cd35d433af4a36415 (diff) | |
Reduce scope of variable
Change-Id: Id55865a539c90ef7e1fa1a2da2cc614e71115e6c
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 77956dd91bcd..8b49de9e0bcf 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4517,9 +4517,9 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sAdjustmentValues ); if ( pAny && ( *pAny >>= seqAdjustmentValues ) && seqAdjustmentValues.getLength() > 1 ) { - double fNumber; if ( seqAdjustmentValues[ 0 ].State == css::beans::PropertyState_DIRECT_VALUE ) { + double fNumber; seqAdjustmentValues[ 0 ].Value >>= fNumber; nEndAngle = NormAngle360( - (sal_Int32)fNumber * 100 ); } @@ -4527,6 +4527,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r { //normal situation:if endAngle != 90,there will be a direct_value,but for damaged curve,the endAngle need to recalculate. Point cent = aPolyBoundRect.Center(); + double fNumber; if ( aStartPt.Y() == cent.Y() ) fNumber = ( aStartPt.X() >= cent.X() ) ? 0:180.0; else if ( aStartPt.X() == cent.X() ) @@ -4543,13 +4544,13 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r if ( seqAdjustmentValues[ 1 ].State == css::beans::PropertyState_DIRECT_VALUE ) { + double fNumber; seqAdjustmentValues[ 1 ].Value >>= fNumber; nStartAngle = NormAngle360( - (sal_Int32)fNumber * 100 ); } else { - fNumber = 0.0; - seqAdjustmentValues[ 1 ].Value <<= fNumber; + seqAdjustmentValues[ 1 ].Value <<= 0.0; seqAdjustmentValues[ 1 ].State = css::beans::PropertyState_DIRECT_VALUE; } |