diff --git a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx index 804e8d2971b0..1c0cc84fed3b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: baseprimitive2d.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2006-12-13 16:57:07 $ + * last change: $Author: aw $ $Date: 2007-01-25 12:56:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -142,11 +142,6 @@ namespace drawinglayer // the buffered decomposition may be reused or not. virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; - // Method to get a hint if the decomposition may produce animated primitives. Default implementation - // returns false. This should be overloaded to give a processor which looks for animated primitives - // hints if he shall decompose or not - virtual bool mayDecompositionBeAnimated() const; - // // Methods from XPrimitive2D // diff --git a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx index 414a365b5f46..ea0c51f34103 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: groupprimitive2d.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2006-11-28 11:03:56 $ + * last change: $Author: aw $ $Date: 2007-01-25 12:56:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,9 +67,6 @@ namespace drawinglayer // compare operator virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; - // give hint that this primitive may be animated. Check the group content - virtual bool mayDecompositionBeAnimated() const; - // provide unique ID DeclPrimitrive2DIDBlock() }; diff --git a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx index b21dc9682729..834b13f9b38b 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: baseprocessor2d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-10-19 10:28:25 $ + * last change: $Author: aw $ $Date: 2007-01-25 12:56:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -96,8 +96,9 @@ namespace drawinglayer primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(maPrimitiveSequence, rSource); } - // data access + // data access and reset const primitive2d::Primitive2DSequence& getPrimitive2DSequence() const { return maPrimitiveSequence; } + void reset() { maPrimitiveSequence = primitive2d::Primitive2DSequence(); } }; } // end of namespace processor2d } // end of namespace drawinglayer diff --git a/drawinglayer/prj/d.lst b/drawinglayer/prj/d.lst index 0a918d98249c..ea872794578e 100644 --- a/drawinglayer/prj/d.lst +++ b/drawinglayer/prj/d.lst @@ -61,7 +61,6 @@ mkdir: %_DEST%\inc%_EXT%\drawinglayer\geometry ..\inc\drawinglayer\geometry\viewinformation2d.hxx %_DEST%\inc%_EXT%\drawinglayer\geometry\viewinformation2d.hxx mkdir: %_DEST%\inc%_EXT%\drawinglayer\processor2d -..\inc\drawinglayer\processor2d\animatedextractor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\animatedextractor2d.hxx ..\inc\drawinglayer\processor2d\baseprocessor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\baseprocessor2d.hxx ..\inc\drawinglayer\processor2d\vclprocessor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\vclprocessor2d.hxx diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx index 4b0f01ecdfa1..230e3f6ea25e 100644 --- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: baseprimitive2d.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: aw $ $Date: 2006-11-28 11:03:57 $ + * last change: $Author: aw $ $Date: 2007-01-25 12:57:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -89,11 +89,6 @@ namespace drawinglayer return getLocalDecomposition(); } - bool BasePrimitive2D::mayDecompositionBeAnimated() const - { - return false; - } - Primitive2DSequence SAL_CALL BasePrimitive2D::getDecomposition( const graphic::Primitive2DParameters& aPrimitive2DParameters ) throw ( uno::RuntimeException ) { const geometry::ViewInformation2D aViewInformation(aPrimitive2DParameters); diff --git a/drawinglayer/source/primitive2d/groupprimitive2d.cxx b/drawinglayer/source/primitive2d/groupprimitive2d.cxx index bc48579bd220..100679e95b4a 100644 --- a/drawinglayer/source/primitive2d/groupprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/groupprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: groupprimitive2d.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2006-11-28 11:03:57 $ + * last change: $Author: aw $ $Date: 2007-01-25 12:57:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -75,44 +75,6 @@ namespace drawinglayer return false; } - bool GroupPrimitive2D::mayDecompositionBeAnimated() const - { - // check children. If one returns true, return true - if(!maChildren.hasElements()) - { - return false; - } - - const sal_Int32 nCount(maChildren.getLength()); - - for(sal_Int32 a(0L); a < nCount; a++) - { - // get reference - const primitive2d::Primitive2DReference xReference(maChildren[a]); - - if(xReference.is()) - { - // try to cast to BasePrimitive2D implementation - const primitive2d::BasePrimitive2D* pBasePrimitive = dynamic_cast< const primitive2d::BasePrimitive2D* >(xReference.get()); - - if(pBasePrimitive) - { - if(pBasePrimitive->mayDecompositionBeAnimated()) - { - return true; - } - } - else - { - // unknown implementation -> may contain animation - return true; - } - } - } - - return false; - } - // provide unique ID ImplPrimitrive2DIDBlock(GroupPrimitive2D, '2','G','r','o') diff --git a/drawinglayer/source/processor2d/makefile.mk b/drawinglayer/source/processor2d/makefile.mk index ac668486e739..1bff99ed7e65 100644 --- a/drawinglayer/source/processor2d/makefile.mk +++ b/drawinglayer/source/processor2d/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: aw $ $Date: 2006-10-19 10:35:37 $ +# last change: $Author: aw $ $Date: 2007-01-25 12:57:14 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -45,7 +45,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Files ------------------------------------- SLOFILES= \ - $(SLO)$/animatedextractor2d.obj \ $(SLO)$/baseprocessor2d.obj \ $(SLO)$/vclprocessor2d.obj