diff options
Diffstat (limited to 'svx/source/dialog/contwnd.cxx')
-rwxr-xr-x[-rw-r--r--] | svx/source/dialog/contwnd.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 1f0008e2ba95..3d7f091b9c5b 100644..100755 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <xoutbmp.hxx> +#include <svx/xoutbmp.hxx> #include <svx/dialogs.hrc> #include <svx/svxids.hrc> #include <contdlg.hrc> @@ -41,16 +41,16 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> // #i75482# -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" #define TRANSCOL Color( COL_WHITE ) ContourWindow::ContourWindow( Window* pParent, const ResId& rResId ) : GraphCtrl ( pParent, rResId ), aWorkRect ( 0, 0, 0, 0 ), - bPipetteMode ( FALSE ), - bWorkplaceMode ( FALSE ), - bClickValid ( FALSE ) + bPipetteMode ( sal_False ), + bWorkplaceMode ( sal_False ), + bClickValid ( sal_False ) { SetWinStyle( WB_SDRMODE ); } @@ -62,7 +62,7 @@ ContourWindow::~ContourWindow() void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly ) { SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 ); - const USHORT nPolyCount = rPolyPoly.Count(); + const sal_uInt16 nPolyCount = rPolyPoly.Count(); // First delete all drawing objects aPolyPoly = rPolyPoly; @@ -73,7 +73,7 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly ) pPage->Clear(); - for ( USHORT i = 0; i < nPolyCount; i++ ) + for ( sal_uInt16 i = 0; i < nPolyCount; i++ ) { basegfx::B2DPolyPolygon aPolyPolygon; aPolyPolygon.append(aPolyPoly[ i ].getB2DPolygon()); @@ -134,7 +134,7 @@ void ContourWindow::InitSdrModel() aSet.Put( XFillColorItem( String(), TRANSCOL ) ); aSet.Put( XFillTransparenceItem( 50 ) ); pView->SetAttributes( aSet ); - pView->SetFrameDragSingles( TRUE ); + pView->SetFrameDragSingles( sal_True ); } void ContourWindow::SdrObjCreated( const SdrObject& ) @@ -143,10 +143,10 @@ void ContourWindow::SdrObjCreated( const SdrObject& ) pView->CombineMarkedObjects( sal_False ); } -BOOL ContourWindow::IsContourChanged() const +sal_Bool ContourWindow::IsContourChanged() const { SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( pPage && pPage->GetObjCount() ) bRet = ( (SdrPathObj*) pPage->GetObj( 0 ) )->GetPathPoly().count() && pModel->IsChanged(); @@ -163,7 +163,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt ) SetPolyPolygon( PolyPolygon() ); aWorkRect = Rectangle( aLogPt, aLogPt ); Paint( Rectangle( Point(), GetGraphicSize() ) ); - SetEditMode( TRUE ); + SetEditMode( sal_True ); } if ( !bPipetteMode ) @@ -172,7 +172,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt ) void ContourWindow::MouseMove( const MouseEvent& rMEvt ) { - bClickValid = FALSE; + bClickValid = sal_False; if ( bPipetteMode ) { |