diff options
| author | Armin Weiss <aw@openoffice.org> | 2006-11-07 14:49:11 +0000 |
|---|---|---|
| committer | Armin Weiss <aw@openoffice.org> | 2006-11-07 14:49:11 +0000 |
| commit | 57aa8ecd2381662ca1a5623d9efdd5e3ef0b9656 (patch) | |
| tree | 2d7a3b94cfcf6726cdc8fc746db5543c25b7031e /drawinglayer | |
| parent | 05bdfac87a4b81d438714361aed2364ffaffe31c (diff) | |
#i39532# changed various aspevcts of XPrimitive2D implementations
Diffstat (limited to 'drawinglayer')
72 files changed, 369 insertions, 393 deletions
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/alphaprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/alphaprimitive2d.hxx index d451ed1f9721..96b6a47eee75 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/alphaprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/alphaprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: alphaprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:27:59 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -63,7 +63,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx index a2f7f1e6e0ff..e6fc4bac782d 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: animatedprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:00 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -96,7 +96,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() // The getDecomposition is overloaded here since the decompose is dependent of the point in time, // so the default implementation is nut useful here, it needs to be handled locally @@ -124,7 +124,7 @@ namespace drawinglayer bool bIsTextAnimation); // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -172,7 +172,7 @@ namespace drawinglayer bool bIsTextAnimation); // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx index 20d18e868c70..7b28533442c6 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: backgroundcolorprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:00 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -77,7 +77,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() // Overload standard getDecomposition call to be view-dependent here virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx index 2cf78882cfeb..457df0aaa89a 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: baseprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:00 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -60,6 +60,18 @@ #define Create2DPrimitiveID(a, b, c, d) ((((((a << 8L)|b)<<8L)|c)<<8L)|d) ////////////////////////////////////////////////////////////////////////////// +// defines for DeclPrimitrive2DIDBlock and ImplPrimitrive2DIDBlock +// Added to be able to simply change identification stuff later, e.g. add +// a identification string and/or ID to the interface and to the implementation +// ATM used to delclare implement getPrimitiveID() + +#define DeclPrimitrive2DIDBlock() \ + virtual sal_uInt32 getPrimitiveID() const; + +#define ImplPrimitrive2DIDBlock(TheClass, a, b, c, d) \ + sal_uInt32 TheClass##::getPrimitiveID() const { return Create2DPrimitiveID(a, b, c, d); } + +////////////////////////////////////////////////////////////////////////////// // predefines namespace drawinglayer { namespace geometry { @@ -120,6 +132,7 @@ namespace drawinglayer // provide unique ID for fast identifying of known primitive implementations in renderers. These use // the Create2DPrimitiveID macro to define unique IDs. The same macro is used from the renderers // in their typical switch/case loop + // This method is normally defined using DeclPrimitrive2DIDBlock() virtual sal_uInt32 getPrimitiveID() const = 0; // The getDecomposition default implementation will on demand use createLocalDecomposition() if maLocalDecomposition is empty. diff --git a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx index 352b7cfcc3d8..0dab1ab0963f 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: bitmapprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:00 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -77,7 +77,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx index 92bec4566bc5..5c90d209d6fc 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: embedded3dprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:00 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -81,7 +81,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx index f4243b2d4053..d474d36124b2 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: fillbitmapprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:00 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -81,7 +81,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx index 4e70f9139990..e53b513f31be 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: fillgradientprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:00 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -77,7 +77,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx index d612267908bc..250533722ce5 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: fillhatchprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:01 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -80,7 +80,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx index 6aec6c6fb338..23e33b9f91e4 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: gridprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:01 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -103,7 +103,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() // Overload standard getDecomposition call to be view-dependent here virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx index b4ce7aca800b..be5c6d91a876 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: groupprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:01 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -68,7 +68,7 @@ namespace drawinglayer virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx index cd9e0171811c..18e8f092edf1 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: helplineprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:01 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -100,7 +100,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() // Overload standard getDecomposition call to be view-dependent here virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx index 776724a0e706..26eadfadd733 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: maskprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:01 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,7 +67,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx index b66dc2904f77..75b142a21500 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: metafileprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:01 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -77,7 +77,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx index 34bec1ac4868..3403ab7ce905 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: modifiedcolorprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:02 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,7 +67,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx index 215e546f2b8a..64ee7d0a8cdb 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: polygonprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:02 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -75,7 +75,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -119,7 +119,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -157,7 +157,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -197,7 +197,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx index cfaa9bb723b4..014816b23a94 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: polypolygonprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:02 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -81,7 +81,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -115,7 +115,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -149,7 +149,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -183,7 +183,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx index 6c78d4ec7231..a3bcb73fcb7d 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sceneprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:02 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -122,7 +122,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() // get local decomposition. Overloaded since this decomposition is view-dependent virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx index 1720757fd737..ec146eb4831d 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: shadowprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:02 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -81,7 +81,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx index dbbce8254fc6..834589ef1aee 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: textprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:03 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -139,7 +139,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -252,7 +252,7 @@ namespace drawinglayer virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx index fffee24822f7..fe98374fb228 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: transformprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:03 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,7 +70,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx index 334721868a71..e109dc3535d6 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: unifiedalphaprimitive2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:03 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,7 +67,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive2DIDBlock() }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx index e8f95c4ba9ab..b90d0867a1e8 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: baseprimitive3d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:32:39 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -60,6 +60,18 @@ #define Create3DPrimitiveID(a, b, c, d) ((((((a << 8L)|b)<<8L)|c)<<8L)|d) ////////////////////////////////////////////////////////////////////////////// +// defines for DeclPrimitrive3DIDBlock and ImplPrimitrive3DIDBlock +// Added to be able to simply change identification stuff later, e.g. add +// a identification string and/or ID to the interface and to the implementation +// ATM used to delclare implement getPrimitiveID() + +#define DeclPrimitrive3DIDBlock() \ + virtual sal_uInt32 getPrimitiveID() const; + +#define ImplPrimitrive3DIDBlock(TheClass, a, b, c, d) \ + sal_uInt32 TheClass##::getPrimitiveID() const { return Create3DPrimitiveID(a, b, c, d); } + +////////////////////////////////////////////////////////////////////////////// // basePrimitive3D class namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx index aea5517fe907..4cec2b1a2bf0 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: groupprimitive3d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:32:39 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,7 +67,7 @@ namespace drawinglayer virtual bool operator==( const BasePrimitive3D& rPrimitive ) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx index 70bcc61f6a78..0a0b2a182125 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: hatchtextureprimitive3d.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:32:39 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,7 +70,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive3D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx index bf17b19a8ecc..b555d9ee86f1 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: modifiedcolorprimitive3d.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:32:39 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,7 +67,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive3D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx index 5527409f5990..30d49b9ecc12 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: polygonprimitive3d.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:32:39 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -80,7 +80,7 @@ namespace drawinglayer virtual basegfx::B3DRange getB3DRange(double fTime) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer @@ -114,7 +114,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive3D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx index 969ae6c5b454..fcebbcf41657 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: polygontubeprimitive3d.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:32:39 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -84,7 +84,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive3D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index ab32cf75362a..b61d7e9a2a16 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: polypolygonprimitive3d.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:32:39 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -81,7 +81,7 @@ namespace drawinglayer virtual basegfx::B3DRange getB3DRange(double fTime) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx index f962c00b94a0..8a6a2dbf13d6 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrcubeprimitive3d.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:32:39 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -66,7 +66,7 @@ namespace drawinglayer virtual basegfx::B3DRange getB3DRange(double fTime) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 9b6787079b8a..d605ab6e43b8 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrextrudeprimitive3d.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:32:40 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -117,7 +117,7 @@ namespace drawinglayer virtual basegfx::B3DRange getB3DRange(double fTime) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index 9567612b6b6c..bc617bafec69 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrlatheprimitive3d.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:32:40 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -122,7 +122,7 @@ namespace drawinglayer virtual basegfx::B3DRange getB3DRange(double fTime) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx index 6b47aeaf0b40..dc02967f1f0b 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrpolypolygonprimitive3d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:32:40 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -71,7 +71,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive3D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx index 9773d8c4e8c7..5bf9dcbd5551 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrsphereprimitive3d.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:32:40 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -76,7 +76,7 @@ namespace drawinglayer virtual basegfx::B3DRange getB3DRange(double fTime) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx index bea22f95be18..dbea20f64c05 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: shadowprimitive3d.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:32:40 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -82,7 +82,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive3D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx index 67a96149775f..9d0d6009b40e 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: textureprimitive3d.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:32:40 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -115,7 +115,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive3D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer @@ -150,7 +150,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive3D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer @@ -185,7 +185,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive3D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer @@ -208,7 +208,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive3D& rPrimitive) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx index e75340b22638..4490c1fd9fa8 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: transformprimitive3d.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:32:41 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,7 +70,7 @@ namespace drawinglayer virtual basegfx::B3DRange getB3DRange(double fTime) const; // provide unique ID - virtual sal_uInt32 getPrimitiveID() const; + DeclPrimitrive3DIDBlock() }; } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/alphaprimitive2d.cxx b/drawinglayer/source/primitive2d/alphaprimitive2d.cxx index 5aedcead73b5..6c534065f69d 100644 --- a/drawinglayer/source/primitive2d/alphaprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/alphaprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: alphaprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:01 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,10 +67,8 @@ namespace drawinglayer return false; } - sal_uInt32 AlphaPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','A','l','p'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(AlphaPrimitive2D, '2','A','l','p') } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx index 18e39d7e086a..4b8efe160de5 100644 --- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: animatedprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:01 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -137,10 +137,9 @@ namespace drawinglayer return BasePrimitive2D::getB2DRange(rViewInformation); } - sal_uInt32 AnimatedSwitchPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','A','S','w'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(AnimatedSwitchPrimitive2D, '2','A','S','w') + } // end of namespace primitive2d } // end of namespace drawinglayer @@ -173,10 +172,9 @@ namespace drawinglayer { } - sal_uInt32 AnimatedBlinkPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','A','B','l'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(AnimatedBlinkPrimitive2D, '2','A','B','l') + } // end of namespace primitive2d } // end of namespace drawinglayer @@ -245,10 +243,9 @@ namespace drawinglayer { } - sal_uInt32 AnimatedInterpolatePrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','A','I','n'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(AnimatedInterpolatePrimitive2D, '2','A','I','n') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx index 644cd916da56..2ea415a15624 100644 --- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: backgroundcolorprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:01 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -107,11 +107,6 @@ namespace drawinglayer return rViewInformation.getViewport(); } - sal_uInt32 BackgroundColorPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','B','C','o'); - } - Primitive2DSequence BackgroundColorPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const { ::osl::MutexGuard aGuard( m_aMutex ); @@ -131,6 +126,10 @@ namespace drawinglayer // use parent implementation return BasePrimitive2D::get2DDecomposition(rViewInformation); } + + // provide unique ID + ImplPrimitrive2DIDBlock(BackgroundColorPrimitive2D, '2','B','C','o') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx index c228f57a4ba9..199923a0768f 100644 --- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bitmapprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:02 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -73,17 +73,16 @@ namespace drawinglayer return false; } - sal_uInt32 BitmapPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','B','i','t'); - } - basegfx::B2DRange BitmapPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const { basegfx::B2DRange aRetval(0.0, 0.0, 1.0, 1.0); aRetval.transform(maTransform); return aRetval; } + + // provide unique ID + ImplPrimitrive2DIDBlock(BitmapPrimitive2D, '2','B','i','t') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx index 959f9d028d4b..d920aeba1b3a 100644 --- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: embedded3dprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:02 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -111,11 +111,6 @@ namespace drawinglayer return false; } - sal_uInt32 Embedded3DPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','E','m','b'); - } - basegfx::B2DRange Embedded3DPrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const { // use the 3d transformation stack to create a projection of the 3D range @@ -130,6 +125,10 @@ namespace drawinglayer return aRetval; } + + // provide unique ID + ImplPrimitrive2DIDBlock(Embedded3DPrimitive2D, '2','E','m','b') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx index cabbc2b7afab..f350f9fb52ea 100644 --- a/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fillbitmapprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:02 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -145,10 +145,9 @@ namespace drawinglayer return basegfx::tools::getRange(aPolygon); } - sal_uInt32 FillBitmapPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','F','B','i'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(FillBitmapPrimitive2D, '2','F','B','i') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx index e5ddbacbdbc9..8cf3c100d609 100644 --- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fillgradientprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:02 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -206,10 +206,9 @@ namespace drawinglayer return getObjectRange(); } - sal_uInt32 FillGradientPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','F','G','r'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(FillGradientPrimitive2D, '2','F','G','r') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx index a5f813839349..ae65fc1791a8 100644 --- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fillhatchprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:02 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -164,10 +164,9 @@ namespace drawinglayer return getObjectRange(); } - sal_uInt32 FillHatchPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','F','H','a'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(FillHatchPrimitive2D, '2','F','H','a') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx index 9bb9d88fefd7..c3a4749c0b99 100644 --- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: gridprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:02 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -267,11 +267,6 @@ namespace drawinglayer return aUnitRange; } - sal_uInt32 GridPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','G','r','i'); - } - Primitive2DSequence GridPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const { ::osl::MutexGuard aGuard( m_aMutex ); @@ -295,6 +290,10 @@ namespace drawinglayer // use parent implementation return BasePrimitive2D::get2DDecomposition(rViewInformation); } + + // provide unique ID + ImplPrimitrive2DIDBlock(GridPrimitive2D, '2','G','r','i') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/groupprimitive2d.cxx b/drawinglayer/source/primitive2d/groupprimitive2d.cxx index da6a0c370f86..5fefcf374f8c 100644 --- a/drawinglayer/source/primitive2d/groupprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/groupprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: groupprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:02 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -75,10 +75,9 @@ namespace drawinglayer return false; } - sal_uInt32 GroupPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','G','r','o'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(GroupPrimitive2D, '2','G','r','o') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx index 231c683812db..37c062d10213 100644 --- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: helplineprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:03 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -210,11 +210,6 @@ namespace drawinglayer return false; } - sal_uInt32 HelplinePrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','H','e','l'); - } - Primitive2DSequence HelplinePrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const { ::osl::MutexGuard aGuard( m_aMutex ); @@ -238,6 +233,10 @@ namespace drawinglayer // use parent implementation return BasePrimitive2D::get2DDecomposition(rViewInformation); } + + // provide unique ID + ImplPrimitrive2DIDBlock(HelplinePrimitive2D, '2','H','e','l') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/maskprimitive2d.cxx b/drawinglayer/source/primitive2d/maskprimitive2d.cxx index 7aae26bdf45c..171ef5fe3d26 100644 --- a/drawinglayer/source/primitive2d/maskprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/maskprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: maskprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:03 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,10 +67,9 @@ namespace drawinglayer return false; } - sal_uInt32 MaskPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','M','a','s'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(MaskPrimitive2D, '2','M','a','s') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index cbdefa340c7b..6d461f0b02df 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: metafileprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:03 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -73,17 +73,16 @@ namespace drawinglayer return false; } - sal_uInt32 MetafilePrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','M','e','t'); - } - basegfx::B2DRange MetafilePrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const { basegfx::B2DRange aRetval(0.0, 0.0, 1.0, 1.0); aRetval.transform(getTransform()); return aRetval; } + + // provide unique ID + ImplPrimitrive2DIDBlock(MetafilePrimitive2D, '2','M','e','t') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx index 36432333122c..366a1f5be03e 100644 --- a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: modifiedcolorprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:03 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,10 +67,9 @@ namespace drawinglayer return false; } - sal_uInt32 ModifiedColorPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','M','C','o'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(ModifiedColorPrimitive2D, '2','M','C','o') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index 9dc860899b09..c20b0f164936 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: polygonprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:03 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -91,10 +91,9 @@ namespace drawinglayer return basegfx::tools::getRange(basegfx::tools::adaptiveSubdivideByAngle(getB2DPolygon())); } - sal_uInt32 PolygonHairlinePrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','P','H','a'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(PolygonHairlinePrimitive2D, '2','P','H','a') + } // end of namespace primitive2d } // end of namespace drawinglayer @@ -181,10 +180,9 @@ namespace drawinglayer return basegfx::tools::getRange(basegfx::tools::adaptiveSubdivideByAngle(getB2DPolygon())); } - sal_uInt32 PolygonMarkerPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','P','M','a'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(PolygonMarkerPrimitive2D, '2','P','M','a') + } // end of namespace primitive2d } // end of namespace drawinglayer @@ -305,10 +303,9 @@ namespace drawinglayer return aRetval; } - sal_uInt32 PolygonStrokePrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','P','S','t'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(PolygonStrokePrimitive2D, '2','P','S','t') + } // end of namespace primitive2d } // end of namespace drawinglayer @@ -423,10 +420,9 @@ namespace drawinglayer } } - sal_uInt32 PolygonStrokeArrowPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','P','S','A'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(PolygonStrokeArrowPrimitive2D, '2','P','S','A') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx index 6320dd6f04d8..52054afef68b 100644 --- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: polypolygonprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:04 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -103,10 +103,9 @@ namespace drawinglayer return basegfx::tools::getRange(basegfx::tools::adaptiveSubdivideByAngle(getB2DPolyPolygon())); } - sal_uInt32 PolyPolygonColorPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','P','P','C'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(PolyPolygonColorPrimitive2D, '2','P','P','C') + } // end of namespace primitive2d } // end of namespace drawinglayer @@ -150,10 +149,9 @@ namespace drawinglayer return false; } - sal_uInt32 PolyPolygonGradientPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','P','P','G'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(PolyPolygonGradientPrimitive2D, '2','P','P','G') + } // end of namespace primitive2d } // end of namespace drawinglayer @@ -197,10 +195,9 @@ namespace drawinglayer return false; } - sal_uInt32 PolyPolygonHatchPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','P','P','H'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(PolyPolygonHatchPrimitive2D, '2','P','P','H') + } // end of namespace primitive2d } // end of namespace drawinglayer @@ -250,10 +247,9 @@ namespace drawinglayer return false; } - sal_uInt32 PolyPolygonBitmapPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','P','P','B'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(PolyPolygonBitmapPrimitive2D, '2','P','P','B') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx index 1b4584582dc9..8416a88d230d 100644 --- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sceneprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:04 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -265,11 +265,6 @@ namespace drawinglayer return false; } - sal_uInt32 ScenePrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','S','c','e'); - } - basegfx::B2DRange ScenePrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const { // call parent. Do not calculate using unit range since the decomposition may extend the range @@ -420,6 +415,10 @@ namespace drawinglayer // return if there are label primitives return maLabelPrimitives.hasElements(); } + + // provide unique ID + ImplPrimitrive2DIDBlock(ScenePrimitive2D, '2','S','c','e') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx index b716a2ae6835..5a631fa5f20b 100644 --- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shadowprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:04 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -113,17 +113,16 @@ namespace drawinglayer return false; } - sal_uInt32 ShadowPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','S','h','a'); - } - basegfx::B2DRange ShadowPrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const { basegfx::B2DRange aRetval(getB2DRangeFromPrimitive2DSequence(getChildren(), rViewInformation)); aRetval.transform(getShadowTransform()); return aRetval; } + + // provide unique ID + ImplPrimitrive2DIDBlock(ShadowPrimitive2D, '2','S','h','a') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index 286cf88bf2e1..a955065a80e1 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: textprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:04 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -260,11 +260,6 @@ namespace drawinglayer return false; } - sal_uInt32 TextSimplePortionPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','T','S','i'); - } - basegfx::B2DRange TextSimplePortionPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const { const xub_StrLen aStrLen(getText().Len()); @@ -292,6 +287,10 @@ namespace drawinglayer return aRetval; } + + // provide unique ID + ImplPrimitrive2DIDBlock(TextSimplePortionPrimitive2D, '2','T','S','i') + } // end of namespace primitive2d } // end of namespace drawinglayer @@ -367,10 +366,9 @@ namespace drawinglayer return false; } - sal_uInt32 TextComplexPortionPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','T','C','o'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(TextComplexPortionPrimitive2D, '2','T','C','o') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/transformprimitive2d.cxx b/drawinglayer/source/primitive2d/transformprimitive2d.cxx index eba0b39020cd..14145594871a 100644 --- a/drawinglayer/source/primitive2d/transformprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/transformprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: transformprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:04 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,10 +78,9 @@ namespace drawinglayer return aRetval; } - sal_uInt32 TransformPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','T','r','a'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(TransformPrimitive2D, '2','T','r','a') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive2d/unifiedalphaprimitive2d.cxx b/drawinglayer/source/primitive2d/unifiedalphaprimitive2d.cxx index 29dda5d3a66e..c901f1d7c125 100644 --- a/drawinglayer/source/primitive2d/unifiedalphaprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/unifiedalphaprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unifiedalphaprimitive2d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:35:04 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -113,10 +113,9 @@ namespace drawinglayer return false; } - sal_uInt32 UnifiedAlphaPrimitive2D::getPrimitiveID() const - { - return Create2DPrimitiveID('2','U','A','l'); - } + // provide unique ID + ImplPrimitrive2DIDBlock(UnifiedAlphaPrimitive2D, '2','U','A','l') + } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive3d/groupprimitive3d.cxx b/drawinglayer/source/primitive3d/groupprimitive3d.cxx index 1b89299acf27..33f24fd277a5 100644 --- a/drawinglayer/source/primitive3d/groupprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/groupprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: groupprimitive3d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:38:32 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -75,10 +75,9 @@ namespace drawinglayer return false; } - sal_uInt32 GroupPrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','G','r','o'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(GroupPrimitive3D, '3','G','r','o') + } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx index 9b7c47f62ed3..d9b9cd354530 100644 --- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: hatchtextureprimitive3d.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:38:32 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -332,10 +332,9 @@ namespace drawinglayer return false; } - sal_uInt32 HatchTexturePrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','H','T','e'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(HatchTexturePrimitive3D, '3','H','T','e') + } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx index e96d54b9e512..8f5bae143cf2 100644 --- a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: modifiedcolorprimitive3d.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:38:32 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,10 +67,9 @@ namespace drawinglayer return false; } - sal_uInt32 ModifiedColorPrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','M','C','o'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(ModifiedColorPrimitive3D, '3','M','C','o') + } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx index 753eecfac098..829730b66835 100644 --- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: polygonprimitive3d.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:38:32 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -90,10 +90,9 @@ namespace drawinglayer return basegfx::tools::getRange(getB3DPolygon()); } - sal_uInt32 PolygonHairlinePrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','P','H','a'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(PolygonHairlinePrimitive3D, '3','P','H','a') + } // end of namespace primitive3d } // end of namespace drawinglayer @@ -173,10 +172,9 @@ namespace drawinglayer return false; } - sal_uInt32 PolygonStrokePrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','P','S','t'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(PolygonStrokePrimitive3D, '3','P','S','t') + } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 3eaf0e695758..ecbd606bdff2 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: polygontubeprimitive3d.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:38:33 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -579,10 +579,9 @@ namespace drawinglayer return false; } - sal_uInt32 PolygonTubePrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','P','T','u'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(PolygonTubePrimitive3D, '3','P','T','u') + } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx index ff7aba0a8fbc..9ce65d35e002 100644 --- a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: polypolygonprimitive3d.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:38:33 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -85,10 +85,9 @@ namespace drawinglayer return basegfx::tools::getRange(getB3DPolyPolygon()); } - sal_uInt32 PolyPolygonMaterialPrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','P','P','M'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(PolyPolygonMaterialPrimitive3D, '3','P','P','M') + } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx index 7fe1b1fd896d..6e3bc414739f 100644 --- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrcubeprimitive3d.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:38:33 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -216,10 +216,9 @@ namespace drawinglayer return getStandard3DRange(); } - sal_uInt32 SdrCubePrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','C','u','b'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(SdrCubePrimitive3D, '3','C','u','b') + } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx index e5648f05f546..cc96aece4781 100644 --- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrextrudeprimitive3d.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:38:33 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -330,10 +330,9 @@ namespace drawinglayer return get3DRangeFromSlices(getSlices()); } - sal_uInt32 SdrExtrudePrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','E','x','t'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(SdrExtrudePrimitive3D, '3','E','x','t') + } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx index 86ecce156d15..38626d27e851 100644 --- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrlatheprimitive3d.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:38:33 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -341,10 +341,9 @@ namespace drawinglayer return get3DRangeFromSlices(getSlices()); } - sal_uInt32 SdrLathePrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','L','a','t'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(SdrLathePrimitive3D, '3','L','a','t') + } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx index c91be70dc08f..837336923a1e 100644 --- a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrpolypolygonprimitive3d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:38:34 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -114,10 +114,9 @@ namespace drawinglayer return false; } - sal_uInt32 SdrPolyPolygonPrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','P','P','o'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(SdrPolyPolygonPrimitive3D, '3','P','P','o') + } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx index bb01dc7cbfbe..9b4161b6efe7 100644 --- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrsphereprimitive3d.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:38:34 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -215,10 +215,9 @@ namespace drawinglayer return getStandard3DRange(); } - sal_uInt32 SdrSpherePrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','S','p','h'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(SdrSpherePrimitive3D, '3','S','p','h') + } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx index 10ebb54f23a6..a29a4e7312f6 100644 --- a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shadowprimitive3d.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:38:34 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -76,10 +76,9 @@ namespace drawinglayer return false; } - sal_uInt32 ShadowPrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','S','h','a'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(ShadowPrimitive3D, '3','S','h','a') + } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive3d/textureprimitive3d.cxx b/drawinglayer/source/primitive3d/textureprimitive3d.cxx index 876765b948d9..aafd28df998f 100644 --- a/drawinglayer/source/primitive3d/textureprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/textureprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: textureprimitive3d.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:38:34 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -121,10 +121,9 @@ namespace drawinglayer return false; } - sal_uInt32 UnifiedAlphaTexturePrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','U','A','T'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(UnifiedAlphaTexturePrimitive3D, '3','U','A','T') + } // end of namespace primitive3d } // end of namespace drawinglayer @@ -162,10 +161,9 @@ namespace drawinglayer return false; } - sal_uInt32 GradientTexturePrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','G','T','e'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(GradientTexturePrimitive3D, '3','G','T','e') + } // end of namespace primitive3d } // end of namespace drawinglayer @@ -202,10 +200,9 @@ namespace drawinglayer return false; } - sal_uInt32 BitmapTexturePrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','B','T','e'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(BitmapTexturePrimitive3D, '3','B','T','e') + } // end of namespace primitive3d } // end of namespace drawinglayer @@ -228,10 +225,9 @@ namespace drawinglayer return (GradientTexturePrimitive3D::operator==(rPrimitive)); } - sal_uInt32 AlphaTexturePrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','A','T','e'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(AlphaTexturePrimitive3D, '3','A','T','e') + } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/source/primitive3d/transformprimitive3d.cxx b/drawinglayer/source/primitive3d/transformprimitive3d.cxx index 80a2635b6061..765d6b96387f 100644 --- a/drawinglayer/source/primitive3d/transformprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/transformprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: transformprimitive3d.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:38:34 $ + * last change: $Author: aw $ $Date: 2006-11-07 15:49:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,10 +78,9 @@ namespace drawinglayer return aRetval; } - sal_uInt32 TransformPrimitive3D::getPrimitiveID() const - { - return Create3DPrimitiveID('3','T','r','a'); - } + // provide unique ID + ImplPrimitrive3DIDBlock(TransformPrimitive3D, '3','T','r','a') + } // end of namespace primitive3d } // end of namespace drawinglayer |