diff options
author | Noel Grandin <noel@peralex.com> | 2014-10-01 13:54:59 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-10-02 07:37:19 +0200 |
commit | e54d93ac344f9061897f768fd09375fe210f34e0 (patch) | |
tree | b814d237807cd9b700d0bac7dd687cb9c8166e0e /drawinglayer | |
parent | 6edb52ebaf5d2c932a185a44f943a062ee649cfe (diff) |
loplugin: cstylecast
Change-Id: I06957bb1a736331995be810672e9d47b47cc6c0e
Diffstat (limited to 'drawinglayer')
36 files changed, 105 insertions, 105 deletions
diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx index ab50d90569fc..3441483a9ac4 100644 --- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx @@ -61,7 +61,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const BackgroundColorPrimitive2D& rCompare = (BackgroundColorPrimitive2D&)rPrimitive; + const BackgroundColorPrimitive2D& rCompare = static_cast<const BackgroundColorPrimitive2D&>(rPrimitive); return (getBColor() == rCompare.getBColor()); } diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx index dad2fa835099..c0bf971e7afc 100644 --- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx @@ -44,7 +44,7 @@ namespace drawinglayer { if(BasePrimitive2D::operator==(rPrimitive)) { - const BitmapPrimitive2D& rCompare = (BitmapPrimitive2D&)rPrimitive; + const BitmapPrimitive2D& rCompare = static_cast<const BitmapPrimitive2D&>(rPrimitive); return (getBitmapEx() == rCompare.getBitmapEx() && getTransform() == rCompare.getTransform()); diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx index 7b9348dc6fec..30e656d99866 100644 --- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx @@ -342,7 +342,7 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive( { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const BorderLinePrimitive2D& rCompare = (BorderLinePrimitive2D&)rPrimitive; + const BorderLinePrimitive2D& rCompare = static_cast<const BorderLinePrimitive2D&>(rPrimitive); return (getStart() == rCompare.getStart() && getEnd() == rCompare.getEnd() diff --git a/drawinglayer/source/primitive2d/clippedborderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/clippedborderlineprimitive2d.cxx index 895c06eafa52..5a19ee88fc5a 100644 --- a/drawinglayer/source/primitive2d/clippedborderlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/clippedborderlineprimitive2d.cxx @@ -46,7 +46,7 @@ namespace drawinglayer { if(BorderLinePrimitive2D::operator==(rPrimitive)) { - const ClippedBorderLinePrimitive2D& rCompare = (ClippedBorderLinePrimitive2D&)rPrimitive; + const ClippedBorderLinePrimitive2D& rCompare = static_cast<const ClippedBorderLinePrimitive2D&>(rPrimitive); return maIntersection == rCompare.maIntersection; } diff --git a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx index 477a138b57ba..dbf86748a8c8 100644 --- a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx @@ -86,7 +86,7 @@ namespace drawinglayer { if(ObjectAndViewTransformationDependentPrimitive2D::operator==(rPrimitive)) { - const DiscreteBitmapPrimitive2D& rCompare = (DiscreteBitmapPrimitive2D&)rPrimitive; + const DiscreteBitmapPrimitive2D& rCompare = static_cast<const DiscreteBitmapPrimitive2D&>(rPrimitive); return (getBitmapEx() == rCompare.getBitmapEx() && getTopLeft() == rCompare.getTopLeft()); diff --git a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx index 317f1046c312..b845602c4fb9 100644 --- a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx @@ -285,7 +285,7 @@ namespace drawinglayer { if(DiscreteMetricDependentPrimitive2D::operator==(rPrimitive)) { - const DiscreteShadowPrimitive2D& rCompare = (DiscreteShadowPrimitive2D&)rPrimitive; + const DiscreteShadowPrimitive2D& rCompare = static_cast<const DiscreteShadowPrimitive2D&>(rPrimitive); return (getTransform() == rCompare.getTransform() && getDiscreteShadow() == rCompare.getDiscreteShadow()); diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx b/drawinglayer/source/primitive2d/epsprimitive2d.cxx index 6e254030367c..a2d5cf63f5c3 100644 --- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/epsprimitive2d.cxx @@ -61,7 +61,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const EpsPrimitive2D& rCompare = (EpsPrimitive2D&)rPrimitive; + const EpsPrimitive2D& rCompare = static_cast<const EpsPrimitive2D&>(rPrimitive); return (getEpsTransform() == rCompare.getEpsTransform() && getGfxLink().IsEqual(rCompare.getGfxLink()) diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx index f5be906e6a2a..8f7fb120d3a9 100644 --- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx @@ -328,7 +328,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const FillGradientPrimitive2D& rCompare = (FillGradientPrimitive2D&)rPrimitive; + const FillGradientPrimitive2D& rCompare = static_cast<const FillGradientPrimitive2D&>(rPrimitive); return (getOutputRange() == rCompare.getOutputRange() && getDefinitionRange() == rCompare.getDefinitionRange() diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx index cbad4a13acef..758a707516a6 100644 --- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx @@ -168,7 +168,7 @@ namespace drawinglayer { if(DiscreteMetricDependentPrimitive2D::operator==(rPrimitive)) { - const FillHatchPrimitive2D& rCompare = (FillHatchPrimitive2D&)rPrimitive; + const FillHatchPrimitive2D& rCompare = static_cast<const FillHatchPrimitive2D&>(rPrimitive); return (getOutputRange() == rCompare.getOutputRange() && getDefinitionRange() == rCompare.getDefinitionRange() diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx index 49a675d6d041..b83ed34dccce 100644 --- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx @@ -291,7 +291,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const GridPrimitive2D& rCompare = (GridPrimitive2D&)rPrimitive; + const GridPrimitive2D& rCompare = static_cast<const GridPrimitive2D&>(rPrimitive); return (getTransform() == rCompare.getTransform() && getWidth() == rCompare.getWidth() diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx index 5ed84d91b5a6..59397a6a6b0f 100644 --- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx @@ -164,7 +164,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const HelplinePrimitive2D& rCompare = (HelplinePrimitive2D&)rPrimitive; + const HelplinePrimitive2D& rCompare = static_cast<const HelplinePrimitive2D&>(rPrimitive); return (getPosition() == rCompare.getPosition() && getDirection() == rCompare.getDirection() diff --git a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx index 70269a7cee73..1d0bbae6545c 100644 --- a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx @@ -91,7 +91,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const MarkerArrayPrimitive2D& rCompare = (MarkerArrayPrimitive2D&)rPrimitive; + const MarkerArrayPrimitive2D& rCompare = static_cast<const MarkerArrayPrimitive2D&>(rPrimitive); return (getPositions() == rCompare.getPositions() && getMarker() == rCompare.getMarker()); diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 6a207b895a53..b546ede49a1b 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -1655,7 +1655,7 @@ namespace while(META_PIXEL_ACTION == pAction->GetType() && nAction < nCount) { - const MetaPixelAction* pA = (const MetaPixelAction*)pAction; + const MetaPixelAction* pA = static_cast<const MetaPixelAction*>(pAction); if(pA->GetColor() != aLastColor) { @@ -1691,7 +1691,7 @@ namespace while(META_POINT_ACTION == pAction->GetType() && nAction < nCount) { - const MetaPointAction* pA = (const MetaPointAction*)pAction; + const MetaPointAction* pA = static_cast<const MetaPointAction*>(pAction); const Point& rPoint = pA->GetPoint(); aPositions.push_back(basegfx::B2DPoint(rPoint.X(), rPoint.Y())); nAction++; if(nAction < nCount) pAction = rMetaFile.GetAction(nAction); @@ -1717,7 +1717,7 @@ namespace while(META_LINE_ACTION == pAction->GetType() && nAction < nCount) { - const MetaLineAction* pA = (const MetaLineAction*)pAction; + const MetaLineAction* pA = static_cast<const MetaLineAction*>(pAction); const Point& rStartPoint = pA->GetStartPoint(); const Point& rEndPoint = pA->GetEndPoint(); const basegfx::B2DPoint aStart(rStartPoint.X(), rStartPoint.Y()); @@ -1766,7 +1766,7 @@ namespace /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineOrFillActive()) { - const MetaRectAction* pA = (const MetaRectAction*)pAction; + const MetaRectAction* pA = static_cast<const MetaRectAction*>(pAction); const Rectangle& rRectangle = pA->GetRect(); if(!rRectangle.IsEmpty()) @@ -1793,7 +1793,7 @@ namespace */ if(rPropertyHolders.Current().getLineOrFillActive()) { - const MetaRoundRectAction* pA = (const MetaRoundRectAction*)pAction; + const MetaRoundRectAction* pA = static_cast<const MetaRoundRectAction*>(pAction); const Rectangle& rRectangle = pA->GetRect(); if(!rRectangle.IsEmpty()) @@ -1832,7 +1832,7 @@ namespace /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineOrFillActive()) { - const MetaEllipseAction* pA = (const MetaEllipseAction*)pAction; + const MetaEllipseAction* pA = static_cast<const MetaEllipseAction*>(pAction); const Rectangle& rRectangle = pA->GetRect(); if(!rRectangle.IsEmpty()) @@ -1856,7 +1856,7 @@ namespace /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineColorActive()) { - const MetaArcAction* pA = (const MetaArcAction*)pAction; + const MetaArcAction* pA = static_cast<const MetaArcAction*>(pAction); const Polygon aToolsPoly(pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_ARC); const basegfx::B2DPolygon aOutline(aToolsPoly.getB2DPolygon()); @@ -1870,7 +1870,7 @@ namespace /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineOrFillActive()) { - const MetaPieAction* pA = (const MetaPieAction*)pAction; + const MetaPieAction* pA = static_cast<const MetaPieAction*>(pAction); const Polygon aToolsPoly(pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_PIE); const basegfx::B2DPolygon aOutline(aToolsPoly.getB2DPolygon()); @@ -1884,7 +1884,7 @@ namespace /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineOrFillActive()) { - const MetaChordAction* pA = (const MetaChordAction*)pAction; + const MetaChordAction* pA = static_cast<const MetaChordAction*>(pAction); const Polygon aToolsPoly(pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_CHORD); const basegfx::B2DPolygon aOutline(aToolsPoly.getB2DPolygon()); @@ -1898,7 +1898,7 @@ namespace /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineColorActive()) { - const MetaPolyLineAction* pA = (const MetaPolyLineAction*)pAction; + const MetaPolyLineAction* pA = static_cast<const MetaPolyLineAction*>(pAction); createLinePrimitive(pA->GetPolygon().getB2DPolygon(), pA->GetLineInfo(), rTargetHolders.Current(), rPropertyHolders.Current()); } @@ -1909,7 +1909,7 @@ namespace /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineOrFillActive()) { - const MetaPolygonAction* pA = (const MetaPolygonAction*)pAction; + const MetaPolygonAction* pA = static_cast<const MetaPolygonAction*>(pAction); basegfx::B2DPolygon aOutline(pA->GetPolygon().getB2DPolygon()); // the metafile play interprets the polygons from MetaPolygonAction @@ -1930,7 +1930,7 @@ namespace /** CHECKED, WORKS WELL */ if(rPropertyHolders.Current().getLineOrFillActive()) { - const MetaPolyPolygonAction* pA = (const MetaPolyPolygonAction*)pAction; + const MetaPolyPolygonAction* pA = static_cast<const MetaPolyPolygonAction*>(pAction); basegfx::B2DPolyPolygon aPolyPolygonOutline(pA->GetPolyPolygon().getB2DPolyPolygon()); // the metafile play interprets the single polygons from MetaPolyPolygonAction @@ -1955,7 +1955,7 @@ namespace case META_TEXT_ACTION : { /** CHECKED, WORKS WELL */ - const MetaTextAction* pA = (const MetaTextAction*)pAction; + const MetaTextAction* pA = static_cast<const MetaTextAction*>(pAction); sal_uInt32 nTextLength(pA->GetLen()); const sal_uInt32 nTextIndex(pA->GetIndex()); const sal_uInt32 nStringLength(pA->GetText().getLength()); @@ -1983,7 +1983,7 @@ namespace case META_TEXTARRAY_ACTION : { /** CHECKED, WORKS WELL */ - const MetaTextArrayAction* pA = (const MetaTextArrayAction*)pAction; + const MetaTextArrayAction* pA = static_cast<const MetaTextArrayAction*>(pAction); sal_uInt32 nTextLength(pA->GetLen()); const sal_uInt32 nTextIndex(pA->GetIndex()); const sal_uInt32 nStringLength(pA->GetText().getLength()); @@ -2031,7 +2031,7 @@ namespace // New status: /** CHECKED, WORKS WELL */ - const MetaStretchTextAction* pA = (const MetaStretchTextAction*)pAction; + const MetaStretchTextAction* pA = static_cast<const MetaStretchTextAction*>(pAction); sal_uInt32 nTextLength(pA->GetLen()); const sal_uInt32 nTextIndex(pA->GetIndex()); const sal_uInt32 nStringLength(pA->GetText().getLength()); @@ -2088,7 +2088,7 @@ namespace { /** CHECKED, WORKS WELL */ // OSL_FAIL("META_TEXTRECT_ACTION requested (!)"); - const MetaTextRectAction* pA = (const MetaTextRectAction*)pAction; + const MetaTextRectAction* pA = static_cast<const MetaTextRectAction*>(pAction); const Rectangle& rRectangle = pA->GetRect(); const sal_uInt32 nStringLength(pA->GetText().getLength()); @@ -2147,7 +2147,7 @@ namespace case META_BMP_ACTION : { /** CHECKED, WORKS WELL */ - const MetaBmpAction* pA = (const MetaBmpAction*)pAction; + const MetaBmpAction* pA = static_cast<const MetaBmpAction*>(pAction); const BitmapEx aBitmapEx(pA->GetBitmap()); createBitmapExPrimitive(aBitmapEx, pA->GetPoint(), rTargetHolders.Current(), rPropertyHolders.Current()); @@ -2157,7 +2157,7 @@ namespace case META_BMPSCALE_ACTION : { /** CHECKED, WORKS WELL */ - const MetaBmpScaleAction* pA = (const MetaBmpScaleAction*)pAction; + const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction); const Bitmap aBitmapEx(pA->GetBitmap()); createBitmapExPrimitive(aBitmapEx, pA->GetPoint(), pA->GetSize(), rTargetHolders.Current(), rPropertyHolders.Current()); @@ -2167,7 +2167,7 @@ namespace case META_BMPSCALEPART_ACTION : { /** CHECKED, WORKS WELL */ - const MetaBmpScalePartAction* pA = (const MetaBmpScalePartAction*)pAction; + const MetaBmpScalePartAction* pA = static_cast<const MetaBmpScalePartAction*>(pAction); const Bitmap& rBitmap = pA->GetBitmap(); if(!rBitmap.IsEmpty()) @@ -2189,7 +2189,7 @@ namespace case META_BMPEX_ACTION : { /** CHECKED, WORKS WELL: Simply same as META_BMP_ACTION */ - const MetaBmpExAction* pA = (const MetaBmpExAction*)pAction; + const MetaBmpExAction* pA = static_cast<const MetaBmpExAction*>(pAction); const BitmapEx& rBitmapEx = pA->GetBitmapEx(); createBitmapExPrimitive(rBitmapEx, pA->GetPoint(), rTargetHolders.Current(), rPropertyHolders.Current()); @@ -2199,7 +2199,7 @@ namespace case META_BMPEXSCALE_ACTION : { /** CHECKED, WORKS WELL: Simply same as META_BMPSCALE_ACTION */ - const MetaBmpExScaleAction* pA = (const MetaBmpExScaleAction*)pAction; + const MetaBmpExScaleAction* pA = static_cast<const MetaBmpExScaleAction*>(pAction); const BitmapEx& rBitmapEx = pA->GetBitmapEx(); createBitmapExPrimitive(rBitmapEx, pA->GetPoint(), pA->GetSize(), rTargetHolders.Current(), rPropertyHolders.Current()); @@ -2209,7 +2209,7 @@ namespace case META_BMPEXSCALEPART_ACTION : { /** CHECKED, WORKS WELL: Simply same as META_BMPSCALEPART_ACTION */ - const MetaBmpExScalePartAction* pA = (const MetaBmpExScalePartAction*)pAction; + const MetaBmpExScalePartAction* pA = static_cast<const MetaBmpExScalePartAction*>(pAction); const BitmapEx& rBitmapEx = pA->GetBitmapEx(); if(!rBitmapEx.IsEmpty()) @@ -2231,7 +2231,7 @@ namespace { /** CHECKED, WORKS WELL: Simply same as META_BMP_ACTION */ /** Huh, no it isn't!? */ - const MetaMaskAction* pA = (const MetaMaskAction*)pAction; + const MetaMaskAction* pA = static_cast<const MetaMaskAction*>(pAction); const BitmapEx aBitmapEx(createMaskBmpEx(pA->GetBitmap(), pA->GetColor())); createBitmapExPrimitive(aBitmapEx, pA->GetPoint(), rTargetHolders.Current(), rPropertyHolders.Current()); @@ -2241,7 +2241,7 @@ namespace case META_MASKSCALE_ACTION : { /** CHECKED, WORKS WELL: Simply same as META_BMPSCALE_ACTION */ - const MetaMaskScaleAction* pA = (const MetaMaskScaleAction*)pAction; + const MetaMaskScaleAction* pA = static_cast<const MetaMaskScaleAction*>(pAction); const BitmapEx aBitmapEx(createMaskBmpEx(pA->GetBitmap(), pA->GetColor())); createBitmapExPrimitive(aBitmapEx, pA->GetPoint(), pA->GetSize(), rTargetHolders.Current(), rPropertyHolders.Current()); @@ -2251,7 +2251,7 @@ namespace case META_MASKSCALEPART_ACTION : { /** CHECKED, WORKS WELL: Simply same as META_BMPSCALEPART_ACTION */ - const MetaMaskScalePartAction* pA = (const MetaMaskScalePartAction*)pAction; + const MetaMaskScalePartAction* pA = static_cast<const MetaMaskScalePartAction*>(pAction); const Bitmap& rBitmap = pA->GetBitmap(); if(!rBitmap.IsEmpty()) @@ -2273,7 +2273,7 @@ namespace case META_GRADIENT_ACTION : { /** CHECKED, WORKS WELL */ - const MetaGradientAction* pA = (const MetaGradientAction*)pAction; + const MetaGradientAction* pA = static_cast<const MetaGradientAction*>(pAction); const Rectangle& rRectangle = pA->GetRect(); if(!rRectangle.IsEmpty()) @@ -2335,7 +2335,7 @@ namespace case META_HATCH_ACTION : { /** CHECKED, WORKS WELL */ - const MetaHatchAction* pA = (const MetaHatchAction*)pAction; + const MetaHatchAction* pA = static_cast<const MetaHatchAction*>(pAction); basegfx::B2DPolyPolygon aOutline(pA->GetPolyPolygon().getB2DPolyPolygon()); if(aOutline.count()) @@ -2363,7 +2363,7 @@ namespace case META_WALLPAPER_ACTION : { /** CHECKED, WORKS WELL */ - const MetaWallpaperAction* pA = (const MetaWallpaperAction*)pAction; + const MetaWallpaperAction* pA = static_cast<const MetaWallpaperAction*>(pAction); Rectangle aWallpaperRectangle(pA->GetRect()); if(!aWallpaperRectangle.IsEmpty()) @@ -2413,7 +2413,7 @@ namespace case META_CLIPREGION_ACTION : { /** CHECKED, WORKS WELL */ - const MetaClipRegionAction* pA = (const MetaClipRegionAction*)pAction; + const MetaClipRegionAction* pA = static_cast<const MetaClipRegionAction*>(pAction); if(pA->IsClipping()) { @@ -2436,7 +2436,7 @@ namespace case META_ISECTRECTCLIPREGION_ACTION : { /** CHECKED, WORKS WELL */ - const MetaISectRectClipRegionAction* pA = (const MetaISectRectClipRegionAction*)pAction; + const MetaISectRectClipRegionAction* pA = static_cast<const MetaISectRectClipRegionAction*>(pAction); const Rectangle& rRectangle = pA->GetRect(); if(rRectangle.IsEmpty()) @@ -2504,7 +2504,7 @@ namespace case META_ISECTREGIONCLIPREGION_ACTION : { /** CHECKED, WORKS WELL */ - const MetaISectRegionClipRegionAction* pA = (const MetaISectRegionClipRegionAction*)pAction; + const MetaISectRegionClipRegionAction* pA = static_cast<const MetaISectRegionClipRegionAction*>(pAction); const vcl::Region& rNewRegion = pA->GetRegion(); if(rNewRegion.IsEmpty()) @@ -2560,7 +2560,7 @@ namespace case META_MOVECLIPREGION_ACTION : { /** CHECKED, WORKS WELL */ - const MetaMoveClipRegionAction* pA = (const MetaMoveClipRegionAction*)pAction; + const MetaMoveClipRegionAction* pA = static_cast<const MetaMoveClipRegionAction*>(pAction); if(rPropertyHolders.Current().getClipPolyPolygonActive()) { @@ -2596,7 +2596,7 @@ namespace case META_LINECOLOR_ACTION : { /** CHECKED, WORKS WELL */ - const MetaLineColorAction* pA = (const MetaLineColorAction*)pAction; + const MetaLineColorAction* pA = static_cast<const MetaLineColorAction*>(pAction); const bool bActive(pA->IsSetting()); rPropertyHolders.Current().setLineColorActive(bActive); @@ -2608,7 +2608,7 @@ namespace case META_FILLCOLOR_ACTION : { /** CHECKED, WORKS WELL */ - const MetaFillColorAction* pA = (const MetaFillColorAction*)pAction; + const MetaFillColorAction* pA = static_cast<const MetaFillColorAction*>(pAction); const bool bActive(pA->IsSetting()); rPropertyHolders.Current().setFillColorActive(bActive); @@ -2620,7 +2620,7 @@ namespace case META_TEXTCOLOR_ACTION : { /** SIMPLE, DONE */ - const MetaTextColorAction* pA = (const MetaTextColorAction*)pAction; + const MetaTextColorAction* pA = static_cast<const MetaTextColorAction*>(pAction); const bool bActivate(COL_TRANSPARENT != pA->GetColor().GetColor()); rPropertyHolders.Current().setTextColorActive(bActivate); @@ -2631,7 +2631,7 @@ namespace case META_TEXTFILLCOLOR_ACTION : { /** SIMPLE, DONE */ - const MetaTextFillColorAction* pA = (const MetaTextFillColorAction*)pAction; + const MetaTextFillColorAction* pA = static_cast<const MetaTextFillColorAction*>(pAction); const bool bWithColorArgument(pA->IsSetting()); if(bWithColorArgument) @@ -2652,7 +2652,7 @@ namespace case META_TEXTALIGN_ACTION : { /** SIMPLE, DONE */ - const MetaTextAlignAction* pA = (const MetaTextAlignAction*)pAction; + const MetaTextAlignAction* pA = static_cast<const MetaTextAlignAction*>(pAction); const TextAlign aNewTextAlign = pA->GetTextAlign(); // TextAlign is applied to the current font (as in @@ -2673,7 +2673,7 @@ namespace // the most necessary MapMode to be interpreted is MAP_RELATIVE, // but also the others may occur. Even not yet supported ones // may need to be added here later - const MetaMapModeAction* pA = (const MetaMapModeAction*)pAction; + const MetaMapModeAction* pA = static_cast<const MetaMapModeAction*>(pAction); const MapMode& rMapMode = pA->GetMapMode(); basegfx::B2DHomMatrix aMapping; @@ -2727,7 +2727,7 @@ namespace case META_FONT_ACTION : { /** SIMPLE, DONE */ - const MetaFontAction* pA = (const MetaFontAction*)pAction; + const MetaFontAction* pA = static_cast<const MetaFontAction*>(pAction); rPropertyHolders.Current().setFont(pA->GetFont()); Size aFontSize(pA->GetFont().GetSize()); @@ -2780,7 +2780,7 @@ namespace case META_PUSH_ACTION : { /** CHECKED, WORKS WELL */ - const MetaPushAction* pA = (const MetaPushAction*)pAction; + const MetaPushAction* pA = static_cast<const MetaPushAction*>(pAction); rPropertyHolders.Push(pA->GetFlags()); break; @@ -2825,7 +2825,7 @@ namespace case META_RASTEROP_ACTION : { /** CHECKED, WORKS WELL */ - const MetaRasterOpAction* pA = (const MetaRasterOpAction*)pAction; + const MetaRasterOpAction* pA = static_cast<const MetaRasterOpAction*>(pAction); const RasterOp aRasterOp = pA->GetRasterOp(); HandleNewRasterOp(aRasterOp, rTargetHolders, rPropertyHolders); @@ -2835,7 +2835,7 @@ namespace case META_TRANSPARENT_ACTION : { /** CHECKED, WORKS WELL */ - const MetaTransparentAction* pA = (const MetaTransparentAction*)pAction; + const MetaTransparentAction* pA = static_cast<const MetaTransparentAction*>(pAction); const basegfx::B2DPolyPolygon aOutline(pA->GetPolyPolygon().getB2DPolyPolygon()); if(aOutline.count()) @@ -2883,7 +2883,7 @@ namespace // by default decompose to the Metafile replacement data. To support // this EPS on screen, the renderer visualizing this has to support // that primitive and visualize the Eps file (e.g. printing) - const MetaEPSAction* pA = (const MetaEPSAction*)pAction; + const MetaEPSAction* pA = static_cast<const MetaEPSAction*>(pAction); const Rectangle aRectangle(pA->GetPoint(), pA->GetSize()); if(!aRectangle.IsEmpty()) @@ -2920,7 +2920,7 @@ namespace case META_TEXTLINECOLOR_ACTION : { /** SIMPLE, DONE */ - const MetaTextLineColorAction* pA = (const MetaTextLineColorAction*)pAction; + const MetaTextLineColorAction* pA = static_cast<const MetaTextLineColorAction*>(pAction); const bool bActive(pA->IsSetting()); rPropertyHolders.Current().setTextLineColorActive(bActive); @@ -2939,7 +2939,7 @@ namespace // This Metaaction seems not to be used (was not used in any // checked files). It's used in combination with the current // Font. - const MetaTextLineAction* pA = (const MetaTextLineAction*)pAction; + const MetaTextLineAction* pA = static_cast<const MetaTextLineAction*>(pAction); proccessMetaTextLineAction( *pA, @@ -2951,7 +2951,7 @@ namespace case META_FLOATTRANSPARENT_ACTION : { /** CHECKED, WORKS WELL */ - const MetaFloatTransparentAction* pA = (const MetaFloatTransparentAction*)pAction; + const MetaFloatTransparentAction* pA = static_cast<const MetaFloatTransparentAction*>(pAction); const basegfx::B2DRange aTargetRange( pA->GetPoint().X(), pA->GetPoint().Y(), @@ -3060,21 +3060,21 @@ namespace case META_LAYOUTMODE_ACTION : { /** SIMPLE, DONE */ - const MetaLayoutModeAction* pA = (const MetaLayoutModeAction*)pAction; + const MetaLayoutModeAction* pA = static_cast<const MetaLayoutModeAction*>(pAction); rPropertyHolders.Current().setLayoutMode(pA->GetLayoutMode()); break; } case META_TEXTLANGUAGE_ACTION : { /** SIMPLE, DONE */ - const MetaTextLanguageAction* pA = (const MetaTextLanguageAction*)pAction; + const MetaTextLanguageAction* pA = static_cast<const MetaTextLanguageAction*>(pAction); rPropertyHolders.Current().setLanguageType(pA->GetTextLanguage()); break; } case META_OVERLINECOLOR_ACTION : { /** SIMPLE, DONE */ - const MetaOverlineColorAction* pA = (const MetaOverlineColorAction*)pAction; + const MetaOverlineColorAction* pA = static_cast<const MetaOverlineColorAction*>(pAction); const bool bActive(pA->IsSetting()); rPropertyHolders.Current().setOverlineColorActive(bActive); @@ -3091,7 +3091,7 @@ namespace // XPATHSTROKE_SEQ_BEGIN, XPATHSTROKE_SEQ_END, // but opted to remove these again; it works well without them // and makes the code less dependent from those Metafile Add-Ons - const MetaCommentAction* pA = (const MetaCommentAction*)pAction; + const MetaCommentAction* pA = static_cast<const MetaCommentAction*>(pAction); if (pA->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_BEGIN")) { @@ -3109,11 +3109,11 @@ namespace if(META_GRADIENTEX_ACTION == pAction->GetType()) { - pMetaGradientExAction = (const MetaGradientExAction*)pAction; + pMetaGradientExAction = static_cast<const MetaGradientExAction*>(pAction); } else if(META_COMMENT_ACTION == pAction->GetType()) { - if (((const MetaCommentAction*)pAction)->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_END")) + if (static_cast<const MetaCommentAction*>(pAction)->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_END")) { bDone = true; } @@ -3240,7 +3240,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const MetafilePrimitive2D& rCompare = (MetafilePrimitive2D&)rPrimitive; + const MetafilePrimitive2D& rCompare = static_cast<const MetafilePrimitive2D&>(rPrimitive); return (getTransform() == rCompare.getTransform() && getMetaFile() == rCompare.getMetaFile()); diff --git a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx index 0323ac5e828a..4e370379594c 100644 --- a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx @@ -42,7 +42,7 @@ namespace drawinglayer { if(GroupPrimitive2D::operator==(rPrimitive)) { - const ModifiedColorPrimitive2D& rCompare = (ModifiedColorPrimitive2D&)rPrimitive; + const ModifiedColorPrimitive2D& rCompare = static_cast<const ModifiedColorPrimitive2D&>(rPrimitive); if(getColorModifier().get() == rCompare.getColorModifier().get()) { diff --git a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx index 29f05693ceb2..ea77adab7563 100644 --- a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx @@ -41,7 +41,7 @@ namespace drawinglayer { if(GroupPrimitive2D::operator==(rPrimitive)) { - const ObjectInfoPrimitive2D& rCompare = (ObjectInfoPrimitive2D&)rPrimitive; + const ObjectInfoPrimitive2D& rCompare = static_cast<const ObjectInfoPrimitive2D&>(rPrimitive); return (getName() == rCompare.getName() && getTitle() == rCompare.getTitle() diff --git a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx index 7cbe69de3111..edbe3c360073 100644 --- a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx @@ -44,7 +44,7 @@ namespace drawinglayer { if(BasePrimitive2D::operator==(rPrimitive)) { - const PointArrayPrimitive2D& rCompare = (PointArrayPrimitive2D&)rPrimitive; + const PointArrayPrimitive2D& rCompare = static_cast<const PointArrayPrimitive2D&>(rPrimitive); return (getPositions() == rCompare.getPositions() && getRGBColor() == rCompare.getRGBColor()); diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index e8f5e18bffab..79a5e9e10c54 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -50,7 +50,7 @@ namespace drawinglayer { if(BasePrimitive2D::operator==(rPrimitive)) { - const PolygonHairlinePrimitive2D& rCompare = (PolygonHairlinePrimitive2D&)rPrimitive; + const PolygonHairlinePrimitive2D& rCompare = static_cast<const PolygonHairlinePrimitive2D&>(rPrimitive); return (getB2DPolygon() == rCompare.getB2DPolygon() && getBColor() == rCompare.getBColor()); @@ -143,7 +143,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const PolygonMarkerPrimitive2D& rCompare = (PolygonMarkerPrimitive2D&)rPrimitive; + const PolygonMarkerPrimitive2D& rCompare = static_cast<const PolygonMarkerPrimitive2D&>(rPrimitive); return (getB2DPolygon() == rCompare.getB2DPolygon() && getRGBColorA() == rCompare.getRGBColorA() @@ -321,7 +321,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const PolygonStrokePrimitive2D& rCompare = (PolygonStrokePrimitive2D&)rPrimitive; + const PolygonStrokePrimitive2D& rCompare = static_cast<const PolygonStrokePrimitive2D&>(rPrimitive); return (getB2DPolygon() == rCompare.getB2DPolygon() && getLineAttribute() == rCompare.getLineAttribute() @@ -475,7 +475,7 @@ namespace drawinglayer { if(PolygonStrokePrimitive2D::operator==(rPrimitive)) { - const PolygonWavePrimitive2D& rCompare = (PolygonWavePrimitive2D&)rPrimitive; + const PolygonWavePrimitive2D& rCompare = static_cast<const PolygonWavePrimitive2D&>(rPrimitive); return (getWaveWidth() == rCompare.getWaveWidth() && getWaveHeight() == rCompare.getWaveHeight()); @@ -619,7 +619,7 @@ namespace drawinglayer { if(PolygonStrokePrimitive2D::operator==(rPrimitive)) { - const PolygonStrokeArrowPrimitive2D& rCompare = (PolygonStrokeArrowPrimitive2D&)rPrimitive; + const PolygonStrokeArrowPrimitive2D& rCompare = static_cast<const PolygonStrokeArrowPrimitive2D&>(rPrimitive); return (getStart() == rCompare.getStart() && getEnd() == rCompare.getEnd()); diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx index 1fe0a6f7eb8a..ec18be6997b0 100644 --- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx @@ -75,7 +75,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const PolyPolygonHairlinePrimitive2D& rCompare = (PolyPolygonHairlinePrimitive2D&)rPrimitive; + const PolyPolygonHairlinePrimitive2D& rCompare = static_cast<const PolyPolygonHairlinePrimitive2D&>(rPrimitive); return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() && getBColor() == rCompare.getBColor()); @@ -146,7 +146,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const PolyPolygonMarkerPrimitive2D& rCompare = (PolyPolygonMarkerPrimitive2D&)rPrimitive; + const PolyPolygonMarkerPrimitive2D& rCompare = static_cast<const PolyPolygonMarkerPrimitive2D&>(rPrimitive); return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() && getRGBColorA() == rCompare.getRGBColorA() @@ -224,7 +224,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const PolyPolygonStrokePrimitive2D& rCompare = (PolyPolygonStrokePrimitive2D&)rPrimitive; + const PolyPolygonStrokePrimitive2D& rCompare = static_cast<const PolyPolygonStrokePrimitive2D&>(rPrimitive); return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() && getLineAttribute() == rCompare.getLineAttribute() @@ -273,7 +273,7 @@ namespace drawinglayer { if(BasePrimitive2D::operator==(rPrimitive)) { - const PolyPolygonColorPrimitive2D& rCompare = (PolyPolygonColorPrimitive2D&)rPrimitive; + const PolyPolygonColorPrimitive2D& rCompare = static_cast<const PolyPolygonColorPrimitive2D&>(rPrimitive); return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() && getBColor() == rCompare.getBColor()); @@ -350,7 +350,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const PolyPolygonGradientPrimitive2D& rCompare = (PolyPolygonGradientPrimitive2D&)rPrimitive; + const PolyPolygonGradientPrimitive2D& rCompare = static_cast<const PolyPolygonGradientPrimitive2D&>(rPrimitive); return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() && getDefinitionRange() == rCompare.getDefinitionRange() @@ -427,7 +427,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const PolyPolygonHatchPrimitive2D& rCompare = (PolyPolygonHatchPrimitive2D&)rPrimitive; + const PolyPolygonHatchPrimitive2D& rCompare = static_cast<const PolyPolygonHatchPrimitive2D&>(rPrimitive); return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() && getDefinitionRange() == rCompare.getDefinitionRange() @@ -556,7 +556,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const PolyPolygonGraphicPrimitive2D& rCompare = (PolyPolygonGraphicPrimitive2D&)rPrimitive; + const PolyPolygonGraphicPrimitive2D& rCompare = static_cast<const PolyPolygonGraphicPrimitive2D&>(rPrimitive); return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() && getDefinitionRange() == rCompare.getDefinitionRange() @@ -642,7 +642,7 @@ namespace drawinglayer { if(DiscreteMetricDependentPrimitive2D::operator==(rPrimitive)) { - const PolyPolygonSelectionPrimitive2D& rCompare = (PolyPolygonSelectionPrimitive2D&)rPrimitive; + const PolyPolygonSelectionPrimitive2D& rCompare = static_cast<const PolyPolygonSelectionPrimitive2D&>(rPrimitive); return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() && getColor() == rCompare.getColor() diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx index b669a20e8fa3..a424610c5418 100644 --- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx @@ -418,7 +418,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const ScenePrimitive2D& rCompare = (ScenePrimitive2D&)rPrimitive; + const ScenePrimitive2D& rCompare = static_cast<const ScenePrimitive2D&>(rPrimitive); return (primitive3d::arePrimitive3DSequencesEqual(getChildren3D(), rCompare.getChildren3D()) && getSdrSceneAttribute() == rCompare.getSdrSceneAttribute() diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx index d04f693ec65d..b309b3f63056 100644 --- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx @@ -362,7 +362,7 @@ namespace drawinglayer { if(TextSimplePortionPrimitive2D::operator==(rPrimitive)) { - const TextDecoratedPortionPrimitive2D& rCompare = (TextDecoratedPortionPrimitive2D&)rPrimitive; + const TextDecoratedPortionPrimitive2D& rCompare = static_cast<const TextDecoratedPortionPrimitive2D&>(rPrimitive); return (getOverlineColor() == rCompare.getOverlineColor() && getTextlineColor() == rCompare.getTextlineColor() diff --git a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx index 4eb6dab3aa29..f55d1dbaacba 100644 --- a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx @@ -200,7 +200,7 @@ namespace drawinglayer { if(BasePrimitive2D::operator==(rPrimitive)) { - const TextEffectPrimitive2D& rCompare = (TextEffectPrimitive2D&)rPrimitive; + const TextEffectPrimitive2D& rCompare = static_cast<const TextEffectPrimitive2D&>(rPrimitive); return (getTextContent() == rCompare.getTextContent() && getRotationCenter() == rCompare.getRotationCenter() diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx index 67d1a26d4395..f69d4766d014 100644 --- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx @@ -112,7 +112,7 @@ namespace drawinglayer { if(GroupPrimitive2D::operator==(rPrimitive)) { - const TextHierarchyFieldPrimitive2D& rCompare = (TextHierarchyFieldPrimitive2D&)rPrimitive; + const TextHierarchyFieldPrimitive2D& rCompare = static_cast<const TextHierarchyFieldPrimitive2D&>(rPrimitive); return (getType() == rCompare.getType() && getString() == rCompare.getString()); diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx index 71fd3039c571..b3d669f053ed 100644 --- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx @@ -275,7 +275,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const TextLinePrimitive2D& rCompare = (TextLinePrimitive2D&)rPrimitive; + const TextLinePrimitive2D& rCompare = static_cast<const TextLinePrimitive2D&>(rPrimitive); return (getObjectTransformation() == rCompare.getObjectTransformation() && getWidth() == rCompare.getWidth() diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index b825a82bdd2e..1554a685859d 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -262,7 +262,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const TextSimplePortionPrimitive2D& rCompare = (TextSimplePortionPrimitive2D&)rPrimitive; + const TextSimplePortionPrimitive2D& rCompare = static_cast<const TextSimplePortionPrimitive2D&>(rPrimitive); return (getTextTransform() == rCompare.getTextTransform() && getText() == rCompare.getText() diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx index 40e23d63fdb3..e5ffc580f96f 100644 --- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx @@ -48,7 +48,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const BaseTextStrikeoutPrimitive2D& rCompare = (BaseTextStrikeoutPrimitive2D&)rPrimitive; + const BaseTextStrikeoutPrimitive2D& rCompare = static_cast<const BaseTextStrikeoutPrimitive2D&>(rPrimitive); return (getObjectTransformation() == rCompare.getObjectTransformation() && getWidth() == rCompare.getWidth() @@ -129,7 +129,7 @@ namespace drawinglayer { if(BaseTextStrikeoutPrimitive2D::operator==(rPrimitive)) { - const TextCharacterStrikeoutPrimitive2D& rCompare = (TextCharacterStrikeoutPrimitive2D&)rPrimitive; + const TextCharacterStrikeoutPrimitive2D& rCompare = static_cast<const TextCharacterStrikeoutPrimitive2D&>(rPrimitive); return (getStrikeoutChar() == rCompare.getStrikeoutChar() && getFontAttribute() == rCompare.getFontAttribute() @@ -255,7 +255,7 @@ namespace drawinglayer { if(BaseTextStrikeoutPrimitive2D::operator==(rPrimitive)) { - const TextGeometryStrikeoutPrimitive2D& rCompare = (TextGeometryStrikeoutPrimitive2D&)rPrimitive; + const TextGeometryStrikeoutPrimitive2D& rCompare = static_cast<const TextGeometryStrikeoutPrimitive2D&>(rPrimitive); return (getHeight() == rCompare.getHeight() && getOffset() == rCompare.getOffset() diff --git a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx index e16a77a7ee2c..193674d9ad8e 100644 --- a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx @@ -42,7 +42,7 @@ namespace drawinglayer { if(GroupPrimitive2D::operator==(rPrimitive)) { - const TransparencePrimitive2D& rCompare = (TransparencePrimitive2D&)rPrimitive; + const TransparencePrimitive2D& rCompare = static_cast<const TransparencePrimitive2D&>(rPrimitive); return (getTransparence() == rCompare.getTransparence()); } diff --git a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx index da91914abefd..6a02672b0683 100644 --- a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx @@ -48,7 +48,7 @@ namespace drawinglayer { if(GroupPrimitive2D::operator==(rPrimitive)) { - const UnifiedTransparencePrimitive2D& rCompare = (UnifiedTransparencePrimitive2D&)rPrimitive; + const UnifiedTransparencePrimitive2D& rCompare = static_cast<const UnifiedTransparencePrimitive2D&>(rPrimitive); return (getTransparence() == rCompare.getTransparence()); } diff --git a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx index 01abd1c332c3..13bf9c6acc98 100644 --- a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx @@ -233,7 +233,7 @@ namespace drawinglayer { if(ViewTransformationDependentPrimitive2D::operator==(rPrimitive)) { - const WallpaperBitmapPrimitive2D& rCompare = (WallpaperBitmapPrimitive2D&)rPrimitive; + const WallpaperBitmapPrimitive2D& rCompare = static_cast<const WallpaperBitmapPrimitive2D&>(rPrimitive); return (getLocalObjectRange() == rCompare.getLocalObjectRange() && getBitmapEx() == rCompare.getBitmapEx() diff --git a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx index d49cdc78c59d..e488422a653e 100644 --- a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx @@ -90,7 +90,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { - const WrongSpellPrimitive2D& rCompare = (WrongSpellPrimitive2D&)rPrimitive; + const WrongSpellPrimitive2D& rCompare = static_cast<const WrongSpellPrimitive2D&>(rPrimitive); return (getTransformation() == rCompare.getTransformation() && getStart() == rCompare.getStart() diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx index 24162d698d43..204932f78126 100644 --- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx @@ -292,7 +292,7 @@ namespace drawinglayer { if(TexturePrimitive3D::operator==(rPrimitive)) { - const HatchTexturePrimitive3D& rCompare = (HatchTexturePrimitive3D&)rPrimitive; + const HatchTexturePrimitive3D& rCompare = static_cast<const HatchTexturePrimitive3D&>(rPrimitive); return (getHatch() == rCompare.getHatch()); } diff --git a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx index 3323a3376f0b..c74dba780178 100644 --- a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx @@ -42,7 +42,7 @@ namespace drawinglayer { if(GroupPrimitive3D::operator==(rPrimitive)) { - const ModifiedColorPrimitive3D& rCompare = (ModifiedColorPrimitive3D&)rPrimitive; + const ModifiedColorPrimitive3D& rCompare = static_cast<const ModifiedColorPrimitive3D&>(rPrimitive); if(getColorModifier().get() == rCompare.getColorModifier().get()) { diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx index 5d7f7e2d809c..94ca04c207ca 100644 --- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx @@ -47,7 +47,7 @@ namespace drawinglayer { if(BasePrimitive3D::operator==(rPrimitive)) { - const PolygonHairlinePrimitive3D& rCompare = (PolygonHairlinePrimitive3D&)rPrimitive; + const PolygonHairlinePrimitive3D& rCompare = static_cast<const PolygonHairlinePrimitive3D&>(rPrimitive); return (getB3DPolygon() == rCompare.getB3DPolygon() && getBColor() == rCompare.getBColor()); @@ -144,7 +144,7 @@ namespace drawinglayer { if(BufferedDecompositionPrimitive3D::operator==(rPrimitive)) { - const PolygonStrokePrimitive3D& rCompare = (PolygonStrokePrimitive3D&)rPrimitive; + const PolygonStrokePrimitive3D& rCompare = static_cast<const PolygonStrokePrimitive3D&>(rPrimitive); return (getB3DPolygon() == rCompare.getB3DPolygon() && getLineAttribute() == rCompare.getLineAttribute() diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 452f5a07f269..578026ba055c 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -761,7 +761,7 @@ namespace drawinglayer { if(PolygonHairlinePrimitive3D::operator==(rPrimitive)) { - const PolygonTubePrimitive3D& rCompare = (PolygonTubePrimitive3D&)rPrimitive; + const PolygonTubePrimitive3D& rCompare = static_cast<const PolygonTubePrimitive3D&>(rPrimitive); return (getRadius() == rCompare.getRadius() && getDegreeStepWidth() == rCompare.getDegreeStepWidth() diff --git a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx index c62f53a606b3..7dc3b00dd846 100644 --- a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx @@ -47,7 +47,7 @@ namespace drawinglayer { if(BasePrimitive3D::operator==(rPrimitive)) { - const PolyPolygonMaterialPrimitive3D& rCompare = (PolyPolygonMaterialPrimitive3D&)rPrimitive; + const PolyPolygonMaterialPrimitive3D& rCompare = static_cast<const PolyPolygonMaterialPrimitive3D&>(rPrimitive); return (getB3DPolyPolygon() == rCompare.getB3DPolyPolygon() && getMaterial() == rCompare.getMaterial() diff --git a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx index f10ae91ff4fb..782170daf46d 100644 --- a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx @@ -48,7 +48,7 @@ namespace drawinglayer { if(GroupPrimitive3D::operator==(rPrimitive)) { - const ShadowPrimitive3D& rCompare = (ShadowPrimitive3D&)rPrimitive; + const ShadowPrimitive3D& rCompare = static_cast<const ShadowPrimitive3D&>(rPrimitive); return (getShadowTransform() == rCompare.getShadowTransform() && getShadowColor() == rCompare.getShadowColor() diff --git a/drawinglayer/source/primitive3d/textureprimitive3d.cxx b/drawinglayer/source/primitive3d/textureprimitive3d.cxx index 0e97802054ea..674e76846c57 100644 --- a/drawinglayer/source/primitive3d/textureprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/textureprimitive3d.cxx @@ -46,7 +46,7 @@ namespace drawinglayer { if(GroupPrimitive3D::operator==(rPrimitive)) { - const TexturePrimitive3D& rCompare = (TexturePrimitive3D&)rPrimitive; + const TexturePrimitive3D& rCompare = static_cast<const TexturePrimitive3D&>(rPrimitive); return (getModulate() == rCompare.getModulate() && getFilter() == rCompare.getFilter()); @@ -75,7 +75,7 @@ namespace drawinglayer { if(TexturePrimitive3D::operator==(rPrimitive)) { - const UnifiedTransparenceTexturePrimitive3D& rCompare = (UnifiedTransparenceTexturePrimitive3D&)rPrimitive; + const UnifiedTransparenceTexturePrimitive3D& rCompare = static_cast<const UnifiedTransparenceTexturePrimitive3D&>(rPrimitive); return (getTransparence() == rCompare.getTransparence()); } @@ -139,7 +139,7 @@ namespace drawinglayer { if(TexturePrimitive3D::operator==(rPrimitive)) { - const GradientTexturePrimitive3D& rCompare = (GradientTexturePrimitive3D&)rPrimitive; + const GradientTexturePrimitive3D& rCompare = static_cast<const GradientTexturePrimitive3D&>(rPrimitive); return (getGradient() == rCompare.getGradient()); } @@ -173,7 +173,7 @@ namespace drawinglayer { if(TexturePrimitive3D::operator==(rPrimitive)) { - const BitmapTexturePrimitive3D& rCompare = (BitmapTexturePrimitive3D&)rPrimitive; + const BitmapTexturePrimitive3D& rCompare = static_cast<const BitmapTexturePrimitive3D&>(rPrimitive); return (getFillGraphicAttribute() == rCompare.getFillGraphicAttribute()); } |