diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-06-14 16:53:52 +0300 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-06-28 09:02:12 +0000 |
| commit | c7e184598540af5b609e77518abbd0f51b9e38ec (patch) | |
| tree | f7fa74a8bca6572897ea37cd9f8a3daba8c991fd /sc/source | |
| parent | 32ce3c6b0a945078868fb2ae35c9260e4e4c3649 (diff) | |
Further MCE work
As it is wrong (says Thorsten) to override the methods from
XFastContextHandler in ContextHandler2 in its derived classes, mark them with
SAL_FINAL to catch that (when compiling with a compiler thaty supports
"final").
Do corresponding changes then; change createFastChildContext() methods to
onCreateContext() ones instead.
Now the unit tests work, and a sample PPTX that uses embedded OLE thingies
loads without crash, but unfortunately it looks like crap...
Change-Id: Ie30022f37418ba9caf8ce59fe4003b808fa900f3
Reviewed-on: https://gerrit.libreoffice.org/4578
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/filter/inc/drawingfragment.hxx | 7 | ||||
| -rw-r--r-- | sc/source/filter/oox/drawingfragment.cxx | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 27459e0f68cb..3c149c4a3e94 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -98,11 +98,10 @@ public: ::oox::drawingml::ShapePtr* pxShape = 0 ); protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL - createFastChildContext( + virtual ::oox::core::ContextHandlerRef + onCreateContext( sal_Int32 nElement, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; }; // ============================================================================ diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index b4c1fa7229cc..7c864cc63de1 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -169,11 +169,11 @@ GroupShapeContext::GroupShapeContext( ContextHandler2Helper& rParent, return 0; } -Reference< XFastContextHandler > SAL_CALL GroupShapeContext::createFastChildContext( - sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw (SAXException, RuntimeException) +ContextHandlerRef GroupShapeContext::onCreateContext( + sal_Int32 nElement, const AttributeList& rAttribs ) { - ContextHandlerRef xContext = createShapeContext( *this, *this, nElement, AttributeList( rxAttribs ), mpGroupShapePtr ); - return xContext.get() ? xContext.get() : ShapeGroupContext::createFastChildContext( nElement, rxAttribs ); + ContextHandlerRef xContext = createShapeContext( *this, *this, nElement, rAttribs, mpGroupShapePtr ); + return xContext.get() ? xContext.get() : ShapeGroupContext::onCreateContext( nElement, rAttribs ); } // ============================================================================ |