diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-28 07:51:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-30 11:47:41 +0200 |
| commit | c9d4a2887c13a5df244022276dd79a5bef8af0ea (patch) | |
| tree | fb849270affd5fca01fa26094c89595d18c6f588 | |
| parent | d17d4d48b5dc3332fd03f6ef186ed2bda4665e7c (diff) | |
fdo#82577: Handle PolyPolygon
Put the TOOLS PolyPolygon class in the tools namespace. Avoids clash with the Windows
PolyPolygon typedef.
Change-Id: I811ecbb3d55ba4ce66e4555a8586f60fcd57fb66
171 files changed, 715 insertions, 710 deletions
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx index 7d99fea243c8..78a722b092d8 100644 --- a/basegfx/source/polygon/b2dlinegeometry.cxx +++ b/basegfx/source/polygon/b2dlinegeometry.cxx @@ -47,7 +47,7 @@ namespace basegfx { B2DPolyPolygon aRetval; OSL_ENSURE(rCandidate.count() > 1L, "createAreaGeometryForLineStartEnd: Line polygon has too less points (!)"); - OSL_ENSURE(rArrow.count() > 0L, "createAreaGeometryForLineStartEnd: Empty arrow PolyPolygon (!)"); + OSL_ENSURE(rArrow.count() > 0L, "createAreaGeometryForLineStartEnd: Empty arrow tools::PolyPolygon (!)"); OSL_ENSURE(fWidth > 0.0, "createAreaGeometryForLineStartEnd: Width too small (!)"); OSL_ENSURE(fDockingPosition >= 0.0 && fDockingPosition <= 1.0, "createAreaGeometryForLineStartEnd: fDockingPosition out of range [0.0 .. 1.0] (!)"); diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx index c9f1587634e1..7dc42139b927 100644 --- a/basegfx/source/polygon/b2dpolygonclipper.cxx +++ b/basegfx/source/polygon/b2dpolygonclipper.cxx @@ -474,7 +474,7 @@ namespace basegfx else { // use common aIntersectionRange as result, convert - // to expected PolyPolygon form + // to expected tools::PolyPolygon form return basegfx::B2DPolyPolygon( basegfx::tools::createPolygonFromRect(aIntersectionRange)); } @@ -489,7 +489,7 @@ namespace basegfx // Also get rid of some not-needed polygons (neutral, no area -> when // no intersections, these are tubes). // Now it is possible to correct the orientations in the cut-free - // polygons to values corresponding to painting the PolyPolygon with + // polygons to values corresponding to painting the tools::PolyPolygon with // a XOR-WindingRule. aMergePolyPolygonA = solveCrossovers(aMergePolyPolygonA); aMergePolyPolygonA = stripNeutralPolygons(aMergePolyPolygonA); diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx index 8b5c9540e406..3c5f80d470f4 100644 --- a/basegfx/source/polygon/b2dpolygontools.cxx +++ b/basegfx/source/polygon/b2dpolygontools.cxx @@ -3449,7 +3449,7 @@ namespace basegfx OSL_ENSURE(com::sun::star::drawing::PolygonFlags_CONTROL != ePolygonFlag && bControlA == bControlB, "UnoPolygonBezierCoordsToB2DPolygon: Illegal source polygon (!)"); - // the previous writes used the B2DPolyPoygon -> PolyPolygon converter + // the previous writes used the B2DPolyPoygon -> tools::PolyPolygon converter // which did not create minimal PolyPolygons, but created all control points // as null vectors (identical points). Because of the former P(CA)(CB)-norm of // B2DPolygon and it's unused sign of being the zero-vector and CA and CB being diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx index b49f3c6cd1de..3b80c0bc1bd7 100644 --- a/basegfx/source/polygon/b2dtrapezoid.cxx +++ b/basegfx/source/polygon/b2dtrapezoid.cxx @@ -944,7 +944,7 @@ namespace basegfx { namespace tools { - // convert Source PolyPolygon to trapezoids + // convert Source tools::PolyPolygon to trapezoids void trapezoidSubdivide(B2DTrapezoidVector& ro_Result, const B2DPolyPolygon& rSourcePolyPolygon) { trapezoidhelper::TrapezoidSubdivider aTrapezoidSubdivider(rSourcePolyPolygon); diff --git a/basegfx/source/tools/unotools.cxx b/basegfx/source/tools/unotools.cxx index c1c5044070be..f5b1e273b8f4 100644 --- a/basegfx/source/tools/unotools.cxx +++ b/basegfx/source/tools/unotools.cxx @@ -110,7 +110,7 @@ namespace unotools if(drawing::PolygonFlags_CONTROL == ePolyFlag || bControlA != bControlB) throw lang::IllegalArgumentException(); - // the previous writes used the B2DPolyPoygon -> PolyPolygon converter + // the previous writes used the B2DPolyPoygon -> tools::PolyPolygon converter // which did not create minimal PolyPolygons, but created all control points // as null vectors (identical points). Because of the former P(CA)(CB)-norm of // B2DPolygon and it's unused sign of being the zero-vector and CA and CB being diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index 41f2f85d4538..e4117525e9ff 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -147,7 +147,7 @@ namespace cairocanvas ::basegfx::unotools::homMatrixFromAffineMatrix( aMatrix, viewState.AffineTransform ) ); - aClipRegion = vcl::Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) ); + aClipRegion = vcl::Region::GetRegionFromPolyPolygon( tools::PolyPolygon( aClipPoly ) ); } } @@ -166,7 +166,7 @@ namespace cairocanvas if( aClipPoly.count() ) { // setup non-empty clipping - vcl::Region aRegion = vcl::Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) ); + vcl::Region aRegion = vcl::Region::GetRegionFromPolyPolygon( tools::PolyPolygon( aClipPoly ) ); if( aClipRegion.IsEmpty() ) aClipRegion = aRegion; diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index b565d8c598a4..0a61a8422812 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -171,7 +171,7 @@ namespace dxcanvas } aClipPoly.transform(aMatrix); - const vcl::Region& rClipRegion = vcl::Region(PolyPolygon(aClipPoly)); + const vcl::Region& rClipRegion = vcl::Region(tools::PolyPolygon(aClipPoly)); aVirtualDevice.IntersectClipRegion(rClipRegion); } @@ -179,7 +179,7 @@ namespace dxcanvas { ::basegfx::B2DPolyPolygon aClipPoly(dxcanvas::tools::polyPolygonFromXPolyPolygon2D(rRenderState.Clip)); aClipPoly.transform(aWorldTransform); - const vcl::Region& rClipRegion = vcl::Region(PolyPolygon(aClipPoly)); + const vcl::Region& rClipRegion = vcl::Region(tools::PolyPolygon(aClipPoly)); aVirtualDevice.IntersectClipRegion(rClipRegion); } diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index 30f616dda0ad..86ecacdce683 100644 --- a/canvas/source/directx/dx_winstuff.hxx +++ b/canvas/source/directx/dx_winstuff.hxx @@ -50,7 +50,6 @@ #define ULONG win32ULONG #define GradientStyle_RECT win32GradientStyle_RECT #define Polygon win32Polygon -#define PolyPolygon win32PolyPolygon #undef WB_LEFT #undef WB_RIGHT diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 29e4dadb66d0..9510d7e57a3e 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -294,7 +294,7 @@ namespace vclcanvas const ::basegfx::B2DPolyPolygon& rPolyPoly( ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon) ); - const PolyPolygon aPolyPoly( tools::mapPolyPolygon( rPolyPoly, viewState, renderState ) ); + const ::tools::PolyPolygon aPolyPoly( tools::mapPolyPolygon( rPolyPoly, viewState, renderState ) ); if( rPolyPoly.isClosed() ) { @@ -419,7 +419,7 @@ namespace vclcanvas // user coordinates. aStrokedPolyPoly.transform( aMatrix ); - const PolyPolygon aVCLPolyPoly( aStrokedPolyPoly ); + const ::tools::PolyPolygon aVCLPolyPoly( aStrokedPolyPoly ); // TODO(F2): When using alpha here, must handle that via // temporary surface or somesuch. @@ -504,7 +504,7 @@ namespace vclcanvas ::basegfx::B2DPolyPolygon aB2DPolyPoly( ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon)); aB2DPolyPoly.setClosed(true); // ensure closed poly, otherwise VCL does not fill - const PolyPolygon aPolyPoly( tools::mapPolyPolygon( + const ::tools::PolyPolygon aPolyPoly( tools::mapPolyPolygon( aB2DPolyPoly, viewState, renderState ) ); const bool bSourceAlpha( renderState.CompositeOperation == rendering::CompositeOperation::SOURCE ); @@ -1247,7 +1247,7 @@ namespace vclcanvas ::basegfx::unotools::homMatrixFromAffineMatrix( aMatrix, viewState.AffineTransform ) ); - aClipRegion = vcl::Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) ); + aClipRegion = vcl::Region::GetRegionFromPolyPolygon( ::tools::PolyPolygon( aClipPoly ) ); } else { @@ -1270,7 +1270,7 @@ namespace vclcanvas if( aClipPoly.count() ) { // setup non-empty clipping - vcl::Region aRegion = vcl::Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) ); + vcl::Region aRegion = vcl::Region::GetRegionFromPolyPolygon( ::tools::PolyPolygon( aClipPoly ) ); aClipRegion.Intersect( aRegion ); } else diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 103302593f6f..7f6ff6381779 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -417,7 +417,7 @@ namespace vclcanvas // here, keep it all the way and only change the vertex values // in the loop below (as ::Polygon is a pimpl class, creating // one every loop turn would really stress the mem allocator) - ::PolyPolygon aTempPolyPoly; + ::tools::PolyPolygon aTempPolyPoly; ::Polygon aTempPoly2( static_cast<sal_uInt16>(nNumPoints+1) ); aTempPoly2[0] = rBounds.TopLeft(); @@ -540,7 +540,7 @@ namespace vclcanvas OutputDevice* p2ndOutDev, const ::canvas::ParametricPolyPolygon::Values& rValues, const std::vector< ::Color >& rColors, - const PolyPolygon& rPoly, + const ::tools::PolyPolygon& rPoly, const rendering::ViewState& viewState, const rendering::RenderState& renderState, const rendering::Texture& texture, @@ -675,7 +675,7 @@ namespace vclcanvas tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev ); const int nTransparency( setupOutDevState( viewState, renderState, IGNORE_COLOR ) ); - PolyPolygon aPolyPoly( tools::mapPolyPolygon( + ::tools::PolyPolygon aPolyPoly( tools::mapPolyPolygon( ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon), viewState, renderState ) ); diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx index 673407ba7294..4167d1f19eb6 100644 --- a/canvas/source/vcl/impltools.cxx +++ b/canvas/source/vcl/impltools.cxx @@ -150,7 +150,7 @@ namespace vclcanvas return true; } - bool isRectangle( const PolyPolygon& rPolyPoly ) + bool isRectangle( const ::tools::PolyPolygon& rPolyPoly ) { // exclude some cheap cases first if( rPolyPoly.Count() != 1 ) @@ -184,7 +184,7 @@ namespace vclcanvas return ::vcl::unotools::pointFromB2DPoint( aPoint ); } - ::PolyPolygon mapPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly, + ::tools::PolyPolygon mapPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly, const rendering::ViewState& rViewState, const rendering::RenderState& rRenderState ) { @@ -197,7 +197,7 @@ namespace vclcanvas aTemp.transform( aMatrix ); - return ::PolyPolygon( aTemp ); + return ::tools::PolyPolygon( aTemp ); } ::BitmapEx transformBitmap( const BitmapEx& rBitmap, diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx index 3b7eac05b3c6..059495523db0 100644 --- a/canvas/source/vcl/impltools.hxx +++ b/canvas/source/vcl/impltools.hxx @@ -95,7 +95,7 @@ namespace vclcanvas @return true, if the polygon is a rectangle. */ - bool isRectangle( const PolyPolygon& rPolyPoly ); + bool isRectangle( const ::tools::PolyPolygon& rPolyPoly ); // Little helper to encapsulate locking into policy class @@ -167,7 +167,7 @@ namespace vclcanvas const ::com::sun::star::rendering::ViewState& rViewState, const ::com::sun::star::rendering::RenderState& rRenderState ); - ::PolyPolygon mapPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly, + ::tools::PolyPolygon mapPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly, const ::com::sun::star::rendering::ViewState& rViewState, const ::com::sun::star::rendering::RenderState& rRenderState ); diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index ebbd8142d75c..523e4aa37a68 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -259,7 +259,7 @@ namespace vclcanvas rTargetSurface.SetLineColor( Color( 0,255,0 ) ); rTargetSurface.SetFillColor(); - rTargetSurface.DrawPolyPolygon(PolyPolygon(aClipPoly)); // #i76339# + rTargetSurface.DrawPolyPolygon(::tools::PolyPolygon(aClipPoly)); // #i76339# } vcl::Region aClipRegion( aClipPoly ); @@ -302,7 +302,7 @@ namespace vclcanvas if( mbShowSpriteBounds ) { - ::PolyPolygon aMarkerPoly( + ::tools::PolyPolygon aMarkerPoly( ::canvas::tools::getBoundMarksPolyPolygon( ::basegfx::B2DRectangle(aOutPos.X(), aOutPos.Y(), diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index ac8869abdb7d..b8ca6b4675c3 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -282,7 +282,7 @@ class DemoRenderer aStrokeAttrs.StartCapType = rendering::PathCapType::BUTT; aStrokeAttrs.EndCapType = rendering::PathCapType::BUTT; aStrokeAttrs.JoinType = rendering::PathJoinType::MITER; - //fprintf( stderr, "FIXME: stroking a PolyPolygon doesn't show up\n" ); + //fprintf( stderr, "FIXME: stroking a tools::PolyPolygon doesn't show up\n" ); //yes it does mxCanvas->strokePolyPolygon( xPP, maViewState, aRenderState, aStrokeAttrs ); // FIXME: do this instead: diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 865c95e8257c..b165b442f895 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -85,7 +85,7 @@ void ShapeFactory::setPageSize(uno::Reference< drawing::XShapes >, const awt::Si { } -// diverse PolyPolygon create methods +// diverse tools::PolyPolygon create methods uno::Any createPolyPolygon_Cube( const drawing::Direction3D& rSize, double fRoundedEdge, bool bRounded = true ) diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index fe3d639e732e..88e7e5cc38aa 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -38,7 +38,7 @@ class VirtualDevice; class Gradient; class Rectangle; namespace vcl { class Font; } -class PolyPolygon; +namespace tools { class PolyPolygon; } class Point; class MetaCommentAction; @@ -259,7 +259,7 @@ static float GetSwapFloat( SvStream& rSt ) const char* pCommentString, sal_uInt16 nType ) const; - void createGradientAction( const ::PolyPolygon& rPoly, + void createGradientAction( const ::tools::PolyPolygon& rPoly, const ::Gradient& rGradient, const ActionFactoryParameters& rParms, bool bIsPolygonRectangle, diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index e5c622367cec..1437f32a0832 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -492,7 +492,7 @@ namespace cppcanvas return bRet; } - void ImplRenderer::createGradientAction( const ::PolyPolygon& rPoly, + void ImplRenderer::createGradientAction( const ::tools::PolyPolygon& rPoly, const ::Gradient& rGradient, const ActionFactoryParameters& rParms, bool bIsPolygonRectangle, @@ -1743,7 +1743,7 @@ namespace cppcanvas aTexture.RepeatModeY = rendering::TexturingMode::NONE; } - ::PolyPolygon aPath; + ::tools::PolyPolygon aPath; aFill.getPath( aPath ); ::basegfx::B2DPolyPolygon aPoly( aPath.getB2DPolyPolygon() ); diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 8d7032505268..6a207b895a53 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -2417,7 +2417,7 @@ namespace if(pA->IsClipping()) { - // new clipping. Get PolyPolygon and transform with current transformation + // new clipping. Get tools::PolyPolygon and transform with current transformation basegfx::B2DPolyPolygon aNewClipPolyPolygon(getB2DPolyPolygonFromRegion(pA->GetRegion())); aNewClipPolyPolygon.transform(rPropertyHolders.Current().getTransformation()); diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index 3dd582169a5a..e8f5e18bffab 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -266,7 +266,7 @@ namespace drawinglayer for(sal_uInt32 b(0L); b < aAreaPolyPolygon.count(); b++) { // put into single polyPolygon primitives to make clear that this is NOT meant - // to be painted as a single PolyPolygon (XORed as fill rule). Alternatively, a + // to be painted as a single tools::PolyPolygon (XORed as fill rule). Alternatively, a // melting process may be used here one day. const basegfx::B2DPolyPolygon aNewPolyPolygon(aAreaPolyPolygon.getB2DPolygon(b)); static bool bTestByUsingRandomColor(false); diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx index 4cd12f046551..607c4116dafb 100644 --- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx @@ -543,7 +543,7 @@ namespace drawinglayer } else { - OSL_ENSURE(bSamePolygonCount, "Slice PolyPolygon with different Polygon count (!)"); + OSL_ENSURE(bSamePolygonCount, "Slice tools::PolyPolygon with different Polygon count (!)"); OSL_ENSURE(bSamePointCount, "Slice Polygon with different point count (!)"); } } diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 5e368fba4bf5..14a1a6ec8ed5 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -213,11 +213,11 @@ namespace Needed to fix fdo#37559 @param rPoly - PolyPolygon to filter + tools::PolyPolygon to filter @return converted tools PolyPolygon, w/o one-point fills */ - PolyPolygon getFillPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly ) + tools::PolyPolygon getFillPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly ) { // filter input rPoly basegfx::B2DPolyPolygon aPoly; @@ -228,7 +228,7 @@ namespace if( !aCandidate.isClosed() || aCandidate.count() > 1 ) aPoly.append(aCandidate); } - return PolyPolygon(aPoly); + return tools::PolyPolygon(aPoly); } } // end of anonymous namespace @@ -521,8 +521,8 @@ namespace drawinglayer pRetval = new SvtGraphicStroke( Polygon(aLocalPolygon), - PolyPolygon(aStartArrow), - PolyPolygon(aEndArrow), + tools::PolyPolygon(aStartArrow), + tools::PolyPolygon(aEndArrow), mfCurrentUnifiedTransparence, fLineWidth, eCap, @@ -590,7 +590,7 @@ namespace drawinglayer is rendered by VCL (and thus fragmented to polygon color actions and others). On that base, e.g. the Metafile to SdrObject import creates it's gradient objects. Best (and safest) way to support it here is to use PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D, - map it back to the corresponding tools PolyPolygon and the Gradient and just call + map it back to the corresponding tools tools::PolyPolygon and the Gradient and just call OutputDevice::DrawGradient which creates the necessary compatible actions. XPATHFILL_SEQ_BEGIN, XPATHFILL_SEQ_END: @@ -624,7 +624,7 @@ namespace drawinglayer contained path accordingly. The other one is SdrObject::Imp_DrawLineGeometry. It's done when MetaFile is set at OutDev and only when geometry is a single polygon (!). I see no reason for that; in the PS exporter this - would hinder to make use of PolyPolygon strokes. I will need to add support at: + would hinder to make use of tools::PolyPolygon strokes. I will need to add support at: PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D PRIMITIVE2D_ID_POLYGONSTROKEARROWPRIMITIVE2D @@ -1541,7 +1541,7 @@ namespace drawinglayer // #i111954# do NOT use decomposition, but use direct VCL-command // process(rCandidate.get2DDecomposition(getViewInformation2D())); - const PolyPolygon aToolsPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon)); + const tools::PolyPolygon aToolsPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon)); const HatchStyle aHatchStyle( attribute::HATCHSTYLE_SINGLE == rFillHatchAttribute.getStyle() ? HATCH_SINGLE : attribute::HATCHSTYLE_DOUBLE == rFillHatchAttribute.getStyle() ? HATCH_DOUBLE : @@ -1616,7 +1616,7 @@ namespace drawinglayer // necessary to again remove this subdivision since it decreases possible // printing quality (not even resolution-dependent for now). THB will tell // me when that task is fixed in the master - const PolyPolygon aToolsPolyPolygon( + const tools::PolyPolygon aToolsPolyPolygon( getFillPolyPolygon( basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon))); @@ -1848,7 +1848,7 @@ namespace drawinglayer // Check also for correct ID to exclude derived implementations if(pPoPoColor && PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D == pPoPoColor->getPrimitive2DID()) { - // single transparent PolyPolygon identified, use directly + // single transparent tools::PolyPolygon identified, use directly const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(pPoPoColor->getBColor())); basegfx::B2DPolyPolygon aLocalPolyPolygon(pPoPoColor->getB2DPolyPolygon()); @@ -1900,7 +1900,7 @@ namespace drawinglayer } mpOutputDevice->DrawTransparent( - PolyPolygon(aLocalPolyPolygon), + tools::PolyPolygon(aLocalPolyPolygon), nTransPercentVcl); if(bSupportSvtGraphicFill) diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx index 1879a64637d5..95ff674980d9 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx @@ -95,7 +95,7 @@ namespace drawinglayer /// Convert the fWidth to the same space as its coordinates. double getTransformedLineWidth( double fWidth ) const; - /// the current clipping PolyPolygon from MaskPrimitive2D + /// the current clipping tools::PolyPolygon from MaskPrimitive2D basegfx::B2DPolyPolygon maClipPolyPolygon; /// the target MetaFile diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 1a4db9512bd5..79351ce96363 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -782,7 +782,7 @@ namespace drawinglayer } else { - // direct draw of PolyPolygon with color + // direct draw of tools::PolyPolygon with color const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(rPolyPolygonColorPrimitive2D.getBColor())); mpOutputDevice->SetFillColor(Color(aPolygonColor)); @@ -898,7 +898,7 @@ namespace drawinglayer { case PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D: { - // single transparent PolyPolygon identified, use directly + // single transparent tools::PolyPolygon identified, use directly const primitive2d::PolyPolygonColorPrimitive2D* pPoPoColor = static_cast< const primitive2d::PolyPolygonColorPrimitive2D* >(pBasePrimitive); OSL_ENSURE(pPoPoColor, "OOps, PrimitiveID and PrimitiveType do not match (!)"); bDrawTransparentUsed = tryDrawPolyPolygonColorPrimitive2DDirect(*pPoPoColor, rUniTransparenceCandidate.getTransparence()); @@ -1149,7 +1149,7 @@ namespace drawinglayer ::Hatch aVCLHatch(eHatchStyle, Color(rFillHatchAttributes.getColor()), nDistance, nAngle10); // draw hatch using VCL - mpOutputDevice->DrawHatch(PolyPolygon(Polygon(aHatchPolygon)), aVCLHatch); + mpOutputDevice->DrawHatch(tools::PolyPolygon(Polygon(aHatchPolygon)), aVCLHatch); } break; } diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index c05efd3915cc..0f92e6337d73 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -707,7 +707,7 @@ namespace drawinglayer // a single polygon fill. The form of the fill depends on tiling if(rFillGraphicAttribute.getTiling()) { - // with tiling, fill the whole PolyPolygon with the modifier color + // with tiling, fill the whole tools::PolyPolygon with the modifier color basegfx::B2DPolyPolygon aLocalPolyPolygon(rPolyPolygon); aLocalPolyPolygon.transform(maCurrentTransformation); @@ -718,7 +718,7 @@ namespace drawinglayer else { // without tiling, only the area common to the bitmap tile and the - // PolyPolygon is filled. Create the bitmap tile area in object + // tools::PolyPolygon is filled. Create the bitmap tile area in object // coordinates. For this, the object transformation needs to be created // from the already scaled PolyPolygon. The tile area in object // coordinates wil always be non-rotated, so it's not necessary to diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index d9d5810b9019..d636c5d2338e 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -153,9 +153,9 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, vcl::Region* pRegion, Ou // but someone switches the update mode! // pRegion: When not NULL, then only calculate Region. - PolyPolygon* pPolyPoly = NULL; + tools::PolyPolygon* pPolyPoly = NULL; if ( pRegion ) - pPolyPoly = new PolyPolygon; + pPolyPoly = new tools::PolyPolygon; OutputDevice* pTarget = pTargetDevice ? pTargetDevice : pOutWin; bool bClipRegion = pTarget->IsClipRegion(); @@ -301,7 +301,7 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, vcl::Region* pRegion, Ou } } -void ImpEditView::ImplDrawHighlightRect( OutputDevice* _pTarget, const Point& rDocPosTopLeft, const Point& rDocPosBottomRight, PolyPolygon* pPolyPoly ) +void ImpEditView::ImplDrawHighlightRect( OutputDevice* _pTarget, const Point& rDocPosTopLeft, const Point& rDocPosBottomRight, tools::PolyPolygon* pPolyPoly ) { if ( rDocPosTopLeft.X() != rDocPosBottomRight.X() ) { diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 2e3a1cc04bf1..4e93d9322d4e 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -260,7 +260,7 @@ protected: void ShowDDCursor( const Rectangle& rRect ); void HideDDCursor(); - void ImplDrawHighlightRect( OutputDevice* _pTarget, const Point& rDocPosTopLeft, const Point& rDocPosBottomRight, PolyPolygon* pPolyPoly ); + void ImplDrawHighlightRect( OutputDevice* _pTarget, const Point& rDocPosTopLeft, const Point& rDocPosBottomRight, tools::PolyPolygon* pPolyPoly ); public: ImpEditView( EditView* pView, EditEngine* pEng, vcl::Window* pWindow ); diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx index ac27c223c1ea..7312bff66891 100644 --- a/editeng/source/misc/txtrange.cxx +++ b/editeng/source/misc/txtrange.cxx @@ -44,7 +44,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, bVertical( bVert ) { sal_uInt32 nCount(rPolyPolygon.count()); - mpPolyPolygon = new PolyPolygon( (sal_uInt16)nCount ); + mpPolyPolygon = new tools::PolyPolygon( (sal_uInt16)nCount ); for(sal_uInt32 i(0L); i < nCount; i++) { @@ -56,7 +56,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, if( pLinePolyPolygon ) { nCount = pLinePolyPolygon->count(); - mpLinePolyPolygon = new PolyPolygon(); + mpLinePolyPolygon = new tools::PolyPolygon(); for(sal_uInt32 i(0L); i < nCount; i++) { @@ -135,8 +135,8 @@ public: { if( nMin > nL ) nMin = nL; if( nMax < nR ) nMax = nR; } sal_uInt16 Area( const Point& rPt ); void NoteUpLow( long nA, const sal_uInt8 nArea ); - void Calc( const PolyPolygon& rPoly ); - void Concat( const PolyPolygon* pPoly ); + void Calc( const tools::PolyPolygon& rPoly ); + void Concat( const tools::PolyPolygon* pPoly ); // inlines void NoteLast() { if( bMultiple ) NoteRange( nAct == nFirst ); } void SetClosed( const bool bNew ){ bClosed = bNew; } @@ -300,7 +300,7 @@ void SvxBoundArgs::NoteRange( bool bToggle ) } } -void SvxBoundArgs::Calc( const PolyPolygon& rPoly ) +void SvxBoundArgs::Calc( const tools::PolyPolygon& rPoly ) { sal_uInt16 nCount; nAct = 0; @@ -488,7 +488,7 @@ void SvxBoundArgs::Add() } } -void SvxBoundArgs::Concat( const PolyPolygon* pPoly ) +void SvxBoundArgs::Concat( const tools::PolyPolygon* pPoly ) { SetConcat( true ); DBG_ASSERT( pPoly, "Nothing to do?" ); diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index de866c4dac6d..ded932b424ac 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -334,13 +334,13 @@ sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf, sal_Int16 x, sal_Int16 sal_uInt16 Writer::defineShape( const Polygon& rPoly, const FillStyle& rFillStyle ) { - const PolyPolygon aPolyPoly( rPoly ); + const tools::PolyPolygon aPolyPoly( rPoly ); return defineShape( aPolyPoly, rFillStyle ); } -sal_uInt16 Writer::defineShape( const PolyPolygon& rPolyPoly, const FillStyle& rFillStyle ) +sal_uInt16 Writer::defineShape( const tools::PolyPolygon& rPolyPoly, const FillStyle& rFillStyle ) { sal_uInt16 nShapeId = createID(); @@ -384,7 +384,7 @@ sal_uInt16 Writer::defineShape( const PolyPolygon& rPolyPoly, const FillStyle& r -sal_uInt16 Writer::defineShape( const PolyPolygon& rPolyPoly, sal_uInt16 nLineWidth, const Color& rLineColor ) +sal_uInt16 Writer::defineShape( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nLineWidth, const Color& rLineColor ) { sal_uInt16 nShapeId = createID(); diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 9e63078ecc85..efa22470216b 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -41,7 +41,7 @@ class GDIMetaFile; class BitmapEx; -class PolyPolygon; +namespace tools { class PolyPolygon; } class Gradient; class SvtGraphicFill; class SvtGraphicStroke; @@ -273,7 +273,7 @@ public: void storeTo( com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutStream ); // geometry - void setClipping( const PolyPolygon* pClipPolyPolygon ); + void setClipping( const tools::PolyPolygon* pClipPolyPolygon ); /** defines a flash shape from a filled polygon. The coordinates must be in twips */ @@ -281,11 +281,11 @@ public: /** defines a flash shape from a filled polypolygon. The coordinates must be in twips */ - sal_uInt16 defineShape( const PolyPolygon& rPolyPoly, const FillStyle& rFillStyle ); + sal_uInt16 defineShape( const tools::PolyPolygon& rPolyPoly, const FillStyle& rFillStyle ); /** defines a flash shape from a outlined polypolygon. The coordinates must be in twips */ - sal_uInt16 defineShape( const PolyPolygon& rPolyPoly, sal_uInt16 nLineWidth, const Color& rLineColor ); + sal_uInt16 defineShape( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nLineWidth, const Color& rLineColor ); /** defines a flash shape from a vcl metafile. The mapmode of the metafile is used to map all coordinates to twips. @@ -329,7 +329,7 @@ public: private: Point map( const Point& rPoint ) const; Size map( const Size& rSize ) const; - void map( PolyPolygon& rPolyPolygon ) const; + void map( tools::PolyPolygon& rPolyPolygon ) const; sal_Int32 mapRelative( sal_Int32 n100thMM ) const; void startTag( sal_uInt8 nTagId ); @@ -343,11 +343,11 @@ private: void Impl_writeActions( const GDIMetaFile& rMtf ); void Impl_writePolygon( const Polygon& rPoly, bool bFilled ); void Impl_writePolygon( const Polygon& rPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor ); - void Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, sal_uInt8 nTransparence = 0); - void Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor ); + void Impl_writePolyPolygon( const tools::PolyPolygon& rPolyPoly, bool bFilled, sal_uInt8 nTransparence = 0); + void Impl_writePolyPolygon( const tools::PolyPolygon& rPolyPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor ); void Impl_writeText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth ); void Impl_writeText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth, Color aTextColor ); - void Impl_writeGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); + void Impl_writeGradientEx( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ); void Impl_writeLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor = NULL ); void Impl_writeRect( const Rectangle& rRect, long nRadX, long nRadY ); void Impl_writeEllipse( const Point& rCenter, long nRadX, long nRadY ); @@ -397,7 +397,7 @@ private: VirtualDevice* mpVDev; - const PolyPolygon* mpClipPolyPolygon; + const tools::PolyPolygon* mpClipPolyPolygon; /** holds the information of the objects defined in the movie stream while executing defineShape diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 89c0c22cc2f4..f2cf9e65b6b5 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -84,7 +84,7 @@ Size Writer::map( const Size& rSize ) const -void Writer::map( PolyPolygon& rPolyPolygon ) const +void Writer::map( tools::PolyPolygon& rPolyPolygon ) const { const sal_uInt16 nPolyCount = rPolyPolygon.Count(); if( nPolyCount ) @@ -262,7 +262,7 @@ void Writer::Impl_addEndShapeRecord( BitStream& rBits ) void Writer::Impl_writePolygon( const Polygon& rPoly, bool bFilled ) { - PolyPolygon aPolyPoly( rPoly ); + tools::PolyPolygon aPolyPoly( rPoly ); Impl_writePolyPolygon( aPolyPoly, bFilled ); } @@ -270,13 +270,13 @@ void Writer::Impl_writePolygon( const Polygon& rPoly, bool bFilled ) void Writer::Impl_writePolygon( const Polygon& rPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor ) { - PolyPolygon aPolyPoly( rPoly ); + tools::PolyPolygon aPolyPoly( rPoly ); Impl_writePolyPolygon( aPolyPoly, bFilled, rFillColor, rLineColor ); } -void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, sal_uInt8 nTransparence /* = 0 */ ) +void Writer::Impl_writePolyPolygon( const tools::PolyPolygon& rPolyPoly, bool bFilled, sal_uInt8 nTransparence /* = 0 */ ) { Color aLineColor( mpVDev->GetLineColor() ); if( 0 == aLineColor.GetTransparency() ) @@ -289,9 +289,9 @@ void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, -void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor ) +void Writer::Impl_writePolyPolygon( const tools::PolyPolygon& rPolyPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor ) { - PolyPolygon aPolyPoly( rPolyPoly ); + tools::PolyPolygon aPolyPoly( rPolyPoly ); if( aPolyPoly.Count() ) { @@ -325,11 +325,11 @@ void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, /** A gradient is a transition from one color to another, rendered inside a given polypolygon */ -void Writer::Impl_writeGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient ) +void Writer::Impl_writeGradientEx( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ) { if( rPolyPoly.Count() ) { - PolyPolygon aPolyPolygon( rPolyPoly ); + tools::PolyPolygon aPolyPolygon( rPolyPoly ); map( aPolyPolygon ); if( (rGradient.GetStyle() == GradientStyle_LINEAR && rGradient.GetAngle() == 900) || (rGradient.GetStyle() == GradientStyle_RADIAL) ) @@ -359,7 +359,7 @@ void Writer::Impl_writeGradientEx( const PolyPolygon& rPolyPoly, const Gradient& -void Writer::setClipping( const PolyPolygon* pClipPolyPolygon ) +void Writer::setClipping( const tools::PolyPolygon* pClipPolyPolygon ) { mpClipPolyPolygon = pClipPolyPolygon; } @@ -516,7 +516,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon if( bRTL || (nScriptType != ScriptType::LATIN) ) { // todo: optimize me as this will generate a huge amount of duplicate polygons - PolyPolygon aPolyPoygon; + tools::PolyPolygon aPolyPoygon; mpVDev->GetTextOutline( aPolyPoygon, rText, 0, 0, (sal_uInt16)nLen, true, nWidth, pDXArray ); aPolyPoygon.Translate( rPos ); Impl_writePolyPolygon( aPolyPoygon, true, aTextColor, aTextColor ); @@ -1173,7 +1173,7 @@ bool Writer::Impl_writeStroke( SvtGraphicStroke& rStroke ) { Polygon aPolygon; rStroke.getPath( aPolygon ); - PolyPolygon aPolyPolygon( aPolygon ); + tools::PolyPolygon aPolyPolygon( aPolygon ); map( aPolyPolygon ); @@ -1183,12 +1183,12 @@ bool Writer::Impl_writeStroke( SvtGraphicStroke& rStroke ) if(SvtGraphicStroke::joinRound != rStroke.getJoinType()) return false; - PolyPolygon aStartArrow; + tools::PolyPolygon aStartArrow; rStroke.getStartArrow( aStartArrow ); if( 0 != aStartArrow.Count() ) return false; // todo: Implement line ends - PolyPolygon aEndArrow; + tools::PolyPolygon aEndArrow; rStroke.getEndArrow( aEndArrow ); if( 0 != aEndArrow.Count() ) return false; // todo: Implement line ends @@ -1215,7 +1215,7 @@ bool Writer::Impl_writeStroke( SvtGraphicStroke& rStroke ) */ bool Writer::Impl_writeFilling( SvtGraphicFill& rFilling ) { - PolyPolygon aPolyPolygon; + tools::PolyPolygon aPolyPolygon; rFilling.getPath( aPolyPolygon ); Rectangle aOldRect( aPolyPolygon.GetBoundRect() ); @@ -1365,7 +1365,7 @@ void Writer::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegf for(sal_uInt32 a(0); a < aFillPolyPolygon.count(); a++) { const Polygon aPolygon(aFillPolyPolygon.getB2DPolygon(a)); - Impl_writePolyPolygon(PolyPolygon(Polygon(aPolygon)), true ); + Impl_writePolyPolygon(tools::PolyPolygon(Polygon(aPolygon)), true ); } mpVDev->SetLineColor(aOldLineColor); @@ -1510,7 +1510,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) case( META_POLYPOLYGON_ACTION ): { const MetaPolyPolygonAction* pA = (const MetaPolyPolygonAction*) pAction; - const PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); + const tools::PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); if( rPolyPoly.Count() ) Impl_writePolyPolygon( rPolyPoly, true ); @@ -1546,7 +1546,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) case( META_TRANSPARENT_ACTION ): { const MetaTransparentAction* pA = (const MetaTransparentAction*) pAction; - const PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); + const tools::PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); if( rPolyPoly.Count() ) { diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx index 0e6110c96a60..b1fe002071a3 100644 --- a/filter/source/flash/swfwriter2.cxx +++ b/filter/source/flash/swfwriter2.cxx @@ -459,7 +459,7 @@ sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev ) aOldFont.SetOrientation(0); // let the virtual device convert the character to polygons - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; pVDev->GetTextOutline( aPolyPoly, OUString(nChar) ); maGlyphOffsets.push_back( _uInt16( maGlyphData.getOffset() ) ); diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index e6b7fc371c63..8aaa5b2c8b74 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -208,7 +208,7 @@ private: void METMove(Point aPt); void METLine(Point aPt1, Point aPt2); void METLine(const Polygon & rPolygon); - void METLine(const PolyPolygon & rPolyPolygon); + void METLine(const tools::PolyPolygon & rPolyPolygon); void METLineAtCurPos(Point aPt); void METBox(bool bFill, bool bBoundary, Rectangle aRect, sal_uInt32 nHAxis, sal_uInt32 nVAxis); @@ -1314,7 +1314,7 @@ void METWriter::METLine(const Polygon & rPolygon) } -void METWriter::METLine(const PolyPolygon & rPolyPolygon) +void METWriter::METLine(const tools::PolyPolygon & rPolyPolygon) { sal_uInt16 i,nCount; nCount=rPolyPolygon.Count(); @@ -1818,7 +1818,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) { const MetaPolyPolygonAction* pA = (const MetaPolyPolygonAction*) pMA; - PolyPolygon aSimplePolyPoly( pA->GetPolyPolygon() ); + tools::PolyPolygon aSimplePolyPoly( pA->GetPolyPolygon() ); sal_uInt16 i, nCount = aSimplePolyPoly.Count(); for ( i = 0; i < nCount; i++ ) { diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index 1d574aa55880..e5fee90e9bdd 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -110,7 +110,7 @@ private: // counts the bitmaps and actions (nNumberOfActions and nNumberOfBitmaps // have to be set to 0 at the beginning, since this method is recursive) - Polygon PolyPolygonToPolygon(const PolyPolygon & rPoly); + Polygon PolyPolygonToPolygon(const tools::PolyPolygon & rPoly); // generates a relatively sane polygon on the basis of a PolyPolygon Rectangle MapRectangle( const Rectangle& rRect ); @@ -219,7 +219,7 @@ void PictWriter::CountActionsAndBitmaps(const GDIMetaFile & rMTF) } -Polygon PictWriter::PolyPolygonToPolygon(const PolyPolygon & rPolyPoly) +Polygon PictWriter::PolyPolygonToPolygon(const tools::PolyPolygon & rPolyPoly) { sal_uInt16 nCount,nSize1,nSize2,np,i1,i2,i3,nBestIdx1,nBestIdx2; long nDistSqr,nBestDistSqr, nCountdownTests; @@ -1667,9 +1667,9 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) { const MetaPolyPolygonAction* pA = (const MetaPolyPolygonAction*) pMA; - const PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); + const tools::PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); sal_uInt16 nPolyCount = rPolyPoly.Count(); - PolyPolygon aSimplePolyPoly( rPolyPoly ); + tools::PolyPolygon aSimplePolyPoly( rPolyPoly ); for ( sal_uInt16 i = 0; i < nPolyCount; i++ ) { if ( aSimplePolyPoly[ i ].HasFlags() ) @@ -2074,7 +2074,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) case META_TRANSPARENT_ACTION: { - const PolyPolygon& rPolyPoly = ( (const MetaTransparentAction*) pMA )->GetPolyPolygon(); + const tools::PolyPolygon& rPolyPoly = ( (const MetaTransparentAction*) pMA )->GetPolyPolygon(); if (aFillColor!=Color( COL_TRANSPARENT )) { diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 7cf09e88b0af..c9b8dd5beea5 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -202,9 +202,9 @@ private: void ImplWriteLineInfo( const LineInfo& rLineInfo ); void ImplRect( const Rectangle & rRectangle ); void ImplRectFill ( const Rectangle & rRectangle ); - void ImplWriteGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient, VirtualDevice& rVDev ); - void ImplIntersect( const PolyPolygon& rPolyPoly ); - void ImplPolyPoly( const PolyPolygon & rPolyPolygon, bool bTextOutline = false ); + void ImplWriteGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient, VirtualDevice& rVDev ); + void ImplIntersect( const tools::PolyPolygon& rPolyPoly ); + void ImplPolyPoly( const tools::PolyPolygon & rPolyPolygon, bool bTextOutline = false ); void ImplPolyLine( const Polygon & rPolygon ); void ImplSetClipRegion( vcl::Region& rRegion ); @@ -654,7 +654,7 @@ void PSWriter::ImplWriteEpilog() void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) { - PolyPolygon aFillPath; + tools::PolyPolygon aFillPath; for( size_t nCurAction = 0, nCount = rMtf.GetActionSize(); nCurAction < nCount; nCurAction++ ) { @@ -715,7 +715,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) Rectangle aRect = ( ( (const MetaEllipseAction*) pMA )->GetRect() ); Point aCenter = aRect.Center(); Polygon aPoly( aCenter, aRect.GetWidth() / 2, aRect.GetHeight() / 2 ); - PolyPolygon aPolyPoly( aPoly ); + tools::PolyPolygon aPolyPoly( aPoly ); ImplPolyPoly( aPolyPoly ); } break; @@ -724,7 +724,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) { Polygon aPoly( ( (const MetaArcAction*)pMA )->GetRect(), ( (const MetaArcAction*)pMA )->GetStartPoint(), ( (const MetaArcAction*)pMA )->GetEndPoint(), POLY_ARC ); - PolyPolygon aPolyPoly( aPoly ); + tools::PolyPolygon aPolyPoly( aPoly ); ImplPolyPoly( aPolyPoly ); } break; @@ -733,7 +733,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) { Polygon aPoly( ( (const MetaPieAction*)pMA )->GetRect(), ( (const MetaPieAction*)pMA )->GetStartPoint(), ( (const MetaPieAction*)pMA )->GetEndPoint(), POLY_PIE ); - PolyPolygon aPolyPoly( aPoly ); + tools::PolyPolygon aPolyPoly( aPoly ); ImplPolyPoly( aPolyPoly ); } break; @@ -742,7 +742,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) { Polygon aPoly( ( (const MetaChordAction*)pMA )->GetRect(), ( (const MetaChordAction*)pMA )->GetStartPoint(), ( (const MetaChordAction*)pMA )->GetEndPoint(), POLY_CHORD ); - PolyPolygon aPolyPoly( aPoly ); + tools::PolyPolygon aPolyPoly( aPoly ); ImplPolyPoly( aPolyPoly ); } break; @@ -791,7 +791,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) case META_POLYGON_ACTION : { - PolyPolygon aPolyPoly( ( (const MetaPolygonAction*) pMA )->GetPolygon() ); + tools::PolyPolygon aPolyPoly( ( (const MetaPolygonAction*) pMA )->GetPolygon() ); ImplPolyPoly( aPolyPoly ); } break; @@ -926,14 +926,14 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) case META_GRADIENT_ACTION : { - PolyPolygon aPolyPoly( ( (const MetaGradientAction*)pMA)->GetRect() ); + tools::PolyPolygon aPolyPoly( ( (const MetaGradientAction*)pMA)->GetRect() ); ImplWriteGradient( aPolyPoly, ( (const MetaGradientAction*) pMA )->GetGradient(), rVDev ); } break; case META_GRADIENTEX_ACTION : { - PolyPolygon aPolyPoly( ( (const MetaGradientExAction*)pMA)->GetPolyPolygon() ); + tools::PolyPolygon aPolyPoly( ( (const MetaGradientExAction*)pMA)->GetPolyPolygon() ); ImplWriteGradient( aPolyPoly, ( (const MetaGradientExAction*) pMA )->GetGradient(), rVDev ); } break; @@ -1282,7 +1282,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) { if ( aFillPath.Count() ) { - aFillPath = PolyPolygon(); + aFillPath = tools::PolyPolygon(); ImplWriteLine( "gr" ); } } @@ -1304,8 +1304,8 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) Polygon aPath; aStroke.getPath( aPath ); - PolyPolygon aStartArrow; - PolyPolygon aEndArrow; + tools::PolyPolygon aStartArrow; + tools::PolyPolygon aEndArrow; // double fTransparency( aStroke.getTransparency() ); double fStrokeWidth( aStroke.getStrokeWidth() ); SvtGraphicStroke::JoinType eJT( aStroke.getJoinType() ); @@ -1341,7 +1341,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) case SvtGraphicFill::fillSolid : { bSkipSequence = true; - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; aFill.getPath( aPolyPoly ); sal_uInt16 i, nPolyCount = aPolyPoly.Count(); if ( nPolyCount ) @@ -1416,7 +1416,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) aTempMtf.AddAction( rMtf.GetAction( nBitmapAction )->Clone() ); ImplWriteActions( aTempMtf, rVDev ); ImplWriteLine( "gr" ); - aFillPath = PolyPolygon(); + aFillPath = tools::PolyPolygon(); } else nCurAction = nCommentStartAction + 1; @@ -1588,7 +1588,7 @@ void PSWriter::ImplAddPath( const Polygon & rPolygon ) -void PSWriter::ImplIntersect( const PolyPolygon& rPolyPoly ) +void PSWriter::ImplIntersect( const tools::PolyPolygon& rPolyPoly ) { sal_uInt16 i, nPolyCount = rPolyPoly.Count(); for ( i = 0; i < nPolyCount; ) @@ -1606,7 +1606,7 @@ void PSWriter::ImplIntersect( const PolyPolygon& rPolyPoly ) -void PSWriter::ImplWriteGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient, VirtualDevice& rVDev ) +void PSWriter::ImplWriteGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient, VirtualDevice& rVDev ) { VirtualDevice l_aVDev; GDIMetaFile aTmpMtf; @@ -1617,7 +1617,7 @@ void PSWriter::ImplWriteGradient( const PolyPolygon& rPolyPoly, const Gradient& -void PSWriter::ImplPolyPoly( const PolyPolygon & rPolyPoly, bool bTextOutline ) +void PSWriter::ImplPolyPoly( const tools::PolyPolygon & rPolyPoly, bool bTextOutline ) { sal_uInt16 i, nPolyCount = rPolyPoly.Count(); if ( nPolyCount ) @@ -2158,7 +2158,7 @@ void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const lo } bool bOldLineColor = bLineColor; bLineColor = false; - std::vector<PolyPolygon> aPolyPolyVec; + std::vector<tools::PolyPolygon> aPolyPolyVec; if ( aVirDev.GetTextOutlines( aPolyPolyVec, rUniString, 0, 0, -1, true, nWidth, pDXArry ) ) { // always adjust text position to match baseline alignment @@ -2171,7 +2171,7 @@ void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const lo ImplWriteF( nRotation, 1 ); mpPS->WriteCharPtr( "r " ); } - std::vector<PolyPolygon>::iterator aIter( aPolyPolyVec.begin() ); + std::vector<tools::PolyPolygon>::iterator aIter( aPolyPolyVec.begin() ); while ( aIter != aPolyPolyVec.end() ) ImplPolyPoly( *aIter++, true ); ImplWriteLine( "pom" ); diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 80f2d9c3054b..ad03946f9545 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -717,7 +717,7 @@ void CGMImpressOutAct::DrawPolybezier( Polygon& rPolygon ) -void CGMImpressOutAct::DrawPolyPolygon( PolyPolygon& rPolyPolygon ) +void CGMImpressOutAct::DrawPolyPolygon( tools::PolyPolygon& rPolyPolygon ) { sal_uInt32 nNumPolys = rPolyPolygon.Count(); if ( nNumPolys && ImplCreateShape( "com.sun.star.drawing.ClosedBezierShape" ) ) diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx index 64086a1a0949..f10cb18d3033 100644 --- a/filter/source/graphicfilter/icgm/class4.cxx +++ b/filter/source/graphicfilter/icgm/class4.cxx @@ -273,7 +273,7 @@ void CGM::ImplDoClass4() sal_uInt16 nPoints = 0; boost::scoped_array<Point> pPoints(new Point[ 0x4000 ]); - PolyPolygon aPolyPolygon; + tools::PolyPolygon aPolyPolygon; FloatPoint aFloatPoint; sal_uInt32 nEdgeFlag; while ( mnParaSize < mnElementSize ) diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx index 7e5fd3a1c4c0..49712e1f44ff 100644 --- a/filter/source/graphicfilter/icgm/outact.hxx +++ b/filter/source/graphicfilter/icgm/outact.hxx @@ -55,7 +55,7 @@ class CGMOutAct sal_uInt16 mnIndex; // figure sal_uInt8* mpFlags; Point* mpPoints; - PolyPolygon maPolyPolygon; + tools::PolyPolygon maPolyPolygon; ::com::sun::star::awt::Gradient* mpGradient; CGM* mpCGM; @@ -85,7 +85,7 @@ class CGMOutAct virtual void DrawPolygon( Polygon& ) {} ; virtual void DrawPolyLine( Polygon& ) {} ; virtual void DrawPolybezier( Polygon& ) {} ; - virtual void DrawPolyPolygon( PolyPolygon& ) {} ; + virtual void DrawPolyPolygon( tools::PolyPolygon& ) {} ; virtual void DrawText( ::com::sun::star::awt::Point&, ::com::sun::star::awt::Size&, char*, sal_uInt32, FinalFlag ) {} ; virtual void AppendText( char*, sal_uInt32, FinalFlag ) {} ; virtual sal_uInt32 DrawText( TextEntry*, NodeFrameSet&, sal_uInt32 ) { return 0; } ; @@ -126,7 +126,7 @@ public: virtual void DrawPolygon( Polygon& ) SAL_OVERRIDE ; virtual void DrawPolyLine( Polygon& ) SAL_OVERRIDE ; virtual void DrawPolybezier( Polygon& ) SAL_OVERRIDE ; - virtual void DrawPolyPolygon( PolyPolygon& ) SAL_OVERRIDE ; + virtual void DrawPolyPolygon( tools::PolyPolygon& ) SAL_OVERRIDE ; virtual void DrawText( ::com::sun::star::awt::Point& TextRectPos, ::com::sun::star::awt::Size& TextRectSize, char* String, sal_uInt32 StringSize, FinalFlag ) SAL_OVERRIDE ; virtual void AppendText( char* String, sal_uInt32 StringSize, FinalFlag ) SAL_OVERRIDE ; virtual sal_uInt32 DrawText( TextEntry*, NodeFrameSet&, sal_uInt32 ) SAL_OVERRIDE ; diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx index ba8f3fe0022e..a849b47cfc61 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx @@ -572,7 +572,7 @@ void DXF2GDIMetaFile::DrawHatchEntity(const DXFHatchEntity & rE, const DXFTransf { SetAreaAttribute( rE ); sal_Int32 j = 0; - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; for ( j = 0; j < rE.nBoundaryPathCount; j++ ) { DXFPointArray aPtAry; diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 89e1c9b6ad4e..cc2d6bbecef7 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -213,7 +213,7 @@ struct OSPalette { struct OSArea { OSArea * pSucc; sal_uInt8 nFlags; - PolyPolygon aPPoly; + tools::PolyPolygon aPPoly; bool bClosed; Color aCol; Color aBgCol; @@ -226,7 +226,7 @@ struct OSPath { OSPath* pSucc; sal_uInt32 nID; - PolyPolygon aPPoly; + tools::PolyPolygon aPPoly; bool bClosed; bool bStroke; }; @@ -395,7 +395,7 @@ private: bool IsLineInfo(); void DrawPolyLine( const Polygon& rPolygon ); void DrawPolygon( const Polygon& rPolygon ); - void DrawPolyPolygon( const PolyPolygon& rPolygon ); + void DrawPolyPolygon( const tools::PolyPolygon& rPolygon ); sal_uInt16 ReadBigEndianWord(); sal_uLong ReadBigEndian3BytesLong(); sal_uLong ReadLittleEndian3BytesLong(); @@ -493,7 +493,7 @@ void OS2METReader::DrawPolygon( const Polygon& rPolygon ) pVirDev->DrawPolygon( rPolygon ); } -void OS2METReader::DrawPolyPolygon( const PolyPolygon& rPolyPolygon ) +void OS2METReader::DrawPolyPolygon( const tools::PolyPolygon& rPolyPolygon ) { if ( IsLineInfo() ) { @@ -513,7 +513,7 @@ void OS2METReader::AddPointsToArea(const Polygon & rPoly) sal_uInt16 nOldSize, nNewSize,i; if (pAreaStack==NULL || rPoly.GetSize()==0) return; - PolyPolygon * pPP=&(pAreaStack->aPPoly); + tools::PolyPolygon * pPP=&(pAreaStack->aPPoly); if (pPP->Count()==0 || pAreaStack->bClosed) pPP->Insert(rPoly); else { Polygon aLastPoly(pPP->GetObject(pPP->Count()-1)); @@ -534,7 +534,7 @@ void OS2METReader::AddPointsToPath(const Polygon & rPoly) sal_uInt16 nOldSize, nNewSize,i; if (pPathStack==NULL || rPoly.GetSize()==0) return; - PolyPolygon * pPP=&(pPathStack->aPPoly); + tools::PolyPolygon * pPP=&(pPathStack->aPPoly); if (pPP->Count()==0 /*|| pPathStack->bClosed==sal_True*/) pPP->Insert(rPoly); else { Polygon aLastPoly(pPP->GetObject(pPP->Count()-1)); @@ -1190,7 +1190,7 @@ void OS2METReader::ReadPartialArc(bool bGivenPos, sal_uInt16 nOrderSize) void OS2METReader::ReadPolygons() { sal_uInt32 i,j,nNumPolys, nNumPoints; - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; Polygon aPoly; Point aPoint; sal_uInt8 nFlags; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index cac923aacc8f..2f6961b63a6c 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -862,7 +862,7 @@ bool EscherPropertyContainer::GetLineArrow( const bool bLineStart, if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, sLine, false ) ) { - PolyPolygon aPolyPoly( EscherPropertyContainer::GetPolyPolygon( aAny ) ); + tools::PolyPolygon aPolyPoly( EscherPropertyContainer::GetPolyPolygon( aAny ) ); if ( aPolyPoly.Count() && aPolyPoly[ 0 ].GetSize() ) { bIsArrow = true; @@ -1401,7 +1401,7 @@ GraphicObject lclDrawHatch( const ::com::sun::star::drawing::Hatch& rHatch, cons aOut.SetLineColor(); aOut.SetFillColor(bFillBackground ? rBackColor : Color(COL_TRANSPARENT)); aOut.DrawRect(rRect); - aOut.DrawHatch(PolyPolygon(rRect), Hatch((HatchStyle)rHatch.Style, Color(rHatch.Color), rHatch.Distance, (sal_uInt16)rHatch.Angle)); + aOut.DrawHatch(tools::PolyPolygon(rRect), Hatch((HatchStyle)rHatch.Style, Color(rHatch.Color), rHatch.Distance, (sal_uInt16)rHatch.Angle)); aMtf.Stop(); aMtf.WindStart(); aMtf.SetPrefMapMode(MapMode(MAP_100TH_MM)); @@ -1774,9 +1774,9 @@ bool EscherPropertyContainer::CreateGraphicProperties( return bRetValue; } -PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ) +tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ) { - PolyPolygon aRetPolyPoly; + tools::PolyPolygon aRetPolyPoly; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXPropSet; ::com::sun::star::uno::Any aAny( rXShape->queryInterface( cppu::UnoType<com::sun::star::beans::XPropertySet>::get())); @@ -1801,12 +1801,12 @@ PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno return aRetPolyPoly; } -PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno::Any& rAny ) +tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno::Any& rAny ) { bool bNoError = true; Polygon aPolygon; - PolyPolygon aPolyPolygon; + tools::PolyPolygon aPolyPolygon; if ( rAny.getValueType() == cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get()) { @@ -2024,7 +2024,7 @@ bool EscherPropertyContainer::CreatePolygonProperties( bool bRetValue = true; bool bLine = ( nFlags & ESCHER_CREATEPOLYGON_LINE ) != 0; - PolyPolygon aPolyPolygon; + tools::PolyPolygon aPolyPolygon; if ( pPolygon ) aPolyPolygon.Insert( *pPolygon, POLYPOLY_APPEND ); @@ -2385,7 +2385,7 @@ bool EscherPropertyContainer::CreateConnectorProperties( { if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sEdgePath ) ) { - PolyPolygon aPolyPolygon = GetPolyPolygon( aAny ); + tools::PolyPolygon aPolyPolygon = GetPolyPolygon( aAny ); Polygon aPoly; if ( aPolyPolygon.Count() > 0 ) { @@ -4792,7 +4792,7 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) // #i74631# use explicit constructor here. Also XPolyPolygon is not necessary, // reducing to PolyPolygon - const PolyPolygon aPolyPoly(((SdrPathObj*)pPoly)->GetPathPoly()); + const tools::PolyPolygon aPolyPoly(((SdrPathObj*)pPoly)->GetPathPoly()); for ( a = 0; a < aPolyPoly.Count(); a++ ) { diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index c2962de8e0a7..5b4599ea2bc1 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -518,7 +518,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver ) { bool bNotFound = true; - PolyPolygon aPolyPoly( EscherPropertyContainer::GetPolyPolygon( aXShape ) ); + tools::PolyPolygon aPolyPoly( EscherPropertyContainer::GetPolyPolygon( aXShape ) ); sal_uInt16 k, j, nPolySize = aPolyPoly.Count(); if ( nPolySize ) { diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index b1dd2a5cd99b..4454b8934e00 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -234,7 +234,7 @@ void SVGFontExport::implEmbedFont( const vcl::Font& rFont ) { const Point aPos; - const PolyPolygon aMissingGlyphPolyPoly( Rectangle( aPos, aSize ) ); + const tools::PolyPolygon aMissingGlyphPolyPoly( Rectangle( aPos, aSize ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, "d", SVGActionWriter::GetPathString( aMissingGlyphPolyPoly, false ) ); @@ -258,7 +258,7 @@ void SVGFontExport::implEmbedFont( const vcl::Font& rFont ) void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const OUString& rCellStr ) { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; const sal_Unicode nSpace = ' '; if( rOut.GetTextOutline( aPolyPoly, rCellStr ) ) diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 5eb5bb4cbf46..97967fdd1b6d 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1698,11 +1698,11 @@ Polygon& SVGActionWriter::ImplMap( const Polygon& rPoly, Polygon& rDstPoly ) con return( rDstPoly ); } -PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon& rDstPolyPoly ) const +tools::PolyPolygon& SVGActionWriter::ImplMap( const tools::PolyPolygon& rPolyPoly, tools::PolyPolygon& rDstPolyPoly ) const { Polygon aPoly; - rDstPolyPoly = PolyPolygon(); + rDstPolyPoly = tools::PolyPolygon(); for( sal_uInt16 i = 0, nCount = rPolyPoly.Count(); i < nCount; ++i ) { @@ -1712,7 +1712,7 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon return( rDstPolyPoly ); } -OUString SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly, bool bLine ) +OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bool bLine ) { OUString aPathData; const OUString aBlank( " " ); @@ -1919,10 +1919,10 @@ void SVGActionWriter::ImplAddLineAttr( const LineInfo &rAttrs, } -void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, bool bLineOnly, +void SVGActionWriter::ImplWritePolyPolygon( const tools::PolyPolygon& rPolyPoly, bool bLineOnly, bool bApplyMapping ) { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; if( bApplyMapping ) ImplMap( rPolyPoly, aPolyPoly ); @@ -1940,7 +1940,7 @@ void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, bool b void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, bool bApplyMapping ) { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; if( bApplyMapping ) ImplMap( rShape.maShapePolyPoly, aPolyPoly ); @@ -2029,7 +2029,7 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, bool bAp ImplWritePolyPolygon( aPolyPoly, bLineOnly, false ); } -void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly, +void SVGActionWriter::ImplWritePattern( const tools::PolyPolygon& rPolyPoly, const Hatch* pHatch, const Gradient* pGradient, sal_uInt32 nWriteFlags ) @@ -2086,7 +2086,7 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly, } } -void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient, +void SVGActionWriter::ImplWriteGradientEx( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient, sal_uInt32 nWriteFlags) { if ( rGradient.GetStyle() == GradientStyle_LINEAR || @@ -2100,7 +2100,7 @@ void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const G } } -void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, +void SVGActionWriter::ImplWriteGradientLinear( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ) { if( rPolyPoly.Count() ) @@ -2282,7 +2282,7 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf, { SvXMLElementExport aElemMask( mrExport, XML_NAMESPACE_NONE, aXMLElemMask, true, true ); - const PolyPolygon aPolyPolygon( PolyPolygon( Rectangle( rDestPt, rDestSize ) ) ); + const tools::PolyPolygon aPolyPolygon( tools::PolyPolygon( Rectangle( rDestPt, rDestSize ) ) ); Gradient aGradient( rGradient ); // swap gradient stops to adopt SVG mask @@ -2858,7 +2858,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, if( nWriteFlags & SVGWRITER_WRITE_FILL ) { const MetaPolyPolygonAction* pA = (const MetaPolyPolygonAction*) pAction; - const PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); + const tools::PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); if( rPolyPoly.Count() ) { @@ -2875,7 +2875,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, { const MetaGradientAction* pA = (const MetaGradientAction*) pAction; const Polygon aRectPoly( pA->GetRect() ); - const PolyPolygon aRectPolyPoly( aRectPoly ); + const tools::PolyPolygon aRectPolyPoly( aRectPoly ); ImplWriteGradientEx( aRectPolyPoly, pA->GetGradient(), nWriteFlags ); } @@ -2907,7 +2907,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, if( nWriteFlags & SVGWRITER_WRITE_FILL ) { const MetaTransparentAction* pA = (const MetaTransparentAction*) pAction; - const PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); + const tools::PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); if( rPolyPoly.Count() ) { @@ -3010,7 +3010,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, if( bSkip ) { - PolyPolygon aShapePolyPoly; + tools::PolyPolygon aShapePolyPoly; aFill.getPath( aShapePolyPoly ); @@ -3076,7 +3076,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, { SvMemoryStream aMemStm( (void*) pA->GetData(), pA->GetDataSize(), STREAM_READ ); SvtGraphicStroke aStroke; - PolyPolygon aStartArrow, aEndArrow; + tools::PolyPolygon aStartArrow, aEndArrow; ReadSvtGraphicStroke( aMemStm, aStroke ); aStroke.getStartArrow( aStartArrow ); diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 6e186689b5da..459978caf6d1 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -127,7 +127,7 @@ public: struct SVGShapeDescriptor { - PolyPolygon maShapePolyPoly; + tools::PolyPolygon maShapePolyPoly; Color maShapeFillColor; Color maShapeLineColor; sal_Int32 mnStrokeWidth; @@ -334,7 +334,7 @@ private: Size& ImplMap( const Size& rSz, Size& rDstSz ) const; Rectangle& ImplMap( const Rectangle& rRect, Rectangle& rDstRect ) const; Polygon& ImplMap( const Polygon& rPoly, Polygon& rDstPoly ) const; - PolyPolygon& ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon& rDstPolyPoly ) const; + tools::PolyPolygon& ImplMap( const tools::PolyPolygon& rPolyPoly, tools::PolyPolygon& rDstPolyPoly ) const; void ImplWriteLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor = NULL, bool bApplyMapping = true ); @@ -342,14 +342,14 @@ private: bool bApplyMapping = true ); void ImplWriteEllipse( const Point& rCenter, long nRadX, long nRadY, bool bApplyMapping = true ); - void ImplWritePattern( const PolyPolygon& rPolyPoly, const Hatch* pHatch, const Gradient* pGradient, sal_uInt32 nWriteFlags ); + void ImplWritePattern( const tools::PolyPolygon& rPolyPoly, const Hatch* pHatch, const Gradient* pGradient, sal_uInt32 nWriteFlags ); void ImplAddLineAttr( const LineInfo &rAttrs, bool bApplyMapping = true ); - void ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, bool bLineOnly, + void ImplWritePolyPolygon( const tools::PolyPolygon& rPolyPoly, bool bLineOnly, bool bApplyMapping = true ); void ImplWriteShape( const SVGShapeDescriptor& rShape, bool bApplyMapping = true ); - void ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient, sal_uInt32 nWriteFlags); - void ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); + void ImplWriteGradientEx( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient, sal_uInt32 nWriteFlags); + void ImplWriteGradientLinear( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ); void ImplWriteGradientStop( const Color& rColor, double fOffset ); Color ImplGetColorWithIntensity( const Color& rColor, sal_uInt16 nIntensity ); Color ImplGetGradientColor( const Color& rStartColor, const Color& rEndColor, double fOffset ); @@ -372,7 +372,7 @@ private: public: - static OUString GetPathString( const PolyPolygon& rPolyPoly, bool bLine ); + static OUString GetPathString( const tools::PolyPolygon& rPolyPoly, bool bLine ); static sal_uLong GetChecksum( const MetaAction* pAction ); public: diff --git a/include/basegfx/polygon/b2dlinegeometry.hxx b/include/basegfx/polygon/b2dlinegeometry.hxx index 9d6ae0b53700..ca9fb18ad686 100644 --- a/include/basegfx/polygon/b2dlinegeometry.hxx +++ b/include/basegfx/polygon/b2dlinegeometry.hxx @@ -126,7 +126,7 @@ namespace basegfx to [F_PI .. 0.01 * F_PI]. @return - The PolyPolygon containing the geometry of the extended line by + The tools::PolyPolygon containing the geometry of the extended line by it's line width. Contains bezier segments and edge roundings as needed and defined. */ diff --git a/include/basegfx/polygon/b2dpolygonclipper.hxx b/include/basegfx/polygon/b2dpolygonclipper.hxx index 821ed5bbf795..7fb2430c1dca 100644 --- a/include/basegfx/polygon/b2dpolygonclipper.hxx +++ b/include/basegfx/polygon/b2dpolygonclipper.hxx @@ -33,7 +33,7 @@ namespace basegfx namespace tools { - // This method clips the given PolyPolygon against a horizontal or vertical axis (parallell to X or Y axis). The axis is + // This method clips the given tools::PolyPolygon against a horizontal or vertical axis (parallell to X or Y axis). The axis is // defined by bParallelToXAxis (true -> it's parallel to the X-Axis of the coordinate system, else to the Y-Axis) and the // fValueOnOtherAxis (gives the translation to the coordinate system axis). For example, when You want to define // a clip axis parallel to X.Axis and 100 above it, use bParallelToXAxis = true and fValueOnOtherAxis = 100. @@ -42,16 +42,16 @@ namespace basegfx BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnParallelAxis(const B2DPolyPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke); BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnParallelAxis(const B2DPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke); - // Clip the given PolyPolygon against the given range. bInside defines if the result will contain the + // Clip the given tools::PolyPolygon against the given range. bInside defines if the result will contain the // parts which are contained in the range or vice versa. // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true). BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnRange(const B2DPolyPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke); BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnRange(const B2DPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke); - // Clip given PolyPolygon against given clipping polygon. + // Clip given tools::PolyPolygon against given clipping polygon. // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true). // With stroke polygons, You get all line snippets inside rCip. - // With filled polygons, You get all PolyPolygon parts which were inside rClip. + // With filled polygons, You get all tools::PolyPolygon parts which were inside rClip. // The switch bInside decides if the parts inside the clip polygon or outside shall be created. // The clip polygon is always assumed closed, even when it's isClosed() is false. BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnPolyPolygon(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke); diff --git a/include/basegfx/polygon/b2dpolygoncutandtouch.hxx b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx index c5a2a0fb0cf9..89cf1012f075 100644 --- a/include/basegfx/polygon/b2dpolygoncutandtouch.hxx +++ b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx @@ -34,7 +34,7 @@ namespace basegfx // extra points there. Result will have no touches or intersections on an edge, only on points BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCutsAndTouches(const B2DPolygon& rCandidate); - // look for polypolygon-intersections and polypolygon-touches (point of poly A on an edge of poly B) in given PolyPolygon and add + // look for polypolygon-intersections and polypolygon-touches (point of poly A on an edge of poly B) in given tools::PolyPolygon and add // extra points there. Result will have no touches or intersections between contained polygons on an edge, only on points. For // convenience, the correction for self-intersections for each member polygon will be used, too. // Changed: Self intersections are searched by default, but may be switched off by 2nd parameter. diff --git a/include/basegfx/polygon/b2dpolygontools.hxx b/include/basegfx/polygon/b2dpolygontools.hxx index 4e5fc5124318..0fb90cb744ee 100644 --- a/include/basegfx/polygon/b2dpolygontools.hxx +++ b/include/basegfx/polygon/b2dpolygontools.hxx @@ -292,7 +292,7 @@ namespace basegfx // third coordinate. BASEGFX_DLLPUBLIC B3DPolygon createB3DPolygonFromB2DPolygon(const B2DPolygon& rCandidate, double fZCoordinate = 0.0); - // create 2d PolyPolygon from given 3d PolyPolygon. All coordinates are transformed using the given + // create 2d tools::PolyPolygon from given 3d PolyPolygon. All coordinates are transformed using the given // matrix and the resulting x,y is used to form the new polygon. BASEGFX_DLLPUBLIC B2DPolygon createB2DPolygonFromB3DPolygon(const B3DPolygon& rCandidate, const B3DHomMatrix& rMat); diff --git a/include/basegfx/polygon/b2dpolypolygon.hxx b/include/basegfx/polygon/b2dpolypolygon.hxx index 203db76663a8..07bffcd6527d 100644 --- a/include/basegfx/polygon/b2dpolypolygon.hxx +++ b/include/basegfx/polygon/b2dpolypolygon.hxx @@ -111,7 +111,7 @@ namespace basegfx // flip polygon direction void flip(); - // test if PolyPolygon has double points + // test if tools::PolyPolygon has double points bool hasDoublePoints() const; // remove double points, at the begin/end and follow-ups, too diff --git a/include/basegfx/polygon/b2dpolypolygoncutter.hxx b/include/basegfx/polygon/b2dpolypolygoncutter.hxx index 3171432a3e49..cfa2449cb7c5 100644 --- a/include/basegfx/polygon/b2dpolypolygoncutter.hxx +++ b/include/basegfx/polygon/b2dpolypolygoncutter.hxx @@ -138,7 +138,7 @@ namespace basegfx @param rInput The source PolyPolygons - @return A single PolyPolygon containing the Or-merged result + @return A single tools::PolyPolygon containing the Or-merged result */ BASEGFX_DLLPUBLIC B2DPolyPolygon mergeToSinglePolyPolygon(const B2DPolyPolygonVector& rInput); diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx index e92fe5a2f01a..11fed4743019 100644 --- a/include/basegfx/polygon/b2dpolypolygontools.hxx +++ b/include/basegfx/polygon/b2dpolypolygontools.hxx @@ -124,7 +124,7 @@ namespace basegfx }; /** the PointIndexSet itself; it allows to define a 'selection'of - points in a PolyPolygon by giving the polygon and point index. + points in a tools::PolyPolygon by giving the polygon and point index. Adding points double makes no sense, hence the std::set */ typedef std::set< PointIndex > PointIndexSet; @@ -181,11 +181,11 @@ namespace basegfx // organisation, e.g. same amount of polygons BASEGFX_DLLPUBLIC B2DPolyPolygon interpolate(const B2DPolyPolygon& rOld1, const B2DPolyPolygon& rOld2, double t); - // create 3d PolyPolygon from given 2d PolyPolygon. The given fZCoordinate is used to expand the + // create 3d tools::PolyPolygon from given 2d PolyPolygon. The given fZCoordinate is used to expand the // third coordinate. BASEGFX_DLLPUBLIC B3DPolyPolygon createB3DPolyPolygonFromB2DPolyPolygon(const B2DPolyPolygon& rCandidate, double fZCoordinate = 0.0); - // create 2d PolyPolygon from given 3d PolyPolygon. All coordinates are transformed using the given + // create 2d tools::PolyPolygon from given 3d PolyPolygon. All coordinates are transformed using the given // matrix and the resulting x,y is used to form the new polygon. BASEGFX_DLLPUBLIC B2DPolyPolygon createB2DPolyPolygonFromB3DPolyPolygon(const B3DPolyPolygon& rCandidate, const B3DHomMatrix& rMat); @@ -205,7 +205,7 @@ namespace basegfx /** Predicate whether a given poly-polygon is a rectangle. @param rPoly - PolyPolygon to check + tools::PolyPolygon to check @return true, if the poly-polygon describes a rectangle (contains exactly one polygon, polygon is closed, and the diff --git a/include/basegfx/polygon/b2dtrapezoid.hxx b/include/basegfx/polygon/b2dtrapezoid.hxx index 569f1425f83a..d56c48fbc425 100644 --- a/include/basegfx/polygon/b2dtrapezoid.hxx +++ b/include/basegfx/polygon/b2dtrapezoid.hxx @@ -107,7 +107,7 @@ namespace basegfx double fLineWidth = 1.0); // create trapezoids for all edges of the given polyPolygon. The closed state of - // the PolyPolygon is taken into account. If curves are contaned, the default + // the tools::PolyPolygon is taken into account. If curves are contaned, the default // AdaptiveSubdivision will be used. BASEGFX_DLLPUBLIC void createLineTrapezoidFromB2DPolyPolygon( B2DTrapezoidVector& ro_Result, diff --git a/include/basegfx/polygon/b3dpolypolygon.hxx b/include/basegfx/polygon/b3dpolypolygon.hxx index 461a325a95a7..3ca1e10740ae 100644 --- a/include/basegfx/polygon/b3dpolypolygon.hxx +++ b/include/basegfx/polygon/b3dpolypolygon.hxx @@ -95,7 +95,7 @@ namespace basegfx // flip polygon direction void flip(); - // test if PolyPolygon has double points + // test if tools::PolyPolygon has double points bool hasDoublePoints() const; // remove double points, at the begin/end and follow-ups, too diff --git a/include/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx index 9b5ce34c3336..2104dee39a5e 100644 --- a/include/cppcanvas/canvas.hxx +++ b/include/cppcanvas/canvas.hxx @@ -47,7 +47,7 @@ namespace cppcanvas class PolyPolygon; class Canvas; - // forward declaration, since PolyPolygon also references Canvas + // forward declaration, since tools::PolyPolygon also references Canvas typedef ::boost::shared_ptr< PolyPolygon > PolyPolygonSharedPtr; // forward declaration, since cloneCanvas() also references Canvas diff --git a/include/cppcanvas/canvasgraphic.hxx b/include/cppcanvas/canvasgraphic.hxx index ca3db47be9e1..09d8018ef76f 100644 --- a/include/cppcanvas/canvasgraphic.hxx +++ b/include/cppcanvas/canvasgraphic.hxx @@ -37,7 +37,7 @@ namespace basegfx namespace cppcanvas { - // forward declaration, since PolyPolygon also derives from CanvasGraphic + // forward declaration, since tools::PolyPolygon also derives from CanvasGraphic typedef ::boost::shared_ptr< class PolyPolygon > PolyPolygonSharedPtr; diff --git a/include/cppcanvas/polypolygon.hxx b/include/cppcanvas/polypolygon.hxx index 1db71e276a74..3cb186354512 100644 --- a/include/cppcanvas/polypolygon.hxx +++ b/include/cppcanvas/polypolygon.hxx @@ -37,12 +37,12 @@ namespace com { namespace sun { namespace star { namespace rendering } } } } -/* Definition of PolyPolygon interface */ +/* Definition of tools::PolyPolygon interface */ namespace cppcanvas { - /** This interface defines a PolyPolygon canvas object + /** This interface defines a tools::PolyPolygon canvas object Consider this object part of the view, and not of the model data. Although the given polygon is typically copied and held diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx index 9d85248f9340..a48c62416569 100644 --- a/include/cppcanvas/vclfactory.hxx +++ b/include/cppcanvas/vclfactory.hxx @@ -35,7 +35,7 @@ namespace vcl { class Window; } class Bitmap; class BitmapEx; class Polygon; -class PolyPolygon; +namespace tools { class PolyPolygon; } class Size; class Graphic; class GDIMetaFile; diff --git a/include/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx index 1aae7c1a0f53..b7b2e1092850 100644 --- a/include/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -34,16 +34,16 @@ namespace drawinglayer /** MaskPrimitive2D class This is the central masking primitive. It's a grouping - primitive and contains a PolyPolygon which defines the visible + primitive and contains a tools::PolyPolygon which defines the visible area. Only visualisation parts of the Child primitive sequence - inside of the mask PolyPolygon is defined to be visible. + inside of the mask tools::PolyPolygon is defined to be visible. This primitive should be handled by a renderer. If it is not handled, it decomposes to its Child content, and thus the visualisation would contaiun no clips. The geometrc range of this primitive is completely defined by the Mask - PolyPolygon since by definition nothing outside of the mask is visible. + tools::PolyPolygon since by definition nothing outside of the mask is visible. */ class DRAWINGLAYER_DLLPUBLIC MaskPrimitive2D : public GroupPrimitive2D { diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx index a22a891206a6..9776978c6fae 100644 --- a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx @@ -33,10 +33,10 @@ namespace drawinglayer { /** PatternFillPrimitive2D class - This primitive allows filling a given PolyPolygon with a pattern + This primitive allows filling a given tools::PolyPolygon with a pattern defined by a sequence of primitives which are mapped to the unit range. The pattern is defined using a reference range which defines a rectangular - area relative to the PolyPolygon (in unit coordinates) which is virtually + area relative to the tools::PolyPolygon (in unit coordinates) which is virtually infinitely repeated. */ class DRAWINGLAYER_DLLPUBLIC PatternFillPrimitive2D : public BufferedDecompositionPrimitive2D diff --git a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx index e65952250362..f80e5193a9ee 100644 --- a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx @@ -201,14 +201,14 @@ namespace drawinglayer { /** PolyPolygonColorPrimitive2D class - This primitive defines a PolyPolygon filled with a single color. + This primitive defines a tools::PolyPolygon filled with a single color. This is one of the non-decomposable primitives, so a renderer should process it. */ class DRAWINGLAYER_DLLPUBLIC PolyPolygonColorPrimitive2D : public BasePrimitive2D { private: - /// the PolyPolygon geometry + /// the tools::PolyPolygon geometry basegfx::B2DPolyPolygon maPolyPolygon; /// the polygon fill color @@ -245,14 +245,14 @@ namespace drawinglayer { /** PolyPolygonColorPrimitive2D class - This primitive defines a PolyPolygon filled with a gradient. The + This primitive defines a tools::PolyPolygon filled with a gradient. The decomosition will create a MaskPrimitive2D containing a FillGradientPrimitive2D. */ class DRAWINGLAYER_DLLPUBLIC PolyPolygonGradientPrimitive2D : public BufferedDecompositionPrimitive2D { private: - /// the PolyPolygon geometry + /// the tools::PolyPolygon geometry basegfx::B2DPolyPolygon maPolyPolygon; /// the definition range @@ -298,14 +298,14 @@ namespace drawinglayer { /** PolyPolygonHatchPrimitive2D class - This primitive defines a PolyPolygon filled with a hatch. The + This primitive defines a tools::PolyPolygon filled with a hatch. The decomosition will create a MaskPrimitive2D containing a FillHatchPrimitive2D. */ class DRAWINGLAYER_DLLPUBLIC PolyPolygonHatchPrimitive2D : public BufferedDecompositionPrimitive2D { private: - /// the PolyPolygon geometry + /// the tools::PolyPolygon geometry basegfx::B2DPolyPolygon maPolyPolygon; /// the definition range @@ -357,14 +357,14 @@ namespace drawinglayer { /** PolyPolygonGraphicPrimitive2D class - This primitive defines a PolyPolygon filled with bitmap data + This primitive defines a tools::PolyPolygon filled with bitmap data (including transparence). The decomosition will create a MaskPrimitive2D containing a FillGraphicPrimitive2D. */ class DRAWINGLAYER_DLLPUBLIC PolyPolygonGraphicPrimitive2D : public BufferedDecompositionPrimitive2D { private: - /// the PolyPolygon geometry + /// the tools::PolyPolygon geometry basegfx::B2DPolyPolygon maPolyPolygon; /// the definition range @@ -410,14 +410,14 @@ namespace drawinglayer { /** PolyPolygonSelectionPrimitive2D class - This primitive defines a PolyPolygon which gets filled with a defined color + This primitive defines a tools::PolyPolygon which gets filled with a defined color and a defined transparence, but also gets extended ('grown') by the given discrete size (thus being a view-dependent primitive) */ class DRAWINGLAYER_DLLPUBLIC PolyPolygonSelectionPrimitive2D : public DiscreteMetricDependentPrimitive2D { private: - /// the PolyPolygon geometry + /// the tools::PolyPolygon geometry basegfx::B2DPolyPolygon maPolyPolygon; /// the color diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index bb8dd1a21343..311ec94e71ae 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -47,7 +47,7 @@ namespace drawinglayer This is the basic primitive for representing a text portion. It contains all needed information. If it is not handled by a renderer, its decomposition - will provide the text PolyPolygon outlines as filled polygons, correctly + will provide the text tools::PolyPolygon outlines as filled polygons, correctly transformed. To get better text quality, it is suggested to handle tis primitive directly diff --git a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index 47ed330213c0..41337ac3a564 100644 --- a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -34,7 +34,7 @@ namespace drawinglayer { /** PolyPolygonMaterialPrimitive3D class - This primitive defines a planar 3D PolyPolygon filled with a single color. + This primitive defines a planar 3D tools::PolyPolygon filled with a single color. This is one of the non-decomposable primitives, so a renderer should process it. @@ -43,7 +43,7 @@ namespace drawinglayer class DRAWINGLAYER_DLLPUBLIC PolyPolygonMaterialPrimitive3D : public BasePrimitive3D { private: - /// the PolyPolygon geometry + /// the tools::PolyPolygon geometry basegfx::B3DPolyPolygon maPolyPolygon; /// the fill parameters diff --git a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 9155378f7112..030144f8e91c 100644 --- a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -34,7 +34,7 @@ namespace drawinglayer /** SdrExtrudePrimitive3D class This 3D primitive expands the SdrPrimitive3D to a 3D extrude definition. - The given 2D PolyPolygon geometry is imagined as lying on the XY-plane in 3D + The given 2D tools::PolyPolygon geometry is imagined as lying on the XY-plane in 3D and gets extruded in Z-Direction by Depth. Various possibilities e.g. for creating diagonals (edge roudings in 3D) diff --git a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index fe030c9a6fe8..bf6dfb237a0b 100644 --- a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -34,7 +34,7 @@ namespace drawinglayer /** SdrLathePrimitive3D class This 3D primitive expands the SdrPrimitive3D to a 3D rotation definition. - The given 2D PolyPolygon geometry is imagined as lying on the XY-plane in 3D + The given 2D tools::PolyPolygon geometry is imagined as lying on the XY-plane in 3D and gets rotated around the Y-Axis. Various possibilities e.g. for creating diagonals (edge roudings in 3D) diff --git a/include/drawinglayer/processor2d/canvasprocessor.hxx b/include/drawinglayer/processor2d/canvasprocessor.hxx index e742e039486a..d928a84a5d35 100644 --- a/include/drawinglayer/processor2d/canvasprocessor.hxx +++ b/include/drawinglayer/processor2d/canvasprocessor.hxx @@ -82,7 +82,7 @@ namespace drawinglayer // SvtOptionsDrawinglayer incarnation to react on diverse settings const SvtOptionsDrawinglayer maDrawinglayerOpt; - // the current clipping PolyPolygon from MaskPrimitive2D, always in + // the current clipping tools::PolyPolygon from MaskPrimitive2D, always in // object coordinates basegfx::B2DPolyPolygon maClipPolyPolygon; diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index e10b7a1b826c..882b0a4428ee 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -76,7 +76,7 @@ class MapMode; class Color; namespace vcl { class Font; } class KeyEvent; -class PolyPolygon; +namespace tools { class PolyPolygon; } class Size; class Point; class Rectangle; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 5a020c147830..ac5f18b6ffab 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -56,7 +56,7 @@ class Pointer; class CommandEvent; class MapMode; class OutputDevice; -class PolyPolygon; +namespace tools { class PolyPolygon; } class SfxStyleSheetPool; class SfxStyleSheet; class SfxItemPool; diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx index b18a79302f2d..8fe6b4f2bb5d 100644 --- a/include/editeng/txtrange.hxx +++ b/include/editeng/txtrange.hxx @@ -24,7 +24,7 @@ #include <tools/gen.hxx> #include <deque> -class PolyPolygon; +namespace tools { class PolyPolygon; } class Rectangle; namespace basegfx { @@ -43,8 +43,8 @@ class EDITENG_DLLPUBLIC TextRanger RangeCache(const Range& rng) : range(rng) {}; }; std::deque<RangeCache> mRangeCache; //!< Cached range calculations. - PolyPolygon *mpPolyPolygon; // Surface polygon - PolyPolygon *mpLinePolyPolygon; // Line polygon + tools::PolyPolygon *mpPolyPolygon; // Surface polygon + tools::PolyPolygon *mpLinePolyPolygon; // Line polygon Rectangle *pBound; // Comprehensive rectangle sal_uInt16 nCacheSize; // Cache-Size sal_uInt16 nRight; // Distance Contour-Text @@ -75,8 +75,8 @@ public: bool IsInner() const { return bInner; } bool IsVertical() const { return bVertical; } bool HasBorder() const { return nRight || nLeft; } - const PolyPolygon& GetPolyPolygon() const { return *mpPolyPolygon; } - const PolyPolygon* GetLinePolygon() const { return mpLinePolyPolygon; } + const tools::PolyPolygon& GetPolyPolygon() const { return *mpPolyPolygon; } + const tools::PolyPolygon* GetLinePolygon() const { return mpLinePolyPolygon; } const Rectangle& GetBoundRect() { return pBound ? static_cast< const Rectangle& >(*pBound) : _GetBoundRect(); } void SetUpper( sal_uInt16 nNew ){ nUpper = nNew; } diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 29de8abcfec6..82c84e3fc074 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1327,10 +1327,10 @@ public: bool IsFontWork() const; // helper functions which are also used by the escher import - static PolyPolygon GetPolyPolygon( + static tools::PolyPolygon GetPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ); - static PolyPolygon GetPolyPolygon( const ::com::sun::star::uno::Any& rSource ); + static tools::PolyPolygon GetPolyPolygon( const ::com::sun::star::uno::Any& rSource ); static MSO_SPT GetCustomShapeType( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, sal_uInt32& nMirrorFlags diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 5f2d1c9a2132..33cbc41fd221 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -54,7 +54,7 @@ class SvStream; class SdrObject; class SdrOle2Obj; class Polygon; -class PolyPolygon; +namespace tools { class PolyPolygon; } class FmFormModel; class SdrModel; class SwFlyFrmFmt; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 74c044233cb1..594cb54391e0 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -45,7 +45,7 @@ class SdrPage; class SdrObject; class SvStream; class Polygon; -class PolyPolygon; +namespace tools { class PolyPolygon; } class SfxItemSet; class Outliner; class Graphic; diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index f68c5e6428c7..4bfaf3a6e572 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -176,7 +176,7 @@ public: void WritePresetShape( const char* pShape ); void WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, const ::com::sun::star::beans::PropertyValue& rProp ); - void WritePolyPolygon( const PolyPolygon& rPolyPolygon ); + void WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon ); void WriteFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropSet ); void WriteShapeStyle( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet ); void WriteShapeEffects( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet ); diff --git a/include/postwin.h b/include/postwin.h index 37bf579c7a42..8f9be8959c25 100644 --- a/include/postwin.h +++ b/include/postwin.h @@ -19,7 +19,6 @@ /* not protected, do only include once! */ -#undef PolyPolygon #undef Polygon #undef Rectangle #undef DELETE diff --git a/include/prewin.h b/include/prewin.h index b60372f89d1f..3ec0312aa222 100644 --- a/include/prewin.h +++ b/include/prewin.h @@ -23,7 +23,6 @@ #define Rectangle BLA_Rectangle #define Polygon BLA_Polygon -#define PolyPolygon BLA_PolyPolygon #define Folder WIN_Folder #define GradientStyle_RECT WIN_GradientStyle_RECT diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index bca790be0472..30ac6345a489 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -201,7 +201,7 @@ private: Point& rPt, Size& rSz, const GraphicAttr* pAttr, - PolyPolygon& rClipPolyPoly, + tools::PolyPolygon& rClipPolyPoly, bool& bRectClipRegion ) const; diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx index 75954e0f2b2c..f1192de2a0f8 100644 --- a/include/svx/contdlg.hxx +++ b/include/svx/contdlg.hxx @@ -80,14 +80,14 @@ public: const Graphic& GetGraphic() const; bool IsGraphicChanged() const; - PolyPolygon GetPolyPolygon(); + tools::PolyPolygon GetPolyPolygon(); const void* GetEditingObject() const; void Update( const Graphic& rGraphic, bool bGraphicLinked, - const PolyPolygon* pPolyPoly = NULL, void* pEditingObj = NULL ); + const tools::PolyPolygon* pPolyPoly = NULL, void* pEditingObj = NULL ); - static PolyPolygon CreateAutoContour( const Graphic& rGraphic, + static tools::PolyPolygon CreateAutoContour( const Graphic& rGraphic, const Rectangle* pRect = NULL, const sal_uIntPtr nFlags = 0L ); }; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 3eac84f5efa5..81b176a668f5 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -69,7 +69,7 @@ class SfxUndoAction; class XFillAttrSetItem; class XLineAttrSetItem; class SfxItemPool; -class PolyPolygon; +namespace tools { class PolyPolygon; } class SfxPoolItem; class SdrVirtObj; class SdrDragView; @@ -591,7 +591,7 @@ public: virtual OUString TakeObjNamePlural() const; // Das Xor-Polygon wird von der View zu Draggen des Objektes benoetigt. - // Alle Polygone innerhalb des PolyPolygon werden als PolyLine interpretiert. + // Alle Polygone innerhalb des tools::PolyPolygon werden als PolyLine interpretiert. // Moechte man ein geschlossenes Polygon, so muss man es explizit schliessen. virtual basegfx::B2DPolyPolygon TakeXorPoly() const; @@ -868,7 +868,7 @@ public: // In this case it would have to: // - set SOLID_BRUSH with the color of the given pen, // - set NULL_PEN, and - // - generate PolyPolygon with two polygons with four supporting points each. + // - generate tools::PolyPolygon with two polygons with four supporting points each. // In each case the return value is a SdrObject*, because it is also // allowed to return group objects (e.g. for SdrTextObj). // In the case of the conversion from TextObj to PathObj, diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index fa6319f7ef9e..b287c23816f3 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -52,7 +52,7 @@ inline long Round(double a) { return a>0.0 ? (long)(a+0.5) : -(long)((-a)+0.5); inline void MoveRect(Rectangle& rRect, const Size& S) { rRect.Move(S.Width(),S.Height()); } inline void MovePoint(Point& rPnt, const Size& S) { rPnt.X()+=S.Width(); rPnt.Y()+=S.Height(); } inline void MovePoly(Polygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); } -inline void MovePoly(PolyPolygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); } +inline void MovePoly(tools::PolyPolygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); } void MoveXPoly(XPolygon& rPoly, const Size& S); SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bNoJustify = false); diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx index 57c9432262fe..52de1f120f33 100644 --- a/include/svx/xpoly.hxx +++ b/include/svx/xpoly.hxx @@ -26,7 +26,7 @@ class Point; class Rectangle; class SvStream; class Polygon; -class PolyPolygon; +namespace tools { class PolyPolygon; } class OutputDevice; #define XPOLYPOLY_APPEND 0xFFFF diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx index dbfb94da729a..4d38ce08ff37 100644 --- a/include/tools/poly.hxx +++ b/include/tools/poly.hxx @@ -73,7 +73,7 @@ public: class SvStream; class ImplPolygon; class ImplPolyPolygon; -class PolyPolygon; +namespace tools { class PolyPolygon; } namespace basegfx { @@ -195,19 +195,21 @@ public: explicit Polygon(const ::basegfx::B2DPolygon& rPolygon); }; +namespace tools { + class TOOLS_DLLPUBLIC SAL_WARN_UNUSED PolyPolygon { private: ImplPolyPolygon* mpImplPolyPolygon; - TOOLS_DLLPRIVATE void ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, sal_uIntPtr nOperation ) const; + TOOLS_DLLPRIVATE void ImplDoOperation( const tools::PolyPolygon& rPolyPoly, tools::PolyPolygon& rResult, sal_uIntPtr nOperation ) const; TOOLS_DLLPRIVATE void *ImplCreateArtVpath() const; TOOLS_DLLPRIVATE void ImplSetFromArtVpath( void *pVpath ); public: PolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 ); PolyPolygon( const Polygon& rPoly ); - PolyPolygon( const PolyPolygon& rPolyPoly ); + PolyPolygon( const tools::PolyPolygon& rPolyPoly ); ~PolyPolygon(); void Insert( const Polygon& rPoly, sal_uInt16 nPos = POLYPOLY_APPEND ); @@ -242,11 +244,11 @@ public: the original polygon is guaranteed to be smaller than one pixel. */ - void AdaptiveSubdivide( PolyPolygon& rResult, const double d = 1.0 ) const; - static PolyPolygon SubdivideBezier( const PolyPolygon& rPolyPoly ); + void AdaptiveSubdivide( tools::PolyPolygon& rResult, const double d = 1.0 ) const; + static tools::PolyPolygon SubdivideBezier( const tools::PolyPolygon& rPolyPoly ); - void GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; - void GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; + void GetIntersection( const tools::PolyPolygon& rPolyPoly, tools::PolyPolygon& rResult ) const; + void GetUnion( const tools::PolyPolygon& rPolyPoly, tools::PolyPolygon& rResult ) const; void Move( long nHorzMove, long nVertMove ); void Translate( const Point& rTrans ); @@ -257,15 +259,15 @@ public: const Polygon& operator[]( sal_uInt16 nPos ) const { return GetObject( nPos ); } Polygon& operator[]( sal_uInt16 nPos ); - PolyPolygon& operator=( const PolyPolygon& rPolyPoly ); - bool operator==( const PolyPolygon& rPolyPoly ) const; - bool operator!=( const PolyPolygon& rPolyPoly ) const + tools::PolyPolygon& operator=( const tools::PolyPolygon& rPolyPoly ); + bool operator==( const tools::PolyPolygon& rPolyPoly ) const; + bool operator!=( const tools::PolyPolygon& rPolyPoly ) const { return !(PolyPolygon::operator==( rPolyPoly )); } - bool IsEqual( const PolyPolygon& rPolyPoly ) const; + bool IsEqual( const tools::PolyPolygon& rPolyPoly ) const; - TOOLS_DLLPUBLIC friend SvStream& ReadPolyPolygon( SvStream& rIStream, PolyPolygon& rPolyPoly ); - TOOLS_DLLPUBLIC friend SvStream& WritePolyPolygon( SvStream& rOStream, const PolyPolygon& rPolyPoly ); + TOOLS_DLLPUBLIC friend SvStream& ReadPolyPolygon( SvStream& rIStream, tools::PolyPolygon& rPolyPoly ); + TOOLS_DLLPUBLIC friend SvStream& WritePolyPolygon( SvStream& rOStream, const tools::PolyPolygon& rPolyPoly ); void Read( SvStream& rIStream ); void Write( SvStream& rOStream ) const; @@ -278,12 +280,14 @@ public: explicit PolyPolygon(const ::basegfx::B2DPolyPolygon& rPolyPolygon); }; -typedef std::vector< PolyPolygon > PolyPolyVector; +} /* namespace tools */ + +typedef std::vector< tools::PolyPolygon > PolyPolyVector; template<typename charT, typename traits> inline std::basic_ostream<charT, traits> & operator <<( - std::basic_ostream<charT, traits> & stream, const PolyPolygon& rPolyPoly) + std::basic_ostream<charT, traits> & stream, const tools::PolyPolygon& rPolyPoly) { if (!rPolyPoly.Count()) stream << "EMPTY"; diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 516e4072f05b..accb763c5faa 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -694,7 +694,7 @@ public: @return true, if the operation was completed successfully. */ bool Vectorize( - PolyPolygon& rPolyPoly, + tools::PolyPolygon& rPolyPoly, sal_uLong nFlags = BMP_VECTORIZE_OUTER, const Link* pProgress = NULL ); diff --git a/include/vcl/canvastools.hxx b/include/vcl/canvastools.hxx index 774f09ff50e0..08b5b6dba648 100644 --- a/include/vcl/canvastools.hxx +++ b/include/vcl/canvastools.hxx @@ -31,7 +31,7 @@ class Point; class Size; class Rectangle; class Polygon; -class PolyPolygon; +namespace tools { class PolyPolygon; } class Bitmap; class BitmapEx; class Color; diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 414f4306ac8f..5a80213a7550 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -34,7 +34,7 @@ class SvStream; class Color; class BitmapEx; class Polygon; -class PolyPolygon; +namespace tools { class PolyPolygon; } class Gradient; @@ -106,11 +106,11 @@ private: const Size& rOffset, double fSin, double fCos ); SAL_DLLPRIVATE Polygon ImplGetRotatedPolygon( const Polygon& rPoly, const Point& rRotatePt, const Size& rOffset, double fSin, double fCos ); - SAL_DLLPRIVATE PolyPolygon ImplGetRotatedPolyPolygon( const PolyPolygon& rPoly, const Point& rRotatePt, + SAL_DLLPRIVATE tools::PolyPolygon ImplGetRotatedPolyPolygon( const tools::PolyPolygon& rPoly, const Point& rRotatePt, const Size& rOffset, double fSin, double fCos ); SAL_DLLPRIVATE void ImplAddGradientEx( GDIMetaFile& rMtf, const OutputDevice& rMapDev, - const PolyPolygon& rPolyPoly, + const tools::PolyPolygon& rPolyPoly, const Gradient& rGrad ); SAL_DLLPRIVATE bool ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, Size rLogicDestSize ); SAL_DLLPRIVATE void ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct, OutputDevice* pOut ); diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx index a96ac40d2427..ace82ffa545b 100644 --- a/include/vcl/graphictools.hxx +++ b/include/vcl/graphictools.hxx @@ -83,8 +83,8 @@ public: See accessor method descriptions for argument description */ SvtGraphicStroke( const Polygon& rPath, - const PolyPolygon& rStartArrow, - const PolyPolygon& rEndArrow, + const tools::PolyPolygon& rStartArrow, + const tools::PolyPolygon& rEndArrow, double fTransparency, double fStrokeWidth, CapType aCap, @@ -108,7 +108,7 @@ public: width, it has to fit every stroke with every stroke width exactly. */ - void getStartArrow ( PolyPolygon& ) const; + void getStartArrow ( tools::PolyPolygon& ) const; /** Get the polygon that is put at the end of the line The polygon is in a special normalized position, and already @@ -122,7 +122,7 @@ public: arrow does have this width, it has to fit every stroke with every stroke width exactly. */ - void getEndArrow ( PolyPolygon& ) const; + void getEndArrow ( tools::PolyPolygon& ) const; /** Get stroke transparency @return the transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent) @@ -155,7 +155,7 @@ public: arrow does have this width, it will fit every stroke with every stroke width exactly. */ - void setStartArrow ( const PolyPolygon& ); + void setStartArrow ( const tools::PolyPolygon& ); /** Set the polygon that is put at the end of the line The polygon has to be in a special normalized position, and @@ -169,7 +169,7 @@ public: arrow does have this width, it will fit every stroke with every stroke width exactly. */ - void setEndArrow ( const PolyPolygon& ); + void setEndArrow ( const tools::PolyPolygon& ); /// Affine scaling in both X and Y dimensions void scale ( double fScaleX, double fScaleY ); @@ -179,8 +179,8 @@ private: VCL_DLLPUBLIC friend SvStream& ReadSvtGraphicStroke( SvStream& rIStm, SvtGraphicStroke& rClass ); Polygon maPath; - PolyPolygon maStartArrow; - PolyPolygon maEndArrow; + tools::PolyPolygon maStartArrow; + tools::PolyPolygon maEndArrow; double mfTransparency; double mfStrokeWidth; CapType maCapType; @@ -281,7 +281,7 @@ public: See accessor method descriptions for argument description */ - SvtGraphicFill( const PolyPolygon& rPath, + SvtGraphicFill( const tools::PolyPolygon& rPath, Color aFillColor, double fTransparency, FillRule aFillRule, @@ -298,7 +298,7 @@ public: // accessors /// Query path to fill - void getPath ( PolyPolygon& ) const; + void getPath ( tools::PolyPolygon& ) const; /// Get color used for solid fills const Color& getFillColor () const { return maFillColor;} /** Get stroke transparency @@ -348,14 +348,14 @@ public: // mutators /// Set path to fill - void setPath ( const PolyPolygon& rPath ); + void setPath ( const tools::PolyPolygon& rPath ); private: // friends VCL_DLLPUBLIC friend SvStream& WriteSvtGraphicFill( SvStream& rOStm, const SvtGraphicFill& rClass ); VCL_DLLPUBLIC friend SvStream& ReadSvtGraphicFill( SvStream& rIStm, SvtGraphicFill& rClass ); - PolyPolygon maPath; + tools::PolyPolygon maPath; Color maFillColor; double mfTransparency; FillRule maFillRule; diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index d98d9ef87e57..1aea53f3a0a4 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -413,7 +413,7 @@ class VCL_DLLPUBLIC MetaPolyPolygonAction : public MetaAction { private: - PolyPolygon maPolyPoly; + tools::PolyPolygon maPolyPoly; virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; @@ -427,12 +427,12 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; - explicit MetaPolyPolygonAction( const PolyPolygon& ); + explicit MetaPolyPolygonAction( const tools::PolyPolygon& ); virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; - const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } + const tools::PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } }; class VCL_DLLPUBLIC MetaTextAction : public MetaAction @@ -937,7 +937,7 @@ class VCL_DLLPUBLIC MetaGradientExAction : public MetaAction { private: - PolyPolygon maPolyPoly; + tools::PolyPolygon maPolyPoly; Gradient maGradient; virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; @@ -952,12 +952,12 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; - MetaGradientExAction( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); + MetaGradientExAction( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ); virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; - const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } + const tools::PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } const Gradient& GetGradient() const { return maGradient; } }; @@ -965,7 +965,7 @@ class VCL_DLLPUBLIC MetaHatchAction : public MetaAction { private: - PolyPolygon maPolyPoly; + tools::PolyPolygon maPolyPoly; Hatch maHatch; virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; @@ -980,12 +980,12 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; - MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHatch ); + MetaHatchAction( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ); virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; - const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } + const tools::PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } const Hatch& GetHatch() const { return maHatch; } }; @@ -1410,7 +1410,7 @@ class VCL_DLLPUBLIC MetaTransparentAction : public MetaAction { private: - PolyPolygon maPolyPoly; + tools::PolyPolygon maPolyPoly; sal_uInt16 mnTransPercent; virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; @@ -1425,12 +1425,12 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; - MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ); + MetaTransparentAction( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ); virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; - const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } + const tools::PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } sal_uInt16 GetTransparence() const { return mnTransPercent; } }; diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 6dc4f076cba7..fd04d9814d7a 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -781,14 +781,14 @@ public: @see DrawPolyLine */ - void DrawPolyPolygon( const PolyPolygon& rPolyPoly ); + void DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly ); void DrawPolyPolygon( const basegfx::B2DPolyPolygon& ); private: - SAL_DLLPRIVATE void ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pClipPolyPoly = NULL ); - SAL_DLLPRIVATE void ImplDrawPolyPolygon( const PolyPolygon& rPolyPoly, const PolyPolygon* pClipPolyPoly = NULL ); - SAL_DLLPRIVATE void ImplDrawPolyPolygon( sal_uInt16 nPoly, const PolyPolygon& rPolyPoly ); + SAL_DLLPRIVATE void ImplDrawPolygon( const Polygon& rPoly, const tools::PolyPolygon* pClipPolyPoly = NULL ); + SAL_DLLPRIVATE void ImplDrawPolyPolygon( const tools::PolyPolygon& rPolyPoly, const tools::PolyPolygon* pClipPolyPoly = NULL ); + SAL_DLLPRIVATE void ImplDrawPolyPolygon( sal_uInt16 nPoly, const tools::PolyPolygon& rPolyPoly ); // #i101491# // Helper who implements the DrawPolyPolygon functionality for basegfx::B2DPolyPolygon // without MetaFile processing @@ -825,7 +825,7 @@ public: public: void DrawGradient( const Rectangle& rRect, const Gradient& rGradient ); - void DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); + void DrawGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ); void AddGradientActions( const Rectangle& rRect, @@ -840,8 +840,8 @@ protected: private: - SAL_DLLPRIVATE void DrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const PolyPolygon* pClipPolyPoly ); - SAL_DLLPRIVATE void DrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const PolyPolygon* pClipPolyPoly ); + SAL_DLLPRIVATE void DrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const tools::PolyPolygon* pClipPolyPoly ); + SAL_DLLPRIVATE void DrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const tools::PolyPolygon* pClipPolyPoly ); SAL_DLLPRIVATE long GetGradientSteps( const Gradient& rGradient, const Rectangle& rRect, bool bMtf, bool bComplex=false ); @@ -857,23 +857,23 @@ private: public: #ifdef _MSC_VER - void DrawHatch( const PolyPolygon& rPolyPoly, const ::Hatch& rHatch ); - void AddHatchActions( const PolyPolygon& rPolyPoly, + void DrawHatch( const tools::PolyPolygon& rPolyPoly, const ::Hatch& rHatch ); + void AddHatchActions( const tools::PolyPolygon& rPolyPoly, const ::Hatch& rHatch, GDIMetaFile& rMtf ); #else - void DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ); - void AddHatchActions( const PolyPolygon& rPolyPoly, + void DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ); + void AddHatchActions( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch, GDIMetaFile& rMtf ); #endif - void DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, bool bMtf ); + void DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch, bool bMtf ); private: SAL_DLLPRIVATE void CalcHatchValues( const Rectangle& rRect, long nDist, sal_uInt16 nAngle10, Point& rPt1, Point& rPt2, Size& rInc, Point& rEndPt1 ); - SAL_DLLPRIVATE void DrawHatchLine( const Line& rLine, const PolyPolygon& rPolyPoly, Point* pPtBuffer, bool bMtf ); + SAL_DLLPRIVATE void DrawHatchLine( const Line& rLine, const tools::PolyPolygon& rPolyPoly, Point* pPtBuffer, bool bMtf ); ///@} @@ -1001,7 +1001,7 @@ public: Rectangle ImplGetTextBoundRect( const SalLayout& ); - bool GetTextOutline( PolyPolygon&, + bool GetTextOutline( tools::PolyPolygon&, const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, bool bOptimize = true, sal_uLong nLayoutWidth = 0, const long* pDXArray = NULL ) const; @@ -1156,7 +1156,7 @@ public: */ SystemFontData GetSysFontData( int nFallbacklevel ) const; - SAL_DLLPRIVATE void ImplGetEmphasisMark( PolyPolygon& rPolyPoly, bool& rPolyLine, Rectangle& rRect1, Rectangle& rRect2, + SAL_DLLPRIVATE void ImplGetEmphasisMark( tools::PolyPolygon& rPolyPoly, bool& rPolyLine, Rectangle& rRect1, Rectangle& rRect2, long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, long nHeight, short nOrient ); SAL_DLLPRIVATE static FontEmphasisMark ImplGetEmphasisMarkStyle( const vcl::Font& rFont ); @@ -1216,7 +1216,7 @@ private: SAL_DLLPRIVATE OUString ImplGetEllipsisString( const OutputDevice& rTargetDevice, const OUString& rStr, long nMaxWidth, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ); - SAL_DLLPRIVATE void ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); + SAL_DLLPRIVATE void ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); SAL_DLLPRIVATE void ImplDrawEmphasisMarks( SalLayout& ); ///@} @@ -1512,7 +1512,7 @@ public: virtual sal_uInt16 GetAlphaBitCount() const; - void DrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); + void DrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); void DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, double fTransparency); void DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, @@ -1520,12 +1520,12 @@ public: protected: - virtual void EmulateDrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); - void DrawInvisiblePolygon( const PolyPolygon& rPolyPoly ); + virtual void EmulateDrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); + void DrawInvisiblePolygon( const tools::PolyPolygon& rPolyPoly ); private: - SAL_DLLPRIVATE bool DrawTransparentNatively( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); + SAL_DLLPRIVATE bool DrawTransparentNatively( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); ///@} @@ -1614,7 +1614,7 @@ public: Size LogicToPixel( const Size& rLogicSize ) const; Rectangle LogicToPixel( const Rectangle& rLogicRect ) const; Polygon LogicToPixel( const Polygon& rLogicPoly ) const; - PolyPolygon LogicToPixel( const PolyPolygon& rLogicPolyPoly ) const; + tools::PolyPolygon LogicToPixel( const tools::PolyPolygon& rLogicPolyPoly ) const; basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const; vcl::Region LogicToPixel( const vcl::Region& rLogicRegion )const; Point LogicToPixel( const Point& rLogicPt, @@ -1627,7 +1627,7 @@ public: const MapMode& rMapMode ) const; basegfx::B2DPolygon LogicToPixel( const basegfx::B2DPolygon& rLogicPoly, const MapMode& rMapMode ) const; - PolyPolygon LogicToPixel( const PolyPolygon& rLogicPolyPoly, + tools::PolyPolygon LogicToPixel( const tools::PolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const; basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const; @@ -1639,7 +1639,7 @@ public: Size PixelToLogic( const Size& rDeviceSize ) const; Rectangle PixelToLogic( const Rectangle& rDeviceRect ) const; Polygon PixelToLogic( const Polygon& rDevicePoly ) const; - PolyPolygon PixelToLogic( const PolyPolygon& rDevicePolyPoly ) const; + tools::PolyPolygon PixelToLogic( const tools::PolyPolygon& rDevicePolyPoly ) const; basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly ) const; vcl::Region PixelToLogic( const vcl::Region& rDeviceRegion ) const; Point PixelToLogic( const Point& rDevicePt, @@ -1652,7 +1652,7 @@ public: const MapMode& rMapMode ) const; basegfx::B2DPolygon PixelToLogic( const basegfx::B2DPolygon& rDevicePoly, const MapMode& rMapMode ) const; - PolyPolygon PixelToLogic( const PolyPolygon& rDevicePolyPoly, + tools::PolyPolygon PixelToLogic( const tools::PolyPolygon& rDevicePolyPoly, const MapMode& rMapMode ) const; basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly, const MapMode& rMapMode ) const; @@ -1842,7 +1842,7 @@ private: @returns Polypolygon based on physical device pixel coordinates and units. */ - SAL_DLLPRIVATE PolyPolygon ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyPoly ) const; + SAL_DLLPRIVATE tools::PolyPolygon ImplLogicToDevicePixel( const tools::PolyPolygon& rLogicPolyPoly ) const; /** Convert a line in logical units to a line in physical device pixel units. diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index 56ce18c40052..03211f42aa80 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -48,7 +48,7 @@ class GDIMetaFile; class MapMode; class Polygon; class LineInfo; -class PolyPolygon; +namespace tools { class PolyPolygon; } class Bitmap; class BitmapEx; class Image; @@ -791,7 +791,7 @@ The following structure describes the permissions used in PDF security const LineInfo& rLineInfo ); void DrawPolyLine( const Polygon& rPoly, const ExtLineInfo& rInfo ); void DrawPolygon( const Polygon& rPoly ); - void DrawPolyPolygon( const PolyPolygon& rPolyPoly ); + void DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly ); void DrawRect( const Rectangle& rRect ); void DrawRect( const Rectangle& rRect, sal_uLong nHorzRount, sal_uLong nVertRound ); @@ -810,12 +810,12 @@ The following structure describes the permissions used in PDF security const BitmapEx& rBitmapEx ); void DrawGradient( const Rectangle& rRect, const Gradient& rGradient ); - void DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); + void DrawGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ); - void DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ); + void DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ); void DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper ); - void DrawTransparent( const PolyPolygon& rPolyPoly, + void DrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); /** Start a transparency group diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 6de196c8a6c8..99d781e60f30 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -288,7 +288,7 @@ protected: const Point& rSrcPtPixel, const Size& rSrcSizePixel, BitmapEx& rBitmapEx ) SAL_OVERRIDE; - virtual void EmulateDrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) SAL_OVERRIDE; + virtual void EmulateDrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) SAL_OVERRIDE; virtual void InitFont() const SAL_OVERRIDE; virtual void SetFontOrientation( ImplFontEntry* const pFontEntry ) const SAL_OVERRIDE; diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx index f4d2dd31644a..362fa45ee35e 100644 --- a/include/vcl/region.hxx +++ b/include/vcl/region.hxx @@ -29,13 +29,13 @@ class ImplRegionBand; class RegionBand; class Polygon; -class PolyPolygon; +namespace tools { class PolyPolygon; } namespace vcl { class Window; } class OutputDevice; class Bitmap; typedef boost::shared_ptr< RegionBand > RegionBandPtr; -typedef boost::shared_ptr< PolyPolygon > PolyPolygonPtr; +typedef boost::shared_ptr< tools::PolyPolygon > PolyPolygonPtr; typedef boost::shared_ptr< basegfx::B2DPolyPolygon > B2DPolyPolygonPtr; typedef std::vector< Rectangle > RectangleVector; @@ -57,10 +57,10 @@ private: bool mbIsNull : 1; // helpers - SAL_DLLPRIVATE void ImplCreatePolyPolyRegion( const PolyPolygon& rPolyPoly ); + SAL_DLLPRIVATE void ImplCreatePolyPolyRegion( const tools::PolyPolygon& rPolyPoly ); SAL_DLLPRIVATE void ImplCreatePolyPolyRegion( const basegfx::B2DPolyPolygon& rPolyPoly ); - SAL_DLLPRIVATE PolyPolygon ImplCreatePolyPolygonFromRegionBand() const; + SAL_DLLPRIVATE tools::PolyPolygon ImplCreatePolyPolygonFromRegionBand() const; SAL_DLLPRIVATE basegfx::B2DPolyPolygon ImplCreateB2DPolyPolygonFromRegionBand() const; public: @@ -68,19 +68,19 @@ public: explicit Region(bool bIsNull = false); // default creates empty region, with true a null region is created explicit Region(const Rectangle& rRect); explicit Region(const Polygon& rPolygon); - explicit Region(const PolyPolygon& rPolyPoly); + explicit Region(const tools::PolyPolygon& rPolyPoly); explicit Region(const basegfx::B2DPolyPolygon&); Region(const vcl::Region& rRegion); ~Region(); // direct access to contents const basegfx::B2DPolyPolygon* getB2DPolyPolygon() const { return mpB2DPolyPolygon.get(); } - const PolyPolygon* getPolyPolygon() const { return mpPolyPolygon.get(); } + const tools::PolyPolygon* getPolyPolygon() const { return mpPolyPolygon.get(); } const RegionBand* getRegionBand() const { return mpRegionBand.get(); } // access with converters, the asked data will be created from the most // valuable data, buffered and returned - const PolyPolygon GetAsPolyPolygon() const; + const tools::PolyPolygon GetAsPolyPolygon() const; const basegfx::B2DPolyPolygon GetAsB2DPolyPolygon() const; const RegionBand* GetAsRegionBand() const; @@ -124,11 +124,11 @@ public: * rectangles, then the returned vcl::Region will be constructed by * XOr'ing the contained Polygons together; in the case of * only Rectangles this can be up to eight times faster than - * Region( const PolyPolygon& ). + * Region( const tools::PolyPolygon& ). * Caution: this is only useful if the vcl::Region is known to be * changed to rectangles; e.g. if being set as clip region */ - static vcl::Region GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly ); + static vcl::Region GetRegionFromPolyPolygon( const tools::PolyPolygon& rPolyPoly ); }; } /* namespace vcl */ diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 99d636d2f588..4e1a0ceaa67b 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2085,7 +2085,7 @@ void DrawingML::WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool b mpFS->endElementNS( XML_a, XML_prstGeom ); } -void DrawingML::WritePolyPolygon( const PolyPolygon& rPolyPolygon ) +void DrawingML::WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon ) { if( rPolyPolygon.Count() < 1 ) return; diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index fc14776197e1..25a8dbabd04a 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -184,7 +184,7 @@ ShapeExport& ShapeExport::WriteBezierShape( Reference< XShape > xShape, bool bCl FSHelperPtr pFS = GetFS(); pFS->startElementNS( mnXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX ? XML_sp : XML_wsp), FSEND ); - PolyPolygon aPolyPolygon = EscherPropertyContainer::GetPolyPolygon( xShape ); + tools::PolyPolygon aPolyPolygon = EscherPropertyContainer::GetPolyPolygon( xShape ); Rectangle aRect( aPolyPolygon.GetBoundRect() ); #if OSL_DEBUG_LEVEL > 0 @@ -635,7 +635,7 @@ ShapeExport& ShapeExport::WriteLineShape( Reference< XShape > xShape ) pFS->startElementNS( mnXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX ? XML_sp : XML_wsp), FSEND ); - PolyPolygon aPolyPolygon = EscherPropertyContainer::GetPolyPolygon( xShape ); + tools::PolyPolygon aPolyPolygon = EscherPropertyContainer::GetPolyPolygon( xShape ); if( aPolyPolygon.Count() == 1 && aPolyPolygon[ 0 ].GetSize() == 2) { const Polygon& rPoly = aPolyPolygon[ 0 ]; diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index 0621f61cb08b..d9dc4cf7c891 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -52,7 +52,7 @@ void OEndMarker::Paint( const Rectangle& /*rRect*/ ) Size aSize = GetSizePixel(); aSize.Width() += nCornerSpace; Rectangle aWholeRect(Point(-nCornerSpace,0),aSize); - PolyPolygon aPoly; + tools::PolyPolygon aPoly; aPoly.Insert(Polygon(aWholeRect,nCornerSpace,nCornerSpace)); Color aStartColor(m_nColor); diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index d8034501b9a7..a1a3f30944d2 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -116,7 +116,7 @@ void OStartMarker::Paint( const Rectangle& rRect ) Rectangle aWholeRect(Point(),aSize); { const ColorChanger aColors( this, m_nTextBoundaries, m_nColor ); - PolyPolygon aPoly; + tools::PolyPolygon aPoly; aPoly.Insert(Polygon(aWholeRect,nCornerWidth,nCornerWidth)); Color aStartColor(m_nColor); diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 63224f65b536..b61ce4dc1cf5 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -1237,7 +1237,7 @@ void ScCsvGrid::ImplDrawColumnSelection( sal_uInt32 nColIndex ) { // use transparent active color maGridDev.SetFillColor( maSelectColor ); - maGridDev.DrawTransparent( PolyPolygon( Polygon( aRect ) ), CSV_HDR_TRANSPARENCY ); + maGridDev.DrawTransparent( tools::PolyPolygon( Polygon( aRect ) ), CSV_HDR_TRANSPARENCY ); } // column selection diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 5a622e255dae..44e32f030e75 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -1866,7 +1866,7 @@ vcl::Region ScOutputData::GetChangedAreaRegion() bool ScOutputData::SetChangedClip() { - PolyPolygon aPoly; + tools::PolyPolygon aPoly; Rectangle aDrawingRect; aDrawingRect.Left() = nScrX; @@ -2078,10 +2078,10 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY, Rectangle aLowerLeft ( aRectMinX1, aRectMaxY1, aRectMinX2, aRectMaxY2 ); Rectangle aUpperRight( aRectMaxX1, aRectMinY1, aRectMaxX2, aRectMinY2 ); - mpDev->DrawTransparent( PolyPolygon( Polygon( aLowerRight ) ), lclCornerRectTransparency ); - mpDev->DrawTransparent( PolyPolygon( Polygon( aUpperLeft ) ), lclCornerRectTransparency ); - mpDev->DrawTransparent( PolyPolygon( Polygon( aLowerLeft ) ), lclCornerRectTransparency ); - mpDev->DrawTransparent( PolyPolygon( Polygon( aUpperRight ) ), lclCornerRectTransparency ); + mpDev->DrawTransparent( tools::PolyPolygon( Polygon( aLowerRight ) ), lclCornerRectTransparency ); + mpDev->DrawTransparent( tools::PolyPolygon( Polygon( aUpperLeft ) ), lclCornerRectTransparency ); + mpDev->DrawTransparent( tools::PolyPolygon( Polygon( aLowerLeft ) ), lclCornerRectTransparency ); + mpDev->DrawTransparent( tools::PolyPolygon( Polygon( aUpperRight ) ), lclCornerRectTransparency ); } } } diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 08aaf18995a9..8a6497eab841 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -267,7 +267,7 @@ void GraphicObject::ImplAutoSwapIn() } bool GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr, - PolyPolygon& rClipPolyPoly, bool& bRectClipRegion ) const + tools::PolyPolygon& rClipPolyPoly, bool& bRectClipRegion ) const { bool bRet = false; @@ -525,7 +525,7 @@ bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Size& Size aSz( rSz ); if ( pAttr && pAttr->IsCropped() ) { - PolyPolygon aClipPolyPoly; + tools::PolyPolygon aClipPolyPoly; bool bRectClip; ImplGetCropParams( pOut, aPt, aSz, pAttr, aClipPolyPoly, bRectClip ); } @@ -578,7 +578,7 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, if( bCropped ) { - PolyPolygon aClipPolyPoly; + tools::PolyPolygon aClipPolyPoly; bool bRectClip; const bool bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip ); @@ -650,7 +650,7 @@ bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev, if( aGrfAttr.IsCropped() ) { - PolyPolygon aClipPolyPoly; + tools::PolyPolygon aClipPolyPoly; bool bRectClip; const bool bCrop = ImplGetCropParams( &rOutDev, aPt, aSz, @@ -723,7 +723,7 @@ bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const if( bCropped ) { - PolyPolygon aClipPolyPoly; + tools::PolyPolygon aClipPolyPoly; bool bRectClip; const bool bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip ); diff --git a/svx/inc/sdr/overlay/overlayhatchrect.hxx b/svx/inc/sdr/overlay/overlayhatchrect.hxx index d54d0679a3ad..bdceb0b1ca2a 100644 --- a/svx/inc/sdr/overlay/overlayhatchrect.hxx +++ b/svx/inc/sdr/overlay/overlayhatchrect.hxx @@ -25,7 +25,7 @@ -class PolyPolygon; +namespace tools { class PolyPolygon; } namespace sdr { diff --git a/svx/inc/sdr/overlay/overlayrectangle.hxx b/svx/inc/sdr/overlay/overlayrectangle.hxx index 3d1378aafd3f..e7a4cc72cf40 100644 --- a/svx/inc/sdr/overlay/overlayrectangle.hxx +++ b/svx/inc/sdr/overlay/overlayrectangle.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <tools/gen.hxx> -class PolyPolygon; +namespace tools { class PolyPolygon; } namespace sdr { diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index bbe054fbe51e..18dd8d10f9be 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -58,7 +58,7 @@ using namespace com::sun::star::uno; struct FWCharacterData // representing a single character { - std::vector< PolyPolygon > vOutlines; + std::vector< tools::PolyPolygon > vOutlines; Rectangle aBoundRect; }; struct FWParagraphData // representing a single paragraph @@ -145,7 +145,7 @@ double GetLength( const Polygon& rPolygon ) /* CalculateHorizontalScalingFactor returns the horizontal scaling factor for the whole text object, so that each text will match its corresponding 2d Outline */ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape, - FWData& rFWData, const PolyPolygon& rOutline2d ) + FWData& rFWData, const tools::PolyPolygon& rOutline2d ) { double fScalingFactor = 1.0; bool bScalingFactorDefined = false; @@ -284,8 +284,8 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, aCharText, 0, 0, -1, true, nWidth, pDXArry ) ) { sal_Int32 nTextWidth = aVirDev.GetTextWidth( aCharText); - std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterData.vOutlines.begin(); - std::vector< PolyPolygon >::iterator aOutlineIEnd = aCharacterData.vOutlines.end(); + std::vector< tools::PolyPolygon >::iterator aOutlineIter = aCharacterData.vOutlines.begin(); + std::vector< tools::PolyPolygon >::iterator aOutlineIEnd = aCharacterData.vOutlines.end(); if ( aOutlineIter == aOutlineIEnd ) { nHeight += rFWData.nSingleLineHeight; @@ -318,8 +318,8 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F std::vector< FWCharacterData >::iterator aCharacterIEnd( aParagraphIter->vCharacters.end() ); while ( aCharacterIter != aCharacterIEnd ) { - std::vector< PolyPolygon >::iterator aOutlineIter( aCharacterIter->vOutlines.begin() ); - std::vector< PolyPolygon >::iterator aOutlineIEnd( aCharacterIter->vOutlines.end() ); + std::vector< tools::PolyPolygon >::iterator aOutlineIter( aCharacterIter->vOutlines.begin() ); + std::vector< tools::PolyPolygon >::iterator aOutlineIEnd( aCharacterIter->vOutlines.end() ); while ( aOutlineIter != aOutlineIEnd ) { aOutlineIter->Move( ( aSingleCharacterUnion.GetWidth() - aCharacterIter->aBoundRect.GetWidth() ) / 2, 0 ); @@ -351,12 +351,12 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F std::vector< FWCharacterData >::iterator aCharacterIEnd ( aParagraphIter->vCharacters.end() ); while ( aCharacterIter != aCharacterIEnd ) { - std::vector< PolyPolygon >::iterator aOutlineIter( aCharacterIter->vOutlines.begin() ); - std::vector< PolyPolygon >::iterator aOutlineIEnd( aCharacterIter->vOutlines.end() ); + std::vector< tools::PolyPolygon >::iterator aOutlineIter( aCharacterIter->vOutlines.begin() ); + std::vector< tools::PolyPolygon >::iterator aOutlineIEnd( aCharacterIter->vOutlines.end() ); while( aOutlineIter != aOutlineIEnd ) { - PolyPolygon& rPolyPoly = *aOutlineIter++; + tools::PolyPolygon& rPolyPoly = *aOutlineIter++; if ( nVerticalOffset ) rPolyPoly.Move( 0, nVerticalOffset ); @@ -387,8 +387,8 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F std::vector< FWCharacterData >::iterator aCharacterIEnd( aParagraphIter->vCharacters.end() ); while ( aCharacterIter != aCharacterIEnd ) { - std::vector< PolyPolygon >::iterator aOutlineIter( aCharacterIter->vOutlines.begin() ); - std::vector< PolyPolygon >::iterator aOutlineIEnd( aCharacterIter->vOutlines.end() ); + std::vector< tools::PolyPolygon >::iterator aOutlineIter( aCharacterIter->vOutlines.begin() ); + std::vector< tools::PolyPolygon >::iterator aOutlineIEnd( aCharacterIter->vOutlines.end() ); while( aOutlineIter != aOutlineIEnd ) { Rectangle aPolyPolyBoundRect( aOutlineIter->GetBoundRect() ); @@ -447,8 +447,8 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape ) std::vector< FWCharacterData >::iterator aCharacterIEnd( aParagraphIter->vCharacters.end() ); while ( aCharacterIter != aCharacterIEnd ) { - std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin(); - std::vector< PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end(); + std::vector< tools::PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin(); + std::vector< tools::PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end(); while( aOutlineIter != aOutlineIEnd ) { aOutlineIter->Scale( fScale, 1.0 ); @@ -482,8 +482,8 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape ) std::vector< FWCharacterData >::iterator aCharacterIEnd( aParagraphIter->vCharacters.end() ); while ( aCharacterIter != aCharacterIEnd ) { - std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin(); - std::vector< PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end(); + std::vector< tools::PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin(); + std::vector< tools::PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end(); while( aOutlineIter != aOutlineIEnd ) { aOutlineIter->Move( nHorzDiff, 0 ); @@ -622,7 +622,7 @@ void GetPoint( const Polygon& rPoly, const std::vector< double >& rDistances, co } } -void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFWData ) +void FitTextOutlinesToShapeOutlines( const tools::PolyPolygon& aOutlines2d, FWData& rFWData ) { std::vector< FWTextArea >::iterator aTextAreaIter = rFWData.vTextAreas.begin(); std::vector< FWTextArea >::iterator aTextAreaIEnd = rFWData.vTextAreas.end(); @@ -656,11 +656,11 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFW std::vector< FWCharacterData >::iterator aCharacterIEnd( aParagraphIter->vCharacters.end() ); while ( aCharacterIter != aCharacterIEnd ) { - std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin(); - std::vector< PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end(); + std::vector< tools::PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin(); + std::vector< tools::PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end(); while( aOutlineIter != aOutlineIEnd ) { - PolyPolygon& rPolyPoly = *aOutlineIter; + tools::PolyPolygon& rPolyPoly = *aOutlineIter; Rectangle aBoundRect( rPolyPoly.GetBoundRect() ); double fx1 = aBoundRect.Left() - nLeft; double fx2 = aBoundRect.Right() - nLeft; @@ -719,11 +719,11 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFW std::vector< FWCharacterData >::iterator aCharacterIEnd( aParagraphIter->vCharacters.end() ); while ( aCharacterIter != aCharacterIEnd ) { - std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin(); - std::vector< PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end(); + std::vector< tools::PolyPolygon >::iterator aOutlineIter = aCharacterIter->vOutlines.begin(); + std::vector< tools::PolyPolygon >::iterator aOutlineIEnd = aCharacterIter->vOutlines.end(); while( aOutlineIter != aOutlineIEnd ) { - PolyPolygon& rPolyPoly = *aOutlineIter; + tools::PolyPolygon& rPolyPoly = *aOutlineIter; sal_uInt16 i, nPolyCount = rPolyPoly.Count(); for ( i = 0; i < nPolyCount; i++ ) { @@ -792,8 +792,8 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const Sd std::vector< FWCharacterData >::const_iterator aCharacterIEnd( aParagraphIter->vCharacters.end() ); while ( aCharacterIter != aCharacterIEnd ) { - std::vector< PolyPolygon >::const_iterator aOutlineIter = aCharacterIter->vOutlines.begin(); - std::vector< PolyPolygon >::const_iterator aOutlineIEnd = aCharacterIter->vOutlines.end(); + std::vector< tools::PolyPolygon >::const_iterator aOutlineIter = aCharacterIter->vOutlines.begin(); + std::vector< tools::PolyPolygon >::const_iterator aOutlineIEnd = aCharacterIter->vOutlines.end(); while( aOutlineIter != aOutlineIEnd ) { aPolyPoly.append( aOutlineIter->getB2DPolyPolygon() ); @@ -832,7 +832,7 @@ SdrObject* EnhancedCustomShapeFontWork::CreateFontWork( const SdrObject* pShape2 { SdrObject* pRet = NULL; - PolyPolygon aOutlines2d( GetOutlinesFromShape2d( pShape2d ) ); + tools::PolyPolygon aOutlines2d( GetOutlinesFromShape2d( pShape2d ) ); sal_uInt16 nOutlinesCount2d = aOutlines2d.Count(); if ( nOutlinesCount2d ) { diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index c47922d47629..688ed456081c 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -90,7 +90,7 @@ SvxContourDlg::~SvxContourDlg() { } -PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, +tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, const Rectangle* pRect, const sal_uIntPtr nFlags ) { @@ -166,7 +166,7 @@ PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, aBmp.SetPrefSize( rGraphic.GetPrefSize() ); aBmp.SetPrefMapMode( rGraphic.GetPrefMapMode() ); - return PolyPolygon( XOutBitmap::GetCountour( aBmp, nContourFlags, 128, pRect ) ); + return tools::PolyPolygon( XOutBitmap::GetCountour( aBmp, nContourFlags, 128, pRect ) ); } // Loop through to super class, no virtual Methods to not become incompatible @@ -182,7 +182,7 @@ bool SvxContourDlg::IsGraphicChanged() const return pSuperClass->IsGraphicChanged(); } -PolyPolygon SvxContourDlg::GetPolyPolygon() +tools::PolyPolygon SvxContourDlg::GetPolyPolygon() { return pSuperClass->GetPolyPolygon( true ); } @@ -193,7 +193,7 @@ const void* SvxContourDlg::GetEditingObject() const } void SvxContourDlg::Update( const Graphic& rGraphic, bool bGraphicLinked, - const PolyPolygon* pPolyPoly, void* pEditingObj ) + const tools::PolyPolygon* pPolyPoly, void* pEditingObj ) { pSuperClass->UpdateGraphic( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj ); } @@ -315,11 +315,11 @@ void SvxSuperContourDlg::SetGraphic( const Graphic& rGraphic ) m_pContourWnd->SetGraphic( aGraphic ); } -void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly ) +void SvxSuperContourDlg::SetPolyPolygon( const tools::PolyPolygon& rPolyPoly ) { DBG_ASSERT( m_pContourWnd->GetGraphic().GetType() != GRAPHIC_NONE, "Graphic must've been set first!" ); - PolyPolygon aPolyPoly( rPolyPoly ); + tools::PolyPolygon aPolyPoly( rPolyPoly ); const MapMode aMap100( MAP_100TH_MM ); const MapMode aGrfMap( aGraphic.GetPrefMapMode() ); OutputDevice* pOutDev = Application::GetDefaultDevice(); @@ -344,9 +344,9 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly ) m_pContourWnd->GetSdrModel()->SetChanged( true ); } -PolyPolygon SvxSuperContourDlg::GetPolyPolygon( bool bRescaleToGraphic ) +tools::PolyPolygon SvxSuperContourDlg::GetPolyPolygon( bool bRescaleToGraphic ) { - PolyPolygon aRetPolyPoly( m_pContourWnd->GetPolyPolygon() ); + tools::PolyPolygon aRetPolyPoly( m_pContourWnd->GetPolyPolygon() ); if ( bRescaleToGraphic ) { @@ -375,7 +375,7 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( bool bRescaleToGraphic ) } void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, bool _bGraphicLinked, - const PolyPolygon* pPolyPoly, void* pEditingObj ) + const tools::PolyPolygon* pPolyPoly, void* pEditingObj ) { aUpdateGraphic = rGraphic; bUpdateGraphicLinked = _bGraphicLinked; @@ -384,7 +384,7 @@ void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, bool _bGraphicL if ( pPolyPoly ) aUpdatePolyPoly = *pPolyPoly; else - aUpdatePolyPoly = PolyPolygon(); + aUpdatePolyPoly = tools::PolyPolygon(); aUpdateTimer.Start(); } @@ -556,7 +556,7 @@ IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl) bGraphicLinked = bUpdateGraphicLinked; aUpdateGraphic = Graphic(); - aUpdatePolyPoly = PolyPolygon(); + aUpdatePolyPoly = tools::PolyPolygon(); bUpdateGraphicLinked = false; m_pContourWnd->GetSdrModel()->SetChanged( false ); diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index 96a99d3a534b..407dd2fd4df1 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -34,7 +34,7 @@ class SvxSuperContourDlg : public SvxContourDlg Graphic aUndoGraphic; Graphic aRedoGraphic; Graphic aUpdateGraphic; - PolyPolygon aUpdatePolyPoly; + tools::PolyPolygon aUpdatePolyPoly; Timer aUpdateTimer; Timer aCreateTimer; Size aLastSize; @@ -91,8 +91,8 @@ public: const Graphic& GetGraphic() const { return aGraphic; } bool IsGraphicChanged() const { return nGrfChanged > 0UL; } - void SetPolyPolygon( const PolyPolygon& rPolyPoly ); - PolyPolygon GetPolyPolygon( bool bRescaleToGraphic = true ); + void SetPolyPolygon( const tools::PolyPolygon& rPolyPoly ); + tools::PolyPolygon GetPolyPolygon( bool bRescaleToGraphic = true ); void SetEditingObject( void* pObj ) { pCheckObj = pObj; } const void* GetEditingObject() const { return pCheckObj; } @@ -101,7 +101,7 @@ public: bool IsRedoPossible() const; void UpdateGraphic( const Graphic& rGraphic, bool bGraphicLinked, - const PolyPolygon* pPolyPoly = NULL, + const tools::PolyPolygon* pPolyPoly = NULL, void* pEditingObj = NULL ); }; diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 64a8ae3b2e15..15fc238b438d 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -47,7 +47,7 @@ ContourWindow::~ContourWindow() { } -void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly ) +void ContourWindow::SetPolyPolygon( const tools::PolyPolygon& rPolyPoly ) { SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 ); const sal_uInt16 nPolyCount = rPolyPoly.Count(); @@ -90,13 +90,13 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly ) pModel->SetChanged( false ); } -const PolyPolygon& ContourWindow::GetPolyPolygon() +const tools::PolyPolygon& ContourWindow::GetPolyPolygon() { if ( pModel->IsChanged() ) { SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 ); - aPolyPoly = PolyPolygon(); + aPolyPoly = tools::PolyPolygon(); if ( pPage && pPage->GetObjCount() ) { @@ -104,7 +104,7 @@ const PolyPolygon& ContourWindow::GetPolyPolygon() // Not sure if subdivision is needed for ContourWindow, but maybe it cannot handle // curves at all. Keeping subdivision here for security const basegfx::B2DPolyPolygon aB2DPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(pPathObj->GetPathPoly())); - aPolyPoly = PolyPolygon(aB2DPolyPolygon); + aPolyPoly = tools::PolyPolygon(aB2DPolyPolygon); } pModel->SetChanged( false ); @@ -148,7 +148,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt ) { const Point aLogPt( PixelToLogic( rMEvt.GetPosPixel() ) ); - SetPolyPolygon( PolyPolygon() ); + SetPolyPolygon( tools::PolyPolygon() ); aWorkRect = Rectangle( aLogPt, aLogPt ); Paint( Rectangle( Point(), GetGraphicSize() ) ); SetEditMode( true ); @@ -206,7 +206,7 @@ void ContourWindow::MouseButtonUp(const MouseEvent& rMEvt) if ( aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom() ) { - PolyPolygon _aPolyPoly( GetPolyPolygon() ); + tools::PolyPolygon _aPolyPoly( GetPolyPolygon() ); _aPolyPoly.Clip( aWorkRect ); SetPolyPolygon( _aPolyPoly ); @@ -249,7 +249,7 @@ void ContourWindow::Paint( const Rectangle& rRect ) if ( aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom() ) { - PolyPolygon _aPolyPoly( 2, 2 ); + tools::PolyPolygon _aPolyPoly( 2, 2 ); const Color aOldFillColor( GetFillColor() ); _aPolyPoly.Insert( Rectangle( Point(), GetGraphicSize() ) ); diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx index 63d68ff82543..2bbf9a6f2feb 100644 --- a/svx/source/dialog/contwnd.hxx +++ b/svx/source/dialog/contwnd.hxx @@ -25,7 +25,7 @@ class ContourWindow : public GraphCtrl { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; Color aPipetteColor; Rectangle aWorkRect; Link aPipetteLink; @@ -52,8 +52,8 @@ public: ContourWindow(vcl::Window* pParent, WinBits nBits); virtual ~ContourWindow(); - void SetPolyPolygon( const PolyPolygon& rPolyPoly ); - const PolyPolygon& GetPolyPolygon(); + void SetPolyPolygon( const tools::PolyPolygon& rPolyPoly ); + const tools::PolyPolygon& GetPolyPolygon(); void SetPipetteMode( const bool bPipette ) { bPipetteMode = bPipette; } bool IsPipetteMode() const { return bPipetteMode; } diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index aa7f8ca434d2..86772cefb6db 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -100,9 +100,9 @@ FrameSelFlags lclGetFlagFromType( FrameBorderType eBorder ) } /** Merges the rSource polypolygon into the rDest polypolygon. */ -inline void lclPolyPolyUnion( PolyPolygon& rDest, const PolyPolygon& rSource ) +inline void lclPolyPolyUnion( tools::PolyPolygon& rDest, const tools::PolyPolygon& rSource ) { - const PolyPolygon aTmp( rDest ); + const tools::PolyPolygon aTmp( rDest ); aTmp.GetUnion( rSource, rDest ); } @@ -163,7 +163,7 @@ void FrameBorder::AddFocusPolygon( const Polygon& rFocus ) lclPolyPolyUnion( maFocusArea, rFocus ); } -void FrameBorder::MergeFocusToPolyPolygon( PolyPolygon& rPPoly ) const +void FrameBorder::MergeFocusToPolyPolygon( tools::PolyPolygon& rPPoly ) const { lclPolyPolyUnion( rPPoly, maFocusArea ); } @@ -528,7 +528,7 @@ void FrameSelectorImpl::DrawBackground() mnLine1 - mnFocusOffs, mnLine1 - mnFocusOffs, mnLine3 + mnFocusOffs, mnLine3 + mnFocusOffs ) ); // draw the white space for enabled frame borders - PolyPolygon aPPoly; + tools::PolyPolygon aPPoly; for( FrameBorderCIter aIt( maEnabBorders ); aIt.Is(); ++aIt ) (*aIt)->MergeFocusToPolyPolygon( aPPoly ); aPPoly.Optimize( POLY_OPTIMIZE_CLOSE ); @@ -676,7 +676,7 @@ void FrameSelectorImpl::CopyVirDevToControl() void FrameSelectorImpl::DrawAllTrackingRects() { - PolyPolygon aPPoly; + tools::PolyPolygon aPPoly; if( mrFrameSel.IsAnyBorderSelected() ) { for( SelFrameBorderCIter aIt( maEnabBorders ); aIt.Is(); ++aIt ) diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index fbab7730d9f0..3769117dd678 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -56,7 +56,7 @@ sdr::properties::BaseProperties* E3dExtrudeObj::CreateObjectSpecificProperties() TYPEINIT1(E3dExtrudeObj, E3dCompoundObject); -// Constructor creates a two cover surface PolyPolygon and (point-count 1) side +// Constructor creates a two cover surface tools::PolyPolygon and (point-count 1) side // surfaces rectangles from the passed PolyPolygon E3dExtrudeObj::E3dExtrudeObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPP, double fDepth) diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index dd5084252335..b8d960b0949d 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -63,7 +63,7 @@ void E3dPolygonObj::CreateDefaultNormals() { basegfx::B3DPolyPolygon aPolyNormals; - // Create a complete PolyPolygon with the plane normal + // Create a complete tools::PolyPolygon with the plane normal for(sal_uInt32 a(0L); a < aPolyPoly3D.count(); a++) { // Find source polygon @@ -92,7 +92,7 @@ void E3dPolygonObj::CreateDefaultNormals() void E3dPolygonObj::CreateDefaultTexture() { basegfx::B2DPolyPolygon aPolyTexture; - // Create a complete PolyPolygon with the texture coordinates + // Create a complete tools::PolyPolygon with the texture coordinates // The texture coordinates extend over X,Y and Z // on the whole extreme values in the range 0.0 .. 1.0 for(sal_uInt32 a(0L); a < aPolyPoly3D.count(); a++) diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index 33b3f510d749..702b2c4b2326 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -58,7 +58,7 @@ public: inline void ClearFocusArea() { maFocusArea.Clear(); } void AddFocusPolygon( const Polygon& rFocus ); - void MergeFocusToPolyPolygon( PolyPolygon& rPPoly ) const; + void MergeFocusToPolyPolygon( tools::PolyPolygon& rPPoly ) const; inline void ClearClickArea() { maClickArea.Clear(); } void AddClickRect( const Rectangle& rRect ); @@ -79,8 +79,8 @@ private: FrameBorderType meKeyRight; /// Right neighbor for keyboard control. FrameBorderType meKeyTop; /// Upper neighbor for keyboard control. FrameBorderType meKeyBottom; /// Lower neighbor for keyboard control. - PolyPolygon maFocusArea; /// Focus drawing areas. - PolyPolygon maClickArea; /// Mouse click areas. + tools::PolyPolygon maFocusArea; /// Focus drawing areas. + tools::PolyPolygon maClickArea; /// Mouse click areas. bool mbEnabled; /// true = Border enabled in control. bool mbSelected; /// true = Border selected in control. }; diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 81ad4d8bd0d7..b102d42a15a3 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -1376,7 +1376,7 @@ bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon, bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, bool bMakeLines) const { bool bOtherObjs(false); // true=objects other than PathObj's existent - bool bMin1PolyPoly(false); // true=at least 1 PolyPolygon with more than one Polygon existent + bool bMin1PolyPoly(false); // true=at least 1 tools::PolyPolygon with more than one Polygon existent SdrObjList* pOL = pObj->GetSubList(); if(pOL) diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 76539b6f064b..2e2c039052e7 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1250,7 +1250,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const if(nSize > 1) { // the topology for contour is correctly a vector of PolyPolygons; for - // historical reasons cut it back to a single PolyPolygon here + // historical reasons cut it back to a single tools::PolyPolygon here for(sal_uInt32 a(0); a < nSize; a++) { aRetval.append(rResult[a]); @@ -2528,7 +2528,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas // check for fill rsults if(!aExtractedLineFills.empty()) { - // merge to a single PolyPolygon (OR) + // merge to a single tools::PolyPolygon (OR) aMergedLineFillPolyPolygon = basegfx::tools::mergeToSinglePolyPolygon(aExtractedLineFills); } } diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index fcd5b0a5a7d6..2d9394db6b2c 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -484,7 +484,7 @@ bool SdrPolyEditView::IsOpenCloseMarkedObjectsPossible() const { // #i76617# Do not yet use basegfx::B2DPolygon since curve definitions // are different and methods need to be changed thoroughly with interaction rework - const PolyPolygon aPathPolyPolygon(pMarkedPathObject->GetPathPoly()); + const tools::PolyPolygon aPathPolyPolygon(pMarkedPathObject->GetPathPoly()); const sal_uInt16 nPolygonCount(aPathPolyPolygon.Count()); for(sal_uInt16 b(0); !bRetval && b < nPolygonCount; b++) diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index c963981800db..a3b791e693c0 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1170,7 +1170,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx { case OWN_ATTR_VALUE_POLYPOLYGON: { - // PolyPolygon in eine struct PolyPolygon packen + // tools::PolyPolygon in eine struct tools::PolyPolygon packen const basegfx::B2DPolyPolygon& rPolyPoly = GetPolygon(); drawing::PointSequenceSequence aRetval( rPolyPoly.count() ); @@ -1181,7 +1181,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx } case OWN_ATTR_BASE_GEOMETRY: { - // pack a PolyPolygon in struct PolyPolygon + // pack a tools::PolyPolygon in struct PolyPolygon basegfx::B2DPolyPolygon aNewPolyPolygon; basegfx::B2DHomMatrix aNewHomogenMatrix; @@ -1195,7 +1195,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx } case OWN_ATTR_VALUE_POLYGON: { - // PolyPolygon in eine struct PolyPolygon packen + // tools::PolyPolygon in eine struct tools::PolyPolygon packen const basegfx::B2DPolyPolygon& rPolyPoly = GetPolygon(); sal_Int32 nCount = 0; @@ -1331,7 +1331,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con { case OWN_ATTR_VALUE_POLYPOLYGONBEZIER: { - // PolyPolygon in eine struct PolyPolygon packen + // tools::PolyPolygon in eine struct tools::PolyPolygon packen const basegfx::B2DPolyPolygon& rPolyPoly = GetPolygon(); drawing::PolyPolygonBezierCoords aRetval; basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier(rPolyPoly, aRetval); @@ -1341,7 +1341,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con } case OWN_ATTR_BASE_GEOMETRY: { - // PolyPolygon in eine struct PolyPolygon packen + // tools::PolyPolygon in eine struct tools::PolyPolygon packen basegfx::B2DPolyPolygon aNewPolyPolygon; basegfx::B2DHomMatrix aNewHomogenMatrix; mpObj.get()->TRGetBaseGeometry(aNewHomogenMatrix, aNewPolyPolygon); diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 86ea10ff7464..b869896b67de 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -40,7 +40,7 @@ #include <svtools/embedhlp.hxx> #include <boost/ptr_container/ptr_vector.hpp> -class PolyPolygon; +namespace tools { class PolyPolygon; } class SwDoc; class DateTime; class CommandExtTextInputData; @@ -593,8 +593,8 @@ public: bool IsGrfSwapOut( bool bOnlyLinked = false ) const; sal_uInt16 GetGraphicType() const; - const PolyPolygon *GetGraphicPolygon() const; - void SetGraphicPolygon( const PolyPolygon *pPoly ); + const tools::PolyPolygon *GetGraphicPolygon() const; + void SetGraphicPolygon( const tools::PolyPolygon *pPoly ); /** If there's an automatic, not manipulated polygon at the selected notxtnode, it has to be deleted, e.g. cause the object has changed. */ diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index d66e55546118..875c75f0e1f0 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -21,7 +21,7 @@ #include "node.hxx" -class PolyPolygon; +namespace tools { class PolyPolygon; } // SwNoTxtNode @@ -30,7 +30,7 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode friend class SwNodes; friend class SwNoTxtFrm; - PolyPolygon *pContour; + tools::PolyPolygon *pContour; bool bAutomaticContour : 1; // automatic contour polygon, not manipulated bool bContourMapModeValid : 1; // contour map mode is not the graphics's // preferred map mode, but either @@ -65,21 +65,21 @@ public: OUString GetDescription() const; void SetDescription( const OUString& rDescription, bool bBroadcast = false ); - void SetContour( const PolyPolygon *pPoly, + void SetContour( const tools::PolyPolygon *pPoly, bool bAutomatic = false ); - const PolyPolygon *HasContour() const; + const tools::PolyPolygon *HasContour() const; bool _HasContour() const { return pContour!=0; }; - void GetContour( PolyPolygon &rPoly ) const; + void GetContour( tools::PolyPolygon &rPoly ) const; void CreateContour(); void SetAutomaticContour( bool bSet ) { bAutomaticContour = bSet; } bool HasAutomaticContour() const { return bAutomaticContour; } // set either a MM100 or pixel contour - void SetContourAPI( const PolyPolygon *pPoly ); + void SetContourAPI( const tools::PolyPolygon *pPoly ); // get either a MM100 or pixel contour, return sal_False if no contour is set. - bool GetContourAPI( PolyPolygon &rPoly ) const; + bool GetContourAPI( tools::PolyPolygon &rPoly ) const; void SetPixelContour( bool bSet ) { bPixelContour = bSet; } bool IsPixelContour() const; diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 4ba7002e59a1..83b8f8da9006 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -245,7 +245,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const OutputDevice *pOut = pSh->GetOut(); pOut->Push(); bool bClip = true; - PolyPolygon aPoly; + tools::PolyPolygon aPoly; SwNoTxtNode& rNoTNd = *(SwNoTxtNode*)GetNode(); SwGrfNode* pGrfNd = rNoTNd.GetGrfNode(); diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx index 940757bf7e7f..7a325c93cc94 100644 --- a/sw/source/core/docnode/ndnotxt.cxx +++ b/sw/source/core/docnode/ndnotxt.cxx @@ -85,11 +85,11 @@ bool SwNoTxtNode::SavePersistentData() return true; } -void SwNoTxtNode::SetContour( const PolyPolygon *pPoly, bool bAutomatic ) +void SwNoTxtNode::SetContour( const tools::PolyPolygon *pPoly, bool bAutomatic ) { delete pContour; if ( pPoly ) - pContour = new PolyPolygon( *pPoly ); + pContour = new tools::PolyPolygon( *pPoly ); else pContour = 0; bAutomaticContour = bAutomatic; @@ -100,13 +100,13 @@ void SwNoTxtNode::SetContour( const PolyPolygon *pPoly, bool bAutomatic ) void SwNoTxtNode::CreateContour() { OSL_ENSURE( !pContour, "Contour available." ); - pContour = new PolyPolygon(SvxContourDlg::CreateAutoContour(GetGraphic())); + pContour = new tools::PolyPolygon(SvxContourDlg::CreateAutoContour(GetGraphic())); bAutomaticContour = true; bContourMapModeValid = true; bPixelContour = false; } -const PolyPolygon *SwNoTxtNode::HasContour() const +const tools::PolyPolygon *SwNoTxtNode::HasContour() const { if( !bContourMapModeValid ) { @@ -178,23 +178,23 @@ const PolyPolygon *SwNoTxtNode::HasContour() const return pContour; } -void SwNoTxtNode::GetContour( PolyPolygon &rPoly ) const +void SwNoTxtNode::GetContour( tools::PolyPolygon &rPoly ) const { OSL_ENSURE( pContour, "Contour not available." ); rPoly = *HasContour(); } -void SwNoTxtNode::SetContourAPI( const PolyPolygon *pPoly ) +void SwNoTxtNode::SetContourAPI( const tools::PolyPolygon *pPoly ) { delete pContour; if ( pPoly ) - pContour = new PolyPolygon( *pPoly ); + pContour = new tools::PolyPolygon( *pPoly ); else pContour = 0; bContourMapModeValid = false; } -bool SwNoTxtNode::GetContourAPI( PolyPolygon &rContour ) const +bool SwNoTxtNode::GetContourAPI( tools::PolyPolygon &rContour ) const { if( !pContour ) return false; @@ -213,7 +213,7 @@ bool SwNoTxtNode::GetContourAPI( PolyPolygon &rContour ) const sal_uInt16 nPolyCount = rContour.Count(); for( sal_uInt16 j=0; j<nPolyCount; j++ ) { - // --> OD #i102238# - use the right <PolyPolygon> instance + // --> OD #i102238# - use the right <tools::PolyPolygon> instance Polygon& rPoly = rContour[j]; // <-- diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 620a98f42b5c..c59b59c697fd 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -328,13 +328,13 @@ void SwEditShell::GetGrfNms( OUString* pGrfName, OUString* pFltName, } } -const PolyPolygon *SwEditShell::GetGraphicPolygon() const +const tools::PolyPolygon *SwEditShell::GetGraphicPolygon() const { SwNoTxtNode *pNd = GetCrsr()->GetNode().GetNoTxtNode(); return pNd->HasContour(); } -void SwEditShell::SetGraphicPolygon( const PolyPolygon *pPoly ) +void SwEditShell::SetGraphicPolygon( const tools::PolyPolygon *pPoly ) { SwNoTxtNode *pNd = GetCrsr()->GetNode().GetNoTxtNode(); StartAllAction(); diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index 9430d976693c..ac895fb8dc47 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -31,7 +31,7 @@ class SwBorderAttrs; class SwVirtFlyDrawObj; class SwFrmFmts; class SwAttrSetChg; -class PolyPolygon; +namespace tools { class PolyPolygon; } class SwFlyDrawContact; class SwFmt; @@ -226,7 +226,7 @@ public: // #i13147# - add parameter <_bForPaint> to avoid load of // the graphic during paint. Default value: sal_False - bool GetContour( PolyPolygon& rContour, + bool GetContour( tools::PolyPolygon& rContour, const bool _bForPaint = false ) const; // Paint on this shell (consider Preview, print flag, etc. recursively)? diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx index a7500dfffc5a..ddb3de8269af 100644 --- a/sw/source/core/inc/txtfly.hxx +++ b/sw/source/core/inc/txtfly.hxx @@ -75,7 +75,7 @@ public: For _non_ contour-flow objects, this is simply the overlap area of BoundRect (including spacing), and the line, for contour-flow, - the PolyPolygon of the object gets traversed + the tools::PolyPolygon of the object gets traversed */ static const SwRect CalcBoundRect( const SwAnchoredObject* pAnchoredObj, const SwRect &rLine, diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index ec2be6bc1443..40131ecd2fe7 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -2425,7 +2425,7 @@ SwTwips SwFlyFrm::CalcAutoWidth() const /// OD 16.04.2003 #i13147# - If called for paint and the <SwNoTxtFrm> contains /// a graphic, load of intrinsic graphic has to be avoided. -bool SwFlyFrm::GetContour( PolyPolygon& rContour, +bool SwFlyFrm::GetContour( tools::PolyPolygon& rContour, const bool _bForPaint ) const { bool bRet = false; diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index a661fd5172a2..91583a6d0747 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -1709,7 +1709,7 @@ static void lcl_implDrawGraphicBackgrd( const SvxBrushItem& _rBackgrdBrush, /// draw background transparent if( _pOut->GetFillColor() != aColor.GetRGBColor() ) _pOut->SetFillColor( aColor.GetRGBColor() ); - PolyPolygon aPoly( _rAlignedPaintRect.SVRect() ); + tools::PolyPolygon aPoly( _rAlignedPaintRect.SVRect() ); _pOut->DrawTransparent( aPoly, nTransparencyPercent ); } else @@ -2181,7 +2181,7 @@ void DrawGraphic( // background region have to be drawn transparent. // Thus, create a poly-polygon from the region and draw it with // the corresponding transparency precent. - PolyPolygon aDrawPoly( rOut.SVRect() ); + tools::PolyPolygon aDrawPoly( rOut.SVRect() ); if ( aGrf.HasArea() ) { if ( !bGrfIsTransparent ) @@ -4108,7 +4108,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const { bool bContour = GetFmt()->GetSurround().IsContour(); - PolyPolygon aPoly; + tools::PolyPolygon aPoly; if ( bContour ) { // OD 16.04.2003 #i13147# - add 2nd parameter with value <sal_True> diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 8d3a903ed26d..3693e0892cf7 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -225,9 +225,9 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt, { // GetContour() causes the graphic to be loaded, which may cause // the graphic to change its size, call ClrObject() - PolyPolygon aPoly; + tools::PolyPolygon aPoly; if( !((SwVirtFlyDrawObj*)pObj)->GetFlyFrm()->GetContour( aPoly ) ) - aPoly = PolyPolygon( ((SwVirtFlyDrawObj*)pObj)-> + aPoly = tools::PolyPolygon( ((SwVirtFlyDrawObj*)pObj)-> GetFlyFrm()->Frm().SVRect() ); aPolyPolygon.clear(); aPolyPolygon.append(aPoly.getB2DPolyPolygon()); diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 5dee0e832309..b5c0de9a42b3 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1439,7 +1439,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: pNoTxt->SetContour(0); else if(aValue >>= aParam) { - PolyPolygon aPoly((sal_uInt16)aParam.getLength()); + tools::PolyPolygon aPoly((sal_uInt16)aParam.getLength()); for(sal_Int32 i = 0; i < aParam.getLength(); i++) { const :: drawing::PointSequence* pPointSeq = aParam.getConstArray(); @@ -2004,7 +2004,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode(); if(pEntry->nWID == FN_PARAM_COUNTOUR_PP) { - PolyPolygon aContour; + tools::PolyPolygon aContour; if( pNoTxt->GetContourAPI( aContour ) ) { drawing::PointSequenceSequence aPtSeq(aContour.Count()); diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 94fdcc2b0135..e92a2c7347b4 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -683,7 +683,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS { if (const SwNoTxtNode* pNd = sw::util::GetNoTxtNodeFromSwFrmFmt(*pFrmFmt)) { - const PolyPolygon* pPolyPoly = pNd->HasContour(); + const tools::PolyPolygon* pPolyPoly = pNd->HasContour(); if (pPolyPoly && pPolyPoly->Count()) { nWrapToken = XML_wrapTight; diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 7beef00019af..89ba42c0132f 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -3737,7 +3737,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const Sw { if (const SwNoTxtNode* pNd = sw::util::GetNoTxtNodeFromSwFrmFmt(*pFlyFrmFmt)) { - const PolyPolygon* pPolyPoly = pNd->HasContour(); + const tools::PolyPolygon* pPolyPoly = pNd->HasContour(); if (pPolyPoly && pPolyPoly->Count()) { Polygon aPoly = sw::util::CorrectWordWrapPolygonForExport(*pPolyPoly, pNd); diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 40519c663a26..0fc558f546b1 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -619,7 +619,7 @@ namespace sw return false; } - Polygon PolygonFromPolyPolygon(const PolyPolygon &rPolyPoly) + Polygon PolygonFromPolyPolygon(const tools::PolyPolygon &rPolyPoly) { if(1 == rPolyPoly.Count()) { @@ -662,7 +662,7 @@ namespace sw } } - Polygon CorrectWordWrapPolygonForExport(const PolyPolygon& rPolyPoly, const SwNoTxtNode* pNd) + Polygon CorrectWordWrapPolygonForExport(const tools::PolyPolygon& rPolyPoly, const SwNoTxtNode* pNd) { Polygon aPoly(PolygonFromPolyPolygon(rPolyPoly)); const Size &rOrigSize = pNd->GetGraphic().GetPrefSize(); diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 592849963c4e..178d0c50bf0c 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -732,17 +732,17 @@ namespace sw a PolyPolygon @param rPolyPoly - The PolyPolygon to try and turn into a Polygon + The tools::PolyPolygon to try and turn into a Polygon @return best fit Polygon from rPolyPoly @author <a href="mailto:cmc@openoffice.org">Caolán McNamara</a> */ - Polygon PolygonFromPolyPolygon(const PolyPolygon &rPolyPoly); + Polygon PolygonFromPolyPolygon(const tools::PolyPolygon &rPolyPoly); /// Undo all scaling / move tricks of the wrap polygon done during import. - Polygon CorrectWordWrapPolygonForExport(const PolyPolygon& rPolyPoly, const SwNoTxtNode* pNd); + Polygon CorrectWordWrapPolygonForExport(const tools::PolyPolygon& rPolyPoly, const SwNoTxtNode* pNd); /** Make setting a drawing object's layer in a Writer document easy diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 92176583a05a..4d526502daa7 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -2103,7 +2103,7 @@ sal_Int32 SwEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType { if (const SwNoTxtNode *pNd = GetNoTxtNodeFromSwFrmFmt(rFmt)) { - const PolyPolygon *pPolyPoly = pNd->HasContour(); + const tools::PolyPolygon *pPolyPoly = pNd->HasContour(); if (pPolyPoly && pPolyPoly->Count()) { Polygon aPoly = CorrectWordWrapPolygonForExport(*pPolyPoly, pNd); diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 1283d9a2caee..56324f571182 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -1943,7 +1943,7 @@ void SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord, what I actually see in word */ - PolyPolygon aPoly(*pRecord->pWrapPolygon); + tools::PolyPolygon aPoly(*pRecord->pWrapPolygon); const Size &rSize = pNd->GetTwipSize(); /* Move to the left by 15twips, and rescale to diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index b6d0b1bfdfcb..2206bf5bc507 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -963,7 +963,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) aSet.Put( aSur ); rSh.SetFlyFrmAttr( aSet ); } - const PolyPolygon aPoly( pDlg->GetPolyPolygon() ); + const tools::PolyPolygon aPoly( pDlg->GetPolyPolygon() ); rSh.SetGraphicPolygon( &aPoly ); if ( pDlg->IsGraphicChanged() ) rSh.ReRead( OUString(), OUString(), &pDlg->GetGraphic()); diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index 7ea33536cc40..ded9805ea4d1 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -451,7 +451,7 @@ void VCLXGraphics::drawPolyPolygon( const uno::Sequence< uno::Sequence< sal_Int3 { InitOutputDevice( INITOUTDEV_CLIPREGION|INITOUTDEV_RASTEROP|INITOUTDEV_COLORS ); sal_uInt16 nPolys = (sal_uInt16) DataX.getLength(); - PolyPolygon aPolyPoly( nPolys ); + tools::PolyPolygon aPolyPoly( nPolys ); for ( sal_uInt16 n = 0; n < nPolys; n++ ) aPolyPoly[n] = VCLUnoHelper::CreatePolygon( DataX.getConstArray()[n], DataY.getConstArray()[n] ); diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx index cde160139e09..3c172bf206b5 100644 --- a/tools/source/generic/poly2.cxx +++ b/tools/source/generic/poly2.cxx @@ -69,6 +69,8 @@ ImplPolyPolygon::~ImplPolyPolygon() } } +namespace tools { + PolyPolygon::PolyPolygon( sal_uInt16 nInitSize, sal_uInt16 nResize ) { if ( nInitSize > MAX_POLYGONS ) @@ -93,7 +95,7 @@ PolyPolygon::PolyPolygon( const Polygon& rPoly ) mpImplPolyPolygon = new ImplPolyPolygon( 16, 16 ); } -PolyPolygon::PolyPolygon( const PolyPolygon& rPolyPoly ) +PolyPolygon::PolyPolygon( const tools::PolyPolygon& rPolyPoly ) { DBG_ASSERT( rPolyPoly.mpImplPolyPolygon->mnRefCount < 0xFFFFFFFE, "PolyPolygon: RefCount overflow" ); @@ -238,7 +240,7 @@ void PolyPolygon::Optimize( sal_uIntPtr nOptimizeFlags, const PolyOptimizeData* if(bIsCurve) { OSL_ENSURE(false, "Optimize does *not* support curves, falling back to AdaptiveSubdivide()..."); - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; AdaptiveSubdivide(aPolyPoly); aPolyPoly.Optimize(nOptimizeFlags, pData); @@ -282,7 +284,7 @@ void PolyPolygon::Optimize( sal_uIntPtr nOptimizeFlags, const PolyOptimizeData* } } -void PolyPolygon::AdaptiveSubdivide( PolyPolygon& rResult, const double d ) const +void PolyPolygon::AdaptiveSubdivide( tools::PolyPolygon& rResult, const double d ) const { rResult.Clear(); @@ -295,10 +297,10 @@ void PolyPolygon::AdaptiveSubdivide( PolyPolygon& rResult, const double d ) cons } } -PolyPolygon PolyPolygon::SubdivideBezier( const PolyPolygon& rPolyPoly ) +tools::PolyPolygon PolyPolygon::SubdivideBezier( const tools::PolyPolygon& rPolyPoly ) { sal_uInt16 i, nPolys = rPolyPoly.Count(); - PolyPolygon aPolyPoly( nPolys ); + tools::PolyPolygon aPolyPoly( nPolys ); for( i=0; i<nPolys; ++i ) aPolyPoly.Insert( Polygon::SubdivideBezier( rPolyPoly.GetObject(i) ) ); @@ -306,20 +308,20 @@ PolyPolygon PolyPolygon::SubdivideBezier( const PolyPolygon& rPolyPoly ) } -void PolyPolygon::GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const +void PolyPolygon::GetIntersection( const tools::PolyPolygon& rPolyPoly, tools::PolyPolygon& rResult ) const { ImplDoOperation( rPolyPoly, rResult, POLY_CLIP_INT ); } -void PolyPolygon::GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const +void PolyPolygon::GetUnion( const tools::PolyPolygon& rPolyPoly, tools::PolyPolygon& rResult ) const { ImplDoOperation( rPolyPoly, rResult, POLY_CLIP_UNION ); } -void PolyPolygon::ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, sal_uIntPtr nOperation ) const +void PolyPolygon::ImplDoOperation( const tools::PolyPolygon& rPolyPoly, tools::PolyPolygon& rResult, sal_uIntPtr nOperation ) const { // Convert to B2DPolyPolygon, temporarily. It might be - // advantageous in the future, to have a PolyPolygon adaptor that + // advantageous in the future, to have a tools::PolyPolygon adaptor that // just simulates a B2DPolyPolygon here... basegfx::B2DPolyPolygon aMergePolyPolygonA( getB2DPolyPolygon() ); basegfx::B2DPolyPolygon aMergePolyPolygonB( rPolyPoly.getB2DPolyPolygon() ); @@ -363,7 +365,7 @@ void PolyPolygon::ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rR } } - rResult = PolyPolygon( aMergePolyPolygonA ); + rResult = tools::PolyPolygon( aMergePolyPolygonA ); } sal_uInt16 PolyPolygon::Count() const @@ -519,7 +521,7 @@ Polygon& PolyPolygon::operator[]( sal_uInt16 nPos ) return *(mpImplPolyPolygon->mpPolyAry[nPos]); } -PolyPolygon& PolyPolygon::operator=( const PolyPolygon& rPolyPoly ) +PolyPolygon& PolyPolygon::operator=( const tools::PolyPolygon& rPolyPoly ) { if (this == &rPolyPoly) return *this; @@ -537,7 +539,7 @@ PolyPolygon& PolyPolygon::operator=( const PolyPolygon& rPolyPoly ) return *this; } -bool PolyPolygon::operator==( const PolyPolygon& rPolyPoly ) const +bool PolyPolygon::operator==( const tools::PolyPolygon& rPolyPoly ) const { if ( rPolyPoly.mpImplPolyPolygon == mpImplPolyPolygon ) return true; @@ -545,7 +547,7 @@ bool PolyPolygon::operator==( const PolyPolygon& rPolyPoly ) const return false; } -bool PolyPolygon::IsEqual( const PolyPolygon& rPolyPoly ) const +bool PolyPolygon::IsEqual( const tools::PolyPolygon& rPolyPoly ) const { bool bIsEqual = true; if ( Count() != rPolyPoly.Count() ) @@ -565,7 +567,7 @@ bool PolyPolygon::IsEqual( const PolyPolygon& rPolyPoly ) const return bIsEqual; } -SvStream& ReadPolyPolygon( SvStream& rIStream, PolyPolygon& rPolyPoly ) +SvStream& ReadPolyPolygon( SvStream& rIStream, tools::PolyPolygon& rPolyPoly ) { DBG_ASSERTWARNING( rIStream.GetVersion(), "PolyPolygon::>> - Solar-Version not set on rIStream" ); @@ -592,12 +594,12 @@ SvStream& ReadPolyPolygon( SvStream& rIStream, PolyPolygon& rPolyPoly ) } } else - rPolyPoly = PolyPolygon(); + rPolyPoly = tools::PolyPolygon(); return rIStream; } -SvStream& WritePolyPolygon( SvStream& rOStream, const PolyPolygon& rPolyPoly ) +SvStream& WritePolyPolygon( SvStream& rOStream, const tools::PolyPolygon& rPolyPoly ) { DBG_ASSERTWARNING( rOStream.GetVersion(), "PolyPolygon::<< - Solar-Version not set on rOStream" ); @@ -641,7 +643,7 @@ void PolyPolygon::Read( SvStream& rIStream ) } } else - *this = PolyPolygon(); + *this = tools::PolyPolygon(); } void PolyPolygon::Write( SvStream& rOStream ) const @@ -696,4 +698,6 @@ PolyPolygon::PolyPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon) } } +} /* namespace tools */ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 2b2f7fa37341..9db574ee407b 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -1366,7 +1366,7 @@ bool ServerFont::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) c class PolyArgs { public: - PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints ); + PolyArgs( tools::PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints ); ~PolyArgs(); void AddPoint( long nX, long nY, PolyFlags); @@ -1376,7 +1376,7 @@ public: long GetPosY() const { return maPosition.y;} private: - PolyPolygon& mrPolyPoly; + tools::PolyPolygon& mrPolyPoly; Point* mpPointAry; sal_uInt8* mpFlagAry; @@ -1388,7 +1388,7 @@ private: bool bHasOffline; }; -PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints ) +PolyArgs::PolyArgs( tools::PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints ) : mrPolyPoly(rPolyPoly), mnMaxPoints(nMaxPoints), mnPoints(0), @@ -1566,7 +1566,7 @@ bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId, } long nMaxPoints = 1 + rOutline.n_points * 3; - PolyPolygon aToolPolyPolygon; + tools::PolyPolygon aToolPolyPolygon; PolyArgs aPolyArg( aToolPolyPolygon, nMaxPoints ); /*int nAngle =*/ ApplyGlyphTransform( nGlyphFlags, pGlyphFT, false ); diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index ac64e2bb7b82..20d57534ce7a 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -688,7 +688,7 @@ void EMFWriter::ImplWritePolygonRecord( const Polygon& rPoly, bool bClose ) } } -void EMFWriter::ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ) +void EMFWriter::ImplWritePolyPolygonRecord( const tools::PolyPolygon& rPolyPoly ) { sal_uInt16 n, i, nPolyCount = rPolyPoly.Count(); @@ -737,7 +737,7 @@ void EMFWriter::ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ) } } -void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, bool bClosed ) +void EMFWriter::ImplWritePath( const tools::PolyPolygon& rPolyPoly, bool bClosed ) { if ( bClosed ) ImplCheckFillAttr(); @@ -969,7 +969,7 @@ void EMFWriter::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const bas for(sal_uInt32 a(0); a < aFillPolyPolygon.count(); a++) { const Polygon aPolygon(aFillPolyPolygon.getB2DPolygon(a)); - ImplWritePolyPolygonRecord(PolyPolygon(Polygon(aPolygon))); + ImplWritePolyPolygonRecord(tools::PolyPolygon(Polygon(aPolygon))); } maVDev.SetLineColor(aOldLineColor); @@ -1192,7 +1192,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case META_TRANSPARENT_ACTION: { - const PolyPolygon& rPolyPoly = static_cast<const MetaTransparentAction*>(pAction)->GetPolyPolygon(); + const tools::PolyPolygon& rPolyPoly = static_cast<const MetaTransparentAction*>(pAction)->GetPolyPolygon(); if( rPolyPoly.Count() ) ImplWritePlusFillPolygonRecord( rPolyPoly[0], static_cast<const MetaTransparentAction*>(pAction)->GetTransparence() ); ImplCheckFillAttr(); diff --git a/vcl/source/filter/wmf/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx index bbd86f06bbc5..5bf294a0e323 100644 --- a/vcl/source/filter/wmf/emfwr.hxx +++ b/vcl/source/filter/wmf/emfwr.hxx @@ -73,9 +73,9 @@ private: void ImplWritePoint( const Point& rPoint ); void ImplWriteSize( const Size& rSize); void ImplWriteRect( const Rectangle& rRect ); - void ImplWritePath( const PolyPolygon& rPolyPoly, bool bClose ); + void ImplWritePath( const tools::PolyPolygon& rPolyPoly, bool bClose ); void ImplWritePolygonRecord( const Polygon& rPoly, bool bClose ); - void ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ); + void ImplWritePolyPolygonRecord( const tools::PolyPolygon& rPolyPoly ); void ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, const Size& rSz, sal_uInt32 nROP ); void ImplWriteTextRecord( const Point& rPos, const OUString& rText, const long* pDXArray, sal_uInt32 nWidth ); diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index 010a35efb54e..5b33913dc1ee 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -355,7 +355,7 @@ SvStream& operator>>(SvStream& rInStream, XForm& rXForm) return rInStream; } -static bool ImplReadRegion( PolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt32 nLen ) +static bool ImplReadRegion( tools::PolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt32 nLen ) { if (nLen == 0) return false; @@ -382,8 +382,8 @@ static bool ImplReadRegion( PolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt3 Rectangle aRectangle(Point(nx1, ny1), Point(nx2, ny2)); Polygon aPolygon(aRectangle); - PolyPolygon aPolyPolyOr1(aPolygon); - PolyPolygon aPolyPolyOr2(rPolyPoly); + tools::PolyPolygon aPolyPolyOr1(aPolygon); + tools::PolyPolygon aPolyPolyOr2(rPolyPoly); rPolyPoly.GetUnion(aPolyPolyOr1, aPolyPolyOr2); rPolyPoly = aPolyPolyOr2; } @@ -590,7 +590,7 @@ void EnhWMFReader::ReadAndDrawPolyPolygon() if ( pWMF->good() && ( nGesPoints * (sizeof(T)+sizeof(T)) ) <= ( nEndPos - pWMF->Tell() ) ) { // Get polygon points - PolyPolygon aPolyPoly(nPoly, nPoly); + tools::PolyPolygon aPolyPoly(nPoly, nPoly); for (sal_uInt32 i = 0; i < nPoly && pWMF->good(); ++i) { const sal_uInt16 nPointCount(pnPoints[i]); @@ -1149,7 +1149,7 @@ bool EnhWMFReader::ReadEnhWMF() pWMF->ReadInt32(cbRgnData); pWMF->ReadInt32(nClippingMode); - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; if (cbRgnData) ImplReadRegion(aPolyPoly, *pWMF, nRecSize); pOut->SetClipPath(aPolyPoly, nClippingMode, false); @@ -1523,7 +1523,7 @@ bool EnhWMFReader::ReadEnhWMF() case EMR_FILLRGN : { sal_uInt32 nLen; - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; pWMF->SeekRel( 0x10 ); pWMF->ReadUInt32( nLen ).ReadUInt32( nIndex ); diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index f0bfad144c85..91d495c305b4 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -47,7 +47,7 @@ void WinMtfClipPath::excludeClipRect( const Rectangle& rRect ) vcl::unotools::b2DRectangleFromRectangle(rRect)); } -void WinMtfClipPath::setClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode ) +void WinMtfClipPath::setClipPath( const tools::PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode ) { const basegfx::B2DPolyPolygon& rB2DPoly=rPolyPolygon.getB2DPolyPolygon(); switch ( nClippingMode ) @@ -91,7 +91,7 @@ void WinMtfPathObj::AddPoint( const Point& rPoint ) { if ( bClosed ) Insert( Polygon(), POLYPOLY_APPEND ); - Polygon& rPoly = ((PolyPolygon&)*this)[ Count() - 1 ]; + Polygon& rPoly = ((tools::PolyPolygon&)*this)[ Count() - 1 ]; rPoly.Insert( rPoly.GetSize(), rPoint, POLY_NORMAL ); bClosed = false; } @@ -100,7 +100,7 @@ void WinMtfPathObj::AddPolyLine( const Polygon& rPolyLine ) { if ( bClosed ) Insert( Polygon(), POLYPOLY_APPEND ); - Polygon& rPoly = ((PolyPolygon&)*this)[ Count() - 1 ]; + Polygon& rPoly = ((tools::PolyPolygon&)*this)[ Count() - 1 ]; rPoly.Insert( rPoly.GetSize(), rPolyLine ); bClosed = false; } @@ -111,7 +111,7 @@ void WinMtfPathObj::AddPolygon( const Polygon& rPoly ) bClosed = true; } -void WinMtfPathObj::AddPolyPolygon( const PolyPolygon& rPolyPoly ) +void WinMtfPathObj::AddPolyPolygon( const tools::PolyPolygon& rPolyPoly ) { sal_uInt16 i, nCount = rPolyPoly.Count(); for ( i = 0; i < nCount; i++ ) @@ -123,7 +123,7 @@ void WinMtfPathObj::ClosePath() { if ( Count() ) { - Polygon& rPoly = ((PolyPolygon&)*this)[ Count() - 1 ]; + Polygon& rPoly = ((tools::PolyPolygon&)*this)[ Count() - 1 ]; if ( rPoly.GetSize() > 2 ) { Point aFirst( rPoly[ 0 ] ); @@ -497,7 +497,7 @@ Polygon& WinMtfOutput::ImplScale( Polygon& rPolygon ) return rPolygon; } -PolyPolygon& WinMtfOutput::ImplScale( PolyPolygon& rPolyPolygon ) +tools::PolyPolygon& WinMtfOutput::ImplScale( tools::PolyPolygon& rPolyPolygon ) { sal_uInt16 nPolys = rPolyPolygon.Count(); for (sal_uInt16 i = 0; i < nPolys; ++i) @@ -507,7 +507,7 @@ PolyPolygon& WinMtfOutput::ImplScale( PolyPolygon& rPolyPolygon ) return rPolyPolygon; } -PolyPolygon& WinMtfOutput::ImplMap( PolyPolygon& rPolyPolygon ) +tools::PolyPolygon& WinMtfOutput::ImplMap( tools::PolyPolygon& rPolyPolygon ) { sal_uInt16 nPolys = rPolyPolygon.Count(); for ( sal_uInt16 i = 0; i < nPolys; ImplMap( rPolyPolygon[ i++ ] ) ) ; @@ -636,7 +636,7 @@ void WinMtfOutput::ImplResizeObjectArry( sal_uInt32 nNewEntrys ) vGDIObj.resize(nNewEntrys, NULL); } -void WinMtfOutput::ImplDrawClippedPolyPolygon( const PolyPolygon& rPolyPoly ) +void WinMtfOutput::ImplDrawClippedPolyPolygon( const tools::PolyPolygon& rPolyPoly ) { if ( rPolyPoly.Count() ) { @@ -781,10 +781,10 @@ void WinMtfOutput::MoveClipRegion( const Size& rSize ) aClipPath.moveClipRegion( ImplMap( rSize ) ); } -void WinMtfOutput::SetClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode, bool bIsMapped ) +void WinMtfOutput::SetClipPath( const tools::PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode, bool bIsMapped ) { mbClipNeedsUpdate = true; - PolyPolygon aPolyPolygon(rPolyPolygon); + tools::PolyPolygon aPolyPolygon(rPolyPolygon); if (!bIsMapped) { @@ -1038,9 +1038,9 @@ void WinMtfOutput::DrawRect( const Rectangle& rRect, bool bEdge ) if ( mbComplexClip ) { Polygon aPoly( ImplMap( rRect ) ); - PolyPolygon aPolyPolyRect( aPoly ); - PolyPolygon aDest; - PolyPolygon(aClipPath.getClipPath()).GetIntersection( aPolyPolyRect, aDest ); + tools::PolyPolygon aPolyPolyRect( aPoly ); + tools::PolyPolygon aDest; + tools::PolyPolygon(aClipPath.getClipPath()).GetIntersection( aPolyPolyRect, aDest ); ImplDrawClippedPolyPolygon( aDest ); } else @@ -1185,9 +1185,9 @@ void WinMtfOutput::DrawPolygon( Polygon& rPolygon, bool bRecordPath ) if ( mbComplexClip ) { - PolyPolygon aPolyPoly( rPolygon ); - PolyPolygon aDest; - PolyPolygon(aClipPath.getClipPath()).GetIntersection( aPolyPoly, aDest ); + tools::PolyPolygon aPolyPoly( rPolygon ); + tools::PolyPolygon aDest; + tools::PolyPolygon(aClipPath.getClipPath()).GetIntersection( aPolyPoly, aDest ); ImplDrawClippedPolyPolygon( aDest ); } else @@ -1215,7 +1215,7 @@ void WinMtfOutput::DrawPolygon( Polygon& rPolygon, bool bRecordPath ) if (maLatestFillStyle.aType != FillStylePattern) mpGDIMetaFile->AddAction( new MetaPolygonAction( rPolygon ) ); else { - SvtGraphicFill aFill = SvtGraphicFill( PolyPolygon( rPolygon ), + SvtGraphicFill aFill = SvtGraphicFill( tools::PolyPolygon( rPolygon ), Color(), 0.0, SvtGraphicFill::fillNonZero, @@ -1245,7 +1245,7 @@ void WinMtfOutput::DrawPolygon( Polygon& rPolygon, bool bRecordPath ) } } -void WinMtfOutput::DrawPolyPolygon( PolyPolygon& rPolyPolygon, bool bRecordPath ) +void WinMtfOutput::DrawPolyPolygon( tools::PolyPolygon& rPolyPolygon, bool bRecordPath ) { UpdateClipRegion(); @@ -1259,8 +1259,8 @@ void WinMtfOutput::DrawPolyPolygon( PolyPolygon& rPolyPolygon, bool bRecordPath if ( mbComplexClip ) { - PolyPolygon aDest; - PolyPolygon(aClipPath.getClipPath()).GetIntersection( rPolyPolygon, aDest ); + tools::PolyPolygon aDest; + tools::PolyPolygon(aClipPath.getClipPath()).GetIntersection( rPolyPolygon, aDest ); ImplDrawClippedPolyPolygon( aDest ); } else @@ -1516,7 +1516,7 @@ void WinMtfOutput::ImplDrawBitmap( const Point& rPos, const Size& rSize, const B aVDev.SetMapMode( aMapMode ); aVDev.SetOutputSizePixel( aSizePixel ); aVDev.SetFillColor( Color( COL_BLACK ) ); - const PolyPolygon aClip( aClipPath.getClipPath() ); + const tools::PolyPolygon aClip( aClipPath.getClipPath() ); aVDev.DrawPolyPolygon( aClip ); const Point aEmptyPoint; diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 5ce0dfd93ccf..2989556b41a1 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -287,7 +287,7 @@ class WinMtfClipPath public : WinMtfClipPath(): maClip() {}; - void setClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode ); + void setClipPath( const tools::PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode ); void intersectClipRect( const Rectangle& rRect ); void excludeClipRect( const Rectangle& rRect ); void moveClipRegion( const Size& rSize ); @@ -302,7 +302,7 @@ public : }; }; -class WinMtfPathObj : public PolyPolygon +class WinMtfPathObj : public tools::PolyPolygon { bool bClosed; @@ -322,7 +322,7 @@ public: void AddPoint( const Point& rPoint ); void AddPolygon( const Polygon& rPoly ); void AddPolyLine( const Polygon& rPoly ); - void AddPolyPolygon( const PolyPolygon& rPolyPolygon ); + void AddPolyPolygon( const tools::PolyPolygon& rPolyPolygon ); }; struct WinMtfFontStyle @@ -640,12 +640,12 @@ class WinMtfOutput Rectangle ImplMap( const Rectangle& rRectangle ); void ImplMap( vcl::Font& rFont ); Polygon& ImplMap( Polygon& rPolygon ); - PolyPolygon& ImplMap( PolyPolygon& rPolyPolygon ); + tools::PolyPolygon& ImplMap( tools::PolyPolygon& rPolyPolygon ); Polygon& ImplScale( Polygon& rPolygon ); - PolyPolygon& ImplScale( PolyPolygon& rPolyPolygon ); + tools::PolyPolygon& ImplScale( tools::PolyPolygon& rPolyPolygon ); void ImplResizeObjectArry( sal_uInt32 nNewEntry ); void ImplSetNonPersistentLineColorTransparenz(); - void ImplDrawClippedPolyPolygon( const PolyPolygon& rPolyPoly ); + void ImplDrawClippedPolyPolygon( const tools::PolyPolygon& rPolyPoly ); void ImplDrawBitmap( const Point& rPos, const Size& rSize, const BitmapEx& rBitmap ); public: @@ -695,7 +695,7 @@ public: void ClearPath(){ aPathObj.Init(); }; void ClosePath(){ aPathObj.ClosePath(); }; - const PolyPolygon& GetPathObj(){ return aPathObj; }; + const tools::PolyPolygon& GetPathObj(){ return aPathObj; }; void MoveTo( const Point& rPoint, bool bRecordPath = false ); void LineTo( const Point& rPoint, bool bRecordPath = false ); @@ -725,7 +725,7 @@ public: //For ReadAndDrawPolygon template compatibility DrawPolygon(rPolygon, bRecordPath); } - void DrawPolyPolygon( PolyPolygon& rPolyPolygon, bool bRecordPath = false ); + void DrawPolyPolygon( tools::PolyPolygon& rPolyPolygon, bool bRecordPath = false ); void DrawPolyLine( Polygon& rPolygon, bool bDrawTo = false, @@ -748,7 +748,7 @@ public: void ExcludeClipRect( const Rectangle& rRect ); void MoveClipRegion( const Size& rSize ); void SetClipPath( - const PolyPolygon& rPolyPoly, + const tools::PolyPolygon& rPolyPoly, sal_Int32 nClippingMode, bool bIsMapped ); diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 821e50b2a1fd..9c818292b1e1 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -348,7 +348,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) // Number of points of each polygon. Determine total number of points boost::scoped_array<sal_uInt16> xPolygonPointCounts(new sal_uInt16[nPolyCount]); sal_uInt16* pnPoints = xPolygonPointCounts.get(); - PolyPolygon aPolyPoly(nPolyCount, nPolyCount); + tools::PolyPolygon aPolyPoly(nPolyCount, nPolyCount); sal_uInt16 nPoints = 0; for (sal_uInt16 a = 0; a < nPolyCount && pWMF->good(); ++a) { @@ -906,7 +906,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) pWMF->ReadInt16( nObjIndex ); if ( !nObjIndex ) { - PolyPolygon aEmptyPolyPoly; + tools::PolyPolygon aEmptyPolyPoly; pOut->SetClipPath( aEmptyPolyPoly, RGN_COPY, true ); } } diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 03ac25e6be2e..ee3beebacf70 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -496,7 +496,7 @@ bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const OUString& r aSrcLineColor = Color( COL_TRANSPARENT ); SetLineAndFillAttr(); pVirDev->SetFont( aSrcFont ); - std::vector<PolyPolygon> aPolyPolyVec; + std::vector<tools::PolyPolygon> aPolyPolyVec; if ( pVirDev->GetTextOutlines( aPolyPolyVec, rUniStr ) ) { sal_uInt32 nDXCount = pDXAry ? nStringLen : 0; @@ -519,10 +519,10 @@ bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const OUString& r aMemoryStream.WriteUInt32( nSkipActions ); WMFRecord_Escape( PRIVATE_ESCAPE_UNICODE, nStrmLen, (const sal_Int8*)aMemoryStream.GetData() ); - std::vector<PolyPolygon>::iterator aIter( aPolyPolyVec.begin() ); + std::vector<tools::PolyPolygon>::iterator aIter( aPolyPolyVec.begin() ); while ( aIter != aPolyPolyVec.end() ) { - PolyPolygon aPolyPoly( *aIter++ ); + tools::PolyPolygon aPolyPoly( *aIter++ ); aPolyPoly.Move( rPoint.X(), rPoint.Y() ); WMFRecord_PolyPolygon( aPolyPoly ); } @@ -637,13 +637,13 @@ void WMFWriter::WMFRecord_PolyLine(const Polygon & rPoly) for (i=0; i<nSize; i++) WritePointXY(aSimplePoly.GetPoint(i)); } -void WMFWriter::WMFRecord_PolyPolygon(const PolyPolygon & rPolyPoly) +void WMFWriter::WMFRecord_PolyPolygon(const tools::PolyPolygon & rPolyPoly) { const Polygon * pPoly; sal_uInt16 nCount,nSize,i,j; nCount=rPolyPoly.Count(); - PolyPolygon aSimplePolyPoly( rPolyPoly ); + tools::PolyPolygon aSimplePolyPoly( rPolyPoly ); for ( i = 0; i < nCount; i++ ) { if ( aSimplePolyPoly[ i ].HasFlags() ) diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx index 7647a2b5ccb5..93ca0d5ddbe2 100644 --- a/vcl/source/filter/wmf/wmfwr.hxx +++ b/vcl/source/filter/wmf/wmfwr.hxx @@ -154,7 +154,7 @@ private: void WMFRecord_Pie(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt); void WMFRecord_Polygon(const Polygon & rPoly); void WMFRecord_PolyLine(const Polygon & rPoly); - void WMFRecord_PolyPolygon(const PolyPolygon & rPolyPoly); + void WMFRecord_PolyPolygon(const tools::PolyPolygon & rPolyPoly); void WMFRecord_Rectangle(const Rectangle & rRect); void WMFRecord_RestoreDC(); void WMFRecord_RoundRect(const Rectangle & rRect, long nHorzRound, long nVertRound); diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 884845b5a51d..ece13a3cfda5 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -2409,7 +2409,7 @@ void Bitmap::ImplMedianCut( sal_uLong* pColBuf, BitmapPalette& rPal, } } -bool Bitmap::Vectorize( PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress ) +bool Bitmap::Vectorize( tools::PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress ) { return ImplVectorizer().ImplVectorize( *this, rPolyPoly, nFlags, pProgress ); } diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 8ee40c3197d0..1caf85742d6a 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -61,7 +61,7 @@ void ImplReadPoly( SvStream& rIStm, Polygon& rPoly ) ReadPair( rIStm, rPoly[ i ] ); } -void ImplReadPolyPoly( SvStream& rIStm, PolyPolygon& rPolyPoly ) +void ImplReadPolyPoly( SvStream& rIStm, tools::PolyPolygon& rPolyPoly ) { Polygon aPoly; sal_Int32 nPolyCount; @@ -75,7 +75,7 @@ void ImplReadPolyPoly( SvStream& rIStm, PolyPolygon& rPolyPoly ) } } -void ImplWritePolyPolyAction( SvStream& rOStm, const PolyPolygon& rPolyPoly ) +void ImplWritePolyPolyAction( SvStream& rOStm, const tools::PolyPolygon& rPolyPoly ) { const sal_uInt16 nPoly = rPolyPoly.Count(); sal_uInt16 nPoints = 0; @@ -311,7 +311,7 @@ void ImplSkipActions( SvStream& rIStm, sal_uLong nSkipCount ) } } -bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPolyPolygon, bool bOnlyWhenCurve) +bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const tools::PolyPolygon& rPolyPolygon, bool bOnlyWhenCurve) { const sal_uInt16 nPolygonCount(rPolyPolygon.Count()); @@ -391,7 +391,7 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPol return false; } -void ImplReadExtendedPolyPolygonAction(SvStream& rIStm, PolyPolygon& rPolyPoly) +void ImplReadExtendedPolyPolygonAction(SvStream& rIStm, tools::PolyPolygon& rPolyPoly) { rPolyPoly.Clear(); sal_uInt16 nPolygonCount(0); @@ -571,8 +571,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case (GDI_EXTENDEDPOLYGON_ACTION) : { - // read the PolyPolygon in every case - PolyPolygon aInputPolyPolygon; + // read the tools::PolyPolygon in every case + tools::PolyPolygon aInputPolyPolygon; ImplReadExtendedPolyPolygonAction(rIStm, aInputPolyPolygon); // now check if it can be set somewhere @@ -760,7 +760,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_POLYPOLYGON_ACTION ): { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; ImplReadPolyPoly( rIStm, aPolyPoly ); @@ -1038,7 +1038,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( 3 ): { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; sal_Int32 nPolyCount; rIStm.ReadInt32( nPolyCount ); @@ -1172,7 +1172,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_TRANSPARENT_COMMENT ): { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; sal_Int32 nFollowingActionCount; sal_Int16 nTrans; @@ -1207,7 +1207,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_HATCH_COMMENT ): { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; Hatch aHatch; sal_Int32 nFollowingActionCount; @@ -1279,7 +1279,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_GRADIENTEX_COMMENT ): { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; Gradient aGradient; sal_Int32 nFollowingActionCount; @@ -1627,7 +1627,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, nCount++; - const PolyPolygon aPolyPolygon(pAct->GetPolygon()); + const tools::PolyPolygon aPolyPolygon(pAct->GetPolygon()); if(ImplWriteExtendedPolyPolygonAction(rOStm, aPolyPolygon, true)) { nCount++; @@ -1675,7 +1675,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, nCount++; - const PolyPolygon aPolyPolygon(pAct->GetPolygon()); + const tools::PolyPolygon aPolyPolygon(pAct->GetPolygon()); if(ImplWriteExtendedPolyPolygonAction(rOStm, aPolyPolygon, true)) { nCount++; @@ -2143,10 +2143,10 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, case( META_TRANSPARENT_ACTION ): { - const PolyPolygon& rPolyPoly = static_cast<const MetaTransparentAction*>(pAction)->GetPolyPolygon(); - const sal_Int16 nTrans = static_cast<const MetaTransparentAction*>(pAction)->GetTransparence(); - const sal_Int16 nBrushStyle = ( nTrans < 38 ) ? 8 : ( nTrans < 63 ) ? 9 : 10; - sal_uLong nOldPos, nNewPos; + const tools::PolyPolygon& rPolyPoly = static_cast<const MetaTransparentAction*>(pAction)->GetPolyPolygon(); + const sal_Int16 nTrans = static_cast<const MetaTransparentAction*>(pAction)->GetTransparence(); + const sal_Int16 nBrushStyle = ( nTrans < 38 ) ? 8 : ( nTrans < 63 ) ? 9 : 10; + sal_uLong nOldPos, nNewPos; // write transparence comment rOStm.WriteInt16( GDI_TRANSPARENT_COMMENT ); @@ -2264,8 +2264,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, case( META_HATCH_ACTION ): { - const MetaHatchAction* pA = static_cast<const MetaHatchAction*>(pAction); - const PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); + const MetaHatchAction* pA = static_cast<const MetaHatchAction*>(pAction); + const tools::PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); const Hatch& rHatch = pA->GetHatch(); sal_uLong nOldPos, nNewPos, nAddCount; diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx index 97cea08278c3..d7ea6092a859 100644 --- a/vcl/source/gdi/gdimetafiletools.cxx +++ b/vcl/source/gdi/gdimetafiletools.cxx @@ -69,7 +69,7 @@ namespace { rTarget.AddAction( new MetaPolyPolygonAction( - PolyPolygon(aResult))); + tools::PolyPolygon(aResult))); } } } @@ -105,7 +105,7 @@ namespace // add clipped geometry rTarget.AddAction( new MetaGradientExAction( - PolyPolygon(aResult), + tools::PolyPolygon(aResult), rGradient)); } } @@ -191,7 +191,7 @@ namespace aPixelPoly.transform(aTransform); // to fill the non-covered parts, use the Xor fill rule of - // PolyPolygon painting. Start with a all-covering polygon and + // tools::PolyPolygon painting. Start with a all-covering polygon and // add the clip polygon one basegfx::B2DPolyPolygon aInvertPixelPoly; @@ -693,7 +693,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) case META_POLYPOLYGON_ACTION : { const MetaPolyPolygonAction* pA = static_cast< const MetaPolyPolygonAction* >(pAction); - const PolyPolygon& rPoly = pA->GetPolyPolygon(); + const tools::PolyPolygon& rPoly = pA->GetPolyPolygon(); bDone = handleGeometricContent( aClips.back(), @@ -872,7 +872,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) else if(rComment.equalsIgnoreAsciiCase("XPATHFILL_SEQ_BEGIN")) { SvtGraphicFill aFilling; - PolyPolygon aPath; + tools::PolyPolygon aPath; { // read SvtGraphicFill SvMemoryStream aMemStm((void*)pA->GetData(), pA->GetDataSize(),STREAM_READ); @@ -896,7 +896,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) if(aResult != aSource) { // add clipped geometry - aFilling.setPath(PolyPolygon(aResult)); + aFilling.setPath(tools::PolyPolygon(aResult)); addSvtGraphicFill(aFilling, aTarget); bDone = true; } @@ -904,7 +904,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) else { // exchange with empty polygon - aFilling.setPath(PolyPolygon()); + aFilling.setPath(tools::PolyPolygon()); addSvtGraphicFill(aFilling, aTarget); bDone = true; } @@ -989,7 +989,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) case META_GRADIENTEX_ACTION : { const MetaGradientExAction* pA = static_cast< const MetaGradientExAction* >(pAction); - const PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); + const tools::PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); bDone = handleGradientContent( aClips.back(), diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index b631331bad5f..d6b8e51da237 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -874,10 +874,10 @@ Polygon GDIMetaFile::ImplGetRotatedPolygon( const Polygon& rPoly, const Point& r return aRet; } -PolyPolygon GDIMetaFile::ImplGetRotatedPolyPolygon( const PolyPolygon& rPolyPoly, const Point& rRotatePt, +tools::PolyPolygon GDIMetaFile::ImplGetRotatedPolyPolygon( const tools::PolyPolygon& rPolyPoly, const Point& rRotatePt, const Size& rOffset, double fSin, double fCos ) { - PolyPolygon aRet( rPolyPoly ); + tools::PolyPolygon aRet( rPolyPoly ); aRet.Rotate( rRotatePt, fSin, fCos ); aRet.Move( rOffset.Width(), rOffset.Height() ); @@ -887,7 +887,7 @@ PolyPolygon GDIMetaFile::ImplGetRotatedPolyPolygon( const PolyPolygon& rPolyPoly void GDIMetaFile::ImplAddGradientEx( GDIMetaFile& rMtf, const OutputDevice& rMapDev, - const PolyPolygon& rPolyPoly, + const tools::PolyPolygon& rPolyPoly, const Gradient& rGrad ) { // Generate comment, GradientEx and Gradient actions (within DrawGradient) @@ -1212,7 +1212,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) { SvtGraphicFill aFill; ReadSvtGraphicFill( aMemStm, aFill ); - PolyPolygon aPath; + tools::PolyPolygon aPath; aFill.getPath( aPath ); aFill.setPath( ImplGetRotatedPolyPolygon( aPath, aRotAnchor, aRotOffset, fSin, fCos ) ); WriteSvtGraphicFill( aDest, aFill ); @@ -2714,7 +2714,7 @@ sal_uLong GDIMetaFile::GetSizeBytes() const case( META_POLYGON_ACTION ): nSizeBytes += static_cast<MetaPolygonAction*>( pAction )->GetPolygon().GetSize() * sizeof( Point ); break; case( META_POLYPOLYGON_ACTION ): { - const PolyPolygon& rPolyPoly = static_cast<MetaPolyPolygonAction*>( pAction )->GetPolyPolygon(); + const tools::PolyPolygon& rPolyPoly = static_cast<MetaPolyPolygonAction*>( pAction )->GetPolyPolygon(); for( sal_uInt16 n = 0; n < rPolyPoly.Count(); ++n ) nSizeBytes += ( rPolyPoly[ n ].GetSize() * sizeof( Point ) ); diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 8cfc4e49b2d8..9a53bb638368 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -41,8 +41,8 @@ SvtGraphicStroke::SvtGraphicStroke() : } SvtGraphicStroke::SvtGraphicStroke( const Polygon& rPath, - const PolyPolygon& rStartArrow, - const PolyPolygon& rEndArrow, + const tools::PolyPolygon& rStartArrow, + const tools::PolyPolygon& rEndArrow, double fTransparency, double fStrokeWidth, CapType aCap, @@ -66,12 +66,12 @@ void SvtGraphicStroke::getPath( Polygon& rPath ) const rPath = maPath; } -void SvtGraphicStroke::getStartArrow( PolyPolygon& rPath ) const +void SvtGraphicStroke::getStartArrow( tools::PolyPolygon& rPath ) const { rPath = maStartArrow; } -void SvtGraphicStroke::getEndArrow( PolyPolygon& rPath ) const +void SvtGraphicStroke::getEndArrow( tools::PolyPolygon& rPath ) const { rPath = maEndArrow; } @@ -91,12 +91,12 @@ void SvtGraphicStroke::setPath( const Polygon& rPoly ) maPath = rPoly; } -void SvtGraphicStroke::setStartArrow( const PolyPolygon& rPoly ) +void SvtGraphicStroke::setStartArrow( const tools::PolyPolygon& rPoly ) { maStartArrow = rPoly; } -void SvtGraphicStroke::setEndArrow( const PolyPolygon& rPoly ) +void SvtGraphicStroke::setEndArrow( const tools::PolyPolygon& rPoly ) { maEndArrow = rPoly; } @@ -181,7 +181,7 @@ SvtGraphicFill::SvtGraphicFill() : { } -SvtGraphicFill::SvtGraphicFill( const PolyPolygon& rPath, +SvtGraphicFill::SvtGraphicFill( const tools::PolyPolygon& rPath, Color aFillColor, double fTransparency, FillRule aFillRule, @@ -212,7 +212,7 @@ SvtGraphicFill::SvtGraphicFill( const PolyPolygon& rPath, { } -void SvtGraphicFill::getPath( PolyPolygon& rPath ) const +void SvtGraphicFill::getPath( tools::PolyPolygon& rPath ) const { rPath = maPath; } @@ -234,7 +234,7 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const rGraphic = maFillGraphic; } -void SvtGraphicFill::setPath( const PolyPolygon& rPath ) +void SvtGraphicFill::setPath( const tools::PolyPolygon& rPath ) { maPath = rPath; } diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index e4ba7fcdb0d7..6b8c06fbbb05 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -639,7 +639,7 @@ bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, if( pRAcc ) { - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; double fPercent = 0.0; double fPercentStep_2 = 0.0; const long nWidth = pRAcc->Width(); @@ -731,7 +731,7 @@ bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, } bool ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp, - PolyPolygon& rPolyPoly, + tools::PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress ) { boost::scoped_ptr<Bitmap> pBmp(new Bitmap( rMonoBmp )); @@ -824,11 +824,11 @@ bool ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp, return bRet; } -void ImplVectorizer::ImplLimitPolyPoly( PolyPolygon& rPolyPoly ) +void ImplVectorizer::ImplLimitPolyPoly( tools::PolyPolygon& rPolyPoly ) { if( rPolyPoly.Count() > VECT_POLY_MAX ) { - PolyPolygon aNewPolyPoly; + tools::PolyPolygon aNewPolyPoly; long nReduce = 0; sal_uInt16 nNewCount; @@ -943,7 +943,7 @@ ImplVectMap* ImplVectorizer::ImplExpand( BitmapReadAccess* pRAcc, const Color& r return pMap; } -void ImplVectorizer::ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags ) +void ImplVectorizer::ImplCalculate( ImplVectMap* pMap, tools::PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags ) { const long nWidth = pMap->Width(), nHeight= pMap->Height(); diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx index f903dcdd44c0..f36f3c169067 100644 --- a/vcl/source/gdi/impvect.hxx +++ b/vcl/source/gdi/impvect.hxx @@ -34,10 +34,10 @@ class ImplVectorizer private: ImplVectMap* ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor ); - void ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags ); + void ImplCalculate( ImplVectMap* pMap, tools::PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags ); bool ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain ); bool ImplIsUp( ImplVectMap* pMap, long nY, long nX ) const; - void ImplLimitPolyPoly( PolyPolygon& rPolyPoly ); + void ImplLimitPolyPoly( tools::PolyPolygon& rPolyPoly ); public: @@ -46,7 +46,7 @@ public: bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress ); - bool ImplVectorize( const Bitmap& rMonoBmp, PolyPolygon& rPolyPoly, + bool ImplVectorize( const Bitmap& rMonoBmp, tools::PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress ); }; diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index a5c5cf61f400..670f1694b75e 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -996,7 +996,7 @@ MetaPolyPolygonAction::MetaPolyPolygonAction() : MetaPolyPolygonAction::~MetaPolyPolygonAction() {} -MetaPolyPolygonAction::MetaPolyPolygonAction( const PolyPolygon& rPolyPoly ) : +MetaPolyPolygonAction::MetaPolyPolygonAction( const tools::PolyPolygon& rPolyPoly ) : MetaAction ( META_POLYPOLYGON_ACTION ), maPolyPoly ( rPolyPoly ) {} @@ -2252,7 +2252,7 @@ MetaGradientExAction::MetaGradientExAction() : MetaAction ( META_GRADIENTEX_ACTION ) {} -MetaGradientExAction::MetaGradientExAction( const PolyPolygon& rPolyPoly, const Gradient& rGradient ) : +MetaGradientExAction::MetaGradientExAction( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ) : MetaAction ( META_GRADIENTEX_ACTION ), maPolyPoly ( rPolyPoly ), maGradient ( rGradient ) @@ -2300,7 +2300,7 @@ void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) VersionCompat aCompat(rOStm, STREAM_WRITE, 1); // #i105373# see comment at MetaTransparentAction::Write - PolyPolygon aNoCurvePolyPolygon; + tools::PolyPolygon aNoCurvePolyPolygon; maPolyPoly.AdaptiveSubdivide(aNoCurvePolyPolygon); WritePolyPolygon( rOStm, aNoCurvePolyPolygon ); @@ -2321,7 +2321,7 @@ MetaHatchAction::MetaHatchAction() : MetaHatchAction::~MetaHatchAction() {} -MetaHatchAction::MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) : +MetaHatchAction::MetaHatchAction( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ) : MetaAction ( META_HATCH_ACTION ), maPolyPoly ( rPolyPoly ), maHatch ( rHatch ) @@ -2362,7 +2362,7 @@ void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) VersionCompat aCompat(rOStm, STREAM_WRITE, 1); // #i105373# see comment at MetaTransparentAction::Write - PolyPolygon aNoCurvePolyPolygon; + tools::PolyPolygon aNoCurvePolyPolygon; maPolyPoly.AdaptiveSubdivide(aNoCurvePolyPolygon); WritePolyPolygon( rOStm, aNoCurvePolyPolygon ); @@ -3235,7 +3235,7 @@ MetaTransparentAction::MetaTransparentAction() : MetaTransparentAction::~MetaTransparentAction() {} -MetaTransparentAction::MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ) : +MetaTransparentAction::MetaTransparentAction( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ) : MetaAction ( META_TRANSPARENT_ACTION ), maPolyPoly ( rPolyPoly ), mnTransPercent ( nTransPercent ) @@ -3275,7 +3275,7 @@ void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) MetaAction::Write(rOStm, pData); VersionCompat aCompat(rOStm, STREAM_WRITE, 1); - // #i105373# The PolyPolygon in this action may be a curve; this + // #i105373# The tools::PolyPolygon in this action may be a curve; this // was ignored until now what is an error. To make older office // versions work with MetaFiles, i opt for applying AdaptiveSubdivide // to the PolyPoylgon. @@ -3284,7 +3284,7 @@ void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) // correctly, but not here :-( ). // The golden solution would be to combine both, but i think it's // not necessary; a good subdivision will be sufficient. - PolyPolygon aNoCurvePolyPolygon; + tools::PolyPolygon aNoCurvePolyPolygon; maPolyPoly.AdaptiveSubdivide(aNoCurvePolyPolygon); WritePolyPolygon( rOStm, aNoCurvePolyPolygon ); @@ -3566,12 +3566,12 @@ void MetaCommentAction::Move( long nXMove, long nYMove ) aPath.Move( nXMove, nYMove ); aStroke.setPath( aPath ); - PolyPolygon aStartArrow; + tools::PolyPolygon aStartArrow; aStroke.getStartArrow(aStartArrow); aStartArrow.Move(nXMove, nYMove); aStroke.setStartArrow(aStartArrow); - PolyPolygon aEndArrow; + tools::PolyPolygon aEndArrow; aStroke.getEndArrow(aEndArrow); aEndArrow.Move(nXMove, nYMove); aStroke.setEndArrow(aEndArrow); @@ -3583,7 +3583,7 @@ void MetaCommentAction::Move( long nXMove, long nYMove ) SvtGraphicFill aFill; ReadSvtGraphicFill( aMemStm, aFill ); - PolyPolygon aPath; + tools::PolyPolygon aPath; aFill.getPath( aPath ); aPath.Move( nXMove, nYMove ); aFill.setPath( aPath ); @@ -3623,7 +3623,7 @@ void MetaCommentAction::Scale( double fXScale, double fYScale ) { SvtGraphicFill aFill; ReadSvtGraphicFill( aMemStm, aFill ); - PolyPolygon aPath; + tools::PolyPolygon aPath; aFill.getPath( aPath ); aPath.Scale( fXScale, fYScale ); aFill.setPath( aPath ); diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index c0f0a695abed..b399d7acefa4 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -166,7 +166,7 @@ void PDFWriter::DrawPolyLine( const Polygon& rPoly, const ExtLineInfo& rInfo ) pImplementation->drawPolyLine( rPoly, rInfo ); } -void PDFWriter::DrawPolyPolygon( const PolyPolygon& rPolyPoly ) +void PDFWriter::DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly ) { pImplementation->drawPolyPolygon( rPolyPoly ); } @@ -186,7 +186,7 @@ void PDFWriter::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize, const pImplementation->drawBitmap( rDestPt, rDestSize, rBitmap ); } -void PDFWriter::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) +void PDFWriter::DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ) { pImplementation->drawHatch( rPolyPoly, rHatch ); } @@ -196,7 +196,7 @@ void PDFWriter::DrawGradient( const Rectangle& rRect, const Gradient& rGradient pImplementation->drawGradient( rRect, rGradient ); } -void PDFWriter::DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient ) +void PDFWriter::DrawGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ) { pImplementation->push(PUSH_CLIPREGION); pImplementation->setClipRegion( rPolyPoly.getB2DPolyPolygon() ); @@ -209,7 +209,7 @@ void PDFWriter::DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpap pImplementation->drawWallpaper( rRect, rWallpaper ); } -void PDFWriter::DrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) +void PDFWriter::DrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) { pImplementation->drawTransparent( rPolyPoly, nTransparencePercent ); } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 100685d62aef..96133718a415 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1547,7 +1547,7 @@ void PDFWriterImpl::PDFPage::appendPolygon( const basegfx::B2DPolygon& rPoly, OS } } -void PDFWriterImpl::PDFPage::appendPolyPolygon( const PolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose ) const +void PDFWriterImpl::PDFPage::appendPolyPolygon( const tools::PolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose ) const { sal_uInt16 nPolygons = rPolyPoly.Count(); for( sal_uInt16 n = 0; n < nPolygons; n++ ) @@ -7708,7 +7708,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool // write eventual emphasis marks if( m_aCurrentPDFState.m_aFont.GetEmphasisMark() & EMPHASISMARK_STYLE ) { - PolyPolygon aEmphPoly; + tools::PolyPolygon aEmphPoly; Rectangle aEmphRect1; Rectangle aEmphRect2; long nEmphYOff; @@ -7795,7 +7795,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool } void PDFWriterImpl::drawEmphasisMark( long nX, long nY, - const PolyPolygon& rPolyPoly, bool bPolyLine, + const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ) { // TODO: pass nWidth as width of this mark @@ -7811,7 +7811,7 @@ void PDFWriterImpl::drawEmphasisMark( long nX, long nY, } else { - PolyPolygon aPolyPoly = rPolyPoly; + tools::PolyPolygon aPolyPoly = rPolyPoly; aPolyPoly.Move( nX, nY ); drawPolyPolygon( aPolyPoly ); } @@ -8539,7 +8539,7 @@ void PDFWriterImpl::drawPolygon( const Polygon& rPoly ) writeBuffer( aLine.getStr(), aLine.getLength() ); } -void PDFWriterImpl::drawPolyPolygon( const PolyPolygon& rPolyPoly ) +void PDFWriterImpl::drawPolyPolygon( const tools::PolyPolygon& rPolyPoly ) { MARK( "drawPolyPolygon" ); @@ -8564,7 +8564,7 @@ void PDFWriterImpl::drawPolyPolygon( const PolyPolygon& rPolyPoly ) writeBuffer( aLine.getStr(), aLine.getLength() ); } -void PDFWriterImpl::drawTransparent( const PolyPolygon& rPolyPoly, sal_uInt32 nTransparentPercent ) +void PDFWriterImpl::drawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt32 nTransparentPercent ) { DBG_ASSERT( nTransparentPercent <= 100, "invalid alpha value" ); nTransparentPercent = nTransparentPercent % 100; @@ -10313,7 +10313,7 @@ void PDFWriterImpl::drawGradient( const Rectangle& rRect, const Gradient& rGradi writeBuffer( aLine.getStr(), aLine.getLength() ); } -void PDFWriterImpl::drawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) +void PDFWriterImpl::drawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ) { MARK( "drawHatch" ); @@ -10321,7 +10321,7 @@ void PDFWriterImpl::drawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch if( rPolyPoly.Count() ) { - PolyPolygon aPolyPoly( rPolyPoly ); + tools::PolyPolygon aPolyPoly( rPolyPoly ); aPolyPoly.Optimize( POLY_OPTIMIZE_NO_SAME ); push( PUSH_LINECOLOR ); diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 655881de8ade..96e096136241 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -149,7 +149,7 @@ public: // appends a polygon optionally closing it void appendPolygon( const basegfx::B2DPolygon& rPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // appends a polypolygon optionally closing the subpaths - void appendPolyPolygon( const PolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose = true ) const; + void appendPolyPolygon( const tools::PolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // appends a polypolygon optionally closing the subpaths void appendPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // converts a length (either vertical or horizontal; this @@ -1017,7 +1017,7 @@ i12626 bool checkEmitStructure(); /* draws an emphasis mark */ - void drawEmphasisMark( long nX, long nY, const PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); + void drawEmphasisMark( long nX, long nY, const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); /* true if PDF/A-1a or PDF/A-1b is output */ bool m_bIsPDF_A1; @@ -1057,7 +1057,7 @@ i12626 bool prepareEncryption( const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& ); // helper for playMetafile - void implWriteGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient, + void implWriteGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient, VirtualDevice* pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& ); void implWriteBitmapEx( const Point& rPoint, const Size& rSize, const BitmapEx& rBitmapEx, VirtualDevice* pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& ); @@ -1216,7 +1216,7 @@ public: void drawLine( const Point& rStart, const Point& rStop ); void drawLine( const Point& rStart, const Point& rStop, const LineInfo& rInfo ); void drawPolygon( const Polygon& rPoly ); - void drawPolyPolygon( const PolyPolygon& rPolyPoly ); + void drawPolyPolygon( const tools::PolyPolygon& rPolyPoly ); void drawPolyLine( const Polygon& rPoly ); void drawPolyLine( const Polygon& rPoly, const LineInfo& rInfo ); void drawPolyLine( const Polygon& rPoly, const PDFWriter::ExtLineInfo& rInfo ); @@ -1233,9 +1233,9 @@ public: void drawJPGBitmap( SvStream& rDCTData, bool bIsTrueColor, const Size& rSizePixel, const Rectangle& rTargetArea, const Bitmap& rMask ); void drawGradient( const Rectangle& rRect, const Gradient& rGradient ); - void drawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ); + void drawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ); void drawWallpaper( const Rectangle& rRect, const Wallpaper& rWall ); - void drawTransparent( const PolyPolygon& rPolyPoly, sal_uInt32 nTransparentPercent ); + void drawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt32 nTransparentPercent ); void beginTransparencyGroup(); void endTransparencyGroup( const Rectangle& rBoundingBox, sal_uInt32 nTransparentPercent ); diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 686ebd4b1eab..3c0aaf7f76b5 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -50,7 +50,7 @@ using namespace com::sun::star::beans; static bool lcl_canUsePDFAxialShading(const Gradient& rGradient); -void PDFWriterImpl::implWriteGradient( const PolyPolygon& i_rPolyPoly, const Gradient& i_rGradient, +void PDFWriterImpl::implWriteGradient( const tools::PolyPolygon& i_rPolyPoly, const Gradient& i_rGradient, VirtualDevice* i_pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& i_rContext ) { GDIMetaFile aTmpMtf; @@ -362,7 +362,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } else { - const PolyPolygon aPolyPoly( pA->GetRect() ); + const tools::PolyPolygon aPolyPoly( pA->GetRect() ); implWriteGradient( aPolyPoly, rGradient, pDummyVDev, i_rContext ); } } @@ -562,8 +562,8 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa Polygon aPath; aStroke.getPath( aPath ); - PolyPolygon aStartArrow; - PolyPolygon aEndArrow; + tools::PolyPolygon aStartArrow; + tools::PolyPolygon aEndArrow; double fTransparency( aStroke.getTransparency() ); double fStrokeWidth( aStroke.getStrokeWidth() ); SvtGraphicStroke::DashArray aDashArray; @@ -649,7 +649,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa double fTransparency = aFill.getTransparency(); if ( fTransparency == 0.0 ) { - PolyPolygon aPath; + tools::PolyPolygon aPath; aFill.getPath( aPath ); bSkipSequence = true; @@ -733,7 +733,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } // draw polypolygon with pattern fill - PolyPolygon aPath; + tools::PolyPolygon aPath; aFill.getPath( aPath ); m_rOuterFace.DrawPolyPolygon( aPath, nPattern, aFill.getFillRule() == SvtGraphicFill::fillEvenOdd ); diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 3951e5720da3..ae62b3953d1d 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -247,7 +247,7 @@ void Printer::DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, } } -void Printer::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, +void Printer::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) { // #110958# Disable alpha VDev, we perform the necessary diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index 3f838f129c7c..c8e0524518db 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -790,7 +790,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, } case META_POLYPOLYGON_ACTION: { - const PolyPolygon aPoly( + const tools::PolyPolygon aPoly( static_cast<const MetaPolyPolygonAction*>(pCurrAct)->GetPolyPolygon()); if( aPoly.Count() != 1 || !basegfx::tools::isRectangle( diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index cf011f1c37f6..3f56d0ef6891 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -37,7 +37,7 @@ namespace /** Return <TRUE/> when the given polygon is rectiliner and oriented so that all sides are either horizontal or vertical. */ - bool ImplIsPolygonRectilinear (const PolyPolygon& rPolyPoly) + bool ImplIsPolygonRectilinear (const tools::PolyPolygon& rPolyPoly) { // Iterate over all polygons. const sal_uInt16 nPolyCount = rPolyPoly.Count(); @@ -82,7 +82,7 @@ namespace A new RegionBand object is returned that contains the bands that represent the given poly-polygon. */ - RegionBand* ImplRectilinearPolygonToBands(const PolyPolygon& rPolyPoly) + RegionBand* ImplRectilinearPolygonToBands(const tools::PolyPolygon& rPolyPoly) { OSL_ASSERT(ImplIsPolygonRectilinear (rPolyPoly)); @@ -180,7 +180,7 @@ namespace /** Convert a general polygon (one for which ImplIsPolygonRectilinear() returns <FALSE/>) to bands. */ - RegionBand* ImplGeneralPolygonToBands(const PolyPolygon& rPolyPoly, const Rectangle& rPolygonBoundingBox) + RegionBand* ImplGeneralPolygonToBands(const tools::PolyPolygon& rPolyPoly, const Rectangle& rPolygonBoundingBox) { long nLineID = 0L; @@ -229,7 +229,7 @@ bool vcl::Region::IsEmpty() const } -RegionBand* ImplCreateRegionBandFromPolyPolygon(const PolyPolygon& rPolyPolygon) +RegionBand* ImplCreateRegionBandFromPolyPolygon(const tools::PolyPolygon& rPolyPolygon) { RegionBand* pRetval = 0; @@ -237,7 +237,7 @@ RegionBand* ImplCreateRegionBandFromPolyPolygon(const PolyPolygon& rPolyPolygon) { // ensure to subdivide when bezier segemnts are used, it's going to // be expanded to rectangles - PolyPolygon aPolyPolygon; + tools::PolyPolygon aPolyPolygon; rPolyPolygon.AdaptiveSubdivide(aPolyPolygon); @@ -277,9 +277,9 @@ RegionBand* ImplCreateRegionBandFromPolyPolygon(const PolyPolygon& rPolyPolygon) return pRetval; } -PolyPolygon vcl::Region::ImplCreatePolyPolygonFromRegionBand() const +tools::PolyPolygon vcl::Region::ImplCreatePolyPolygonFromRegionBand() const { - PolyPolygon aRetval; + tools::PolyPolygon aRetval; if(getRegionBand()) { @@ -301,7 +301,7 @@ PolyPolygon vcl::Region::ImplCreatePolyPolygonFromRegionBand() const basegfx::B2DPolyPolygon vcl::Region::ImplCreateB2DPolyPolygonFromRegionBand() const { - PolyPolygon aPoly(ImplCreatePolyPolygonFromRegionBand()); + tools::PolyPolygon aPoly(ImplCreatePolyPolygonFromRegionBand()); return aPoly.getB2DPolyPolygon(); } @@ -336,7 +336,7 @@ Region::Region(const Polygon& rPolygon) } } -Region::Region(const PolyPolygon& rPolyPoly) +Region::Region(const tools::PolyPolygon& rPolyPoly) : mpB2DPolyPolygon(), mpPolyPolygon(), mpRegionBand(), @@ -374,7 +374,7 @@ Region::~Region() { } -void vcl::Region::ImplCreatePolyPolyRegion( const PolyPolygon& rPolyPoly ) +void vcl::Region::ImplCreatePolyPolyRegion( const tools::PolyPolygon& rPolyPoly ) { const sal_uInt16 nPolyCount = rPolyPoly.Count(); @@ -392,7 +392,7 @@ void vcl::Region::ImplCreatePolyPolyRegion( const PolyPolygon& rPolyPoly ) } else { - mpPolyPolygon.reset(new PolyPolygon(rPolyPoly)); + mpPolyPolygon.reset(new tools::PolyPolygon(rPolyPoly)); } mbIsNull = false; @@ -434,11 +434,11 @@ void vcl::Region::Move( long nHorzMove, long nVertMove ) } else if(getPolyPolygon()) { - PolyPolygon aPoly(*getPolyPolygon()); + tools::PolyPolygon aPoly(*getPolyPolygon()); aPoly.Move(nHorzMove, nVertMove); mpB2DPolyPolygon.reset(); - mpPolyPolygon.reset(aPoly.Count() ? new PolyPolygon(aPoly) : 0); + mpPolyPolygon.reset(aPoly.Count() ? new tools::PolyPolygon(aPoly) : 0); mpRegionBand.reset(); } else if(getRegionBand()) @@ -481,11 +481,11 @@ void vcl::Region::Scale( double fScaleX, double fScaleY ) } else if(getPolyPolygon()) { - PolyPolygon aPoly(*getPolyPolygon()); + tools::PolyPolygon aPoly(*getPolyPolygon()); aPoly.Scale(fScaleX, fScaleY); mpB2DPolyPolygon.reset(); - mpPolyPolygon.reset(aPoly.Count() ? new PolyPolygon(aPoly) : 0); + mpPolyPolygon.reset(aPoly.Count() ? new tools::PolyPolygon(aPoly) : 0); mpRegionBand.reset(); } else if(getRegionBand()) @@ -629,7 +629,7 @@ bool vcl::Region::Intersect( const Rectangle& rRect ) } else // if(getPolyPolygon()) { - PolyPolygon aPoly(*getPolyPolygon()); + tools::PolyPolygon aPoly(*getPolyPolygon()); // use the PolyPolygon::Clip method for rectangles, this is // fairly simple (does not even use GPC) and saves us from @@ -637,7 +637,7 @@ bool vcl::Region::Intersect( const Rectangle& rRect ) aPoly.Clip(rRect); mpB2DPolyPolygon.reset(); - mpPolyPolygon.reset(aPoly.Count() ? new PolyPolygon(aPoly) : 0); + mpPolyPolygon.reset(aPoly.Count() ? new tools::PolyPolygon(aPoly) : 0); mpRegionBand.reset(); } @@ -1276,7 +1276,7 @@ Rectangle vcl::Region::GetBoundRect() const return Rectangle(); } -const PolyPolygon vcl::Region::GetAsPolyPolygon() const +const tools::PolyPolygon vcl::Region::GetAsPolyPolygon() const { if(getPolyPolygon()) { @@ -1286,8 +1286,8 @@ const PolyPolygon vcl::Region::GetAsPolyPolygon() const if(getB2DPolyPolygon()) { // the polygon needs to be converted, buffer the down converion - const PolyPolygon aPolyPolgon(*getB2DPolyPolygon()); - const_cast< vcl::Region* >(this)->mpPolyPolygon.reset(new PolyPolygon(aPolyPolgon)); + const tools::PolyPolygon aPolyPolgon(*getB2DPolyPolygon()); + const_cast< vcl::Region* >(this)->mpPolyPolygon.reset(new tools::PolyPolygon(aPolyPolgon)); return *getPolyPolygon(); } @@ -1295,13 +1295,13 @@ const PolyPolygon vcl::Region::GetAsPolyPolygon() const if(getRegionBand()) { // the BandRegion needs to be converted, buffer the converion - const PolyPolygon aPolyPolgon(ImplCreatePolyPolygonFromRegionBand()); - const_cast< vcl::Region* >(this)->mpPolyPolygon.reset(new PolyPolygon(aPolyPolgon)); + const tools::PolyPolygon aPolyPolgon(ImplCreatePolyPolygonFromRegionBand()); + const_cast< vcl::Region* >(this)->mpPolyPolygon.reset(new tools::PolyPolygon(aPolyPolgon)); return *getPolyPolygon(); } - return PolyPolygon(); + return tools::PolyPolygon(); } const basegfx::B2DPolyPolygon vcl::Region::GetAsB2DPolyPolygon() const @@ -1339,7 +1339,7 @@ const RegionBand* vcl::Region::GetAsRegionBand() const if(getB2DPolyPolygon()) { // convert B2DPolyPolygon to RegionBand, buffer it and return it - const_cast< vcl::Region* >(this)->mpRegionBand.reset(ImplCreateRegionBandFromPolyPolygon(PolyPolygon(*getB2DPolyPolygon()))); + const_cast< vcl::Region* >(this)->mpRegionBand.reset(ImplCreateRegionBandFromPolyPolygon(tools::PolyPolygon(*getB2DPolyPolygon()))); } else if(getPolyPolygon()) { @@ -1593,7 +1593,7 @@ SvStream& ReadRegion(SvStream& rIStrm, vcl::Region& rRegion) if(bHasPolyPolygon) { - PolyPolygon* pNewPoly = new PolyPolygon(); + tools::PolyPolygon* pNewPoly = new tools::PolyPolygon(); ReadPolyPolygon( rIStrm, *pNewPoly ); rRegion.mpPolyPolygon.reset(pNewPoly); } @@ -1669,7 +1669,7 @@ SvStream& WriteRegion( SvStream& rOStrm, const vcl::Region& rRegion ) if(bHasPolyPolygon) { // #i105373# - PolyPolygon aNoCurvePolyPolygon; + tools::PolyPolygon aNoCurvePolyPolygon; rRegion.GetAsPolyPolygon().AdaptiveSubdivide(aNoCurvePolyPolygon); WritePolyPolygon( rOStrm, aNoCurvePolyPolygon ); @@ -1746,7 +1746,7 @@ static inline bool ImplPolygonRectTest( const Polygon& rPoly, Rectangle* pRectOu return bIsRect; } -vcl::Region vcl::Region::GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly ) +vcl::Region vcl::Region::GetRegionFromPolyPolygon( const tools::PolyPolygon& rPolyPoly ) { //return vcl::Region( rPolyPoly ); diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index fe1e901d75fc..7b83d0460407 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -269,7 +269,7 @@ SystemFontData OutputDevice::GetSysFontData(int nFallbacklevel) const return aSysFontData; } -void OutputDevice::ImplGetEmphasisMark( PolyPolygon& rPolyPoly, bool& rPolyLine, +void OutputDevice::ImplGetEmphasisMark( tools::PolyPolygon& rPolyPoly, bool& rPolyLine, Rectangle& rRect1, Rectangle& rRect2, long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, @@ -1845,7 +1845,7 @@ void ImplFontMetricData::ImplInitAboveTextLineSize() } void OutputDevice::ImplDrawEmphasisMark( long nBaseX, long nX, long nY, - const PolyPolygon& rPolyPoly, bool bPolyLine, + const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ) { if( IsRTLEnabled() ) @@ -1865,7 +1865,7 @@ void OutputDevice::ImplDrawEmphasisMark( long nBaseX, long nX, long nY, } else { - PolyPolygon aPolyPoly = rPolyPoly; + tools::PolyPolygon aPolyPoly = rPolyPoly; aPolyPoly.Move( nX, nY ); DrawPolyPolygon( aPolyPoly ); } @@ -1897,7 +1897,7 @@ void OutputDevice::ImplDrawEmphasisMarks( SalLayout& rSalLayout ) EnableMapMode( false ); FontEmphasisMark nEmphasisMark = ImplGetEmphasisMarkStyle( maFont ); - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; Rectangle aRect1; Rectangle aRect2; long nEmphasisYOff; diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx index 50a679c56ce2..e1a423abb0dd 100644 --- a/vcl/source/outdev/gradient.cxx +++ b/vcl/source/outdev/gradient.cxx @@ -31,14 +31,14 @@ void OutputDevice::DrawGradient( const Rectangle& rRect, const Gradient& rGradient ) { - // Convert rectangle to a PolyPolygon by first converting to a Polygon + // Convert rectangle to a tools::PolyPolygon by first converting to a Polygon Polygon aPolygon ( rRect ); - PolyPolygon aPolyPoly ( aPolygon ); + tools::PolyPolygon aPolyPoly ( aPolygon ); DrawGradient ( aPolyPoly, rGradient ); } -void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly, +void OutputDevice::DrawGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ) { if ( mnDrawMode & DRAWMODE_NOGRADIENT ) @@ -120,7 +120,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly, if( !mbOutputClipped ) { - PolyPolygon aClipPolyPoly( ImplLogicToDevicePixel( rPolyPoly ) ); + tools::PolyPolygon aClipPolyPoly( ImplLogicToDevicePixel( rPolyPoly ) ); // draw gradients without border if( mbLineColor || mbInitLineColor ) @@ -177,7 +177,7 @@ namespace void OutputDevice::DrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, - bool bMtf, const PolyPolygon* pClipPolyPoly ) + bool bMtf, const tools::PolyPolygon* pClipPolyPoly ) { // get BoundRect of rotated rectangle Rectangle aRect; @@ -372,7 +372,7 @@ void OutputDevice::DrawLinearGradient( const Rectangle& rRect, void OutputDevice::DrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, - bool bMtf, const PolyPolygon* pClipPolyPoly ) + bool bMtf, const tools::PolyPolygon* pClipPolyPoly ) { // Determine if we output via Polygon or PolyPolygon // For all rasteroperations other then Overpaint always use PolyPolygon, @@ -380,7 +380,7 @@ void OutputDevice::DrawComplexGradient( const Rectangle& rRect, // Also for printers always use PolyPolygon, as not all printers // can print polygons on top of each other. - boost::scoped_ptr<PolyPolygon> pPolyPoly; + boost::scoped_ptr<tools::PolyPolygon> pPolyPoly; Rectangle aRect; Point aCenter; Color aStartCol( rGradient.GetStartColor() ); @@ -399,7 +399,7 @@ void OutputDevice::DrawComplexGradient( const Rectangle& rRect, rGradient.GetBoundRect( rRect, aRect, aCenter ); if ( UsePolyPolygonForComplexGradient() || bMtf ) - pPolyPoly.reset(new PolyPolygon( 2 )); + pPolyPoly.reset(new tools::PolyPolygon( 2 )); // last parameter - true if complex gradient, false if linear long nStepCount = GetGradientSteps( rGradient, rRect, bMtf, true ); @@ -486,7 +486,7 @@ void OutputDevice::DrawComplexGradient( const Rectangle& rRect, nGreen = GetGradientColorValue( nStartGreen + ( ( nGreenSteps * nStepIndex ) / nSteps ) ); nBlue = GetGradientColorValue( nStartBlue + ( ( nBlueSteps * nStepIndex ) / nSteps ) ); - // either slow PolyPolygon output or fast Polygon-Paiting + // either slow tools::PolyPolygon output or fast Polygon-Paiting if( pPolyPoly ) { bPaintLastPolygon = true; // #107349# Paint last polygon only if loop has generated any output diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx index eff7bd482e6f..2e72fa2124ef 100644 --- a/vcl/source/outdev/hatch.cxx +++ b/vcl/source/outdev/hatch.cxx @@ -41,7 +41,7 @@ extern "C" int SAL_CALL HatchCmpFnc( const void* p1, const void* p2 ) return ( nX1 > nX2 ? 1 : nX1 == nX2 ? nY1 > nY2 ? 1: nY1 == nY2 ? 0 : -1 : -1 ); } -void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) +void OutputDevice::DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ) { Hatch aHatch( rHatch ); @@ -93,7 +93,7 @@ void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch if( rPolyPoly.Count() ) { - PolyPolygon aPolyPoly( LogicToPixel( rPolyPoly ) ); + tools::PolyPolygon aPolyPoly( LogicToPixel( rPolyPoly ) ); GDIMetaFile* pOldMetaFile = mpMetaFile; bool bOldMap = mbMap; @@ -115,11 +115,11 @@ void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch mpAlphaVDev->DrawHatch( rPolyPoly, rHatch ); } -void OutputDevice::AddHatchActions( const PolyPolygon& rPolyPoly, const Hatch& rHatch, +void OutputDevice::AddHatchActions( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch, GDIMetaFile& rMtf ) { - PolyPolygon aPolyPoly( rPolyPoly ); + tools::PolyPolygon aPolyPoly( rPolyPoly ); aPolyPoly.Optimize( POLY_OPTIMIZE_NO_SAME | POLY_OPTIMIZE_CLOSE ); if( aPolyPoly.Count() ) @@ -135,7 +135,7 @@ void OutputDevice::AddHatchActions( const PolyPolygon& rPolyPoly, const Hatch& r } } -void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, bool bMtf ) +void OutputDevice::DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch, bool bMtf ) { if(rPolyPoly.Count()) { @@ -153,7 +153,7 @@ void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, if(bIsCurve) { OSL_ENSURE(false, "DrawHatch does *not* support curves, falling back to AdaptiveSubdivide()..."); - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; rPolyPoly.AdaptiveSubdivide(aPolyPoly); DrawHatch(aPolyPoly, rHatch, bMtf); @@ -315,7 +315,7 @@ void OutputDevice::CalcHatchValues( const Rectangle& rRect, long nDist, sal_uInt } } -void OutputDevice::DrawHatchLine( const Line& rLine, const PolyPolygon& rPolyPoly, +void OutputDevice::DrawHatchLine( const Line& rLine, const tools::PolyPolygon& rPolyPoly, Point* pPtBuffer, bool bMtf ) { double fX, fY; diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index 2a6ceb7d51a4..125b8e33345b 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -581,12 +581,12 @@ Polygon OutputDevice::ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const return aPoly; } -PolyPolygon OutputDevice::ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyPoly ) const +tools::PolyPolygon OutputDevice::ImplLogicToDevicePixel( const tools::PolyPolygon& rLogicPolyPoly ) const { if ( !mbMap && !mnOutOffX && !mnOutOffY ) return rLogicPolyPoly; - PolyPolygon aPolyPoly( rLogicPolyPoly ); + tools::PolyPolygon aPolyPoly( rLogicPolyPoly ); sal_uInt16 nPoly = aPolyPoly.Count(); for( sal_uInt16 i = 0; i < nPoly; i++ ) { @@ -1038,13 +1038,13 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly ) const return aPoly; } -PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly ) const +tools::PolyPolygon OutputDevice::LogicToPixel( const tools::PolyPolygon& rLogicPolyPoly ) const { if ( !mbMap ) return rLogicPolyPoly; - PolyPolygon aPolyPoly( rLogicPolyPoly ); + tools::PolyPolygon aPolyPoly( rLogicPolyPoly ); sal_uInt16 nPoly = aPolyPoly.Count(); for( sal_uInt16 i = 0; i < nPoly; i++ ) { @@ -1205,14 +1205,14 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly, return aPoly; } -PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly, +tools::PolyPolygon OutputDevice::LogicToPixel( const tools::PolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const { if ( rMapMode.IsDefault() ) return rLogicPolyPoly; - PolyPolygon aPolyPoly( rLogicPolyPoly ); + tools::PolyPolygon aPolyPoly( rLogicPolyPoly ); sal_uInt16 nPoly = aPolyPoly.Count(); for( sal_uInt16 i = 0; i < nPoly; i++ ) { @@ -1351,13 +1351,13 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly ) const return aPoly; } -PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly ) const +tools::PolyPolygon OutputDevice::PixelToLogic( const tools::PolyPolygon& rDevicePolyPoly ) const { if ( !mbMap ) return rDevicePolyPoly; - PolyPolygon aPolyPoly( rDevicePolyPoly ); + tools::PolyPolygon aPolyPoly( rDevicePolyPoly ); sal_uInt16 nPoly = aPolyPoly.Count(); for( sal_uInt16 i = 0; i < nPoly; i++ ) { @@ -1514,14 +1514,14 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly, return aPoly; } -PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly, +tools::PolyPolygon OutputDevice::PixelToLogic( const tools::PolyPolygon& rDevicePolyPoly, const MapMode& rMapMode ) const { if ( rMapMode.IsDefault() ) return rDevicePolyPoly; - PolyPolygon aPolyPoly( rDevicePolyPoly ); + tools::PolyPolygon aPolyPoly( rDevicePolyPoly ); sal_uInt16 nPoly = aPolyPoly.Count(); for( sal_uInt16 i = 0; i < nPoly; i++ ) { diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx index 632db7d7164e..39c2b6807a77 100644 --- a/vcl/source/outdev/polygon.cxx +++ b/vcl/source/outdev/polygon.cxx @@ -31,7 +31,7 @@ #define OUTDEV_POLYPOLY_STACKBUF 32 -void OutputDevice::DrawPolyPolygon( const PolyPolygon& rPolyPoly ) +void OutputDevice::DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly ) { if( mpMetaFile ) @@ -119,7 +119,7 @@ void OutputDevice::DrawPolyPolygon( const PolyPolygon& rPolyPoly ) } else { - // #100127# moved real PolyPolygon draw to separate method, + // #100127# moved real tools::PolyPolygon draw to separate method, // have to call recursively, avoiding duplicate // ImplLogicToDevicePixel calls ImplDrawPolyPolygon( nPoly, ImplLogicToDevicePixel( rPolyPoly ) ); @@ -237,7 +237,7 @@ void OutputDevice::DrawPolyPolygon( const basegfx::B2DPolyPolygon& rB2DPolyPoly { if( mpMetaFile ) - mpMetaFile->AddAction( new MetaPolyPolygonAction( PolyPolygon( rB2DPolyPoly ) ) ); + mpMetaFile->AddAction( new MetaPolyPolygonAction( tools::PolyPolygon( rB2DPolyPoly ) ) ); // call helper ImplDrawPolyPolygonWithB2DPolyPolygon(rB2DPolyPoly); @@ -310,13 +310,13 @@ void OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP } // fallback to old polygon drawing if needed - const PolyPolygon aToolsPolyPolygon( rB2DPolyPoly ); - const PolyPolygon aPixelPolyPolygon = ImplLogicToDevicePixel( aToolsPolyPolygon ); + const tools::PolyPolygon aToolsPolyPolygon( rB2DPolyPoly ); + const tools::PolyPolygon aPixelPolyPolygon = ImplLogicToDevicePixel( aToolsPolyPolygon ); ImplDrawPolyPolygon( aPixelPolyPolygon.Count(), aPixelPolyPolygon ); } // #100127# Extracted from OutputDevice::DrawPolyPolygon() -void OutputDevice::ImplDrawPolyPolygon( sal_uInt16 nPoly, const PolyPolygon& rPolyPoly ) +void OutputDevice::ImplDrawPolyPolygon( sal_uInt16 nPoly, const tools::PolyPolygon& rPolyPoly ) { // AW: This crashes on empty PolyPolygons, avoid that if(!nPoly) @@ -388,7 +388,7 @@ void OutputDevice::ImplDrawPolyPolygon( sal_uInt16 nPoly, const PolyPolygon& rPo { if( !mpGraphics->DrawPolyPolygonBezier( j, pPointAry, pPointAryAry, pFlagAryAry, this ) ) { - PolyPolygon aPolyPoly = PolyPolygon::SubdivideBezier( rPolyPoly ); + tools::PolyPolygon aPolyPoly = tools::PolyPolygon::SubdivideBezier( rPolyPoly ); ImplDrawPolyPolygon( aPolyPoly.Count(), aPolyPoly ); } } @@ -406,7 +406,7 @@ void OutputDevice::ImplDrawPolyPolygon( sal_uInt16 nPoly, const PolyPolygon& rPo } } -void OutputDevice::ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pClipPolyPoly ) +void OutputDevice::ImplDrawPolygon( const Polygon& rPoly, const tools::PolyPolygon* pClipPolyPoly ) { if( pClipPolyPoly ) { @@ -424,18 +424,18 @@ void OutputDevice::ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pCl } } -void OutputDevice::ImplDrawPolyPolygon( const PolyPolygon& rPolyPoly, const PolyPolygon* pClipPolyPoly ) +void OutputDevice::ImplDrawPolyPolygon( const tools::PolyPolygon& rPolyPoly, const tools::PolyPolygon* pClipPolyPoly ) { - PolyPolygon* pPolyPoly; + tools::PolyPolygon* pPolyPoly; if( pClipPolyPoly ) { - pPolyPoly = new PolyPolygon; + pPolyPoly = new tools::PolyPolygon; rPolyPoly.GetIntersection( *pClipPolyPoly, *pPolyPoly ); } else { - pPolyPoly = (PolyPolygon*) &rPolyPoly; + pPolyPoly = (tools::PolyPolygon*) &rPolyPoly; } if( pPolyPoly->Count() == 1 ) { diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 2c0c028ea5ee..defb3b9c1ca8 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -2758,7 +2758,7 @@ bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector, // convert character image into outline Bitmap aBmp( aVDev.GetBitmap(Point(0, 0), aSize)); - PolyPolygon aPolyPoly; + tools::PolyPolygon aPolyPoly; bool bVectorized = aBmp.Vectorize(aPolyPoly, BMP_VECTORIZE_OUTER | BMP_VECTORIZE_REDUCE_EDGES); if( !bVectorized ) bSuccess = false; @@ -2826,12 +2826,12 @@ bool OutputDevice::GetTextOutlines( PolyPolyVector& rResultVector, rResultVector.reserve( aB2DPolyPolyVector.size() ); ::basegfx::B2DPolyPolygonVector::const_iterator aIt = aB2DPolyPolyVector.begin(); for(; aIt != aB2DPolyPolyVector.end(); ++aIt ) - rResultVector.push_back(PolyPolygon(*aIt)); // #i76339# + rResultVector.push_back(tools::PolyPolygon(*aIt)); // #i76339# return true; } -bool OutputDevice::GetTextOutline( PolyPolygon& rPolyPoly, const OUString& rStr, +bool OutputDevice::GetTextOutline( tools::PolyPolygon& rPolyPoly, const OUString& rStr, sal_Int32 nBase, sal_Int32 nIndex, sal_Int32 nLen, bool bOptimize, sal_uLong nTWidth, const long* pDXArray ) const { diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index 512ca332a972..5490a37736f9 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -59,9 +59,9 @@ namespace return Polygon(rPoly); } - PolyPolygon toPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPoly ) + tools::PolyPolygon toPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPoly ) { - PolyPolygon aTarget; + tools::PolyPolygon aTarget; for (sal_uInt32 i = 0; i < rPolyPoly.count(); ++i) aTarget.Insert(toPolygon(rPolyPoly.getB2DPolygon(i))); @@ -267,7 +267,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, if( bDrawnOk ) { if( mpMetaFile ) - mpMetaFile->AddAction( new MetaTransparentAction( PolyPolygon( rB2DPolyPoly ), static_cast< sal_uInt16 >(fTransparency * 100.0))); + mpMetaFile->AddAction( new MetaTransparentAction( tools::PolyPolygon( rB2DPolyPoly ), static_cast< sal_uInt16 >(fTransparency * 100.0))); return; } @@ -277,7 +277,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, DrawTransparent(toPolyPolygon(rB2DPolyPoly), static_cast<sal_uInt16>(fTransparency * 100.0)); } -void OutputDevice::DrawInvisiblePolygon( const PolyPolygon& rPolyPoly ) +void OutputDevice::DrawInvisiblePolygon( const tools::PolyPolygon& rPolyPoly ) { // short circuit if the polygon border is invisible too if( !mbLineColor ) @@ -290,7 +290,7 @@ void OutputDevice::DrawInvisiblePolygon( const PolyPolygon& rPolyPoly ) Pop(); } -bool OutputDevice::DrawTransparentNatively ( const PolyPolygon& rPolyPoly, +bool OutputDevice::DrawTransparentNatively ( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) { bool bDrawn = false; @@ -363,7 +363,7 @@ bool OutputDevice::DrawTransparentNatively ( const PolyPolygon& rPolyPoly, return bDrawn; } -void OutputDevice::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, +void OutputDevice::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) { // debug helper: @@ -379,7 +379,7 @@ void OutputDevice::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, GDIMetaFile* pOldMetaFile = mpMetaFile; mpMetaFile = NULL; - PolyPolygon aPolyPoly( LogicToPixel( rPolyPoly ) ); + tools::PolyPolygon aPolyPoly( LogicToPixel( rPolyPoly ) ); Rectangle aPolyRect( aPolyPoly.GetBoundRect() ); Point aPoint; Rectangle aDstRect( aPoint, GetOutputSizePixel() ); @@ -597,7 +597,7 @@ void OutputDevice::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, mpAlphaVDev = pOldAlphaVDev; } -void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly, +void OutputDevice::DrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) { // short circuit for drawing an opaque polygon diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 2f5efebe479d..6f4de668109d 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -707,7 +707,7 @@ void Splitter::Paint( const Rectangle& rPaintRect ) DrawRect( rPaintRect ); Polygon aPoly( rPaintRect ); - PolyPolygon aPolyPoly( aPoly ); + tools::PolyPolygon aPolyPoly( aPoly ); DrawTransparent( aPolyPoly, 85 ); if( mbKbdSplitting ) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 9fa514680d8f..d230bb59fe02 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3532,13 +3532,13 @@ void Window::DrawSelectionBackground( const Rectangle& rRect, if( bRoundEdges ) { Polygon aPoly( aRect, nCornerRadius, nCornerRadius ); - PolyPolygon aPolyPoly( aPoly ); + tools::PolyPolygon aPolyPoly( aPoly ); DrawTransparent( aPolyPoly, nPercent ); } else { Polygon aPoly( aRect ); - PolyPolygon aPolyPoly( aPoly ); + tools::PolyPolygon aPolyPoly( aPoly ); DrawTransparent( aPolyPoly, nPercent ); } } diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index d4c934c0f29a..4441458578b0 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -884,7 +884,7 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly, if( nBrushColor_ != SALCOLOR_NONE ) { sal_uInt32 i, n; - Region pXRegA = NULL; + Region pXRegA = NULL; for( i = 0; i < nPoly; i++ ) { n = pPoints[i]; diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index c518305547a2..778e4b2e1643 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -791,7 +791,7 @@ bool WinSalGraphics::setClipRegion( const vcl::Region& i_rClip ) bool bUsePolygon(i_rClip.HasPolyPolygonOrB2DPolyPolygon()); static bool bTryToAvoidPolygon(true); - // #i122149# try to avoid usage of PolyPolygon ClipRegions when PolyPolygon is no curve + // #i122149# try to avoid usage of tools::PolyPolygon ClipRegions when tools::PolyPolygon is no curve // and only contains horizontal/vertical edges. In that case, use the fallback // in GetRegionRectangles which will use vcl::Region::GetAsRegionBand() which will do // the correct polygon-to-RegionBand transformation. @@ -949,7 +949,7 @@ bool WinSalGraphics::setClipRegion( const vcl::Region& i_rClip ) // create clip region from ClipRgnData if(0 == mpClipRgnData->rdh.nCount) { - // #i123585# region is empty; this may happen when e.g. a PolyPolygon is given + // #i123585# region is empty; this may happen when e.g. a tools::PolyPolygon is given // that contains no polygons or only empty ones (no width/height). This is // perfectly fine and we are done, except setting it (see end of method) } diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 45fbe3fe9051..efa5417c2dd1 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -2371,7 +2371,7 @@ bool WinSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, delete[] pData; - // rescaling needed for the PolyPolygon conversion + // rescaling needed for the tools::PolyPolygon conversion if( rB2DPolyPoly.count() ) { const double fFactor(mfCurrentFontScale/256); diff --git a/vcl/win/source/gdi/wntgdi.cxx b/vcl/win/source/gdi/wntgdi.cxx index 7beb176814bd..d371c7802418 100644 --- a/vcl/win/source/gdi/wntgdi.cxx +++ b/vcl/win/source/gdi/wntgdi.cxx @@ -45,7 +45,7 @@ extern "C" { BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt ) { - return PolyPolygon( hDC, ppt, npcnt, ncnt ); + return tools::PolyPolygon( hDC, ppt, npcnt, ncnt ); } } diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index f251a9a33ba7..9b99ee3c1fa5 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -101,7 +101,7 @@ void setupMethodStubs( functor_vector_type& res ) const Rectangle aRect2(aPt3,aPt4); const Polygon aPoly(aRect); const Polygon aPoly2(aRect2); - PolyPolygon aPolyPoly(aPoly); + tools::PolyPolygon aPolyPoly(aPoly); aPolyPoly.Insert( aPoly2 ); Polygon aPoly3(aPoly2); aPoly3.Rotate( aPoly3.GetBoundRect().Center(), @@ -202,11 +202,11 @@ void setupMethodStubs( functor_vector_type& res ) _1, aPoly )); - /* void DrawPolyPolygon( const PolyPolygon& rPolyPoly ); */ + /* void DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly ); */ add(res, "DrawPolyPolygon", boost::bind( - (void (OutputDevice::*)( const PolyPolygon& )) + (void (OutputDevice::*)( const tools::PolyPolygon& )) &OutputDevice::DrawPolyPolygon, _1, aPolyPoly )); @@ -696,16 +696,16 @@ void setupMethodStubs( functor_vector_type& res ) _1, aRect,aGradient )); - /* void DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); */ + /* void DrawGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ); */ add(res, "DrawGradient(polygon)", boost::bind( - (void (OutputDevice::*)( const PolyPolygon&, const Gradient& ))( + (void (OutputDevice::*)( const tools::PolyPolygon&, const Gradient& ))( &OutputDevice::DrawGradient), _1, aPoly3,aGradient )); - /* void DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ); */ + /* void DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ); */ add(res, "DrawHatch", boost::bind( @@ -737,13 +737,13 @@ void setupMethodStubs( functor_vector_type& res ) _1, aRect,Size(10,20),GRID_HORZLINES|GRID_VERTLINES )); - /* void DrawTransparent( const PolyPolygon& rPolyPoly, + /* void DrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); */ add(res, "DrawTransparent", boost::bind( - (void (OutputDevice::*)( const PolyPolygon&, sal_uInt16 ))( + (void (OutputDevice::*)( const tools::PolyPolygon&, sal_uInt16 ))( &OutputDevice::DrawTransparent), _1, aPoly3,(sal_uInt16)50 )); @@ -808,7 +808,7 @@ void outDevGrind( OutputDevice& rTarget, sal_Int32 nTurns=100 ) const Polygon aPoly1( aClipRect ); Polygon aPoly2( aClipRect ); aPoly2.Rotate(aClipRect.Center(),450); - PolyPolygon aClipPoly(aPoly1); + tools::PolyPolygon aClipPoly(aPoly1); aClipPoly.Insert(aPoly2); functor_vector_type::const_iterator iter = aMethods.begin(); diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index da6785be767c..2a838049342c 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -764,8 +764,8 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape } case XmlShapeTypeDrawPolyPolygonShape: // closed PolyPolygon case XmlShapeTypeDrawPolyLineShape: // open PolyPolygon - case XmlShapeTypeDrawClosedBezierShape: // closed PolyPolygon containing curves - case XmlShapeTypeDrawOpenBezierShape: // open PolyPolygon containing curves + case XmlShapeTypeDrawClosedBezierShape: // closed tools::PolyPolygon containing curves + case XmlShapeTypeDrawOpenBezierShape: // open tools::PolyPolygon containing curves { ImpExportPolygonShape(xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint ); break; @@ -3532,7 +3532,7 @@ void XMLShapeExport::ImpExport3DShape( case XmlShapeTypeDraw3DLatheObject: case XmlShapeTypeDraw3DExtrudeObject: { - // write special 3DLathe/3DExtrude attributes, get 3D PolyPolygon as drawing::PolyPolygonShape3D + // write special 3DLathe/3DExtrude attributes, get 3D tools::PolyPolygon as drawing::PolyPolygonShape3D aAny = xPropSet->getPropertyValue("D3DPolyPolygon3D"); drawing::PolyPolygonShape3D xPolyPolygon3D; aAny >>= xPolyPolygon3D; @@ -3542,7 +3542,7 @@ void XMLShapeExport::ImpExport3DShape( basegfx::tools::UnoPolyPolygonShape3DToB3DPolyPolygon( xPolyPolygon3D)); - // convert to 2D PolyPolygon using identity 3D transformation (just grep X and Y) + // convert to 2D tools::PolyPolygon using identity 3D transformation (just grep X and Y) const basegfx::B3DHomMatrix aB3DHomMatrixFor2DConversion; const basegfx::B2DPolyPolygon aPolyPolygon( basegfx::tools::createB2DPolyPolygonFromB3DPolyPolygon( diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 623584dccb8f..ef4002e1cfe4 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -354,7 +354,7 @@ void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sa // set parameters if(!maPoints.isEmpty() && !maViewBox.isEmpty()) { - // import 2d PolyPolygon from svg:d + // import 2d tools::PolyPolygon from svg:d basegfx::B2DPolyPolygon aPolyPolygon; if(basegfx::tools::importFromSvgD(aPolyPolygon, maPoints, GetImport().needFixPositionAfterZ(), 0)) @@ -377,7 +377,7 @@ void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sa } else { - OSL_ENSURE(false, "Error on importing svg:d for 3D PolyPolygon (!)"); + OSL_ENSURE(false, "Error on importing svg:d for 3D tools::PolyPolygon (!)"); } } |