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 /include/oox/ppt | |
| 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 'include/oox/ppt')
| -rw-r--r-- | include/oox/ppt/pptgraphicshapecontext.hxx | 2 | ||||
| -rw-r--r-- | include/oox/ppt/pptshapecontext.hxx | 2 | ||||
| -rw-r--r-- | include/oox/ppt/pptshapegroupcontext.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/oox/ppt/pptgraphicshapecontext.hxx b/include/oox/ppt/pptgraphicshapecontext.hxx index 180098a67166..ebed5902c27b 100644 --- a/include/oox/ppt/pptgraphicshapecontext.hxx +++ b/include/oox/ppt/pptgraphicshapecontext.hxx @@ -29,7 +29,7 @@ class PPTGraphicShapeContext : public ::oox::drawingml::GraphicShapeContext SlidePersistPtr mpSlidePersistPtr; public: - PPTGraphicShapeContext( ::oox::core::ContextHandler& rParent, const SlidePersistPtr pSlidePersistPtr, oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr ); + PPTGraphicShapeContext( ::oox::core::ContextHandler2Helper& rParent, const SlidePersistPtr pSlidePersistPtr, oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); }; diff --git a/include/oox/ppt/pptshapecontext.hxx b/include/oox/ppt/pptshapecontext.hxx index 59e46b3d54b5..078bc7f8226f 100644 --- a/include/oox/ppt/pptshapecontext.hxx +++ b/include/oox/ppt/pptshapecontext.hxx @@ -29,7 +29,7 @@ class PPTShapeContext : public ::oox::drawingml::ShapeContext SlidePersistPtr mpSlidePersistPtr; public: - PPTShapeContext( ::oox::core::ContextHandler& rParent, const SlidePersistPtr pSlidePersistPtr, oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr ); + PPTShapeContext( ::oox::core::ContextHandler2Helper& rParent, const SlidePersistPtr pSlidePersistPtr, oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); }; diff --git a/include/oox/ppt/pptshapegroupcontext.hxx b/include/oox/ppt/pptshapegroupcontext.hxx index c7e60c76e823..aebc347f47dc 100644 --- a/include/oox/ppt/pptshapegroupcontext.hxx +++ b/include/oox/ppt/pptshapegroupcontext.hxx @@ -34,7 +34,7 @@ class PPTShapeGroupContext : public ::oox::drawingml::ShapeGroupContext public: PPTShapeGroupContext( - ::oox::core::ContextHandler& rParent, + ::oox::core::ContextHandler2Helper& rParent, const oox::ppt::SlidePersistPtr pSlidePersistPtr, const oox::ppt::ShapeLocation eShapeLocation, oox::drawingml::ShapePtr pMasterShapePtr, |