diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-06-13 22:44:43 +0300 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-06-28 09:01:52 +0000 |
| commit | 32ce3c6b0a945078868fb2ae35c9260e4e4c3649 (patch) | |
| tree | b16cbf0d06428ddf0b11dae9f6cc680e11352646 /sc | |
| parent | ee002215ce6379ffcba990035eeb71854441f265 (diff) | |
More OOXML Markup Compatibility and Extensibility (MCE) support
Change many classes in oox to be based on ContextHandler2 instead of
ContextHandler. That supposedly adds MCE support.
This is a minimal initial effort. It compiles and links but doesn't work
(CppunitTest_chart2_export fails). Follow-up coming...
Change-Id: If89117abd48cfead468633fd7fce1ea785f6f420
Reviewed-on: https://gerrit.libreoffice.org/4577
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/inc/drawingfragment.hxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/oox/drawingfragment.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 29902b763b58..27459e0f68cb 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -83,14 +83,14 @@ class GroupShapeContext : public ::oox::drawingml::ShapeGroupContext, public Wor { public: explicit GroupShapeContext( - ::oox::core::ContextHandler& rParent, + ::oox::core::ContextHandler2Helper& rParent, const WorksheetHelper& rHelper, const ::oox::drawingml::ShapePtr& rxParentShape, const ::oox::drawingml::ShapePtr& rxShape ); static ::oox::core::ContextHandlerRef createShapeContext( - ::oox::core::ContextHandler& rParent, + ::oox::core::ContextHandler2Helper& rParent, const WorksheetHelper& rHelper, sal_Int32 nElement, const AttributeList& rAttribs, diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index c8338a961189..b4c1fa7229cc 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -122,14 +122,14 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >& // ============================================================================ -GroupShapeContext::GroupShapeContext( ContextHandler& rParent, +GroupShapeContext::GroupShapeContext( ContextHandler2Helper& rParent, const WorksheetHelper& rHelper, const ShapePtr& rxParentShape, const ShapePtr& rxShape ) : ShapeGroupContext( rParent, rxParentShape, rxShape ), WorksheetHelper( rHelper ) { } -/*static*/ ContextHandlerRef GroupShapeContext::createShapeContext( ContextHandler& rParent, +/*static*/ ContextHandlerRef GroupShapeContext::createShapeContext( ContextHandler2Helper& rParent, const WorksheetHelper& rHelper, sal_Int32 nElement, const AttributeList& rAttribs, const ShapePtr& rxParentShape, ShapePtr* pxShape ) { |