diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-20 05:53:05 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-20 05:53:05 +0000 |
| commit | 0f287df6c588720c924b2f03209933a6231c904f (patch) | |
| tree | 3a967a24fac6c68eddada98c875d88e38a155d23 /oox/source/drawingml/graphicshapecontext.cxx | |
| parent | 1c5fb0c81ed4ec54ec8358b66ed47832a85bf4d5 (diff) | |
INTEGRATION: CWS ooxtablefilter (1.3.2); FILE MERGED
2008/06/10 09:52:07 sj 1.3.2.2: RESYNC: (1.3-1.5); FILE MERGED
2008/03/20 15:33:23 sj 1.3.2.1: added table import
Diffstat (limited to 'oox/source/drawingml/graphicshapecontext.cxx')
| -rw-r--r-- | oox/source/drawingml/graphicshapecontext.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx index 6334cb00f968..aacc27d7f514 100644 --- a/oox/source/drawingml/graphicshapecontext.cxx +++ b/oox/source/drawingml/graphicshapecontext.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: graphicshapecontext.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * This file is part of OpenOffice.org. * @@ -33,6 +33,7 @@ #include "oox/drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/graphicshapecontext.hxx" #include "oox/drawingml/diagram/diagramfragmenthandler.hxx" +#include "oox/drawingml/table/tablecontext.hxx" #include "oox/core/namespaces.hxx" #include "oox/helper/attributelist.hxx" #include "oox/helper/propertyset.hxx" @@ -134,9 +135,8 @@ Reference< XFastContextHandler > GraphicalObjectFrameContext::createFastChildCon xRet.set( new DiagramGraphicDataContext( *this, mpShapePtr ) ); else if ( sUri.equalsAscii( "http://schemas.openxmlformats.org/drawingml/2006/chart" ) ) xRet.set( new ChartGraphicDataContext( *this, mpShapePtr ) ); - else if ( sUri.equalsAscii( "http://schemas.openxmlformats.org/drawingml/2006/table" ) ) - // TODO deal with tables too. - xRet.set( this ); + else if ( sUri.compareToAscii( "http://schemas.openxmlformats.org/drawingml/2006/table" ) == 0 ) + xRet.set( new table::TableContext( *this, mpShapePtr ) ); else { OSL_TRACE( "OOX: Ignore graphicsData of %s", OUSTRING_TO_CSTR( sUri ) ); |