diff options
Diffstat (limited to 'vcl/source/filter')
-rw-r--r-- | vcl/source/filter/sgvmain.cxx | 16 | ||||
-rw-r--r-- | vcl/source/filter/wmf/wmfwr.cxx | 2 | ||||
-rw-r--r-- | vcl/source/filter/wmf/wmfwr.hxx | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index 2d6a29b43455..33219b626f99 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -409,10 +409,10 @@ void DrawSlideRect(sal_Int16 x1, sal_Int16 y1, sal_Int16 x2, sal_Int16 y2, ObjAr } break; case 0x18: case 0x38: { // circle - Region ClipMerk=rOut.GetClipRegion(); + vcl::Region ClipMerk=rOut.GetClipRegion(); double a; - rOut.SetClipRegion(Region(Rectangle(x1,y1,x2,y2))); + rOut.SetClipRegion(vcl::Region(Rectangle(x1,y1,x2,y2))); cx=(x1+x2) /2; cy=(y1+y2) /2; dx=x2-x1+1; @@ -526,40 +526,40 @@ void DrawSlideCirc(sal_Int16 cx, sal_Int16 cy, sal_Int16 rx, sal_Int16 ry, ObjAr b0=Int1; switch (F.FBFarbe & 0x38) { case 0x08: { // vertical - Region ClipMerk=rOut.GetClipRegion(); + vcl::Region ClipMerk=rOut.GetClipRegion(); i0=y1; i=y1; while (i<=y2) { b=Int1+sal_Int16((sal_Int32)(Int2-Int1)*(sal_Int32)(i-y1) /(sal_Int32)(y2-y1+1)); if (b!=b0) { SgfAreaColorIntens(F.FMuster,(sal_uInt8)Col1,(sal_uInt8)Col2,(sal_uInt8)b0,rOut); - rOut.SetClipRegion(Region(Rectangle(x1,i0,x2,i-1))); + rOut.SetClipRegion(vcl::Region(Rectangle(x1,i0,x2,i-1))); rOut.DrawEllipse(Rectangle(x1,y1,x2,y2)); i0=i; b0=b; } i++; } SgfAreaColorIntens(F.FMuster,(sal_uInt8)Col1,(sal_uInt8)Col2,(sal_uInt8)Int2,rOut); - rOut.SetClipRegion(Region(Rectangle(x1,i0,x2,y2))); + rOut.SetClipRegion(vcl::Region(Rectangle(x1,i0,x2,y2))); rOut.DrawEllipse(Rectangle(x1,y1,x2,y2)); rOut.SetClipRegion(ClipMerk); } break; case 0x28: { // horizontal - Region ClipMerk=rOut.GetClipRegion(); + vcl::Region ClipMerk=rOut.GetClipRegion(); i0=x1; i=x1; while (i<=x2) { b=Int1+sal_Int16((sal_Int32)(Int2-Int1)*(sal_Int32)(i-x1) /(sal_Int32)(x2-x1+1)); if (b!=b0) { SgfAreaColorIntens(F.FMuster,(sal_uInt8)Col1,(sal_uInt8)Col2,(sal_uInt8)b0,rOut); - rOut.SetClipRegion(Region(Rectangle(i0,y1,i-1,y2))); + rOut.SetClipRegion(vcl::Region(Rectangle(i0,y1,i-1,y2))); rOut.DrawEllipse(Rectangle(x1,y1,x2,y2)); i0=i; b0=b; } i++; } SgfAreaColorIntens(F.FMuster,(sal_uInt8)Col1,(sal_uInt8)Col2,(sal_uInt8)Int2,rOut); - rOut.SetClipRegion(Region(Rectangle(i0,y1,x2,y2))); + rOut.SetClipRegion(vcl::Region(Rectangle(i0,y1,x2,y2))); rOut.DrawEllipse(Rectangle(x1,y1,x2,y2)); rOut.SetClipRegion(ClipMerk); } break; diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index a4b0b67ebd81..03ac25e6be2e 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -1773,7 +1773,7 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, aDstFillColor = aSrcFillColor = Color( COL_WHITE ); CreateSelectDeleteBrush( aDstFillColor ); - aDstClipRegion = aSrcClipRegion = Region(); + aDstClipRegion = aSrcClipRegion = vcl::Region(); bDstIsClipping = bSrcIsClipping = false; vcl::Font aFont; diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx index a4ce97ace9ca..7647a2b5ccb5 100644 --- a/vcl/source/filter/wmf/wmfwr.hxx +++ b/vcl/source/filter/wmf/wmfwr.hxx @@ -39,7 +39,7 @@ struct WMFWriterAttrStackMember RasterOp eRasterOp; vcl::Font aFont; MapMode aMapMode; - Region aClipRegion; + vcl::Region aClipRegion; PushFlags nFlags; }; @@ -76,7 +76,7 @@ private: vcl::Font aSrcFont; MapMode aSrcMapMode; bool bSrcIsClipping; - Region aSrcClipRegion; + vcl::Region aSrcClipRegion; WMFWriterAttrStackMember * pAttrStack; sal_uInt32 eSrcHorTextAlign; @@ -93,7 +93,7 @@ private: sal_uInt32 eDstHorTextAlign; bool bDstIsClipping; // ???: not taken into account at the moment - Region aDstClipRegion; // ???: not taken into account at the moment + vcl::Region aDstClipRegion; // ???: not taken into account at the moment bool bHandleAllocated[MAXOBJECTHANDLES]; // which handles have been assigned sal_uInt16 nDstPenHandle,nDstFontHandle,nDstBrushHandle; // which handles are owned by // Selected-Objects |