diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 14:03:21 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 14:03:21 +0000 |
| commit | 138f22328574e63f27abccf8fc1e0beb0f888816 (patch) | |
| tree | 701fdb6d4780490ed57c0c8b91244b9d43155aa1 /svx/source/dialog/contwnd.cxx | |
| parent | INTEGRATION: CWS warnings01 (1.4.220); FILE MERGED (diff) | |
| download | core-138f22328574e63f27abccf8fc1e0beb0f888816.tar.gz core-138f22328574e63f27abccf8fc1e0beb0f888816.zip | |
INTEGRATION: CWS warnings01 (1.7.220); FILE MERGED
2006/05/04 14:46:50 os 1.7.220.2: warnings removed
2006/04/20 14:49:34 cl 1.7.220.1: warning free code changes
Diffstat (limited to 'svx/source/dialog/contwnd.cxx')
| -rw-r--r-- | svx/source/dialog/contwnd.cxx | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 6331c12ebafe..1184d4a269cc 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -4,9 +4,9 @@ * * $RCSfile: contwnd.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 20:48:03 $ + * last change: $Author: hr $ $Date: 2006-06-19 15:03:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,8 +33,6 @@ * ************************************************************************/ -#pragma hdrstop - #ifndef _XOUTX_HXX //autogen #include <xoutx.hxx> #endif @@ -191,7 +189,7 @@ void ContourWindow::InitSdrModel() |* \************************************************************************/ -void ContourWindow::SdrObjCreated( const SdrObject& rObj ) +void ContourWindow::SdrObjCreated( const SdrObject& ) { pView->MarkAll(); pView->CombineMarkedObjects( FALSE ); @@ -252,7 +250,6 @@ void ContourWindow::MouseMove( const MouseEvent& rMEvt ) if ( bPipetteMode ) { const Point aLogPt( PixelToLogic( rMEvt.GetPosPixel() ) ); - const Link& rLink = GetMousePosLink(); aPipetteColor = GetPixel( aLogPt ); Control::MouseMove( rMEvt ); @@ -301,10 +298,10 @@ void ContourWindow::MouseButtonUp(const MouseEvent& rMEvt) if ( aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom() ) { - PolyPolygon aPolyPoly( GetPolyPolygon() ); + PolyPolygon _aPolyPoly( GetPolyPolygon() ); - aPolyPoly.Clip( aWorkRect ); - SetPolyPolygon( aPolyPoly ); + _aPolyPoly.Clip( aWorkRect ); + SetPolyPolygon( _aPolyPoly ); pView->SetWorkArea( aWorkRect ); } else @@ -346,14 +343,14 @@ void ContourWindow::Paint( const Rectangle& rRect ) if ( aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom() ) { - PolyPolygon aPolyPoly( 2, 2 ); + PolyPolygon _aPolyPoly( 2, 2 ); const Color aOldFillColor( GetFillColor() ); - aPolyPoly.Insert( Rectangle( Point(), GetGraphicSize() ) ); - aPolyPoly.Insert( aWorkRect ); + _aPolyPoly.Insert( Rectangle( Point(), GetGraphicSize() ) ); + _aPolyPoly.Insert( aWorkRect ); SetFillColor( COL_LIGHTRED ); - DrawTransparent( aPolyPoly, 50 ); + DrawTransparent( _aPolyPoly, 50 ); SetFillColor( aOldFillColor ); } |