diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 12:15:05 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 12:15:05 +0000 |
| commit | 5932b9d567f8a357be3164b611afe2b42b624abc (patch) | |
| tree | bdf65583ff817321827f8204d57c0f2573a48012 | |
| parent | 2afa40aad4bbcb59cd6a9a37da9ca0b598ca2ab7 (diff) | |
INTEGRATION: CWS aw024 (1.5.138); FILE MERGED
2006/10/27 12:13:55 aw 1.5.138.9: #i39528# ::basegfx -> basegfx adaption
2006/09/21 18:16:09 aw 1.5.138.8: RESYNC: (1.8-1.9); FILE MERGED
2006/07/04 12:07:57 aw 1.5.138.7: RESYNC: (1.7-1.8); FILE MERGED
2005/09/18 02:11:06 aw 1.5.138.6: RESYNC: (1.6-1.7); FILE MERGED
2005/05/25 09:50:47 aw 1.5.138.5: #i39529#
2005/05/12 16:39:18 aw 1.5.138.4: #i39529#
2005/04/26 15:04:05 aw 1.5.138.3: #i39528#
2005/03/23 23:54:33 aw 1.5.138.2: RESYNC: (1.5-1.6); FILE MERGED
2004/12/23 16:52:29 aw 1.5.138.1: #i39525
| -rw-r--r-- | svx/source/dialog/contwnd.cxx | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 36f695052a84..afea8486806b 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -4,9 +4,9 @@ * * $RCSfile: contwnd.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-09-17 04:13:27 $ + * last change: $Author: ihi $ $Date: 2006-11-14 13:15:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,6 +52,14 @@ #include <xfillit.hxx> #endif +#ifndef _BGFX_POLYGON_B2DPOLYGON_HXX +#include <basegfx/polygon/b2dpolygon.hxx> +#endif + +#ifndef _BGFX_POLYPOLYGON_B2DPOLYGONTOOLS_HXX +#include <basegfx/polygon/b2dpolypolygontools.hxx> +#endif + #ifdef MAC #define TRANSCOL Color( COL_LIGHTGRAY ) #else @@ -109,7 +117,9 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly ) for ( USHORT i = 0; i < nPolyCount; i++ ) { - SdrPathObj* pPathObj = new SdrPathObj( OBJ_PATHFILL, XPolygon( aPolyPoly[ i ] ) ); + basegfx::B2DPolyPolygon aPolyPolygon; + aPolyPolygon.append(aPolyPoly[ i ].getB2DPolygon()); + SdrPathObj* pPathObj = new SdrPathObj( OBJ_PATHFILL, aPolyPolygon ); if ( pPathObj ) { @@ -129,7 +139,7 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly ) if ( nPolyCount ) { pView->MarkAll(); - pView->CombineMarkedObjects( FALSE ); + pView->CombineMarkedObjects( sal_False ); } pModel->SetChanged( sal_False ); @@ -152,12 +162,9 @@ const PolyPolygon& ContourWindow::GetPolyPolygon() if ( pPage && pPage->GetObjCount() ) { - SdrPathObj* pPathObj = (SdrPathObj*) pPage->GetObj( 0 ); - const XPolyPolygon& rXPolyPoly = pPathObj->GetPathPoly(); - - for ( USHORT i = 0, nPolyCount = rXPolyPoly.Count(); i < nPolyCount; i++ ) - aPolyPoly.Insert( XOutCreatePolygon( rXPolyPoly.GetObject( i )) ); -//BFS09 aPolyPoly.Insert( XOutCreatePolygon( rXPolyPoly.GetObject( i ), NULL ) ); + SdrPathObj* pPathObj = (SdrPathObj*)pPage->GetObj(0L); + const basegfx::B2DPolyPolygon aB2DPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(pPathObj->GetPathPoly())); + aPolyPoly = PolyPolygon(aB2DPolyPolygon); } pModel->SetChanged( sal_False ); @@ -195,7 +202,7 @@ void ContourWindow::InitSdrModel() void ContourWindow::SdrObjCreated( const SdrObject& ) { pView->MarkAll(); - pView->CombineMarkedObjects( FALSE ); + pView->CombineMarkedObjects( sal_False ); } @@ -211,7 +218,7 @@ BOOL ContourWindow::IsContourChanged() const BOOL bRet = FALSE; if ( pPage && pPage->GetObjCount() ) - bRet = ( (SdrPathObj*) pPage->GetObj( 0 ) )->GetPathPoly().Count() && pModel->IsChanged(); + bRet = ( (SdrPathObj*) pPage->GetObj( 0 ) )->GetPathPoly().count() && pModel->IsChanged(); return bRet; } |