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/pptshapecontext.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/pptshapecontext.cxx')
| -rw-r--r-- | oox/source/ppt/pptshapecontext.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx index 00631845d63b..843ea3bcdb2e 100644 --- a/oox/source/ppt/pptshapecontext.cxx +++ b/oox/source/ppt/pptshapecontext.cxx @@ -4,9 +4,9 @@ * * $RCSfile: pptshapecontext.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:48:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -64,9 +64,8 @@ using namespace ::com::sun::star::xml::sax; namespace oox { namespace ppt { // CT_Shape -PPTShapeContext::PPTShapeContext( const oox::ppt::SlidePersistPtr pSlidePersistPtr, const FragmentHandlerRef& xHandler, - oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr ) -: oox::drawingml::ShapeContext( xHandler, pMasterShapePtr, pShapePtr ) +PPTShapeContext::PPTShapeContext( ContextHandler& rParent, const SlidePersistPtr pSlidePersistPtr, oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr ) +: oox::drawingml::ShapeContext( rParent, pMasterShapePtr, pShapePtr ) , mpSlidePersistPtr( pSlidePersistPtr ) { } @@ -185,16 +184,16 @@ Reference< XFastContextHandler > PPTShapeContext::createFastChildContext( sal_In // nvSpPr CT_ShapeNonVisual end case NMSP_PPT|XML_spPr: - xRet = new PPTShapePropertiesContext( this, *(mpShapePtr.get()) ); + xRet = new PPTShapePropertiesContext( *this, *mpShapePtr ); break; case NMSP_PPT|XML_style: - xRet = new oox::drawingml::ShapeStyleContext( this, *(mpShapePtr.get()) ); + xRet = new oox::drawingml::ShapeStyleContext( *this, *mpShapePtr ); break; case NMSP_PPT|XML_txBody: { - xRet = new oox::drawingml::TextBodyContext( getHandler(), *(mpShapePtr.get()) ); + xRet = new oox::drawingml::TextBodyContext( *this, *mpShapePtr ); break; } } |