diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 11:00:02 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 11:00:02 +0000 |
| commit | bd46c2baf8d782d8a22507820f250826bd2616f5 (patch) | |
| tree | 45b3e0682268dfb27822f701b39d601ed459c586 /oox/source | |
| parent | 10a265c4c494b22523b7c14a8f0680f4ae7d583b (diff) | |
INTEGRATION: CWS xmlfilter05 (1.3.4); FILE MERGED
2008/05/02 11:17:14 hbrinkm 1.3.4.4: RESYNC: (1.3-1.4); FILE MERGED
2008/04/23 15:58:14 dr 1.3.4.3: a little theme cleanup
2008/04/02 12:41:55 hbrinkm 1.3.4.2: merged changes from xmlfilter04 to xmlfilter05
2008/04/01 15:38:05 hbrinkm 1.3.4.1: 'Merged xmlfilter04'
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/drawingml/objectdefaultcontext.cxx | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/oox/source/drawingml/objectdefaultcontext.cxx b/oox/source/drawingml/objectdefaultcontext.cxx index bb9965cbdc91..a083eba0f822 100644 --- a/oox/source/drawingml/objectdefaultcontext.cxx +++ b/oox/source/drawingml/objectdefaultcontext.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: objectdefaultcontext.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -30,6 +30,7 @@ #include "oox/drawingml/objectdefaultcontext.hxx" #include "oox/drawingml/spdefcontext.hxx" +#include "oox/drawingml/theme.hxx" #include "oox/core/namespaces.hxx" #include "tokens.hxx" @@ -48,29 +49,16 @@ objectDefaultContext::objectDefaultContext( ContextHandler& rParent, Theme& rThe Reference< XFastContextHandler > objectDefaultContext::createFastChildContext( sal_Int32 aElementToken, const Reference< XFastAttributeList >& /* xAttribs */ ) throw (SAXException, RuntimeException) { - Reference< XFastContextHandler > xRet; switch( aElementToken ) { case NMSP_DRAWINGML|XML_spDef: - { - xRet.set( new spDefContext( *this, *mrTheme.getspDef() ) ); - break; - } + return new spDefContext( *this, mrTheme.getSpDef() ); case NMSP_DRAWINGML|XML_lnDef: - { - xRet.set( new spDefContext( *this, *mrTheme.getlnDef() ) ); - break; - } + return new spDefContext( *this, mrTheme.getLnDef() ); case NMSP_DRAWINGML|XML_txDef: - { - xRet.set( new spDefContext( *this, *mrTheme.gettxDef() ) ); - break; - } + return new spDefContext( *this, mrTheme.getTxDef() ); } - if( !xRet.is() ) - xRet.set( this ); - - return xRet; + return 0; } } } |