diff options
Diffstat (limited to 'oox/source/ppt')
30 files changed, 0 insertions, 124 deletions
diff --git a/oox/source/ppt/animationspersist.cxx b/oox/source/ppt/animationspersist.cxx index 1405a6ecc376..6b919851da1d 100644 --- a/oox/source/ppt/animationspersist.cxx +++ b/oox/source/ppt/animationspersist.cxx @@ -77,7 +77,6 @@ namespace oox { namespace ppt { } } - Any AnimTargetElement::convert(const SlidePersistPtr & pSlide, sal_Int16 & nSubType) const { Any aTarget; @@ -125,7 +124,6 @@ namespace oox { namespace ppt { return aTarget; } - // BEGIN CUT&PASTE from sd/source/filter/ppt/pptinanimations.cxx /** this adds an any to another any. if rNewValue is empty, rOldValue is returned. @@ -178,7 +176,6 @@ namespace oox { namespace ppt { return aAny; } - Any AnimationCondition::convertList(const SlidePersistPtr & pSlide, const AnimationConditionList & l) { Any aAny; @@ -192,5 +189,4 @@ namespace oox { namespace ppt { } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/animationtypes.cxx b/oox/source/ppt/animationtypes.cxx index 4992fdd338f4..65686813c28b 100644 --- a/oox/source/ppt/animationtypes.cxx +++ b/oox/source/ppt/animationtypes.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "animationtypes.hxx" #include <com/sun/star/animations/Timing.hpp> @@ -45,7 +44,6 @@ Any GetTime( const OUString & val ) return aDuration; } - // ST_TLTimeAnimateValueTime Any GetTimeAnimateValueTime( const OUString & val ) { diff --git a/oox/source/ppt/animationtypes.hxx b/oox/source/ppt/animationtypes.hxx index d82918a844bb..02316372ea70 100644 --- a/oox/source/ppt/animationtypes.hxx +++ b/oox/source/ppt/animationtypes.hxx @@ -17,16 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef INCLUDED_OOX_SOURCE_PPT_ANIMATIONTYPES_HXX #define INCLUDED_OOX_SOURCE_PPT_ANIMATIONTYPES_HXX - #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/xml/sax/XFastAttributeList.hpp> - namespace oox { namespace ppt { // ST_TLTime diff --git a/oox/source/ppt/animvariantcontext.cxx b/oox/source/ppt/animvariantcontext.cxx index 51ff3a45a130..bc5aca0e262c 100644 --- a/oox/source/ppt/animvariantcontext.cxx +++ b/oox/source/ppt/animvariantcontext.cxx @@ -57,7 +57,6 @@ namespace oox { namespace ppt { } } - ContextHandlerRef AnimVariantContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) { switch( aElementToken ) @@ -97,8 +96,6 @@ namespace oox { namespace ppt { return this; } - - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/backgroundproperties.cxx b/oox/source/ppt/backgroundproperties.cxx index dd1ba5ac3429..e081a7552965 100644 --- a/oox/source/ppt/backgroundproperties.cxx +++ b/oox/source/ppt/backgroundproperties.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star::xml::sax; namespace oox { namespace ppt { - BackgroundPropertiesContext::BackgroundPropertiesContext( FragmentHandler2& rParent, ::oox::drawingml::FillProperties& rFillProperties ) : FragmentHandler2( rParent ) , mrFillProperties( rFillProperties ) diff --git a/oox/source/ppt/buildlistcontext.cxx b/oox/source/ppt/buildlistcontext.cxx index b716ebd5c401..1d812f31be87 100644 --- a/oox/source/ppt/buildlistcontext.cxx +++ b/oox/source/ppt/buildlistcontext.cxx @@ -82,7 +82,6 @@ namespace oox { namespace ppt { return this; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/buildlistcontext.hxx b/oox/source/ppt/buildlistcontext.hxx index 4bc1aa31624f..19bee7666482 100644 --- a/oox/source/ppt/buildlistcontext.hxx +++ b/oox/source/ppt/buildlistcontext.hxx @@ -24,7 +24,6 @@ namespace oox { namespace ppt { - /** CT_BuildList */ class BuildListContext : public ::oox::core::FragmentHandler2 @@ -42,9 +41,6 @@ namespace oox { namespace ppt { bool mbBuildAsOne; }; - - - } } #endif diff --git a/oox/source/ppt/comments.cxx b/oox/source/ppt/comments.cxx index 81d22e9c3d7e..965a7ef658b0 100644 --- a/oox/source/ppt/comments.cxx +++ b/oox/source/ppt/comments.cxx @@ -11,7 +11,6 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <rtl/math.hxx> - namespace oox { namespace ppt { void CommentAuthorList::setValues(const CommentAuthorList& list) diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx index 5cc23c562a08..e715f8ba8697 100644 --- a/oox/source/ppt/commonbehaviorcontext.cxx +++ b/oox/source/ppt/commonbehaviorcontext.cxx @@ -50,13 +50,10 @@ namespace oox { namespace ppt { { } - CommonBehaviorContext::~CommonBehaviorContext( ) throw( ) { } - - void CommonBehaviorContext::onEndElement() { switch( getCurrentElement() ) @@ -110,7 +107,6 @@ namespace oox { namespace ppt { } } - void CommonBehaviorContext::onCharacters( const OUString& aChars ) { if( mbIsInAttrName ) @@ -119,7 +115,6 @@ namespace oox { namespace ppt { } } - ::oox::core::ContextHandlerRef CommonBehaviorContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) { switch ( aElementToken ) diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx index fe989d437a1d..5625f34e9cf1 100644 --- a/oox/source/ppt/commonbehaviorcontext.hxx +++ b/oox/source/ppt/commonbehaviorcontext.hxx @@ -34,7 +34,6 @@ namespace oox { namespace ppt { MS_AttributeNames type; }; - /** CT_TLCommonBehaviorData */ class CommonBehaviorContext : public TimeNodeContext @@ -59,7 +58,6 @@ namespace oox { namespace ppt { OUString msCurrentAttribute; }; - } } #endif diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx index c551a74250a7..61d9c5545909 100644 --- a/oox/source/ppt/commontimenodecontext.cxx +++ b/oox/source/ppt/commontimenodecontext.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::xml::sax; - using ::com::sun::star::beans::NamedValue; namespace oox { namespace ppt { @@ -83,7 +82,6 @@ static const convert_subtype gConvertArray[] = { 0, 0 } }; - struct preset_maping { sal_Int32 mnPresetClass; @@ -229,9 +227,6 @@ static const preset_maping gPresetMaping[] = { ::com::sun::star::presentation::EffectPresetClass::EXIT, 56 ,"ooo-exit-flip" }, { ::com::sun::star::presentation::EffectPresetClass::EXIT, 58 ,"ooo-exit-fold" }, - - - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 16 ,"ooo-motionpath-4-point-star" }, { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 5 ,"ooo-motionpath-5-point-star" }, { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 11 ,"ooo-motionpath-6-point-star" }, @@ -297,7 +292,6 @@ static const preset_maping gPresetMaping[] = { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 39 ,"ooo-motionpath-s-curve-2" }, { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 45 ,"ooo-motionpath-heartbeat" }, - { 0,0,0 } }; @@ -597,12 +591,10 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId xAttribs->getOptionalValue( XML_tmFilter ); } - CommonTimeNodeContext::~CommonTimeNodeContext( ) throw ( ) { } - void CommonTimeNodeContext::onEndElement() { if( isCurrentElement( PPT_TOKEN( iterate ) ) ) @@ -611,7 +603,6 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId } } - ::oox::core::ContextHandlerRef CommonTimeNodeContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) { diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx index 69c7dd7ec1d2..6790135fc9e1 100644 --- a/oox/source/ppt/commontimenodecontext.hxx +++ b/oox/source/ppt/commontimenodecontext.hxx @@ -44,7 +44,6 @@ namespace oox { namespace ppt { ::com::sun::star::uno::Reference< ::com::sun::star::animations::XIterateContainer > mxIter; }; - } } #endif diff --git a/oox/source/ppt/conditioncontext.cxx b/oox/source/ppt/conditioncontext.cxx index 2fa15d23332e..9e7d816fd04d 100644 --- a/oox/source/ppt/conditioncontext.cxx +++ b/oox/source/ppt/conditioncontext.cxx @@ -152,8 +152,6 @@ namespace oox { namespace ppt { } - - /** CT_TLTimeConditionList */ CondListContext::CondListContext( FragmentHandler2& rParent, sal_Int32 aElement, @@ -184,7 +182,6 @@ namespace oox { namespace ppt { return this; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx index 4eac421d68de..612797a57a0a 100644 --- a/oox/source/ppt/conditioncontext.hxx +++ b/oox/source/ppt/conditioncontext.hxx @@ -30,7 +30,6 @@ namespace oox { namespace ppt { - /** CT_TLTimeCondition */ class CondContext : public TimeNodeContext @@ -47,8 +46,6 @@ namespace oox { namespace ppt { AnimationCondition & maCond; }; - - /** CT_TLTimeConditionList */ class CondListContext : public TimeNodeContext @@ -66,7 +63,6 @@ namespace oox { namespace ppt { AnimationConditionList & maConditions; }; - } } #endif diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx index 7cd404937742..a23447740e0b 100644 --- a/oox/source/ppt/customshowlistcontext.cxx +++ b/oox/source/ppt/customshowlistcontext.cxx @@ -65,8 +65,6 @@ CustomShowContext::~CustomShowContext( ) return this; } - - CustomShowListContext::CustomShowListContext( FragmentHandler2& rParent, std::vector< CustomShow >& rCustomShowList ) : FragmentHandler2( rParent ) @@ -95,7 +93,6 @@ CustomShowListContext::~CustomShowListContext( ) return this; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx index d7befd3053cb..3512ca9d5345 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.hxx +++ b/oox/source/ppt/extdrawingfragmenthandler.hxx @@ -18,7 +18,6 @@ namespace oox { namespace ppt { - class ExtDrawingFragmentHandler : public ::oox::core::FragmentHandler2 { public: diff --git a/oox/source/ppt/headerfootercontext.hxx b/oox/source/ppt/headerfootercontext.hxx index 23deb25c0220..7be60f09fe89 100644 --- a/oox/source/ppt/headerfootercontext.hxx +++ b/oox/source/ppt/headerfootercontext.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef INCLUDED_OOX_SOURCE_PPT_HEADERFOOTERCONTEXT_HXX #define INCLUDED_OOX_SOURCE_PPT_HEADERFOOTERCONTEXT_HXX diff --git a/oox/source/ppt/pptfilterhelpers.cxx b/oox/source/ppt/pptfilterhelpers.cxx index cf8b4625c70b..a5f145b7ed17 100644 --- a/oox/source/ppt/pptfilterhelpers.cxx +++ b/oox/source/ppt/pptfilterhelpers.cxx @@ -26,7 +26,6 @@ namespace oox { namespace ppt { // BEGIN CUT&PASTE from sd pptanimations.hxx - static const transition gTransitions[] = { { "wipe(up)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, true }, @@ -86,7 +85,6 @@ namespace oox { namespace ppt { return NULL; } - bool convertMeasure( OUString& rString ) { bool bRet = false; @@ -188,7 +186,6 @@ namespace oox { namespace ppt { return bRet; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/pptfilterhelpers.hxx b/oox/source/ppt/pptfilterhelpers.hxx index 910f4f4b3bda..7cbedd304081 100644 --- a/oox/source/ppt/pptfilterhelpers.hxx +++ b/oox/source/ppt/pptfilterhelpers.hxx @@ -24,7 +24,6 @@ namespace oox { namespace ppt { - //BEGIN CUT&PASTE from sd pptanimations.hxx // conversion of MS to OOo attributes. enum MS_AttributeNames @@ -69,7 +68,6 @@ namespace oox { namespace ppt { }; //END CUT&PASTE - // BEGIN CUT&PASTE from sd pptanimations.hxx struct transition { @@ -83,12 +81,10 @@ namespace oox { namespace ppt { }; // END CUT&PASTE - // BEGIN CUT&PASTE from sd pptinanimation.cxx bool convertMeasure( OUString& rString ); // END CUT&PASTE from sd pptinanimation.cxx - } } #endif diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx index b0772a87d7e0..124b35e560cd 100644 --- a/oox/source/ppt/pptgraphicshapecontext.cxx +++ b/oox/source/ppt/pptgraphicshapecontext.cxx @@ -196,7 +196,6 @@ ContextHandlerRef PPTGraphicShapeContext::onCreateContext( sal_Int32 aElementTok return GraphicShapeContext::onCreateContext( aElementToken, rAttribs ); } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index 6bfb00cc7b4d..0306ab1dc659 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -87,7 +87,6 @@ bool PowerPointImport::importDocument() throw() maTableStyleListPath = xPresentationFragmentHandler->getFragmentPathFromFirstTypeFromOfficeDoc( "tableStyles" ); return importFragment( xPresentationFragmentHandler ); - } bool PowerPointImport::exportDocument() throw() diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx index 64747a4f3e39..f4dd0042bf77 100644 --- a/oox/source/ppt/pptshapecontext.cxx +++ b/oox/source/ppt/pptshapecontext.cxx @@ -227,7 +227,6 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32 aElementToken, con return this; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index 62e64da4bb13..828295e899c6 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -38,7 +38,6 @@ #include "oox/drawingml/clrschemecontext.hxx" #include "oox/ppt/pptimport.hxx" - using namespace ::com::sun::star; using namespace ::oox::core; using namespace ::oox::drawingml; diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index cc564774ea3f..45b007604ea5 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::presentation; namespace oox { namespace ppt { - SlideTransition::SlideTransition() : mnTransitionType( 0 ) , mnTransitionSubType( 0 ) @@ -51,7 +50,6 @@ namespace oox { namespace ppt { } - SlideTransition::SlideTransition(const OUString & sFilterName) : mnTransitionType( 0 ) , mnTransitionSubType( 0 ) @@ -70,7 +68,6 @@ namespace oox { namespace ppt { } } - void SlideTransition::setSlideProperties( PropertyMap & aProps ) { try @@ -109,7 +106,6 @@ namespace oox { namespace ppt { } } - void SlideTransition::setOoxTransitionSpeed( sal_Int32 nToken) { switch( nToken ) @@ -145,7 +141,6 @@ namespace oox { namespace ppt { return nOdpDirection; } - sal_Int16 SlideTransition::ooxToOdpBorderDirections( ::sal_Int32 nOoxType ) { sal_Int16 nOdpDirection; @@ -227,7 +222,6 @@ namespace oox { namespace ppt { return nOdpDirection; } - sal_Int16 SlideTransition::ooxToOdpDirection( ::sal_Int32 nOoxType ) { sal_Int16 nOdpDir; @@ -409,7 +403,6 @@ namespace oox { namespace ppt { } } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx index 0e7caeb23087..c34c44736c6e 100644 --- a/oox/source/ppt/slidetransitioncontext.cxx +++ b/oox/source/ppt/slidetransitioncontext.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::container; namespace oox { namespace ppt { - SlideTransitionContext::SlideTransitionContext( FragmentHandler2& rParent, const AttributeList& rAttribs, PropertyMap & aProperties ) throw() : FragmentHandler2( rParent ) , maSlideProperties( aProperties ) @@ -162,7 +161,6 @@ void SlideTransitionContext::onEndElement() } } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx index a3104e15dfc4..9d72e3ebeff1 100644 --- a/oox/source/ppt/soundactioncontext.cxx +++ b/oox/source/ppt/soundactioncontext.cxx @@ -30,10 +30,8 @@ using namespace ::oox::core; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::uno; - namespace oox { namespace ppt { - SoundActionContext::SoundActionContext( FragmentHandler2& rParent, PropertyMap & aProperties ) throw() : FragmentHandler2( rParent ) , maSlideProperties( aProperties ) @@ -43,12 +41,10 @@ namespace oox { namespace ppt { { } - SoundActionContext::~SoundActionContext() throw() { } - void SoundActionContext::onEndElement() { if ( isCurrentElement( PPT_TOKEN( sndAc ) ) ) @@ -71,7 +67,6 @@ namespace oox { namespace ppt { } } - ::oox::core::ContextHandlerRef SoundActionContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) { switch( aElementToken ) @@ -100,8 +95,6 @@ namespace oox { namespace ppt { return this; } - - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/timeanimvaluecontext.cxx b/oox/source/ppt/timeanimvaluecontext.cxx index cfae1ceb7db3..922b3ae92123 100644 --- a/oox/source/ppt/timeanimvaluecontext.cxx +++ b/oox/source/ppt/timeanimvaluecontext.cxx @@ -36,12 +36,10 @@ namespace oox { namespace ppt { { } - TimeAnimValueListContext::~TimeAnimValueListContext( ) { } - void TimeAnimValueListContext::onEndElement() { if( isCurrentElement( PPT_TOKEN( tav ) ) ) @@ -50,7 +48,6 @@ namespace oox { namespace ppt { } } - ::oox::core::ContextHandlerRef TimeAnimValueListContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) { @@ -79,7 +76,6 @@ namespace oox { namespace ppt { return this; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx index 00703675e2b7..043c2e94c2ba 100644 --- a/oox/source/ppt/timenode.cxx +++ b/oox/source/ppt/timenode.cxx @@ -96,15 +96,12 @@ namespace oox { namespace ppt { return sServiceName; } - - TimeNode::TimeNode( sal_Int16 nNodeType ) : mnNodeType( nNodeType ) , mbHasEndSyncValue( false ) { } - TimeNode::~TimeNode() { } @@ -176,8 +173,6 @@ namespace oox { namespace ppt { } } - - static void fixInteractiveSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) { try @@ -572,7 +567,6 @@ namespace oox { namespace ppt { } } - Reference< XAnimationNode > TimeNode::createAndInsert( const XmlFilterBase& rFilter, const OUString& rServiceName, @@ -593,7 +587,6 @@ namespace oox { namespace ppt { return Reference< XAnimationNode >(); } - void TimeNode::setId( sal_Int32 nId ) { msId = OUString::number(nId); @@ -604,7 +597,6 @@ namespace oox { namespace ppt { maNodeProperties[ NP_TO ] = aTo; } - void TimeNode::setFrom( const Any & aFrom ) { maNodeProperties[ NP_FROM ] = aFrom; @@ -615,7 +607,6 @@ namespace oox { namespace ppt { maNodeProperties[ NP_BY ] = aBy; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 7955db8e5ec5..a2ab7dce42e3 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -104,7 +104,6 @@ namespace oox { namespace ppt { sal_Int32 three; }; - /** CT_TLMediaNodeAudio CT_TLMediaNodeVideo */ class MediaNodeContext @@ -164,7 +163,6 @@ namespace oox { namespace ppt { bool mbFullScrn; }; - /** CT_TLSetBehavior */ class SetTimeNodeContext @@ -316,7 +314,6 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) @@ -335,7 +332,6 @@ namespace oox { namespace ppt { sal_Int32 maType; }; - /** CT_TLTimeNodeSequence */ class SequenceTimeNodeContext @@ -359,7 +355,6 @@ namespace oox { namespace ppt { { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) @@ -383,7 +378,6 @@ namespace oox { namespace ppt { sal_Int32 mnNextAc, mnPrevAc; }; - /** CT_TLTimeNodeParallel * CT_TLTimeNodeExclusive */ @@ -415,7 +409,6 @@ namespace oox { namespace ppt { }; - /** CT_TLAnimateColorBehavior */ class AnimColorContext : public TimeNodeContext @@ -453,7 +446,6 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) @@ -502,7 +494,6 @@ namespace oox { namespace ppt { return this; } - private: sal_Int32 mnColorSpace; sal_Int32 mnDir; @@ -512,7 +503,6 @@ namespace oox { namespace ppt { oox::drawingml::Color maFromClr; }; - /** CT_TLAnimateBehavior */ class AnimContext : public TimeNodeContext @@ -563,7 +553,6 @@ namespace oox { namespace ppt { mnValueType = xAttribs->getOptionalValueToken( XML_valueType, 0 ); } - virtual ~AnimContext() throw () { ::std::list< TimeAnimationValue >::iterator iter, end; @@ -599,7 +588,6 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) @@ -619,7 +607,6 @@ namespace oox { namespace ppt { TimeAnimationValueList maTavList; }; - /** CT_TLAnimateScaleBehavior */ class AnimScaleContext : public TimeNodeContext @@ -704,7 +691,6 @@ namespace oox { namespace ppt { bool mbZoomContents; }; - /** CT_TLAnimateRotationBehavior */ class AnimRotContext : public TimeNodeContext @@ -756,8 +742,6 @@ namespace oox { namespace ppt { } }; - - /** CT_TLAnimateMotionBehavior */ class AnimMotionContext : public TimeNodeContext @@ -801,7 +785,6 @@ namespace oox { namespace ppt { { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) @@ -858,7 +841,6 @@ namespace oox { namespace ppt { sal_Int32 mnAngle; }; - /** CT_TLAnimateEffectBehavior */ class AnimEffectContext : public TimeNodeContext @@ -882,12 +864,10 @@ namespace oox { namespace ppt { } } - virtual ~AnimEffectContext( ) throw() { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) @@ -909,8 +889,6 @@ namespace oox { namespace ppt { OUString msPrList; }; - - TimeNodeContext * TimeNodeContext::makeContext( FragmentHandler2& rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, @@ -962,7 +940,6 @@ namespace oox { namespace ppt { return pCtx; } - TimeNodeContext::TimeNodeContext( FragmentHandler2& rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& /*xAttribs*/, const TimeNodePtr & pNode ) throw() @@ -972,13 +949,11 @@ namespace oox { namespace ppt { { } - TimeNodeContext::~TimeNodeContext( ) throw() { } - TimeNodeListContext::TimeNodeListContext( FragmentHandler2& rParent, TimeNodePtrList & aList ) throw() : FragmentHandler2( rParent ) @@ -986,12 +961,10 @@ namespace oox { namespace ppt { { } - TimeNodeListContext::~TimeNodeListContext( ) throw() { } - ::oox::core::ContextHandlerRef TimeNodeListContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) { sal_Int16 nNodeType; @@ -1052,7 +1025,6 @@ namespace oox { namespace ppt { return pContext ? pContext : this; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx index 719b36de207a..93e3dd0d5578 100644 --- a/oox/source/ppt/timetargetelementcontext.cxx +++ b/oox/source/ppt/timetargetelementcontext.cxx @@ -34,8 +34,6 @@ using namespace ::oox::core; namespace oox { namespace ppt { - - // CT_TLShapeTargetElement class ShapeTargetElementContext : public FragmentHandler2 @@ -94,8 +92,6 @@ namespace oox { namespace ppt { ShapeTargetElement & maShapeTarget; }; - - TimeTargetElementContext::TimeTargetElementContext( FragmentHandler2& rParent, const AnimTargetElementPtr & pValue ) : FragmentHandler2( rParent ), mpTarget( pValue ) @@ -103,7 +99,6 @@ namespace oox { namespace ppt { OSL_ENSURE( mpTarget, "no valid target passed" ); } - TimeTargetElementContext::~TimeTargetElementContext( ) throw( ) { } @@ -150,7 +145,6 @@ namespace oox { namespace ppt { return this; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |