diff options
| author | Noel Grandin <noel@peralex.com> | 2015-12-10 12:27:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-12-11 10:11:23 +0200 |
| commit | 58d8d8ac67aa9b907f1304a48efa0f7a473d9de4 (patch) | |
| tree | a0d88f3c8a57ce9d08d97c803ea0ec83a3dd8b62 /include | |
| parent | 44ad6aca0dee29841ec7cd15c6d0ad9b3dcaedbe (diff) | |
tdf#69977: uno::Sequence is expensive
when used as a mutable data-structure. Plain std::vector halves the time
taken to display the chart dialog
Create a class to represent the std::vector we are going to be passing
around, and move some of the utility methods into it to make the code
prettier.
Also create an optimised append(&&) method for the common case of
appending small temporaries.
Change-Id: I7f5b43fb4a8a84e40e6a52fcb7e9f974091b4485
Diffstat (limited to 'include')
81 files changed, 234 insertions, 216 deletions
diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx index 9e13a8e60584..38ae5623b512 100644 --- a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx @@ -71,7 +71,7 @@ namespace drawinglayer /// constructor AnimatedSwitchPrimitive2D( const animation::AnimationEntry& rAnimationEntry, - const Primitive2DSequence& rChildren, + const Primitive2DContainer& rChildren, bool bIsTextAnimation); /// destructor - needed due to mpAnimationEntry @@ -92,7 +92,7 @@ namespace drawinglayer depends on the point in time, so the default implementation is not useful here, it needs to be handled locally */ - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -116,11 +116,11 @@ namespace drawinglayer /// constructor AnimatedBlinkPrimitive2D( const animation::AnimationEntry& rAnimationEntry, - const Primitive2DSequence& rChildren, + const Primitive2DContainer& rChildren, bool bIsTextAnimation); /// create local decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -153,11 +153,11 @@ namespace drawinglayer AnimatedInterpolatePrimitive2D( const std::vector< basegfx::B2DHomMatrix >& rmMatrixStack, const animation::AnimationEntry& rAnimationEntry, - const Primitive2DSequence& rChildren, + const Primitive2DContainer& rChildren, bool bIsTextAnimation); /// create local decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx index e58d31c5fbdc..e712ffe18080 100644 --- a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx @@ -55,7 +55,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -77,7 +77,7 @@ namespace drawinglayer DeclPrimitive2DIDBlock() /// Override standard getDecomposition call to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx index 860b9a422c99..c21c59cb51c0 100644 --- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -52,6 +52,24 @@ namespace drawinglayer { namespace primitive2d { typedef cppu::WeakComponentImplHelper1< css::graphic::XPrimitive2D > BasePrimitive2DImplBase; typedef css::uno::Reference< css::graphic::XPrimitive2D > Primitive2DReference; typedef css::uno::Sequence< Primitive2DReference > Primitive2DSequence; + + + class DRAWINGLAYER_DLLPUBLIC SAL_WARN_UNUSED Primitive2DContainer : public std::vector< Primitive2DReference > + { + public: + explicit Primitive2DContainer() {} + explicit Primitive2DContainer( size_type count ) : std::vector< Primitive2DReference >(count) {} + Primitive2DContainer( const Primitive2DContainer& other ) : std::vector< Primitive2DReference >(other) {} + Primitive2DContainer( const std::vector< Primitive2DReference >& other ) : std::vector< Primitive2DReference >(other) {} + Primitive2DContainer( std::initializer_list<Primitive2DReference> init ) : std::vector< Primitive2DReference >(init) {} + + void append(const Primitive2DContainer& rSource); + void append(const Primitive2DSequence& rSource); + bool operator==(const Primitive2DContainer& rB) const; + bool operator!=(const Primitive2DContainer& rB) const { return !operator==(rB); } + basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& aViewInformation) const; + Primitive2DContainer maybeInvert(bool bInvert = false) const; + }; }} @@ -163,7 +181,7 @@ namespace drawinglayer virtual sal_uInt32 getPrimitive2DID() const = 0; /// The default implementation will return an empty sequence - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; // Methods from XPrimitive2D @@ -223,20 +241,20 @@ namespace drawinglayer { private: /// a sequence used for buffering the last create2DDecomposition() result - Primitive2DSequence maBuffered2DDecomposition; + Primitive2DContainer maBuffered2DDecomposition; protected: /** access methods to maBuffered2DDecomposition. The usage of this methods may allow later thread-safe stuff to be added if needed. Only to be used by getDecomposition() implementations for buffering the last decomposition. */ - const Primitive2DSequence& getBuffered2DDecomposition() const { return maBuffered2DDecomposition; } - void setBuffered2DDecomposition(const Primitive2DSequence& rNew) { maBuffered2DDecomposition = rNew; } + const Primitive2DContainer& getBuffered2DDecomposition() const { return maBuffered2DDecomposition; } + void setBuffered2DDecomposition(const Primitive2DContainer& rNew) { maBuffered2DDecomposition = rNew; } /** method which is to be used to implement the local decomposition of a 2D primitive. The default implementation will just return an empty decomposition */ - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; public: // constructor/destructor @@ -248,7 +266,7 @@ namespace drawinglayer overridden and the ViewInformation2D for the last decomposition need to be remembered, too, and be used in the next call to decide if the buffered decomposition may be reused or not. */ - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -261,8 +279,7 @@ namespace drawinglayer namespace primitive2d { /// support to handle a sequence of primitives as stl vector and convert it during creation - typedef ::std::vector< BasePrimitive2D* > Primitive2DVector; - Primitive2DSequence DRAWINGLAYER_DLLPUBLIC Primitive2DVectorToPrimitive2DSequence(const Primitive2DVector& rSource, bool bInvert = false); + Primitive2DSequence DRAWINGLAYER_DLLPUBLIC Primitive2DVectorToPrimitive2DSequence(const Primitive2DContainer& rSource, bool bInvert = false); /// get B2DRange from a given Primitive2DReference basegfx::B2DRange DRAWINGLAYER_DLLPUBLIC getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation); @@ -280,6 +297,7 @@ namespace drawinglayer /// concatenate sequence void DRAWINGLAYER_DLLPUBLIC appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DSequence& rSource); + void DRAWINGLAYER_DLLPUBLIC appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DContainer& rSource); /// concatenate single Primitive2D void DRAWINGLAYER_DLLPUBLIC appendPrimitive2DReferenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DReference& rSource); diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx index 72e04d5321f1..bc6bf6bafd76 100644 --- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -95,7 +95,7 @@ namespace drawinglayer const geometry::ViewInformation2D& rViewInformation) const; /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx index 8e305e834221..a7d310150533 100644 --- a/include/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -64,7 +64,7 @@ namespace drawinglayer protected: /// local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -101,7 +101,7 @@ namespace drawinglayer DeclPrimitive2DIDBlock() /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/cropprimitive2d.hxx b/include/drawinglayer/primitive2d/cropprimitive2d.hxx index ec2d46929db0..fcfb7f9506f8 100644 --- a/include/drawinglayer/primitive2d/cropprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/cropprimitive2d.hxx @@ -69,7 +69,7 @@ namespace drawinglayer public: /// constructor CropPrimitive2D( - const Primitive2DSequence& rChildren, + const Primitive2DContainer& rChildren, const basegfx::B2DHomMatrix& rTransformation, double fCropLeft, double fCropTop, @@ -87,7 +87,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; /// local decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx index 61657dc77cae..c69142072dbe 100644 --- a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx @@ -50,7 +50,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx index c080c633b86f..a39c35d60028 100644 --- a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx @@ -90,7 +90,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx index 72ada3d42488..850cc363f447 100644 --- a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx @@ -67,7 +67,7 @@ namespace drawinglayer basegfx::B3DRange maScene3DRange; /// the primitiveSequence for on-demand created shadow primitives (see mbShadow3DChecked) - Primitive2DSequence maShadowPrimitives; + Primitive2DContainer maShadowPrimitives; /// #i96669# add simple range buffering for this primitive basegfx::B2DRange maB2DRange; @@ -83,7 +83,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/epsprimitive2d.hxx b/include/drawinglayer/primitive2d/epsprimitive2d.hxx index af740af1c083..1b871d5af2bb 100644 --- a/include/drawinglayer/primitive2d/epsprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/epsprimitive2d.hxx @@ -46,7 +46,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx index 92104cd9a172..c7a8a0e39494 100644 --- a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -69,21 +69,21 @@ namespace drawinglayer void generateMatricesAndColors( std::vector< drawinglayer::texture::B2DHomMatrixAndBColor >& rEntries, basegfx::BColor& rOuterColor) const; - Primitive2DSequence createOverlappingFill( + Primitive2DContainer createOverlappingFill( const std::vector< drawinglayer::texture::B2DHomMatrixAndBColor >& rEntries, const basegfx::BColor& rOuterColor, const basegfx::B2DPolygon& rUnitPolygon) const; - Primitive2DSequence createNonOverlappingFill( + Primitive2DContainer createNonOverlappingFill( const std::vector< drawinglayer::texture::B2DHomMatrixAndBColor >& rEntries, const basegfx::BColor& rOuterColor, const basegfx::B2DPolygon& rUnitPolygon) const; protected: /// local helper - Primitive2DSequence createFill(bool bOverlapping) const; + Primitive2DContainer createFill(bool bOverlapping) const; /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructors. The one without definition range will use output range as definition range diff --git a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx index 22acf73e9e65..b0d1077730bd 100644 --- a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx @@ -56,7 +56,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx index 76916853e328..8a08ce859193 100644 --- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx @@ -66,7 +66,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructors. The one without definition range will use output range as definition range @@ -93,7 +93,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx index 20c3da3e7ca6..eb5e5df8fd93 100644 --- a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx @@ -61,7 +61,7 @@ namespace drawinglayer protected: /// local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor(s) diff --git a/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx b/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx index 7234f7c68deb..1a322e0e7e4f 100644 --- a/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx +++ b/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx @@ -42,7 +42,7 @@ namespace drawinglayer Bitmaps (with the sub-categories animated bitmap, and SVG), and Metafiles. */ - Primitive2DSequence create2DDecompositionOfGraphic( + Primitive2DContainer create2DDecompositionOfGraphic( const Graphic& rGraphic, const basegfx::B2DHomMatrix& rTransform); @@ -50,8 +50,8 @@ namespace drawinglayer of ModifiedColorPrimitive2D's to get all the needed modifications applied. */ - Primitive2DSequence create2DColorModifierEmbeddingsAsNeeded( - const Primitive2DSequence& rChildren, + Primitive2DContainer create2DColorModifierEmbeddingsAsNeeded( + const Primitive2DContainer& rChildren, GraphicDrawMode aGraphicDrawMode = GRAPHICDRAWMODE_STANDARD, double fLuminance = 0.0, // [-1.0 .. 1.0] double fContrast = 0.0, // [-1.0 .. 1.0] diff --git a/include/drawinglayer/primitive2d/gridprimitive2d.hxx b/include/drawinglayer/primitive2d/gridprimitive2d.hxx index 83067a98bd01..ad7cca17b90c 100644 --- a/include/drawinglayer/primitive2d/gridprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/gridprimitive2d.hxx @@ -71,7 +71,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -107,7 +107,7 @@ namespace drawinglayer DeclPrimitive2DIDBlock() /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/groupprimitive2d.hxx b/include/drawinglayer/primitive2d/groupprimitive2d.hxx index 0cb63500e769..731d7af4c94e 100644 --- a/include/drawinglayer/primitive2d/groupprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/groupprimitive2d.hxx @@ -67,20 +67,20 @@ namespace drawinglayer { private: /// the children. Declared private since this shall never be changed at all after construction - Primitive2DSequence maChildren; + Primitive2DContainer maChildren; public: /// constructor - explicit GroupPrimitive2D(const Primitive2DSequence& rChildren); + explicit GroupPrimitive2D(const Primitive2DContainer& rChildren); /// data read access - const Primitive2DSequence& getChildren() const { return maChildren; } + const Primitive2DContainer& getChildren() const { return maChildren; } /// compare operator virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; /// local decomposition. Implementation will just return children - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx index dc3fb972dc8a..f64a27609a4b 100644 --- a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx @@ -75,7 +75,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -102,7 +102,7 @@ namespace drawinglayer DeclPrimitive2DIDBlock() /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx index ed2cfa27aee2..820c34f73eda 100644 --- a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx @@ -41,7 +41,7 @@ namespace drawinglayer class DRAWINGLAYER_DLLPUBLIC HiddenGeometryPrimitive2D : public GroupPrimitive2D { public: - explicit HiddenGeometryPrimitive2D(const Primitive2DSequence& rChildren); + explicit HiddenGeometryPrimitive2D(const Primitive2DContainer& rChildren); // despite returning an empty decomposition since it's no visualisation data, // range calculation is intended to use hidden geometry, so @@ -49,7 +49,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// local decomposition. Implementation will return empty Primitive2DSequence - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/invertprimitive2d.hxx b/include/drawinglayer/primitive2d/invertprimitive2d.hxx index 1351cc3c7a30..7070b9597792 100644 --- a/include/drawinglayer/primitive2d/invertprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/invertprimitive2d.hxx @@ -44,7 +44,7 @@ namespace drawinglayer { public: /// constructor - explicit InvertPrimitive2D(const Primitive2DSequence& rChildren); + explicit InvertPrimitive2D(const Primitive2DContainer& rChildren); /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx index 966cc86e935a..b2c1afacd97d 100644 --- a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx @@ -57,7 +57,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx index 042097e3eb25..423fe65e19d4 100644 --- a/include/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -55,7 +55,7 @@ namespace drawinglayer /// constructor MaskPrimitive2D( const basegfx::B2DPolyPolygon& rMask, - const Primitive2DSequence& rChildren); + const Primitive2DContainer& rChildren); /// data read access const basegfx::B2DPolyPolygon& getMask() const { return maMask; } diff --git a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx index 4d4cce6fcc27..dfa984fb1868 100644 --- a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -61,7 +61,7 @@ namespace drawinglayer protected: /// local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx index adb14339de21..cf42cf7c1485 100644 --- a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx @@ -64,7 +64,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor MetafilePrimitive2D( diff --git a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx index d5f84b04af8c..73301cd7a74b 100644 --- a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx @@ -59,7 +59,7 @@ namespace drawinglayer public: /// constructor ModifiedColorPrimitive2D( - const Primitive2DSequence& rChildren, + const Primitive2DContainer& rChildren, const basegfx::BColorModifierSharedPtr& rColorModifier); /// data read access diff --git a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx index d9c9a92a4f6e..3c0f1b684df2 100644 --- a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx @@ -45,7 +45,7 @@ namespace drawinglayer public: /// constructor ObjectInfoPrimitive2D( - const Primitive2DSequence& rChildren, + const Primitive2DContainer& rChildren, const OUString& rName, const OUString& rTitle, const OUString& rDesc); diff --git a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx index 03795aa406f9..764f7cdf8c64 100644 --- a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx @@ -50,7 +50,7 @@ namespace drawinglayer const css::uno::Reference< css::drawing::XDrawPage > mxDrawPage; /// the PageContent - Primitive2DSequence maPageContent; + Primitive2DContainer maPageContent; /// the own geometry basegfx::B2DHomMatrix maTransform; @@ -65,7 +65,7 @@ namespace drawinglayer protected: /// local decomposition. Implementation will just return children - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -74,12 +74,12 @@ namespace drawinglayer const basegfx::B2DHomMatrix& rTransform, double fContentWidth, double fContentHeight, - const Primitive2DSequence& rPageContent, + const Primitive2DContainer& rPageContent, bool bKeepAspectRatio); /// data read access const css::uno::Reference< css::drawing::XDrawPage >& getXDrawPage() const { return mxDrawPage; } - const Primitive2DSequence& getPageContent() const { return maPageContent; } + const Primitive2DContainer& getPageContent() const { return maPageContent; } const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } double getContentWidth() const { return mfContentWidth; } double getContentHeight() const { return mfContentHeight; } diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx index e9d8b388cbf0..64d0bf520342 100644 --- a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx @@ -43,23 +43,23 @@ namespace drawinglayer { private: const basegfx::B2DPolyPolygon maMask; - const Primitive2DSequence maChildren; + const Primitive2DContainer maChildren; const basegfx::B2DRange maReferenceRange; protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor PatternFillPrimitive2D( const basegfx::B2DPolyPolygon& rMask, - const Primitive2DSequence& rChildren, + const Primitive2DContainer& rChildren, const basegfx::B2DRange& rReferenceRange); /// data read access const basegfx::B2DPolyPolygon& getMask() const { return maMask; } - const Primitive2DSequence& getChildren() const { return maChildren; } + const Primitive2DContainer& getChildren() const { return maChildren; } const basegfx::B2DRange& getReferenceRange() const { return maReferenceRange; } /// compare operator diff --git a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx index 4d8d05a4923d..c5914827ba2b 100644 --- a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx @@ -110,7 +110,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -133,7 +133,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() @@ -168,7 +168,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -220,7 +220,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -276,7 +276,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx index 7698f1359e81..57f88dbcc3de 100644 --- a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx @@ -57,7 +57,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -107,7 +107,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -162,7 +162,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -263,7 +263,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructors. The one without definition range will use output range as definition range @@ -319,7 +319,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructors. The one without definition range will use output range as definition range @@ -375,7 +375,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructors. The one without definition range will use output range as definition range @@ -435,7 +435,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/primitivetools2d.hxx b/include/drawinglayer/primitive2d/primitivetools2d.hxx index 26e60d10d071..6c02ee4ad1fb 100644 --- a/include/drawinglayer/primitive2d/primitivetools2d.hxx +++ b/include/drawinglayer/primitive2d/primitivetools2d.hxx @@ -66,7 +66,7 @@ namespace drawinglayer double getDiscreteUnit() const { return mfDiscreteUnit; } /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -105,7 +105,7 @@ namespace drawinglayer const basegfx::B2DRange& getViewport() const { return maViewport; } /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -144,7 +144,7 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getViewTransformation() const { return maViewTransformation; } /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -187,7 +187,7 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; } /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx index 9c3fb8e9d846..be2681f5f4e6 100644 --- a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -72,7 +72,7 @@ namespace drawinglayer geometry::ViewInformation3D maViewInformation3D; /// the primitiveSequence for on-demand created shadow primitives (see mbShadow3DChecked) - Primitive2DSequence maShadowPrimitives; + Primitive2DContainer maShadowPrimitives; /// bitfield /** flag if given 3D geometry is already cheched for shadow definitions and 2d shadows @@ -100,7 +100,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// public helpers @@ -108,8 +108,8 @@ namespace drawinglayer the 3D content is not converted to a bitmap visualisation but to projected 2D geometry. This helper is useful e.g. for Contour extraction or HitTests. */ - Primitive2DSequence getGeometry2D() const; - Primitive2DSequence getShadow2D(const geometry::ViewInformation2D& rViewInformation) const; + Primitive2DContainer getGeometry2D() const; + Primitive2DContainer getShadow2D(const geometry::ViewInformation2D& rViewInformation) const; /** Fast HitTest which uses the last buffered BitmapEx from the last rendered area if available. The return value describes if the check @@ -147,7 +147,7 @@ namespace drawinglayer DeclPrimitive2DIDBlock() /// get local decomposition. Override since this decomposition is view-dependent - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx index d4bcc7189710..e0a5fb4045ba 100644 --- a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx @@ -60,7 +60,7 @@ namespace drawinglayer ShadowPrimitive2D( const basegfx::B2DHomMatrix& rShadowTransform, const basegfx::BColor& rShadowColor, - const Primitive2DSequence& rChildren); + const Primitive2DContainer& rChildren); /// data read access const basegfx::B2DHomMatrix& getShadowTransform() const { return maShadowTransform; } @@ -73,7 +73,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// create decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx index 1e6115b1461c..a5d24e5287d4 100644 --- a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx @@ -53,7 +53,7 @@ namespace drawinglayer /// constructor StructureTagPrimitive2D( const vcl::PDFWriter::StructElement& rStructureElement, - const Primitive2DSequence& rChildren); + const Primitive2DContainer& rChildren); /// data read access const vcl::PDFWriter::StructElement& getStructureElement() const { return maStructureElement; } diff --git a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx index 98a15967f790..ffbcf306a12d 100644 --- a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx @@ -121,24 +121,24 @@ namespace drawinglayer protected: /// local helpers - Primitive2DSequence createSingleGradientEntryFill() const; + Primitive2DContainer createSingleGradientEntryFill() const; virtual void createAtom( - Primitive2DVector& rTargetColor, - Primitive2DVector& rTargetOpacity, + Primitive2DContainer& rTargetColor, + Primitive2DContainer& rTargetOpacity, const SvgGradientEntry& rFrom, const SvgGradientEntry& rTo, sal_Int32 nOffset) const = 0; double createRun( - Primitive2DVector& rTargetColor, - Primitive2DVector& rTargetOpacity, + Primitive2DContainer& rTargetColor, + Primitive2DContainer& rTargetOpacity, double fPos, double fMax, const SvgGradientEntryVector& rEntries, sal_Int32 nOffset) const; virtual void checkPreconditions(); - Primitive2DSequence createResult( - const Primitive2DVector& rTargetColor, - const Primitive2DVector& rTargetOpacity, + Primitive2DContainer createResult( + const Primitive2DContainer& rTargetColor, + const Primitive2DContainer& rTargetOpacity, const basegfx::B2DHomMatrix& rUnitGradientToObject, bool bInvert = false) const; bool getCreatesContent() const { return mbCreatesContent; } @@ -189,15 +189,15 @@ namespace drawinglayer protected: /// local helpers virtual void createAtom( - Primitive2DVector& rTargetColor, - Primitive2DVector& rTargetOpacity, + Primitive2DContainer& rTargetColor, + Primitive2DContainer& rTargetOpacity, const SvgGradientEntry& rFrom, const SvgGradientEntry& rTo, sal_Int32 nOffset) const override; virtual void checkPreconditions() override; /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -258,15 +258,15 @@ namespace drawinglayer protected: /// local helpers virtual void createAtom( - Primitive2DVector& rTargetColor, - Primitive2DVector& rTargetOpacity, + Primitive2DContainer& rTargetColor, + Primitive2DContainer& rTargetOpacity, const SvgGradientEntry& rFrom, const SvgGradientEntry& rTo, sal_Int32 nOffset) const override; virtual void checkPreconditions() override; /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -321,7 +321,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -383,7 +383,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/textbreakuphelper.hxx b/include/drawinglayer/primitive2d/textbreakuphelper.hxx index 1f6d598f08fa..811b38fa043b 100644 --- a/include/drawinglayer/primitive2d/textbreakuphelper.hxx +++ b/include/drawinglayer/primitive2d/textbreakuphelper.hxx @@ -42,7 +42,7 @@ namespace drawinglayer { private: const TextSimplePortionPrimitive2D& mrSource; - Primitive2DSequence mxResult; + Primitive2DContainer mxResult; TextLayouterDevice maTextLayouter; basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose maDecTrans; @@ -50,7 +50,7 @@ namespace drawinglayer bool mbNoDXArray : 1; /// create a portion from nIndex to nLength and append to rTempResult - void breakupPortion(Primitive2DVector& rTempResult, sal_Int32 nIndex, sal_Int32 nLength, bool bWordLineMode); + void breakupPortion(Primitive2DContainer& rTempResult, sal_Int32 nIndex, sal_Int32 nLength, bool bWordLineMode); /// breakup complete primitive void breakup(BreakupUnit aBreakupUnit); @@ -70,7 +70,7 @@ namespace drawinglayer virtual ~TextBreakupHelper(); /// get result - const Primitive2DSequence& getResult(BreakupUnit aBreakupUnit = BreakupUnit_character) const; + const Primitive2DContainer& getResult(BreakupUnit aBreakupUnit = BreakupUnit_character) const; }; } // end of namespace primitive2d diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx index c919cfc8158d..671b73246261 100644 --- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -75,7 +75,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx index c7c1d24fba97..6baeffac8d0c 100644 --- a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx @@ -51,7 +51,7 @@ namespace drawinglayer { private: /// the text (or other) content - Primitive2DSequence maTextContent; + Primitive2DContainer maTextContent; /// the style to apply, the direction and the rotation center const basegfx::B2DPoint maRotationCenter; @@ -65,18 +65,18 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// construcor TextEffectPrimitive2D( - const Primitive2DSequence& rTextContent, + const Primitive2DContainer& rTextContent, const basegfx::B2DPoint& rRotationCenter, double fDirection, TextEffectStyle2D eTextEffectStyle2D); /// data read access - const Primitive2DSequence& getTextContent() const { return maTextContent; } + const Primitive2DContainer& getTextContent() const { return maTextContent; } const basegfx::B2DPoint& getRotationCenter() const { return maRotationCenter; } double getDirection() const { return mfDirection; } TextEffectStyle2D getTextEffectStyle2D() const { return meTextEffectStyle2D; } @@ -94,7 +94,7 @@ namespace drawinglayer DeclPrimitive2DIDBlock() /// Override standard getDecomposition to be view-dependent here - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx index a21e36490f50..0abf1f21637e 100644 --- a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx @@ -45,7 +45,7 @@ namespace drawinglayer private: public: /// constructor - explicit TextHierarchyLinePrimitive2D(const Primitive2DSequence& rChildren); + explicit TextHierarchyLinePrimitive2D(const Primitive2DContainer& rChildren); /// provide unique ID DeclPrimitive2DIDBlock() @@ -68,7 +68,7 @@ namespace drawinglayer private: public: /// constructor - explicit TextHierarchyBulletPrimitive2D(const Primitive2DSequence& rChildren); + explicit TextHierarchyBulletPrimitive2D(const Primitive2DContainer& rChildren); /// provide unique ID DeclPrimitive2DIDBlock() @@ -91,7 +91,7 @@ namespace drawinglayer private: public: /// constructor - explicit TextHierarchyParagraphPrimitive2D(const Primitive2DSequence& rChildren); + explicit TextHierarchyParagraphPrimitive2D(const Primitive2DContainer& rChildren); /// provide unique ID DeclPrimitive2DIDBlock() @@ -114,7 +114,7 @@ namespace drawinglayer private: public: /// constructor - explicit TextHierarchyBlockPrimitive2D(const Primitive2DSequence& rChildren); + explicit TextHierarchyBlockPrimitive2D(const Primitive2DContainer& rChildren); /// provide unique ID DeclPrimitive2DIDBlock() @@ -159,7 +159,7 @@ namespace drawinglayer public: /// constructor TextHierarchyFieldPrimitive2D( - const Primitive2DSequence& rChildren, + const Primitive2DContainer& rChildren, const FieldType& rFieldType, const OUString& rString); @@ -197,7 +197,7 @@ namespace drawinglayer private: public: /// constructor - explicit TextHierarchyEditPrimitive2D(const Primitive2DSequence& rChildren); + explicit TextHierarchyEditPrimitive2D(const Primitive2DContainer& rChildren); /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx index b465c008513c..48fa635fbbff 100644 --- a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx @@ -48,7 +48,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index bfd4f20eca24..1513e543934f 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -136,7 +136,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx index 8582e4d71b04..10100009c78f 100644 --- a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx @@ -78,7 +78,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor @@ -119,7 +119,7 @@ namespace drawinglayer protected: /// local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/transformprimitive2d.hxx b/include/drawinglayer/primitive2d/transformprimitive2d.hxx index c0f7cf89fa21..9f09dcd6dc97 100644 --- a/include/drawinglayer/primitive2d/transformprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/transformprimitive2d.hxx @@ -60,7 +60,7 @@ namespace drawinglayer /// constructor TransformPrimitive2D( const basegfx::B2DHomMatrix& rTransformation, - const Primitive2DSequence& rChildren); + const Primitive2DContainer& rChildren); /// data read access const basegfx::B2DHomMatrix& getTransformation() const { return maTransformation; } diff --git a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx index af932ed07354..7effb04df6bc 100644 --- a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx @@ -51,7 +51,7 @@ namespace drawinglayer { private: /// The transparence-Mask who's RGB-Values are interpreted as Luminance - Primitive2DSequence maTransparence; + Primitive2DContainer maTransparence; public: /** constructor @@ -66,11 +66,11 @@ namespace drawinglayer using the common RGB_to_luminance definitions */ TransparencePrimitive2D( - const Primitive2DSequence& rChildren, - const Primitive2DSequence& rTransparence); + const Primitive2DContainer& rChildren, + const Primitive2DContainer& rTransparence); /// data read access - const Primitive2DSequence& getTransparence() const { return maTransparence; } + const Primitive2DContainer& getTransparence() const { return maTransparence; } /// compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; diff --git a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx index 2b23527cda56..4a67adb467f0 100644 --- a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx @@ -48,7 +48,7 @@ namespace drawinglayer public: /// constructor UnifiedTransparencePrimitive2D( - const Primitive2DSequence& rChildren, + const Primitive2DContainer& rChildren, double fTransparence); /// data read access @@ -61,7 +61,7 @@ namespace drawinglayer virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// create decomposition - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx index 5fc00a5d53d9..5ed17c311518 100644 --- a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx @@ -54,7 +54,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx index aa530dae845d..db0aa914b8b5 100644 --- a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx @@ -60,7 +60,7 @@ namespace drawinglayer protected: /// create local decomposition - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; + virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: /// constructor diff --git a/include/drawinglayer/processor2d/baseprocessor2d.hxx b/include/drawinglayer/processor2d/baseprocessor2d.hxx index b2e0ce895e62..274fd5f61d98 100644 --- a/include/drawinglayer/processor2d/baseprocessor2d.hxx +++ b/include/drawinglayer/processor2d/baseprocessor2d.hxx @@ -181,7 +181,7 @@ namespace drawinglayer virtual ~BaseProcessor2D(); /// the central processing method - void process(const primitive2d::Primitive2DSequence& rSource); + void process(const primitive2d::Primitive2DContainer& rSource); /// data read access const geometry::ViewInformation2D& getViewInformation2D() const { return maViewInformation2D; } diff --git a/include/drawinglayer/processor3d/geometry2dextractor.hxx b/include/drawinglayer/processor3d/geometry2dextractor.hxx index d900139184cc..b4111aa032df 100644 --- a/include/drawinglayer/processor3d/geometry2dextractor.hxx +++ b/include/drawinglayer/processor3d/geometry2dextractor.hxx @@ -44,7 +44,7 @@ namespace drawinglayer { private: /// result holding vector (2D) - primitive2d::Primitive2DSequence maPrimitive2DSequence; + primitive2d::Primitive2DContainer maPrimitive2DSequence; /// object transformation for scene for 2d definition basegfx::B2DHomMatrix maObjectTransformation; @@ -63,7 +63,7 @@ namespace drawinglayer const basegfx::B2DHomMatrix& rObjectTransformation); // data read access - const primitive2d::Primitive2DSequence& getPrimitive2DSequence() const { return maPrimitive2DSequence; } + const primitive2d::Primitive2DContainer& getPrimitive2DSequence() const { return maPrimitive2DSequence; } const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; } }; } // end of namespace processor3d diff --git a/include/drawinglayer/processor3d/shadow3dextractor.hxx b/include/drawinglayer/processor3d/shadow3dextractor.hxx index 8919f51f3729..9e4ca9f9908f 100644 --- a/include/drawinglayer/processor3d/shadow3dextractor.hxx +++ b/include/drawinglayer/processor3d/shadow3dextractor.hxx @@ -49,8 +49,8 @@ namespace drawinglayer { private: /// result holding vector (2D) and target vector for stacking (inited to &maPrimitive2DSequence) - primitive2d::Primitive2DVector maPrimitive2DSequence; - primitive2d::Primitive2DVector* mpPrimitive2DSequence; + primitive2d::Primitive2DContainer maPrimitive2DSequence; + primitive2d::Primitive2DContainer* mpPrimitive2DSequence; /// object transformation for scene for 2d definition basegfx::B2DHomMatrix maObjectTransformation; @@ -97,7 +97,7 @@ namespace drawinglayer virtual ~Shadow3DExtractingProcessor(); /// data read access - const primitive2d::Primitive2DSequence getPrimitive2DSequence() const; + const primitive2d::Primitive2DContainer& getPrimitive2DSequence() const; const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; } const basegfx::B3DHomMatrix& getWorldToEye() const { return maWorldToEye; } const basegfx::B3DHomMatrix& getEyeToView() const { return maEyeToView; } diff --git a/include/drawinglayer/tools/converters.hxx b/include/drawinglayer/tools/converters.hxx index c004e25a7a3c..0a29a13d2032 100644 --- a/include/drawinglayer/tools/converters.hxx +++ b/include/drawinglayer/tools/converters.hxx @@ -31,7 +31,7 @@ namespace drawinglayer namespace tools { BitmapEx DRAWINGLAYER_DLLPUBLIC convertToBitmapEx( - const drawinglayer::primitive2d::Primitive2DSequence& rSeq, + const drawinglayer::primitive2d::Primitive2DContainer& rSeq, const geometry::ViewInformation2D& rViewInformation2D, sal_uInt32 nDiscreteWidth, sal_uInt32 nDiscreteHeight, diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index 310804030844..2cdf02f8b6d3 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -121,7 +121,7 @@ public: virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, const ThumbnailItemAttributes *pAttrs); - void addTextPrimitives (const OUString& rText, const ThumbnailItemAttributes *pAttrs, Point aPos, drawinglayer::primitive2d::Primitive2DSequence& rSeq); + void addTextPrimitives (const OUString& rText, const ThumbnailItemAttributes *pAttrs, Point aPos, drawinglayer::primitive2d::Primitive2DContainer& rSeq); static drawinglayer::primitive2d::PolygonHairlinePrimitive2D* createBorderLine (const basegfx::B2DPolygon &rPolygon); diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx index 766bebac34c5..4a868e0515e0 100644 --- a/include/svx/charthelper.hxx +++ b/include/svx/charthelper.hxx @@ -41,7 +41,7 @@ public: // as sequence of primitives. Return range of primitives (chart size) in rRange; // it will be used to embed the chart to the SdrObject transformation. This // allows to define possible distances between chart and SDrObject bounds here - static drawinglayer::primitive2d::Primitive2DSequence tryToGetChartContentAsPrimitive2DSequence( + static drawinglayer::primitive2d::Primitive2DContainer tryToGetChartContentAsPrimitive2DSequence( const css::uno::Reference< css::frame::XModel >& rXModel, basegfx::B2DRange& rRange); diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index e8596b495d93..1638459f1e90 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -439,7 +439,7 @@ SVX_DLLPUBLIC bool CheckFrameBorderConnectable( | \ / | rLFromB \ / rRFromB */ -SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DSequence CreateBorderPrimitives( +SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DContainer CreateBorderPrimitives( const Point& rLPos, /// Reference point for left end of the processed frame border. const Point& rRPos, /// Reference point for right end of the processed frame border. const Style& rBorder, /// Style of the processed frame border. @@ -461,7 +461,7 @@ SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DSequence CreateBorderPrimiti const long& rRotationB = 9000 /// Angle of the bottom slanted frames in 100th of degree ); -SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DSequence CreateBorderPrimitives( +SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DContainer CreateBorderPrimitives( const Point& rLPos, /// Reference point for left end of the processed frame border. const Point& rRPos, /// Reference point for right end of the processed frame border. const Style& rBorder, /// Style of the processed frame border. @@ -479,7 +479,7 @@ SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DSequence CreateBorderPrimiti const long& rRotationB = 9000 /// Angle of the bottom slanted frame in 100th of degrees ); -SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DSequence CreateClippedBorderPrimitives ( +SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DContainer CreateClippedBorderPrimitives ( const Point& rStart, const Point& rEnd, const Style& rBorder, const Rectangle& rClipRect ); diff --git a/include/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx index e072a02f983a..7b83945169d7 100644 --- a/include/svx/sdr/animation/animationstate.hxx +++ b/include/svx/sdr/animation/animationstate.hxx @@ -44,7 +44,7 @@ namespace sdr sdr::contact::ViewObjectContact& mrVOContact; // the vetor of animated primitives - drawinglayer::primitive2d::Primitive2DSequence maAnimatedPrimitives; + drawinglayer::primitive2d::Primitive2DContainer maAnimatedPrimitives; // local helpers double getSmallestNextTime(double fCurrentTime); @@ -52,7 +52,7 @@ namespace sdr public: // basic constructor. - PrimitiveAnimation(sdr::contact::ViewObjectContact& rVOContact, const drawinglayer::primitive2d::Primitive2DSequence& rAnimatedPrimitives); + PrimitiveAnimation(sdr::contact::ViewObjectContact& rVOContact, const drawinglayer::primitive2d::Primitive2DContainer& rAnimatedPrimitives); // destructor virtual ~PrimitiveAnimation(); diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx index 580bee23966c..64ac5d21dfdf 100644 --- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx +++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx @@ -40,7 +40,7 @@ namespace drawinglayer basegfx::B2DRange maLastDefineRange; std::shared_ptr< drawinglayer::attribute::SdrFillAttribute > maFillAttribute; std::shared_ptr< drawinglayer::attribute::FillGradientAttribute > maFillGradientAttribute; - drawinglayer::primitive2d::Primitive2DSequence maPrimitives; + drawinglayer::primitive2d::Primitive2DContainer maPrimitives; void createPrimitive2DSequence( const basegfx::B2DRange& rPaintRange, @@ -59,7 +59,7 @@ namespace drawinglayer const drawinglayer::attribute::SdrFillAttribute& getFillAttribute() const; const drawinglayer::attribute::FillGradientAttribute& getFillGradientAttribute() const; - const drawinglayer::primitive2d::Primitive2DSequence& getPrimitive2DSequence( + const drawinglayer::primitive2d::Primitive2DContainer& getPrimitive2DSequence( const basegfx::B2DRange& rPaintRange, const basegfx::B2DRange& rDefineRange) const; diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx index c34f5e9304df..a70c2530cd5c 100644 --- a/include/svx/sdr/contact/viewcontact.hxx +++ b/include/svx/sdr/contact/viewcontact.hxx @@ -46,10 +46,10 @@ private: // Registering and de-registering is done in the VOC constructors/destructors. std::vector< ViewObjectContact* > maViewObjectContactVector; - // Primitive2DSequence of the ViewContact. This contains all necessary information + // Primitive2DContainer of the ViewContact. This contains all necessary information // for the graphical visualisation and needs to be supported by all VCs which // can be visualized. - drawinglayer::primitive2d::Primitive2DSequence mxViewIndependentPrimitive2DSequence; + drawinglayer::primitive2d::Primitive2DContainer mxViewIndependentPrimitive2DSequence; // A new ViewObjectContact was created and shall be remembered. void AddViewObjectContact(ViewObjectContact& rVOContact); @@ -77,10 +77,10 @@ protected: // visualisation method and will also be used for BoundRect computations in the long run. // This means it's always an error when the default implementation is called and thus gets // asserted there - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const; - // method for flushing View Independent Primitive2DSequence for VOC implementations - void flushViewIndependentPrimitive2DSequence() { mxViewIndependentPrimitive2DSequence.realloc(0); } + // method for flushing View Independent Primitive2DContainer for VOC implementations + void flushViewIndependentPrimitive2DSequence() { mxViewIndependentPrimitive2DSequence.clear(); } // basic constructor. Since this is a base class only, it shall // never be called directly @@ -122,15 +122,15 @@ public: // access to the local primitive. This will ensure that the primitive is // current in comparing the local one with a fresh created incarnation - drawinglayer::primitive2d::Primitive2DSequence getViewIndependentPrimitive2DSequence() const; + drawinglayer::primitive2d::Primitive2DContainer getViewIndependentPrimitive2DSequence() const; // add Gluepoints (if available) - virtual drawinglayer::primitive2d::Primitive2DSequence createGluePointPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DContainer createGluePointPrimitive2DSequence() const; // allow embedding if needed (e.g. for SdrObjects, evtl. Name, Title and description get added). This // is a helper normally used from getViewIndependentPrimitive2DSequence(), but there is one exception // for 3D scenes - virtual drawinglayer::primitive2d::Primitive2DSequence embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const; + virtual drawinglayer::primitive2d::Primitive2DContainer embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DContainer& rSource) const; virtual basegfx::B2DRange getRange( const drawinglayer::geometry::ViewInformation2D& rViewInfo2D ) const; diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx index 1b0aee383c5a..eed59dded3d6 100644 --- a/include/svx/sdr/contact/viewcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewcontactofe3d.hxx @@ -56,7 +56,7 @@ public: } // public helpers - drawinglayer::primitive2d::Primitive2DSequence impCreateWithGivenPrimitive3DSequence( + drawinglayer::primitive2d::Primitive2DContainer impCreateWithGivenPrimitive3DSequence( const drawinglayer::primitive3d::Primitive3DSequence& rxContent3D) const; @@ -76,7 +76,7 @@ protected: // This method is responsible for creating the graphical visualisation data derived ONLY from // the model data. The default implementation will try to create a 3D to 2D embedding (will work // when scene is known) which can then be used for 2D processing concerning ranges - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; + virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override; public: // access to the local primitive without the object's local 3D transform. This is e.g. needed diff --git a/include/svx/sdr/contact/viewcontactofe3dscene.hxx b/include/svx/sdr/contact/viewcontactofe3dscene.hxx index b860417bedd4..ce9e85113963 100644 --- a/include/svx/sdr/contact/viewcontactofe3dscene.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dscene.hxx @@ -66,7 +66,7 @@ public: // scene primitive creators. If pLayerVisibility is given, a visibility test with the LayerID and the // given SetOfByte is done. - drawinglayer::primitive2d::Primitive2DSequence createScenePrimitive2DSequence(const SetOfByte* pLayerVisibility) const; + drawinglayer::primitive2d::Primitive2DContainer createScenePrimitive2DSequence(const SetOfByte* pLayerVisibility) const; // helpers to get the sequence of all contained 3D primitives and its range, // regardless of layer or visibility constraints and using a neutral ViewInformation3D @@ -94,7 +94,7 @@ protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; + virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override; }; }} diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx index 874b2140d4f8..b8d995bc52ab 100644 --- a/include/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx @@ -36,7 +36,7 @@ protected: virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; // create graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; + virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override; public: // basic constructor, used from SdrObject. explicit ViewContactOfPageObj(SdrPageObj& rPageObj); diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index e440ee67a4af..3ecf81ed7441 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -64,7 +64,7 @@ protected: protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; + virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override; }; }} diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx index 724865ed8905..2dbfdea043e8 100644 --- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx @@ -72,12 +72,12 @@ public: // primitive stuff // add Gluepoints (if available) - virtual drawinglayer::primitive2d::Primitive2DSequence createGluePointPrimitive2DSequence() const override; + virtual drawinglayer::primitive2d::Primitive2DContainer createGluePointPrimitive2DSequence() const override; // allow embedding if needed (e.g. for SdrObjects, evtl. Name, Title and description get added). This // is a helper normally used from getViewIndependentPrimitive2DSequence(), but there is one exception // for 3D scenes - virtual drawinglayer::primitive2d::Primitive2DSequence embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const override; + virtual drawinglayer::primitive2d::Primitive2DContainer embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DContainer& rSource) const override; }; }} diff --git a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx index c5fad1af395e..5892952808cd 100644 --- a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx @@ -42,7 +42,7 @@ public: protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; + virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override; }; }} diff --git a/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx index 96b0da316d8a..65b50fb0a1d8 100644 --- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx +++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx @@ -44,7 +44,7 @@ public: protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; + virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override; }; }} diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx index 9e8b4e972ffd..ddf54b437477 100644 --- a/include/svx/sdr/contact/viewobjectcontact.hxx +++ b/include/svx/sdr/contact/viewobjectcontact.hxx @@ -52,9 +52,9 @@ private: // PrimitiveSequence of the ViewContact. This contains all necessary information // for the graphical visualisation and needs to be supported by all VCs which // can be visualized. - drawinglayer::primitive2d::Primitive2DSequence mxPrimitive2DSequence; + drawinglayer::primitive2d::Primitive2DContainer mxPrimitive2DSequence; - // the PrimitiveAnimation if Primitive2DSequence contains animations + // the PrimitiveAnimation if Primitive2DContainer contains animations sdr::animation::PrimitiveAnimation* mpPrimitiveAnimation; // bitfield @@ -75,10 +75,10 @@ protected: // from the ViewContact using ViewContact::getViewIndependentPrimitive2DSequence(), takes care of // visibility, handles glue and ghosted. // This method will not handle included hierarchies and not check geometric visibility. - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; - // method for flushing Primitive2DSequence for VOC implementations - void flushPrimitive2DSequence() { mxPrimitive2DSequence.realloc(0); } + // method for flushing Primitive2DContainer for VOC implementations + void flushPrimitive2DSequence() { mxPrimitive2DSequence.clear(); } public: // basic constructor. @@ -110,7 +110,7 @@ public: // access to the local primitive. This will ensure that the local primitive is // current in comparing the local one with a fresh created incarnation // This method will not handle included hierarchies and not check visibility. - drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; // test this VOC for visibility concerning model-view stuff like e.g. Layer virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; @@ -120,10 +120,10 @@ public: // process this primitive: Eventually also recursively travel an existing hierarchy, // e.g. for group objects, scenes or pages. This method will test geometrical visibility. - virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const; // just process the sub-hierarchy, used as tooling from getPrimitive2DSequenceHierarchy - drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceSubHierarchy(DisplayInfo& rDisplayInfo) const; + drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequenceSubHierarchy(DisplayInfo& rDisplayInfo) const; }; }} diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx index a4d3ff3e616f..28eb5d7cdd36 100644 --- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx @@ -38,7 +38,7 @@ protected: // This method is responsible for creating the graphical visualisation data which is // stored/cached in the local primitive. // This method will not handle included hierarchies and not check geometric visibility. - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; + virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; public: ViewObjectContactOfPageObj(ObjectContact& rObjectContact, ViewContact& rViewContact); diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx index 6dee41409975..7679564028ff 100644 --- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx +++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx @@ -43,7 +43,7 @@ public: // all default implementations just call the same methods at the original. To do something // different, override the method and at least do what the method does. - virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( + virtual drawinglayer::primitive2d::Primitive2DContainer createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo); }; diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx index 8594e683ce71..af77c3a4ca40 100644 --- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -54,7 +54,7 @@ namespace sdr bool mbOverlayState : 1; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; + virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; public: OverlayAnimatedBitmapEx( diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx index 25913c1633dc..e98bd4953220 100644 --- a/include/svx/sdr/overlay/overlaybitmapex.hxx +++ b/include/svx/sdr/overlay/overlaybitmapex.hxx @@ -44,7 +44,7 @@ namespace sdr double mfShearX; double mfRotation; - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; + virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; public: OverlayBitmapEx( diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx index d4ada5a75804..6a4da0b11336 100644 --- a/include/svx/sdr/overlay/overlayobject.hxx +++ b/include/svx/sdr/overlay/overlayobject.hxx @@ -64,21 +64,21 @@ namespace sdr // OverlayManager, do not change Yourself. OverlayManager* mpOverlayManager; - // Primitive2DSequence of the OverlayObject - drawinglayer::primitive2d::Primitive2DSequence maPrimitive2DSequence; + // Primitive2DContainer of the OverlayObject + drawinglayer::primitive2d::Primitive2DContainer maPrimitive2DSequence; protected: // access methods to maPrimitive2DSequence. The usage of this methods may allow // later thread-safe stuff to be added if needed. Only to be used by getPrimitive2DSequence() // implementations for buffering the last decomposition. - const drawinglayer::primitive2d::Primitive2DSequence& getPrimitive2DSequence() const { return maPrimitive2DSequence; } - void setPrimitive2DSequence(const drawinglayer::primitive2d::Primitive2DSequence& rNew) { maPrimitive2DSequence = rNew; } + const drawinglayer::primitive2d::Primitive2DContainer& getPrimitive2DSequence() const { return maPrimitive2DSequence; } + void setPrimitive2DSequence(const drawinglayer::primitive2d::Primitive2DContainer& rNew) { maPrimitive2DSequence = rNew; } - // the creation method for Primitive2DSequence. Called when getPrimitive2DSequence() + // the creation method for Primitive2DContainer. Called when getPrimitive2DSequence() // sees that maPrimitive2DSequence is empty. Needs to be supported by all // OverlayObject implementations. Default implementation will assert // a missing implementation - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence(); // #i53216# check blink time value range (currently 25 < mnBlinkTime < 10000) static sal_uInt32 impCheckBlinkTimeValueRange(sal_uInt64 nBlinkTime); @@ -123,10 +123,10 @@ namespace sdr // get OverlayManager OverlayManager* getOverlayManager() const { return mpOverlayManager; } - // the access method for Primitive2DSequence. Will use createPrimitive2DSequence and + // the access method for Primitive2DContainer. Will use createPrimitive2DSequence and // setPrimitive2DSequence if needed. Overriding may be used to allow disposal of last // created primitives to react on changed circumstances and to re-create primitives - virtual drawinglayer::primitive2d::Primitive2DSequence getOverlayObjectPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DContainer getOverlayObjectPrimitive2DSequence() const; // access to visibility state bool isVisible() const { return mbIsVisible; } diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx index 989c7c903e89..08e41ca85343 100644 --- a/include/svx/sdr/overlay/overlayobjectcell.hxx +++ b/include/svx/sdr/overlay/overlayobjectcell.hxx @@ -44,7 +44,7 @@ namespace sdr RangeVector maRectangles; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; + virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; public: OverlayObjectCell( CellOverlayType eType, const Color& rColor, const RangeVector& rRects); diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx index 4e331b0356f1..998b805dcb85 100644 --- a/include/svx/sdr/overlay/overlaypolypolygon.hxx +++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx @@ -37,7 +37,7 @@ namespace sdr basegfx::B2DPolyPolygon maLinePolyPolygon; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; + virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; public: explicit OverlayPolyPolygonStripedAndFilled( diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx index dcaf3c7ed886..2c63a1f6e77a 100644 --- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx +++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx @@ -34,18 +34,18 @@ namespace sdr { protected: // the sequence of primitives to show - const drawinglayer::primitive2d::Primitive2DSequence maSequence; + const drawinglayer::primitive2d::Primitive2DContainer maSequence; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; + virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; public: - explicit OverlayPrimitive2DSequenceObject(const drawinglayer::primitive2d::Primitive2DSequence& rSequence); + explicit OverlayPrimitive2DSequenceObject(const drawinglayer::primitive2d::Primitive2DContainer& rSequence); virtual ~OverlayPrimitive2DSequenceObject(); // data read access - const drawinglayer::primitive2d::Primitive2DSequence& getSequence() const { return maSequence; } + const drawinglayer::primitive2d::Primitive2DContainer& getSequence() const { return maSequence; } }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx index 297a1e08a48d..cdd3448e10ed 100644 --- a/include/svx/sdr/overlay/overlayselection.hxx +++ b/include/svx/sdr/overlay/overlayselection.hxx @@ -47,7 +47,7 @@ namespace sdr std::vector< basegfx::B2DRange > maRanges; // Values of last primitive creation. These are checked in getOverlayObjectPrimitive2DSequence - // to evtl. get rid of last Primitive2DSequence. This ensures that these values are up-to-date + // to evtl. get rid of last Primitive2DContainer. This ensures that these values are up-to-date // and are usable when creating primitives OverlayType maLastOverlayType; sal_uInt16 mnLastTransparence; @@ -56,7 +56,7 @@ namespace sdr bool mbBorder : 1; // geometry creation for OverlayObject, can use local *Last* values - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; + virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; public: OverlaySelection( @@ -71,7 +71,7 @@ namespace sdr bool getBorder() const { return mbBorder; } /// override to check conditions for last createOverlayObjectPrimitive2DSequence - virtual drawinglayer::primitive2d::Primitive2DSequence getOverlayObjectPrimitive2DSequence() const override; + virtual drawinglayer::primitive2d::Primitive2DContainer getOverlayObjectPrimitive2DSequence() const override; // data write access void setRanges(const std::vector< basegfx::B2DRange >& rNew); diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx index a05d6de6ef30..3dcbc52f1151 100644 --- a/include/svx/sdr/overlay/overlaytriangle.hxx +++ b/include/svx/sdr/overlay/overlaytriangle.hxx @@ -34,7 +34,7 @@ namespace sdr basegfx::B2DPoint maThirdPosition; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; + virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; public: OverlayTriangle( diff --git a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx index eb7a29911f6e..8edabccdd18f 100644 --- a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx +++ b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx @@ -71,8 +71,8 @@ namespace drawinglayer bool bWordWrap, bool bClipOnBounds); - Primitive2DSequence SVX_DLLPUBLIC createEmbeddedShadowPrimitive( - const Primitive2DSequence& rContent, + Primitive2DContainer SVX_DLLPUBLIC createEmbeddedShadowPrimitive( + const Primitive2DContainer& rContent, const attribute::SdrShadowAttribute& rShadow); } // end of namespace primitive2d diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 2820436a33f4..dd77d1eb3b1a 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -41,7 +41,7 @@ public: SdrDragEntry(); virtual ~SdrDragEntry(); - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) = 0; + virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) = 0; // data read access bool getAddToTransparent() const { return mbAddToTransparent; } @@ -58,7 +58,7 @@ public: SdrDragEntryPolyPolygon(const basegfx::B2DPolyPolygon& rOriginalPolyPolygon); virtual ~SdrDragEntryPolyPolygon(); - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; + virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; }; @@ -81,7 +81,7 @@ public: const SdrObject& getOriginal() const { return maOriginal; } SdrObject* getClone() { return mpClone; } - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; + virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; }; @@ -89,15 +89,15 @@ public: class SdrDragEntryPrimitive2DSequence : public SdrDragEntry { private: - drawinglayer::primitive2d::Primitive2DSequence maPrimitive2DSequence; + drawinglayer::primitive2d::Primitive2DContainer maPrimitive2DSequence; public: SdrDragEntryPrimitive2DSequence( - const drawinglayer::primitive2d::Primitive2DSequence& rSequence, + const drawinglayer::primitive2d::Primitive2DContainer& rSequence, bool bAddToTransparent); virtual ~SdrDragEntryPrimitive2DSequence(); - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; + virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; }; @@ -112,7 +112,7 @@ public: SdrDragEntryPointGlueDrag(const std::vector< basegfx::B2DPoint >& rPositions, bool bIsPointDrag); virtual ~SdrDragEntryPointGlueDrag(); - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; + virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; }; @@ -177,7 +177,7 @@ protected: bool IsDraggingGluePoints() const { return getSdrDragView().IsDraggingGluePoints(); } bool DoAddConnectorOverlays(); - drawinglayer::primitive2d::Primitive2DSequence AddConnectorOverlays(); + drawinglayer::primitive2d::Primitive2DContainer AddConnectorOverlays(); public: diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index d43bc5062575..c2e1435b419f 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -597,27 +597,27 @@ public: // text primitive decomposition helpers void impDecomposeContourTextPrimitive( - drawinglayer::primitive2d::Primitive2DSequence& rTarget, + drawinglayer::primitive2d::Primitive2DContainer& rTarget, const drawinglayer::primitive2d::SdrContourTextPrimitive2D& rSdrContourTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const; void impDecomposePathTextPrimitive( - drawinglayer::primitive2d::Primitive2DSequence& rTarget, + drawinglayer::primitive2d::Primitive2DContainer& rTarget, const drawinglayer::primitive2d::SdrPathTextPrimitive2D& rSdrPathTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const; void impDecomposeBlockTextPrimitive( - drawinglayer::primitive2d::Primitive2DSequence& rTarget, + drawinglayer::primitive2d::Primitive2DContainer& rTarget, const drawinglayer::primitive2d::SdrBlockTextPrimitive2D& rSdrBlockTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const; void impDecomposeAutoFitTextPrimitive( - drawinglayer::primitive2d::Primitive2DSequence& rTarget, + drawinglayer::primitive2d::Primitive2DContainer& rTarget, const drawinglayer::primitive2d::SdrAutoFitTextPrimitive2D& rSdrAutofitTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const; void impDecomposeStretchTextPrimitive( - drawinglayer::primitive2d::Primitive2DSequence& rTarget, + drawinglayer::primitive2d::Primitive2DContainer& rTarget, const drawinglayer::primitive2d::SdrStretchTextPrimitive2D& rSdrStretchTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const; void impDecomposeChainedTextPrimitive( - drawinglayer::primitive2d::Primitive2DSequence& rTarget, + drawinglayer::primitive2d::Primitive2DContainer& rTarget, const drawinglayer::primitive2d::SdrChainedTextPrimitive2D& rSdrChainedTextPrimitive, const drawinglayer::geometry::ViewInformation2D& aViewInformation) const; void impHandleChainingEventsDuringDecomposition(SdrOutliner &rOutliner) const; diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index b459773b87b9..c8d537035e72 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -555,7 +555,7 @@ public: // all default implementations just call the same methods at the original. To do something // different, override the method and at least do what the method does. - virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( + virtual drawinglayer::primitive2d::Primitive2DContainer createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo) override; }; diff --git a/include/test/primitive2dxmldump.hxx b/include/test/primitive2dxmldump.hxx index a578e60f7596..176f6dd1e0e0 100644 --- a/include/test/primitive2dxmldump.hxx +++ b/include/test/primitive2dxmldump.hxx @@ -23,7 +23,7 @@ class OOO_DLLPUBLIC_TEST Primitive2dXmlDump { private: std::vector<bool> maFilter; - void decomposeAndWrite(const drawinglayer::primitive2d::Primitive2DSequence& rPrimitive2DSequence, XmlWriter& rWriter); + void decomposeAndWrite(const drawinglayer::primitive2d::Primitive2DContainer& rPrimitive2DSequence, XmlWriter& rWriter); public: Primitive2dXmlDump(); @@ -39,7 +39,7 @@ public: pTempStreamName - this is useful when creating the test, to dump the file for examination. */ - xmlDocPtr dumpAndParse(const drawinglayer::primitive2d::Primitive2DSequence& aPrimitive2DSequence, const OUString& rTempStreamName = OUString()); + xmlDocPtr dumpAndParse(const drawinglayer::primitive2d::Primitive2DContainer& aPrimitive2DSequence, const OUString& rTempStreamName = OUString()); }; #endif // INCLUDED_TEST_PRIMITIVE2DXMLDUMP_HXX diff --git a/include/vcl/svgdata.hxx b/include/vcl/svgdata.hxx index 84a625e935d1..361528843691 100644 --- a/include/vcl/svgdata.hxx +++ b/include/vcl/svgdata.hxx @@ -33,7 +33,7 @@ typedef css::uno::Sequence<sal_Int8> SvgDataArray; // using default parameters and graphic::XPrimitive2DRenderer BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( - const css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > >& rSequence, + const std::vector< css::uno::Reference< css::graphic::XPrimitive2D > >& rSequence, const basegfx::B2DRange& rTargetRange, const sal_uInt32 nMaximumQuadraticPixels = 500000); @@ -49,7 +49,7 @@ private: // on demand created content basegfx::B2DRange maRange; - css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > + std::vector< css::uno::Reference< css::graphic::XPrimitive2D > > maSequence; BitmapEx maReplacement; @@ -71,7 +71,7 @@ public: /// data read and evtl. on demand creation const basegfx::B2DRange& getRange() const; - const css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > >& getPrimitive2DSequence() const; + const std::vector< css::uno::Reference< css::graphic::XPrimitive2D > >& getPrimitive2DSequence() const; const BitmapEx& getReplacement() const; }; |