diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:51:09 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:51:09 +0000 |
| commit | 26f51d64b510b23cff0fccc020795c62db239f96 (patch) | |
| tree | e9c2785c68f97bc5642e78d0fd2b6dabd389e8d5 /oox/source/ppt/animvariantcontext.cxx | |
| parent | 8c411921c2b4bf2b19d572e318953f3f8afb1ace (diff) | |
INTEGRATION: CWS xmlfilter03_DEV300 (1.2.4); FILE MERGED
2008/02/04 13:32:48 dr 1.2.4.1: rework of fragment handler/context handler base classes
Diffstat (limited to 'oox/source/ppt/animvariantcontext.cxx')
| -rw-r--r-- | oox/source/ppt/animvariantcontext.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/oox/source/ppt/animvariantcontext.cxx b/oox/source/ppt/animvariantcontext.cxx index 85fc20f55b75..571263d5af4c 100644 --- a/oox/source/ppt/animvariantcontext.cxx +++ b/oox/source/ppt/animvariantcontext.cxx @@ -4,9 +4,9 @@ * * $RCSfile: animvariantcontext.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2008-01-17 08:06:00 $ + * last change: $Author: kz $ $Date: 2008-03-05 18:43:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -56,9 +56,8 @@ using namespace ::com::sun::star::xml::sax; namespace oox { namespace ppt { - AnimVariantContext::AnimVariantContext( const FragmentHandlerRef & xHandler, sal_Int32 aElement, - Any & aValue ) - : Context( xHandler ) + AnimVariantContext::AnimVariantContext( ContextHandler& rParent, sal_Int32 aElement, Any & aValue ) + : ContextHandler( rParent ) , mnElement( aElement ) , maValue( aValue ) { @@ -73,14 +72,14 @@ namespace oox { namespace ppt { { if( ( aElement == mnElement ) && maColor.isUsed() ) { - maValue = makeAny( maColor.getColor( *getHandler()->getFilter().get() ) ); + maValue = makeAny( maColor.getColor( getFilter() ) ); } } Reference< XFastContextHandler > SAL_CALL AnimVariantContext::createFastChildContext( ::sal_Int32 aElementToken, - const Reference< XFastAttributeList >& xAttribs ) + const Reference< XFastAttributeList >& xAttribs ) throw ( SAXException, RuntimeException ) { Reference< XFastContextHandler > xRet; @@ -95,7 +94,7 @@ namespace oox { namespace ppt { break; } case NMSP_PPT|XML_clrVal: - xRet.set( new ::oox::drawingml::colorChoiceContext( getHandler(), maColor ) ); + xRet.set( new ::oox::drawingml::colorChoiceContext( *this, maColor ) ); // we'll defer setting the Any until the end. break; case NMSP_PPT|XML_fltVal: |