diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-11-29 16:42:13 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-11-30 16:30:22 +0100 |
| commit | 34fe9f92b7bea57c8fd70b4c3de5c90e7f6b128e (patch) | |
| tree | f48764c1df1c0eb50b663ff04253d73fbe0e213a | |
| parent | e238216f4a8344498180731b99c6e6de01947da5 (diff) | |
ofz#4481: move Path2DContext body to onEndElement
Change-Id: Ic06fb71c679e87069afda391e598d360b4b59cc2
Reviewed-on: https://gerrit.libreoffice.org/45534
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | oox/source/drawingml/customshapegeometry.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 04ee4240b98c..5b3b04a4a58f 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -929,7 +929,7 @@ class Path2DContext : public ContextHandler2 { public: Path2DContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< css::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D ); - virtual ~Path2DContext() override; + virtual void onEndElement() override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; @@ -952,7 +952,7 @@ Path2DContext::Path2DContext( ContextHandler2Helper const & rParent, const Attri rPath2D.extrusionOk = rAttribs.getBool( XML_extrusionOk, true ); } -Path2DContext::~Path2DContext() +void Path2DContext::onEndElement() { EnhancedCustomShapeSegment aNewSegment; switch ( mrPath2D.fill ) @@ -988,6 +988,7 @@ Path2DContext::~Path2DContext() mrSegments.push_back( aNewSegment ); } + ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) { |