diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-05-24 15:12:13 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-05-24 15:46:42 +0200 |
| commit | d5cbe627426cd28f48cdab9cdab5a33baeed4ed1 (patch) | |
| tree | bb51b9d5625e0c751950933237a0231d0177a231 /filter | |
| parent | f9b5115200123214a6922eb082f838ffe4d900be (diff) | |
cppcheck: redundantAssignment
Change-Id: I657ae67890a7266aa2655c366665ead61a744da6
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index dc72ec7bbfea..bb25efe38435 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4168,14 +4168,12 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r aObjData.aChildAnchor = Rectangle( l, o, r, u ); if ( !rGlobalChildRect.IsEmpty() && !rClientRect.IsEmpty() && rGlobalChildRect.GetWidth() && rGlobalChildRect.GetHeight() ) { - double fl = l; - double fo = o; double fWidth = r - l; double fHeight= u - o; double fXScale = (double)rClientRect.GetWidth() / (double)rGlobalChildRect.GetWidth(); double fYScale = (double)rClientRect.GetHeight() / (double)rGlobalChildRect.GetHeight(); - fl = ( ( l - rGlobalChildRect.Left() ) * fXScale ) + rClientRect.Left(); - fo = ( ( o - rGlobalChildRect.Top() ) * fYScale ) + rClientRect.Top(); + double fl = ( ( l - rGlobalChildRect.Left() ) * fXScale ) + rClientRect.Left(); + double fo = ( ( o - rGlobalChildRect.Top() ) * fYScale ) + rClientRect.Top(); fWidth *= fXScale; fHeight *= fYScale; aObjData.aChildAnchor = Rectangle( Point( (sal_Int32)fl, (sal_Int32)fo ), Size( (sal_Int32)( fWidth + 1 ), (sal_Int32)( fHeight + 1 ) ) ); @@ -4857,14 +4855,12 @@ void SvxMSDffManager::GetGroupAnchors( const DffRecordHeader& rHd, SvStream& rSt { if ( !rGlobalChildRect.IsEmpty() && !rClientRect.IsEmpty() && rGlobalChildRect.GetWidth() && rGlobalChildRect.GetHeight() ) { - double fl = l; - double fo = o; double fWidth = r - l; double fHeight= u - o; double fXScale = (double)rClientRect.GetWidth() / (double)rGlobalChildRect.GetWidth(); double fYScale = (double)rClientRect.GetHeight() / (double)rGlobalChildRect.GetHeight(); - fl = ( ( l - rGlobalChildRect.Left() ) * fXScale ) + rClientRect.Left(); - fo = ( ( o - rGlobalChildRect.Top() ) * fYScale ) + rClientRect.Top(); + double fl = ( ( l - rGlobalChildRect.Left() ) * fXScale ) + rClientRect.Left(); + double fo = ( ( o - rGlobalChildRect.Top() ) * fYScale ) + rClientRect.Top(); fWidth *= fXScale; fHeight *= fYScale; rGroupClientAnchor = Rectangle( Point( (sal_Int32)fl, (sal_Int32)fo ), Size( (sal_Int32)( fWidth + 1 ), (sal_Int32)( fHeight + 1 ) ) ); |