diff options
| -rw-r--r-- | include/oox/drawingml/textbodycontext.hxx | 4 | ||||
| -rw-r--r-- | include/oox/ppt/pptshapegroupcontext.hxx | 2 | ||||
| -rw-r--r-- | oox/source/ppt/pptshapepropertiescontext.cxx | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/oox/drawingml/textbodycontext.hxx b/include/oox/drawingml/textbodycontext.hxx index aaa6f97e187a..c0a5e759b536 100644 --- a/include/oox/drawingml/textbodycontext.hxx +++ b/include/oox/drawingml/textbodycontext.hxx @@ -46,9 +46,9 @@ class RegularTextRunContext : public ::oox::core::ContextHandler2 public: RegularTextRunContext( ::oox::core::ContextHandler2Helper& rParent, TextRunPtr pRunPtr ); - virtual void SAL_CALL onEndElement() SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void SAL_CALL onCharacters( const OUString& aChars ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& aChars ) SAL_OVERRIDE; protected: TextRunPtr mpRunPtr; diff --git a/include/oox/ppt/pptshapegroupcontext.hxx b/include/oox/ppt/pptshapegroupcontext.hxx index efa2c5b246e7..6a9cd19d81a3 100644 --- a/include/oox/ppt/pptshapegroupcontext.hxx +++ b/include/oox/ppt/pptshapegroupcontext.hxx @@ -43,7 +43,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void SAL_CALL onEndElement() SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; protected: diff --git a/oox/source/ppt/pptshapepropertiescontext.cxx b/oox/source/ppt/pptshapepropertiescontext.cxx index 1ebf9268207c..1dcbda895111 100644 --- a/oox/source/ppt/pptshapepropertiescontext.cxx +++ b/oox/source/ppt/pptshapepropertiescontext.cxx @@ -60,7 +60,6 @@ ContextHandlerRef PPTShapePropertiesContext::onCreateContext( sal_Int32 aElement default: return ShapePropertiesContext::onCreateContext( aElementToken, rAttribs ); } - return 0; } } } |