diff options
67 files changed, 371 insertions, 114 deletions
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx index d2c8d4a6571a..827e9b81d05d 100644 --- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx @@ -81,7 +81,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(AnimatedSwitchPrimitive2D, PRIMITIVE2D_ID_ANIMATEDSWITCHPRIMITIVE2D) + sal_uInt32 AnimatedSwitchPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_ANIMATEDSWITCHPRIMITIVE2D; + } } // end of namespace drawinglayer::primitive2d @@ -109,7 +112,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(AnimatedBlinkPrimitive2D, PRIMITIVE2D_ID_ANIMATEDBLINKPRIMITIVE2D) + sal_uInt32 AnimatedBlinkPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_ANIMATEDBLINKPRIMITIVE2D; + } } // end of namespace drawinglayer::primitive2d @@ -189,8 +195,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(AnimatedInterpolatePrimitive2D, PRIMITIVE2D_ID_ANIMATEDINTERPOLATEPRIMITIVE2D) - + sal_uInt32 AnimatedInterpolatePrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_ANIMATEDINTERPOLATEPRIMITIVE2D; + } } // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx index ba0f47193b49..e05b4b9cb239 100644 --- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx @@ -88,7 +88,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(BackgroundColorPrimitive2D, PRIMITIVE2D_ID_BACKGROUNDCOLORPRIMITIVE2D) + sal_uInt32 BackgroundColorPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_BACKGROUNDCOLORPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx index f495d531d8ff..0848193d3c65 100644 --- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx @@ -71,7 +71,7 @@ sal_Int64 SAL_CALL BitmapPrimitive2D::estimateUsage() } // provide unique ID -ImplPrimitive2DIDBlock(BitmapPrimitive2D, PRIMITIVE2D_ID_BITMAPPRIMITIVE2D) +sal_uInt32 BitmapPrimitive2D::getPrimitive2DID() const { return PRIMITIVE2D_ID_BITMAPPRIMITIVE2D; } } // end of namespace diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx index b264e2c028af..e1e6002c35cf 100644 --- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx @@ -302,7 +302,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(BorderLinePrimitive2D, PRIMITIVE2D_ID_BORDERLINEPRIMITIVE2D) + sal_uInt32 BorderLinePrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_BORDERLINEPRIMITIVE2D; + } Primitive2DReference tryMergeBorderLinePrimitive2D( const BorderLinePrimitive2D* pCandidateA, diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx index 7ccc9660c78c..26e42a17cdd1 100644 --- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx @@ -346,7 +346,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(ControlPrimitive2D, PRIMITIVE2D_ID_CONTROLPRIMITIVE2D) + sal_uInt32 ControlPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_CONTROLPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/cropprimitive2d.cxx b/drawinglayer/source/primitive2d/cropprimitive2d.cxx index 2d780ac2645c..ff460a59fd11 100644 --- a/drawinglayer/source/primitive2d/cropprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/cropprimitive2d.cxx @@ -145,7 +145,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(CropPrimitive2D, PRIMITIVE2D_ID_CROPPRIMITIVE2D) + sal_uInt32 CropPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_CROPPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx index 17d6f2301a43..9389fd3aec00 100644 --- a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx @@ -93,7 +93,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(DiscreteBitmapPrimitive2D, PRIMITIVE2D_ID_DISCRETEBITMAPPRIMITIVE2D) + sal_uInt32 DiscreteBitmapPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_DISCRETEBITMAPPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx index 3100db147345..36b97c99d8f2 100644 --- a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx @@ -309,7 +309,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(DiscreteShadowPrimitive2D, PRIMITIVE2D_ID_DISCRETESHADOWPRIMITIVE2D) + sal_uInt32 DiscreteShadowPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_DISCRETESHADOWPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx index e38afeb4d612..e681e31c2084 100644 --- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx @@ -141,7 +141,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(Embedded3DPrimitive2D, PRIMITIVE2D_ID_EMBEDDED3DPRIMITIVE2D) + sal_uInt32 Embedded3DPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_EMBEDDED3DPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx b/drawinglayer/source/primitive2d/epsprimitive2d.cxx index b519547c00d7..ea22e529e22e 100644 --- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/epsprimitive2d.cxx @@ -75,7 +75,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(EpsPrimitive2D, PRIMITIVE2D_ID_EPSPRIMITIVE2D) + sal_uInt32 EpsPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_EPSPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx index fba740e833c5..10fff2638865 100644 --- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx @@ -326,7 +326,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(FillGradientPrimitive2D, PRIMITIVE2D_ID_FILLGRADIENTPRIMITIVE2D) + sal_uInt32 FillGradientPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_FILLGRADIENTPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx index ee67bd305810..c8f1aa6f92d2 100644 --- a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx @@ -122,7 +122,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(FillGraphicPrimitive2D, PRIMITIVE2D_ID_FILLGRAPHICPRIMITIVE2D) + sal_uInt32 FillGraphicPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_FILLGRAPHICPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx index 9c4ef03bfba3..ec81e9ec0d41 100644 --- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx @@ -191,7 +191,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(FillHatchPrimitive2D, PRIMITIVE2D_ID_FILLHATCHPRIMITIVE2D) + sal_uInt32 FillHatchPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_FILLHATCHPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/glowprimitive2d.cxx b/drawinglayer/source/primitive2d/glowprimitive2d.cxx index f6dfab2b3c45..e6adcb4b66d8 100644 --- a/drawinglayer/source/primitive2d/glowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/glowprimitive2d.cxx @@ -55,7 +55,7 @@ GlowPrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation } // provide unique ID -ImplPrimitive2DIDBlock(GlowPrimitive2D, PRIMITIVE2D_ID_GLOWPRIMITIVE2D) +sal_uInt32 GlowPrimitive2D::getPrimitive2DID() const { return PRIMITIVE2D_ID_GLOWPRIMITIVE2D; } } // end of namespace diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx index 40549e6eface..0319c50a7f8e 100644 --- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx @@ -211,7 +211,10 @@ GraphicPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInform } // provide unique ID -ImplPrimitive2DIDBlock(GraphicPrimitive2D, PRIMITIVE2D_ID_GRAPHICPRIMITIVE2D) +sal_uInt32 GraphicPrimitive2D::getPrimitive2DID() const +{ + return PRIMITIVE2D_ID_GRAPHICPRIMITIVE2D; +} } // end of namespace diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx index e1d0841678e2..4c560109ec1e 100644 --- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx @@ -331,7 +331,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(GridPrimitive2D, PRIMITIVE2D_ID_GRIDPRIMITIVE2D) + sal_uInt32 GridPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_GRIDPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/groupprimitive2d.cxx b/drawinglayer/source/primitive2d/groupprimitive2d.cxx index 63f21f842b2b..28f4f064608e 100644 --- a/drawinglayer/source/primitive2d/groupprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/groupprimitive2d.cxx @@ -69,7 +69,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(GroupPrimitive2D, PRIMITIVE2D_ID_GROUPPRIMITIVE2D) + sal_uInt32 GroupPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_GROUPPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx index e4c6ccbf1c3e..d43440fead63 100644 --- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx @@ -181,7 +181,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(HelplinePrimitive2D, PRIMITIVE2D_ID_HELPLINEPRIMITIVE2D) + sal_uInt32 HelplinePrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_HELPLINEPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx index cdce8a750274..c1298cd9589b 100644 --- a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx @@ -42,7 +42,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(HiddenGeometryPrimitive2D, PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D) + sal_uInt32 HiddenGeometryPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/invertprimitive2d.cxx b/drawinglayer/source/primitive2d/invertprimitive2d.cxx index 63c4be5246ac..0066b73d21dd 100644 --- a/drawinglayer/source/primitive2d/invertprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/invertprimitive2d.cxx @@ -33,7 +33,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(InvertPrimitive2D, PRIMITIVE2D_ID_INVERTPRIMITIVE2D) + sal_uInt32 InvertPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_INVERTPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx index a95e42cfecad..46d27c3eaa74 100644 --- a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx @@ -128,7 +128,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(MarkerArrayPrimitive2D, PRIMITIVE2D_ID_MARKERARRAYPRIMITIVE2D) + sal_uInt32 MarkerArrayPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_MARKERARRAYPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/maskprimitive2d.cxx b/drawinglayer/source/primitive2d/maskprimitive2d.cxx index 1e8af509c157..8a71d97008b9 100644 --- a/drawinglayer/source/primitive2d/maskprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/maskprimitive2d.cxx @@ -52,7 +52,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(MaskPrimitive2D, PRIMITIVE2D_ID_MASKPRIMITIVE2D) + sal_uInt32 MaskPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_MASKPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx index 5158c6822492..349e8b1a113c 100644 --- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx @@ -138,7 +138,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(MediaPrimitive2D, PRIMITIVE2D_ID_MEDIAPRIMITIVE2D) + sal_uInt32 MediaPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_MEDIAPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 362ae446fd99..22ef460ec205 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -126,7 +126,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(MetafilePrimitive2D, PRIMITIVE2D_ID_METAFILEPRIMITIVE2D) + sal_uInt32 MetafilePrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_METAFILEPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx index 4c0e8e6ccd18..06d322cada70 100644 --- a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx @@ -57,7 +57,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(ModifiedColorPrimitive2D, PRIMITIVE2D_ID_MODIFIEDCOLORPRIMITIVE2D) + sal_uInt32 ModifiedColorPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_MODIFIEDCOLORPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx index 32e66c705e62..8ea05672812d 100644 --- a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx @@ -50,7 +50,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(ObjectInfoPrimitive2D, PRIMITIVE2D_ID_OBJECTINFOPRIMITIVE2D) + sal_uInt32 ObjectInfoPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_OBJECTINFOPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx index ff52e1c6e7b5..f176e3b8301e 100644 --- a/drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx @@ -30,7 +30,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(PageHierarchyPrimitive2D, PRIMITIVE2D_ID_PAGEHIERARCHYPRIMITIVE2D) + sal_uInt32 PageHierarchyPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_PAGEHIERARCHYPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx index b7c67bf8fd0c..456b02333858 100644 --- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx @@ -141,7 +141,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(PagePreviewPrimitive2D, PRIMITIVE2D_ID_PAGEPREVIEWPRIMITIVE2D) + sal_uInt32 PagePreviewPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_PAGEPREVIEWPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx index 0e5b1a218690..e7a1f7480b6c 100644 --- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx @@ -323,7 +323,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(PatternFillPrimitive2D, PRIMITIVE2D_ID_PATTERNFILLPRIMITIVE2D) + sal_uInt32 PatternFillPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_PATTERNFILLPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx index 7e527487eb85..d616b26226fd 100644 --- a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx @@ -69,7 +69,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(PointArrayPrimitive2D, PRIMITIVE2D_ID_POINTARRAYPRIMITIVE2D) + sal_uInt32 PointArrayPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_POINTARRAYPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index de0b5fad2d13..17e63883c94b 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -77,10 +77,13 @@ PolygonHairlinePrimitive2D::getB2DRange(const geometry::ViewInformation2D& rView } // provide unique ID -ImplPrimitive2DIDBlock(PolygonHairlinePrimitive2D, PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D) +sal_uInt32 PolygonHairlinePrimitive2D::getPrimitive2DID() const +{ + return PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D; +} - void PolygonMarkerPrimitive2D::create2DDecomposition( - Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const +void PolygonMarkerPrimitive2D::create2DDecomposition( + Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const { // calculate logic DashLength const basegfx::B2DVector aDashVector(rViewInformation.getInverseObjectToViewTransformation() @@ -197,7 +200,10 @@ void PolygonMarkerPrimitive2D::get2DDecomposition( } // provide unique ID -ImplPrimitive2DIDBlock(PolygonMarkerPrimitive2D, PRIMITIVE2D_ID_POLYGONMARKERPRIMITIVE2D) +sal_uInt32 PolygonMarkerPrimitive2D::getPrimitive2DID() const +{ + return PRIMITIVE2D_ID_POLYGONMARKERPRIMITIVE2D; +} } // end of namespace @@ -377,11 +383,13 @@ PolygonStrokePrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewIn } // provide unique ID -ImplPrimitive2DIDBlock(PolygonStrokePrimitive2D, PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D) +sal_uInt32 PolygonStrokePrimitive2D::getPrimitive2DID() const +{ + return PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D; +} - void PolygonWavePrimitive2D::create2DDecomposition( - Primitive2DContainer& rContainer, - const geometry::ViewInformation2D& /*rViewInformation*/) const +void PolygonWavePrimitive2D::create2DDecomposition( + Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const { if (!getB2DPolygon().count()) return; @@ -478,11 +486,13 @@ PolygonWavePrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInfo } // provide unique ID -ImplPrimitive2DIDBlock(PolygonWavePrimitive2D, PRIMITIVE2D_ID_POLYGONWAVEPRIMITIVE2D) +sal_uInt32 PolygonWavePrimitive2D::getPrimitive2DID() const +{ + return PRIMITIVE2D_ID_POLYGONWAVEPRIMITIVE2D; +} - void PolygonStrokeArrowPrimitive2D::create2DDecomposition( - Primitive2DContainer& rContainer, - const geometry::ViewInformation2D& /*rViewInformation*/) const +void PolygonStrokeArrowPrimitive2D::create2DDecomposition( + Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const { // copy local polygon, it may be changed basegfx::B2DPolygon aLocalPolygon(getB2DPolygon()); @@ -596,7 +606,10 @@ basegfx::B2DRange PolygonStrokeArrowPrimitive2D::getB2DRange( } // provide unique ID -ImplPrimitive2DIDBlock(PolygonStrokeArrowPrimitive2D, PRIMITIVE2D_ID_POLYGONSTROKEARROWPRIMITIVE2D) +sal_uInt32 PolygonStrokeArrowPrimitive2D::getPrimitive2DID() const +{ + return PRIMITIVE2D_ID_POLYGONSTROKEARROWPRIMITIVE2D; +} } // end of namespace diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx index 21bf591aecc0..27f2f5a3638a 100644 --- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx @@ -690,7 +690,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(ScenePrimitive2D, PRIMITIVE2D_ID_SCENEPRIMITIVE2D) + sal_uInt32 ScenePrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SCENEPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx index f0efd64c7bdc..5ede8b68c9c3 100644 --- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx @@ -84,7 +84,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(ShadowPrimitive2D, PRIMITIVE2D_ID_SHADOWPRIMITIVE2D) + sal_uInt32 ShadowPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SHADOWPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/softedgeprimitive2d.cxx b/drawinglayer/source/primitive2d/softedgeprimitive2d.cxx index 4c5b1b2c6102..03b8ee61c950 100644 --- a/drawinglayer/source/primitive2d/softedgeprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/softedgeprimitive2d.cxx @@ -62,7 +62,10 @@ void SoftEdgePrimitive2D::get2DDecomposition( rVisitor.append(xRef); } -ImplPrimitive2DIDBlock(SoftEdgePrimitive2D, PRIMITIVE2D_ID_SOFTEDGEPRIMITIVE2D) +sal_uInt32 SoftEdgePrimitive2D::getPrimitive2DID() const +{ + return PRIMITIVE2D_ID_SOFTEDGEPRIMITIVE2D; +} } // end of namespace diff --git a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx index c46b7df87fc5..e2465078d33c 100644 --- a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx @@ -52,7 +52,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(StructureTagPrimitive2D, PRIMITIVE2D_ID_STRUCTURETAGPRIMITIVE2D) + sal_uInt32 StructureTagPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_STRUCTURETAGPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx index 116c2c6c03db..80f6a475b106 100644 --- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx @@ -598,7 +598,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SvgLinearGradientPrimitive2D, PRIMITIVE2D_ID_SVGLINEARGRADIENTPRIMITIVE2D) + sal_uInt32 SvgLinearGradientPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SVGLINEARGRADIENTPRIMITIVE2D; + } } // end of namespace drawinglayer::primitive2d @@ -846,7 +849,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SvgRadialGradientPrimitive2D, PRIMITIVE2D_ID_SVGRADIALGRADIENTPRIMITIVE2D) + sal_uInt32 SvgRadialGradientPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SVGRADIALGRADIENTPRIMITIVE2D; + } } // end of namespace drawinglayer::primitive2d @@ -937,7 +943,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SvgLinearAtomPrimitive2D, PRIMITIVE2D_ID_SVGLINEARATOMPRIMITIVE2D) + sal_uInt32 SvgLinearAtomPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SVGLINEARATOMPRIMITIVE2D; + } } // end of namespace drawinglayer::primitive2d @@ -1082,7 +1091,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SvgRadialAtomPrimitive2D, PRIMITIVE2D_ID_SVGRADIALATOMPRIMITIVE2D) + sal_uInt32 SvgRadialAtomPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SVGRADIALATOMPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx index afc841fcf3bd..34dbf72b94ea 100644 --- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx @@ -392,7 +392,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(TextDecoratedPortionPrimitive2D, PRIMITIVE2D_ID_TEXTDECORATEDPORTIONPRIMITIVE2D) + sal_uInt32 TextDecoratedPortionPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_TEXTDECORATEDPORTIONPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx index fbd3dfd14332..7b2839803adf 100644 --- a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx @@ -230,7 +230,10 @@ void TextEffectPrimitive2D::get2DDecomposition( } // provide unique ID -ImplPrimitive2DIDBlock(TextEffectPrimitive2D, PRIMITIVE2D_ID_TEXTEFFECTPRIMITIVE2D) +sal_uInt32 TextEffectPrimitive2D::getPrimitive2DID() const +{ + return PRIMITIVE2D_ID_TEXTEFFECTPRIMITIVE2D; +} } // end of namespace diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx index 77f7f659739c..18895f9a7aae 100644 --- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx @@ -32,7 +32,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(TextHierarchyLinePrimitive2D, PRIMITIVE2D_ID_TEXTHIERARCHYLINEPRIMITIVE2D) + sal_uInt32 TextHierarchyLinePrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_TEXTHIERARCHYLINEPRIMITIVE2D; + } TextHierarchyParagraphPrimitive2D::TextHierarchyParagraphPrimitive2D( @@ -56,7 +59,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(TextHierarchyParagraphPrimitive2D, PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D) + sal_uInt32 TextHierarchyParagraphPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D; + } @@ -66,7 +72,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(TextHierarchyBulletPrimitive2D, PRIMITIVE2D_ID_TEXTHIERARCHYBULLETPRIMITIVE2D) + sal_uInt32 TextHierarchyBulletPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_TEXTHIERARCHYBULLETPRIMITIVE2D; + } TextHierarchyBlockPrimitive2D::TextHierarchyBlockPrimitive2D(const Primitive2DContainer& rChildren) @@ -75,7 +84,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(TextHierarchyBlockPrimitive2D, PRIMITIVE2D_ID_TEXTHIERARCHYBLOCKPRIMITIVE2D) + sal_uInt32 TextHierarchyBlockPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_TEXTHIERARCHYBLOCKPRIMITIVE2D; + } TextHierarchyFieldPrimitive2D::TextHierarchyFieldPrimitive2D( @@ -119,14 +131,22 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(TextHierarchyFieldPrimitive2D, PRIMITIVE2D_ID_TEXTHIERARCHYFIELDPRIMITIVE2D) + sal_uInt32 TextHierarchyFieldPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_TEXTHIERARCHYFIELDPRIMITIVE2D; + } + + TextHierarchyEditPrimitive2D::TextHierarchyEditPrimitive2D(const Primitive2DContainer& rChildren) : GroupPrimitive2D(rChildren) { } // provide unique ID - ImplPrimitive2DIDBlock(TextHierarchyEditPrimitive2D, PRIMITIVE2D_ID_TEXTHIERARCHYEDITPRIMITIVE2D) + sal_uInt32 TextHierarchyEditPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_TEXTHIERARCHYEDITPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx index 2238fc383d5c..6d2293f77f7a 100644 --- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx @@ -281,7 +281,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(TextLinePrimitive2D, PRIMITIVE2D_ID_TEXTLINEPRIMITIVE2D) + sal_uInt32 TextLinePrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_TEXTLINEPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index 3e4aabff75b1..48fe07ac8987 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -300,7 +300,10 @@ basegfx::B2DRange TextSimplePortionPrimitive2D::getB2DRange( } // provide unique ID -ImplPrimitive2DIDBlock(TextSimplePortionPrimitive2D, PRIMITIVE2D_ID_TEXTSIMPLEPORTIONPRIMITIVE2D) +sal_uInt32 TextSimplePortionPrimitive2D::getPrimitive2DID() const +{ + return PRIMITIVE2D_ID_TEXTSIMPLEPORTIONPRIMITIVE2D; +} } // end of namespace diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx index 23b0c5ffe40c..62ad88fe70e9 100644 --- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx @@ -130,9 +130,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(TextCharacterStrikeoutPrimitive2D, PRIMITIVE2D_ID_TEXTCHARACTERSTRIKEOUTPRIMITIVE2D) - - + sal_uInt32 TextCharacterStrikeoutPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_TEXTCHARACTERSTRIKEOUTPRIMITIVE2D; + } void TextGeometryStrikeoutPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const { @@ -248,7 +249,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(TextGeometryStrikeoutPrimitive2D, PRIMITIVE2D_ID_TEXTGEOMETRYSTRIKEOUTPRIMITIVE2D) + sal_uInt32 TextGeometryStrikeoutPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_TEXTGEOMETRYSTRIKEOUTPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/transformprimitive2d.cxx b/drawinglayer/source/primitive2d/transformprimitive2d.cxx index 4ac2ada55027..b44b7d271459 100644 --- a/drawinglayer/source/primitive2d/transformprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/transformprimitive2d.cxx @@ -54,7 +54,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(TransformPrimitive2D, PRIMITIVE2D_ID_TRANSFORMPRIMITIVE2D) + sal_uInt32 TransformPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_TRANSFORMPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx index da157d353209..c36d9f76ef7f 100644 --- a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx @@ -47,7 +47,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(TransparencePrimitive2D, PRIMITIVE2D_ID_TRANSPARENCEPRIMITIVE2D) + sal_uInt32 TransparencePrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_TRANSPARENCEPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx index 70cfe675046e..88ecf44571cf 100644 --- a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx @@ -102,7 +102,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(UnifiedTransparencePrimitive2D, PRIMITIVE2D_ID_UNIFIEDTRANSPARENCEPRIMITIVE2D) + sal_uInt32 UnifiedTransparencePrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_UNIFIEDTRANSPARENCEPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx index d8926824f65a..04df87823e9b 100644 --- a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx @@ -248,7 +248,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(WallpaperBitmapPrimitive2D, PRIMITIVE2D_ID_WALLPAPERBITMAPPRIMITIVE2D) + sal_uInt32 WallpaperBitmapPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_WALLPAPERBITMAPPRIMITIVE2D; + } } // end of namespace diff --git a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx index f0eb918339bd..4b71a4d9ab9c 100644 --- a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx @@ -96,7 +96,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(WrongSpellPrimitive2D, PRIMITIVE2D_ID_WRONGSPELLPRIMITIVE2D) + sal_uInt32 WrongSpellPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_WRONGSPELLPRIMITIVE2D; + } } // end of namespace diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx index 7619e04e5279..dd7f002f1faf 100644 --- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -27,15 +27,6 @@ #include <cppuhelper/basemutex.hxx> #include <basegfx/range/b2drange.hxx> -/** defines ImplPrimitive2DIDBlock - Added to be able to simply change identification stuff later, e.g. add - an identification string and/or ID to the interface and to the implementation - ATM used to delclare implement getPrimitive2DID() -*/ - -#define ImplPrimitive2DIDBlock(TheClass, TheID) \ - sal_uInt32 TheClass::getPrimitive2DID() const { return TheID; } - namespace drawinglayer::geometry { class ViewInformation2D; diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 681ce37ac7da..4d14e9359864 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -1568,8 +1568,10 @@ namespace sdr::contact { m_aTransformation, xControlModel, rControl.getControl() ) ); } - - ImplPrimitive2DIDBlock( LazyControlCreationPrimitive2D, PRIMITIVE2D_ID_SDRCONTROLPRIMITIVE2D ) + sal_uInt32 LazyControlCreationPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRCONTROLPRIMITIVE2D; + } ViewObjectContactOfUnoControl::ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact ) :ViewObjectContactOfSdrObj( _rObjectContact, _rViewContact ) diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index 31e520d3b419..6d77add6652c 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -120,7 +120,10 @@ bool OverlayStaticRectanglePrimitive::operator==(const BasePrimitive2D& rPrimiti return false; } -ImplPrimitive2DIDBlock(OverlayStaticRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRECTANGLEPRIMITIVE) +sal_uInt32 OverlayStaticRectanglePrimitive::getPrimitive2DID() const +{ + return PRIMITIVE2D_ID_OVERLAYRECTANGLEPRIMITIVE; +} @@ -203,7 +206,10 @@ ImplPrimitive2DIDBlock(OverlayStaticRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRE return false; } - ImplPrimitive2DIDBlock(OverlayBitmapExPrimitive, PRIMITIVE2D_ID_OVERLAYBITMAPEXPRIMITIVE) + sal_uInt32 OverlayBitmapExPrimitive::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_OVERLAYBITMAPEXPRIMITIVE; + } @@ -265,7 +271,10 @@ ImplPrimitive2DIDBlock(OverlayStaticRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRE return false; } - ImplPrimitive2DIDBlock(OverlayCrosshairPrimitive, PRIMITIVE2D_ID_OVERLAYCROSSHAIRPRIMITIVE) + sal_uInt32 OverlayCrosshairPrimitive::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_OVERLAYCROSSHAIRPRIMITIVE; + } @@ -392,7 +401,10 @@ ImplPrimitive2DIDBlock(OverlayStaticRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRE return false; } - ImplPrimitive2DIDBlock(OverlayRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRECTANGLEPRIMITIVE) + sal_uInt32 OverlayRectanglePrimitive::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_OVERLAYRECTANGLEPRIMITIVE; + } @@ -497,7 +509,10 @@ ImplPrimitive2DIDBlock(OverlayStaticRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRE return false; } - ImplPrimitive2DIDBlock(OverlayHelplineStripedPrimitive, PRIMITIVE2D_ID_OVERLAYHELPLINESTRIPEDPRIMITIVE) + sal_uInt32 OverlayHelplineStripedPrimitive::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_OVERLAYHELPLINESTRIPEDPRIMITIVE; + } @@ -582,7 +597,10 @@ ImplPrimitive2DIDBlock(OverlayStaticRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRE return false; } - ImplPrimitive2DIDBlock(OverlayRollingRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYROLLINGRECTANGLEPRIMITIVE) + sal_uInt32 OverlayRollingRectanglePrimitive::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_OVERLAYROLLINGRECTANGLEPRIMITIVE; + } } // end of namespace diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx index 5abce7edef3a..2b5b424b426d 100644 --- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx @@ -159,7 +159,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrCaptionPrimitive2D, PRIMITIVE2D_ID_SDRCAPTIONPRIMITIVE2D) + sal_uInt32 SdrCaptionPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRCAPTIONPRIMITIVE2D; + } } // end of namespace diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx index 8b5c8413ccdf..315640e8f2d7 100644 --- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx @@ -98,7 +98,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrConnectorPrimitive2D, PRIMITIVE2D_ID_SDRCONNECTORPRIMITIVE2D) + sal_uInt32 SdrConnectorPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRCONNECTORPRIMITIVE2D; + } } // end of namespace diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index 0a352071500e..0781f2329d84 100644 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx @@ -121,7 +121,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrCustomShapePrimitive2D, PRIMITIVE2D_ID_SDRCUSTOMSHAPEPRIMITIVE2D) + sal_uInt32 SdrCustomShapePrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRCUSTOMSHAPEPRIMITIVE2D; + } } // end of namespace diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx index 1a341b8ff3fc..a49f52c73091 100644 --- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx @@ -131,7 +131,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrEllipsePrimitive2D, PRIMITIVE2D_ID_SDRELLIPSEPRIMITIVE2D) + sal_uInt32 SdrEllipsePrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRELLIPSEPRIMITIVE2D; + } @@ -254,7 +257,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrEllipseSegmentPrimitive2D, PRIMITIVE2D_ID_SDRELLIPSESEGMENTPRIMITIVE2D) + sal_uInt32 SdrEllipseSegmentPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRELLIPSESEGMENTPRIMITIVE2D; + } } // end of namespace diff --git a/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx index b87cfcd9342c..cd20f177a9f0 100644 --- a/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx @@ -923,7 +923,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrFrameBorderPrimitive2D, PRIMITIVE2D_ID_SDRFRAMEBORDERTPRIMITIVE2D) + sal_uInt32 SdrFrameBorderPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRFRAMEBORDERTPRIMITIVE2D; + } } // end of namespace diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx index b0683ad2fd9e..564970251bb7 100644 --- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx @@ -158,7 +158,10 @@ bool SdrGrafPrimitive2D::isTransparent() const } // provide unique ID -ImplPrimitive2DIDBlock(SdrGrafPrimitive2D, PRIMITIVE2D_ID_SDRGRAFPRIMITIVE2D) +sal_uInt32 SdrGrafPrimitive2D::getPrimitive2DID() const +{ + return PRIMITIVE2D_ID_SDRGRAFPRIMITIVE2D; +} } // end of namespace diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx index 894b9a941ceb..7a5f3f96ad73 100644 --- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx @@ -488,7 +488,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrMeasurePrimitive2D, PRIMITIVE2D_ID_SDRMEASUREPRIMITIVE2D) + sal_uInt32 SdrMeasurePrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRMEASUREPRIMITIVE2D; + } } // end of namespace diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx index 0c4dafcd7930..8cb5d1445273 100644 --- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx @@ -167,7 +167,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrOle2Primitive2D, PRIMITIVE2D_ID_SDROLE2PRIMITIVE2D) + sal_uInt32 SdrOle2Primitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDROLE2PRIMITIVE2D; + } } // end of namespace diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx index dd02d5348cc0..528cce8fae59 100644 --- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx @@ -170,7 +170,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrOleContentPrimitive2D, PRIMITIVE2D_ID_SDROLECONTENTPRIMITIVE2D) + sal_uInt32 SdrOleContentPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDROLECONTENTPRIMITIVE2D; + } } // end of namespace diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx index 721eff0ce364..cf22caa52020 100644 --- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx @@ -147,7 +147,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrPathPrimitive2D, PRIMITIVE2D_ID_SDRPATHPRIMITIVE2D) + sal_uInt32 SdrPathPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRPATHPRIMITIVE2D; + } } // end of namespace diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx index 0d3387f2ff4f..3323f5c07f73 100644 --- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx @@ -143,7 +143,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrRectanglePrimitive2D, PRIMITIVE2D_ID_SDRRECTANGLEPRIMITIVE2D) + sal_uInt32 SdrRectanglePrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRRECTANGLEPRIMITIVE2D; + } } // end of namespace diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index 59a1551d9ca8..778eeeac2170 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -281,7 +281,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrContourTextPrimitive2D, PRIMITIVE2D_ID_SDRCONTOURTEXTPRIMITIVE2D) + sal_uInt32 SdrContourTextPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRCONTOURTEXTPRIMITIVE2D; + } @@ -330,7 +333,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrPathTextPrimitive2D, PRIMITIVE2D_ID_SDRPATHTEXTPRIMITIVE2D) + sal_uInt32 SdrPathTextPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRPATHTEXTPRIMITIVE2D; + } @@ -396,7 +402,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrBlockTextPrimitive2D, PRIMITIVE2D_ID_SDRBLOCKTEXTPRIMITIVE2D) + sal_uInt32 SdrBlockTextPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRBLOCKTEXTPRIMITIVE2D; + } @@ -437,8 +446,11 @@ namespace drawinglayer::primitive2d return new SdrAutoFitTextPrimitive2D(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), getWordWrap()); } - // provide unique ID - ImplPrimitive2DIDBlock(SdrAutoFitTextPrimitive2D, PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D) + // provide unique ID + sal_uInt32 SdrAutoFitTextPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D; + } @@ -477,7 +489,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrChainedTextPrimitive2D, PRIMITIVE2D_ID_SDRCHAINEDTEXTPRIMITIVE2D) + sal_uInt32 SdrChainedTextPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRCHAINEDTEXTPRIMITIVE2D; + } void SdrStretchTextPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const @@ -522,7 +537,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrStretchTextPrimitive2D, PRIMITIVE2D_ID_SDRSTRETCHTEXTPRIMITIVE2D) + sal_uInt32 SdrStretchTextPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRSTRETCHTEXTPRIMITIVE2D; + } } // end of namespace diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index 967bfe820738..14c38e773481 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -140,7 +140,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SdrCellPrimitive2D, PRIMITIVE2D_ID_SDRCELLPRIMITIVE2D) + sal_uInt32 SdrCellPrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SDRCELLPRIMITIVE2D; + } } // end of namespace diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 41cea972ee05..d483562c5727 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -238,7 +238,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SwVirtFlyDrawObjPrimitive, PRIMITIVE2D_ID_SWVIRTFLYDRAWOBJPRIMITIVE2D) + sal_uInt32 SwVirtFlyDrawObjPrimitive::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SWVIRTFLYDRAWOBJPRIMITIVE2D; + } } // end of namespace drawinglayer::primitive2d diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 487cd5d2c8f6..2243f2084226 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -4830,7 +4830,10 @@ namespace drawinglayer::primitive2d } // provide unique ID - ImplPrimitive2DIDBlock(SwBorderRectanglePrimitive2D, PRIMITIVE2D_ID_SWBORDERRECTANGLERIMITIVE) + sal_uInt32 SwBorderRectanglePrimitive2D::getPrimitive2DID() const + { + return PRIMITIVE2D_ID_SWBORDERRECTANGLERIMITIVE; + } } // end of namespace drawinglayer::primitive2d diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx index 69c8ce3ad758..804628cc0b7b 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx @@ -174,7 +174,10 @@ bool AnchorPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive return false; } -ImplPrimitive2DIDBlock(AnchorPrimitive, PRIMITIVE2D_ID_SWSIDEBARANCHORPRIMITIVE) +sal_uInt32 AnchorPrimitive::getPrimitive2DID() const +{ + return PRIMITIVE2D_ID_SWSIDEBARANCHORPRIMITIVE; +} /*static*/ std::unique_ptr<AnchorOverlayObject> AnchorOverlayObject::CreateAnchorOverlayObject( SwView const & rDocView, diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/uibase/docvw/ShadowOverlayObject.cxx index ed247eb4b7ea..0e51635aecde 100644 --- a/sw/source/uibase/docvw/ShadowOverlayObject.cxx +++ b/sw/source/uibase/docvw/ShadowOverlayObject.cxx @@ -155,7 +155,10 @@ bool ShadowPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive return false; } -ImplPrimitive2DIDBlock(ShadowPrimitive, PRIMITIVE2D_ID_SWSIDEBARSHADOWPRIMITIVE) +sal_uInt32 ShadowPrimitive::getPrimitive2DID() const +{ + return PRIMITIVE2D_ID_SWSIDEBARSHADOWPRIMITIVE; +} /* static */ std::unique_ptr<ShadowOverlayObject> ShadowOverlayObject::CreateShadowOverlayObject( SwView const & rDocView ) { |