diff options
Diffstat (limited to 'oox')
36 files changed, 367 insertions, 367 deletions
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 6262071a49cd..d8e10144a822 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -275,9 +275,9 @@ class PasswordVerifier : public IDocPasswordVerifier public: explicit PasswordVerifier( DocumentDecryption& aDecryptor ); - virtual DocPasswordVerifierResult verifyPassword( const OUString& rPassword, Sequence<NamedValue>& rEncryptionData ); + virtual DocPasswordVerifierResult verifyPassword( const OUString& rPassword, Sequence<NamedValue>& rEncryptionData ) SAL_OVERRIDE; - virtual DocPasswordVerifierResult verifyEncryptionData( const Sequence<NamedValue>& rEncryptionData ); + virtual DocPasswordVerifierResult verifyEncryptionData( const Sequence<NamedValue>& rEncryptionData ) SAL_OVERRIDE; private: DocumentDecryption& mDecryptor; }; diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx index 9c95a822fb63..2432f88fbc93 100644 --- a/oox/source/core/recordparser.cxx +++ b/oox/source/core/recordparser.cxx @@ -50,10 +50,10 @@ public: // com.sun.star.sax.XLocator interface - virtual sal_Int32 SAL_CALL getColumnNumber() throw( RuntimeException, std::exception ); - virtual sal_Int32 SAL_CALL getLineNumber() throw( RuntimeException, std::exception ); - virtual OUString SAL_CALL getPublicId() throw( RuntimeException, std::exception ); - virtual OUString SAL_CALL getSystemId() throw( RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getColumnNumber() throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getLineNumber() throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getPublicId() throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getSystemId() throw( RuntimeException, std::exception ) SAL_OVERRIDE; private: RecordParser* mpParser; diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx index c0cf3b17ead0..76fa8b4dfc4c 100644 --- a/oox/source/crypto/DocumentDecryption.cxx +++ b/oox/source/crypto/DocumentDecryption.cxx @@ -47,22 +47,22 @@ vector<sal_uInt8> convertToVector(Sequence<sal_Int8>& input) class AgileTokenHandler : public cppu::WeakImplHelper1< XFastTokenHandler > { public: - virtual sal_Int32 SAL_CALL getToken( const OUString& /*nIdentifier*/ ) throw (RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getToken( const OUString& /*nIdentifier*/ ) throw (RuntimeException, std::exception) SAL_OVERRIDE { return FastToken::DONTKNOW; } - virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) throw (RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) throw (RuntimeException, std::exception) SAL_OVERRIDE { return FastToken::DONTKNOW; } - virtual OUString SAL_CALL getIdentifier( sal_Int32 /*nToken*/ ) throw (RuntimeException, std::exception) + virtual OUString SAL_CALL getIdentifier( sal_Int32 /*nToken*/ ) throw (RuntimeException, std::exception) SAL_OVERRIDE { return OUString(); } - virtual Sequence<sal_Int8> SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) throw (RuntimeException, std::exception) + virtual Sequence<sal_Int8> SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) throw (RuntimeException, std::exception) SAL_OVERRIDE { return Sequence<sal_Int8>(); } @@ -78,20 +78,20 @@ public: {} void SAL_CALL startDocument() - throw (RuntimeException, SAXException, std::exception) + throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE {} void SAL_CALL endDocument() - throw (RuntimeException, SAXException, std::exception) + throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE {} void SAL_CALL setDocumentLocator( const Reference< XLocator >& /*xLocator*/ ) - throw (RuntimeException, SAXException, std::exception) + throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE {} void SAL_CALL startFastElement( sal_Int32 /*Element*/, const Reference< XFastAttributeList >& /*Attribs*/ ) - throw (RuntimeException, SAXException, std::exception) + throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE {} void SAL_CALL startUnknownElement( const OUString& /*aNamespace*/, const OUString& aName, const Reference< XFastAttributeList >& aAttributeList ) - throw (RuntimeException, SAXException, std::exception) + throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE { if(aName == "keyData") { @@ -173,26 +173,26 @@ public: } void SAL_CALL endFastElement( sal_Int32 /*aElement*/ ) - throw (RuntimeException, SAXException, std::exception) + throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE {} void SAL_CALL endUnknownElement( const OUString& /*aNamespace*/, const OUString& /*aName*/ ) - throw (RuntimeException, SAXException, std::exception) + throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE {} Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 /*aElement*/, const Reference< XFastAttributeList >& /*aAttribs*/ ) - throw (RuntimeException, SAXException, std::exception) + throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE { return NULL; } Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& /*aNamespace*/, const OUString& /*aName*/, const Reference< XFastAttributeList >& /*aAttribs*/ ) - throw (RuntimeException, SAXException, std::exception) + throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE { return this; } void SAL_CALL characters( const OUString& /*aChars*/ ) - throw (RuntimeException, SAXException, std::exception) + throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE {} }; diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx index f12bd51685db..a978e977ce72 100644 --- a/oox/source/docprop/docprophandler.hxx +++ b/oox/source/docprop/docprophandler.hxx @@ -66,19 +66,19 @@ public: // com.sun.star.xml.sax.XFastDocumentHandler - virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // com.sun.star.xml.sax.XFastContextHandler - virtual void SAL_CALL startFastElement( ::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, std::exception); - virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, 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, std::exception); - virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - 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, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, 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, std::exception); - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startFastElement( ::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, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, 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, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, 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, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx index d56a3cdd6b7e..0dd4e5360853 100644 --- a/oox/source/docprop/ooxmldocpropimport.hxx +++ b/oox/source/docprop/ooxmldocpropimport.hxx @@ -41,15 +41,15 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XOOXMLDocumentPropertiesImporter virtual void SAL_CALL importProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxSource, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties >& rxDocumentProperties ) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::Exception, std::exception); + throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx index 46b60d540bcb..71cdedca6897 100644 --- a/oox/source/drawingml/customshapepresets1.cxx +++ b/oox/source/drawingml/customshapepresets1.cxx @@ -25,7 +25,7 @@ namespace { class ShapeCactionButtonSound : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -322,7 +322,7 @@ class ShapeCactionButtonSound : public CustomShapeProvider class ShapeCborderCallout1 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -585,7 +585,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider class ShapeCplaqueTabs : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -782,7 +782,7 @@ class ShapeCplaqueTabs : public CustomShapeProvider class ShapeCcurvedLeftArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1218,7 +1218,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider class ShapeCoctagon : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1397,7 +1397,7 @@ class ShapeCoctagon : public CustomShapeProvider class ShapeCleftRightRibbon : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1917,7 +1917,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider class ShapeCactionButtonInformation : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2361,7 +2361,7 @@ class ShapeCactionButtonInformation : public CustomShapeProvider class ShapeCbentConnector5 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2608,7 +2608,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider class ShapeCcircularArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3058,7 +3058,7 @@ class ShapeCcircularArrow : public CustomShapeProvider class ShapeCdownArrowCallout : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3385,7 +3385,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider class ShapeCmathMinus : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3543,7 +3543,7 @@ class ShapeCmathMinus : public CustomShapeProvider class ShapeCgear9 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4224,7 +4224,7 @@ class ShapeCgear9 : public CustomShapeProvider class ShapeCround1Rect : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4397,7 +4397,7 @@ class ShapeCround1Rect : public CustomShapeProvider class ShapeCsun : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4738,7 +4738,7 @@ class ShapeCsun : public CustomShapeProvider class ShapeCplaque : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4953,7 +4953,7 @@ class ShapeCplaque : public CustomShapeProvider class ShapeCchevron : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5124,7 +5124,7 @@ class ShapeCchevron : public CustomShapeProvider class ShapeCflowChartPreparation : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5258,7 +5258,7 @@ class ShapeCflowChartPreparation : public CustomShapeProvider class ShapeCdiagStripe : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5418,7 +5418,7 @@ class ShapeCdiagStripe : public CustomShapeProvider class ShapeCpentagon : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5560,7 +5560,7 @@ class ShapeCpentagon : public CustomShapeProvider class ShapeCfunnel : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5740,7 +5740,7 @@ class ShapeCfunnel : public CustomShapeProvider class ShapeCchartStar : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5874,7 +5874,7 @@ class ShapeCchartStar : public CustomShapeProvider class ShapeCaccentBorderCallout1 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6151,7 +6151,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider class ShapeCnotchedRightArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6375,7 +6375,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider class ShapeCrightBracket : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6595,7 +6595,7 @@ class ShapeCrightBracket : public CustomShapeProvider class ShapeCflowChartOffpageConnector : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6723,7 +6723,7 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider class ShapeCleftRightArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6958,7 +6958,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider class ShapeCdecagon : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7119,7 +7119,7 @@ class ShapeCdecagon : public CustomShapeProvider class ShapeCactionButtonHelp : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7634,7 +7634,7 @@ class ShapeCactionButtonHelp : public CustomShapeProvider class ShapeCstar24 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8088,7 +8088,7 @@ class ShapeCstar24 : public CustomShapeProvider class ShapeCmathDivide : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8382,7 +8382,7 @@ class ShapeCmathDivide : public CustomShapeProvider class ShapeCcurvedConnector4 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8613,7 +8613,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider class ShapeCflowChartOr : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8850,7 +8850,7 @@ class ShapeCflowChartOr : public CustomShapeProvider class ShapeCborderCallout3 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -9259,7 +9259,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider class ShapeCupDownArrowCallout : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -9624,7 +9624,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider class ShapeCflowChartDecision : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; diff --git a/oox/source/drawingml/customshapepresets2.cxx b/oox/source/drawingml/customshapepresets2.cxx index 3079aea4dc24..19e781906aca 100644 --- a/oox/source/drawingml/customshapepresets2.cxx +++ b/oox/source/drawingml/customshapepresets2.cxx @@ -25,7 +25,7 @@ namespace { class ShapeCleftRightArrowCallout : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -390,7 +390,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider class ShapeCflowChartManualOperation : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -515,7 +515,7 @@ class ShapeCflowChartManualOperation : public CustomShapeProvider class ShapeCsnipRoundRect : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -739,7 +739,7 @@ class ShapeCsnipRoundRect : public CustomShapeProvider class ShapeCmathPlus : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -943,7 +943,7 @@ class ShapeCmathPlus : public CustomShapeProvider class ShapeCactionButtonForwardNext : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1145,7 +1145,7 @@ class ShapeCactionButtonForwardNext : public CustomShapeProvider class ShapeCcan : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1415,7 +1415,7 @@ class ShapeCcan : public CustomShapeProvider class ShapeCfoldedCorner : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1647,7 +1647,7 @@ class ShapeCfoldedCorner : public CustomShapeProvider class ShapeCstar32 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2203,7 +2203,7 @@ class ShapeCstar32 : public CustomShapeProvider class ShapeCflowChartInternalStorage : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2391,7 +2391,7 @@ class ShapeCflowChartInternalStorage : public CustomShapeProvider class ShapeCupDownArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2627,7 +2627,7 @@ class ShapeCupDownArrow : public CustomShapeProvider class ShapeCirregularSeal2 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2877,7 +2877,7 @@ class ShapeCirregularSeal2 : public CustomShapeProvider class ShapeCmathEqual : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3107,7 +3107,7 @@ class ShapeCmathEqual : public CustomShapeProvider class ShapeCstar12 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3394,7 +3394,7 @@ class ShapeCstar12 : public CustomShapeProvider class ShapeCuturnArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3829,7 +3829,7 @@ class ShapeCuturnArrow : public CustomShapeProvider class ShapeCsquareTabs : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4014,7 +4014,7 @@ class ShapeCsquareTabs : public CustomShapeProvider class ShapeCleftRightUpArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4333,7 +4333,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider class ShapeCupArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4552,7 +4552,7 @@ class ShapeCupArrow : public CustomShapeProvider class ShapeChomePlate : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4716,7 +4716,7 @@ class ShapeChomePlate : public CustomShapeProvider class ShapeCdodecagon : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4873,7 +4873,7 @@ class ShapeCdodecagon : public CustomShapeProvider class ShapeCleftArrowCallout : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5200,7 +5200,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider class ShapeCchord : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5375,7 +5375,7 @@ class ShapeCchord : public CustomShapeProvider class ShapeCquadArrowCallout : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5816,7 +5816,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider class ShapeCactionButtonBeginning : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6092,7 +6092,7 @@ class ShapeCactionButtonBeginning : public CustomShapeProvider class ShapeCellipse : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6244,7 +6244,7 @@ class ShapeCellipse : public CustomShapeProvider class ShapeCactionButtonEnd : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6520,7 +6520,7 @@ class ShapeCactionButtonEnd : public CustomShapeProvider class ShapeCarc : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6738,7 +6738,7 @@ class ShapeCarc : public CustomShapeProvider class ShapeCstar16 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7085,7 +7085,7 @@ class ShapeCstar16 : public CustomShapeProvider class ShapeCparallelogram : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7258,7 +7258,7 @@ class ShapeCparallelogram : public CustomShapeProvider class ShapeCbevel : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7617,7 +7617,7 @@ class ShapeCbevel : public CustomShapeProvider class ShapeCroundRect : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7832,7 +7832,7 @@ class ShapeCroundRect : public CustomShapeProvider class ShapeCaccentCallout1 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8110,7 +8110,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider class ShapeCflowChartSort : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8288,7 +8288,7 @@ class ShapeCflowChartSort : public CustomShapeProvider class ShapeCstar8 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8525,7 +8525,7 @@ class ShapeCstar8 : public CustomShapeProvider class ShapeCflowChartAlternateProcess : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8696,7 +8696,7 @@ class ShapeCflowChartAlternateProcess : public CustomShapeProvider class ShapeCmoon : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; diff --git a/oox/source/drawingml/customshapepresets3.cxx b/oox/source/drawingml/customshapepresets3.cxx index bfe10271be0c..3973ef126223 100644 --- a/oox/source/drawingml/customshapepresets3.cxx +++ b/oox/source/drawingml/customshapepresets3.cxx @@ -25,7 +25,7 @@ namespace { class ShapeCstar6 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -242,7 +242,7 @@ class ShapeCstar6 : public CustomShapeProvider class ShapeCround2SameRect : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -509,7 +509,7 @@ class ShapeCround2SameRect : public CustomShapeProvider class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -718,7 +718,7 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider class ShapeCdiamond : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -833,7 +833,7 @@ class ShapeCdiamond : public CustomShapeProvider class ShapeCcallout2 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1170,7 +1170,7 @@ class ShapeCcallout2 : public CustomShapeProvider class ShapeCellipseRibbon : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1756,7 +1756,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider class ShapeCpie : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1935,7 +1935,7 @@ class ShapeCpie : public CustomShapeProvider class ShapeCstar4 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2120,7 +2120,7 @@ class ShapeCstar4 : public CustomShapeProvider class ShapeCflowChartPredefinedProcess : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2308,7 +2308,7 @@ class ShapeCflowChartPredefinedProcess : public CustomShapeProvider class ShapeCflowChartPunchedTape : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2473,7 +2473,7 @@ class ShapeCflowChartPunchedTape : public CustomShapeProvider class ShapeCcurvedConnector2 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2584,7 +2584,7 @@ class ShapeCcurvedConnector2 : public CustomShapeProvider class ShapeCbentConnector3 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2737,7 +2737,7 @@ class ShapeCbentConnector3 : public CustomShapeProvider class ShapeCcornerTabs : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2902,7 +2902,7 @@ class ShapeCcornerTabs : public CustomShapeProvider class ShapeChexagon : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3090,7 +3090,7 @@ class ShapeChexagon : public CustomShapeProvider class ShapeCflowChartConnector : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3242,7 +3242,7 @@ class ShapeCflowChartConnector : public CustomShapeProvider class ShapeCflowChartMagneticDisk : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3457,7 +3457,7 @@ class ShapeCflowChartMagneticDisk : public CustomShapeProvider class ShapeCheart : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3593,7 +3593,7 @@ class ShapeCheart : public CustomShapeProvider class ShapeCribbon2 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4247,7 +4247,7 @@ class ShapeCribbon2 : public CustomShapeProvider class ShapeCbracePair : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4670,7 +4670,7 @@ class ShapeCbracePair : public CustomShapeProvider class ShapeCflowChartExtract : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4788,7 +4788,7 @@ class ShapeCflowChartExtract : public CustomShapeProvider class ShapeCactionButtonHome : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5229,7 +5229,7 @@ class ShapeCactionButtonHome : public CustomShapeProvider class ShapeCaccentBorderCallout3 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5652,7 +5652,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider class ShapeCflowChartOfflineStorage : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5817,7 +5817,7 @@ class ShapeCflowChartOfflineStorage : public CustomShapeProvider class ShapeCirregularSeal1 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6045,7 +6045,7 @@ class ShapeCirregularSeal1 : public CustomShapeProvider class ShapeCquadArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6400,7 +6400,7 @@ class ShapeCquadArrow : public CustomShapeProvider class ShapeCleftBrace : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6727,7 +6727,7 @@ class ShapeCleftBrace : public CustomShapeProvider class ShapeCleftBracket : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6947,7 +6947,7 @@ class ShapeCleftBracket : public CustomShapeProvider class ShapeCblockArc : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7207,7 +7207,7 @@ class ShapeCblockArc : public CustomShapeProvider class ShapeCcurvedConnector3 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7379,7 +7379,7 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider class ShapeCwedgeRoundRectCallout : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7717,7 +7717,7 @@ class ShapeCwedgeRoundRectCallout : public CustomShapeProvider class ShapeCactionButtonMovie : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8195,7 +8195,7 @@ class ShapeCactionButtonMovie : public CustomShapeProvider class ShapeCflowChartOnlineStorage : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8340,7 +8340,7 @@ class ShapeCflowChartOnlineStorage : public CustomShapeProvider class ShapeCgear6 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8799,7 +8799,7 @@ class ShapeCgear6 : public CustomShapeProvider class ShapeChalfFrame : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -9019,7 +9019,7 @@ class ShapeChalfFrame : public CustomShapeProvider class ShapeCsnip2SameRect : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; diff --git a/oox/source/drawingml/customshapepresets4.cxx b/oox/source/drawingml/customshapepresets4.cxx index 56ef5d9c3d06..47b10977b1bc 100644 --- a/oox/source/drawingml/customshapepresets4.cxx +++ b/oox/source/drawingml/customshapepresets4.cxx @@ -25,7 +25,7 @@ namespace { class ShapeCtriangle : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -177,7 +177,7 @@ class ShapeCtriangle : public CustomShapeProvider class ShapeCteardrop : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -393,7 +393,7 @@ class ShapeCteardrop : public CustomShapeProvider class ShapeCflowChartDocument : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -527,7 +527,7 @@ class ShapeCflowChartDocument : public CustomShapeProvider class ShapeCrightArrowCallout : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -854,7 +854,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider class ShapeCrightBrace : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1182,7 +1182,7 @@ class ShapeCrightBrace : public CustomShapeProvider class ShapeCchartPlus : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1304,7 +1304,7 @@ class ShapeCchartPlus : public CustomShapeProvider class ShapeCflowChartManualInput : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1428,7 +1428,7 @@ class ShapeCflowChartManualInput : public CustomShapeProvider class ShapeCflowChartMerge : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1546,7 +1546,7 @@ class ShapeCflowChartMerge : public CustomShapeProvider class ShapeCline : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1617,7 +1617,7 @@ class ShapeCline : public CustomShapeProvider class ShapeCdownArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1836,7 +1836,7 @@ class ShapeCdownArrow : public CustomShapeProvider class ShapeCcurvedDownArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2280,7 +2280,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider class ShapeCactionButtonReturn : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2785,7 +2785,7 @@ class ShapeCactionButtonReturn : public CustomShapeProvider class ShapeCflowChartInputOutput : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2912,7 +2912,7 @@ class ShapeCflowChartInputOutput : public CustomShapeProvider class ShapeCbracketPair : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3206,7 +3206,7 @@ class ShapeCbracketPair : public CustomShapeProvider class ShapeCsmileyFace : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3460,7 +3460,7 @@ class ShapeCsmileyFace : public CustomShapeProvider class ShapeCactionButtonBlank : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3571,7 +3571,7 @@ class ShapeCactionButtonBlank : public CustomShapeProvider class ShapeCwave : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3815,7 +3815,7 @@ class ShapeCwave : public CustomShapeProvider class ShapeCswooshArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4063,7 +4063,7 @@ class ShapeCswooshArrow : public CustomShapeProvider class ShapeCflowChartSummingJunction : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4300,7 +4300,7 @@ class ShapeCflowChartSummingJunction : public CustomShapeProvider class ShapeClightningBolt : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4469,7 +4469,7 @@ class ShapeClightningBolt : public CustomShapeProvider class ShapeCflowChartDisplay : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4607,7 +4607,7 @@ class ShapeCflowChartDisplay : public CustomShapeProvider class ShapeCactionButtonBackPrevious : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4809,7 +4809,7 @@ class ShapeCactionButtonBackPrevious : public CustomShapeProvider class ShapeCframe : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4990,7 +4990,7 @@ class ShapeCframe : public CustomShapeProvider class ShapeCrtTriangle : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5100,7 +5100,7 @@ class ShapeCrtTriangle : public CustomShapeProvider class ShapeCflowChartMagneticTape : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5264,7 +5264,7 @@ class ShapeCflowChartMagneticTape : public CustomShapeProvider class ShapeCcurvedRightArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5699,7 +5699,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider class ShapeCleftUpArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5991,7 +5991,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider class ShapeCwedgeEllipseCallout : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6203,7 +6203,7 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider class ShapeCdoubleWave : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6483,7 +6483,7 @@ class ShapeCdoubleWave : public CustomShapeProvider class ShapeCbentArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6831,7 +6831,7 @@ class ShapeCbentArrow : public CustomShapeProvider class ShapeCstar10 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7101,7 +7101,7 @@ class ShapeCstar10 : public CustomShapeProvider class ShapeCleftArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7320,7 +7320,7 @@ class ShapeCleftArrow : public CustomShapeProvider class ShapeCcurvedUpArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7758,7 +7758,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider class ShapeCsnip1Rect : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7922,7 +7922,7 @@ class ShapeCsnip1Rect : public CustomShapeProvider class ShapeCellipseRibbon2 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; diff --git a/oox/source/drawingml/customshapepresets5.cxx b/oox/source/drawingml/customshapepresets5.cxx index c59890e0c2cf..9b663ce84c4a 100644 --- a/oox/source/drawingml/customshapepresets5.cxx +++ b/oox/source/drawingml/customshapepresets5.cxx @@ -25,7 +25,7 @@ namespace { class ShapeCplus : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -228,7 +228,7 @@ class ShapeCplus : public CustomShapeProvider class ShapeCaccentCallout3 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -652,7 +652,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider class ShapeCleftCircularArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1121,7 +1121,7 @@ class ShapeCleftCircularArrow : public CustomShapeProvider class ShapeCrightArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1340,7 +1340,7 @@ class ShapeCrightArrow : public CustomShapeProvider class ShapeCflowChartPunchedCard : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1468,7 +1468,7 @@ class ShapeCflowChartPunchedCard : public CustomShapeProvider class ShapeCsnip2DiagRect : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1695,7 +1695,7 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider class ShapeCverticalScroll : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2231,7 +2231,7 @@ class ShapeCverticalScroll : public CustomShapeProvider class ShapeCstar7 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2482,7 +2482,7 @@ class ShapeCstar7 : public CustomShapeProvider class ShapeCchartX : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2604,7 +2604,7 @@ class ShapeCchartX : public CustomShapeProvider class ShapeCcloud : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3066,7 +3066,7 @@ class ShapeCcloud : public CustomShapeProvider class ShapeCcube : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3343,7 +3343,7 @@ class ShapeCcube : public CustomShapeProvider class ShapeCround2DiagRect : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -3610,7 +3610,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider class ShapeCflowChartMultidocument : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4062,7 +4062,7 @@ class ShapeCflowChartMultidocument : public CustomShapeProvider class ShapeCactionButtonDocument : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4341,7 +4341,7 @@ class ShapeCactionButtonDocument : public CustomShapeProvider class ShapeCflowChartTerminator : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4489,7 +4489,7 @@ class ShapeCflowChartTerminator : public CustomShapeProvider class ShapeCflowChartDelay : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4616,7 +4616,7 @@ class ShapeCflowChartDelay : public CustomShapeProvider class ShapeCcurvedConnector5 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -4906,7 +4906,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider class ShapeChorizontalScroll : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5441,7 +5441,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider class ShapeCbentConnector4 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -5641,7 +5641,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider class ShapeCleftRightCircularArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6146,7 +6146,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider class ShapeCwedgeRectCallout : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6419,7 +6419,7 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider class ShapeCaccentCallout2 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6770,7 +6770,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider class ShapeCflowChartMagneticDrum : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -6997,7 +6997,7 @@ class ShapeCflowChartMagneticDrum : public CustomShapeProvider class ShapeCcorner : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7213,7 +7213,7 @@ class ShapeCcorner : public CustomShapeProvider class ShapeCborderCallout2 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7549,7 +7549,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider class ShapeCdonut : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7799,7 +7799,7 @@ class ShapeCdonut : public CustomShapeProvider class ShapeCflowChartCollate : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -7934,7 +7934,7 @@ class ShapeCflowChartCollate : public CustomShapeProvider class ShapeCmathNotEqual : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8281,7 +8281,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider class ShapeCbentConnector2 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8385,7 +8385,7 @@ class ShapeCbentConnector2 : public CustomShapeProvider class ShapeCmathMultiply : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8608,7 +8608,7 @@ class ShapeCmathMultiply : public CustomShapeProvider class ShapeCheptagon : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8764,7 +8764,7 @@ class ShapeCheptagon : public CustomShapeProvider class ShapeCrect : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -8875,7 +8875,7 @@ class ShapeCrect : public CustomShapeProvider class ShapeCaccentBorderCallout2 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -9225,7 +9225,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider class ShapeCpieWedge : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -9345,7 +9345,7 @@ class ShapeCpieWedge : public CustomShapeProvider class ShapeCupArrowCallout : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; diff --git a/oox/source/drawingml/customshapepresets6.cxx b/oox/source/drawingml/customshapepresets6.cxx index 1c4d73c21807..c8d97561d814 100644 --- a/oox/source/drawingml/customshapepresets6.cxx +++ b/oox/source/drawingml/customshapepresets6.cxx @@ -25,7 +25,7 @@ namespace { class ShapeCflowChartProcess : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -147,7 +147,7 @@ class ShapeCflowChartProcess : public CustomShapeProvider class ShapeCstar5 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -368,7 +368,7 @@ class ShapeCstar5 : public CustomShapeProvider class ShapeClineInv : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -439,7 +439,7 @@ class ShapeClineInv : public CustomShapeProvider class ShapeCstraightConnector1 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -538,7 +538,7 @@ class ShapeCstraightConnector1 : public CustomShapeProvider class ShapeCstripedRightArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -807,7 +807,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider class ShapeCcallout3 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1217,7 +1217,7 @@ class ShapeCcallout3 : public CustomShapeProvider class ShapeCbentUpArrow : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1490,7 +1490,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider class ShapeCnoSmoking : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1746,7 +1746,7 @@ class ShapeCnoSmoking : public CustomShapeProvider class ShapeCtrapezoid : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -1911,7 +1911,7 @@ class ShapeCtrapezoid : public CustomShapeProvider class ShapeCcloudCallout : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2560,7 +2560,7 @@ class ShapeCcloudCallout : public CustomShapeProvider class ShapeCcallout1 : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; @@ -2824,7 +2824,7 @@ class ShapeCcallout1 : public CustomShapeProvider class ShapeCribbon : public CustomShapeProvider { - virtual PropertyMap getProperties() + virtual PropertyMap getProperties() SAL_OVERRIDE { PropertyMap aPropertyMap; diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx index e1b255f16d85..6c2ffd6183b9 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx @@ -32,7 +32,7 @@ public: DiagramDataFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr pDataPtr ) throw(); virtual ~DiagramDataFragmentHandler() throw(); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; private: @@ -48,7 +48,7 @@ public: DiagramLayoutFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr pDataPtr ) throw(); virtual ~DiagramLayoutFragmentHandler() throw(); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; private: @@ -64,10 +64,10 @@ public: const OUString& rFragmentPath, DiagramQStyleMap& rStylesMap ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onEndElement(); + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; private: ::oox::core::ContextHandlerRef createStyleMatrixContext(sal_Int32 nElement, @@ -87,10 +87,10 @@ public: const OUString& rFragmentPath, DiagramColorMap& rColorMap ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onEndElement(); + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; private: OUString maColorName; diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 5b4cfc85ea99..ba1f8574961e 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -517,12 +517,12 @@ class ShapeLayoutingVisitor : public LayoutAtomVisitor const Diagram& mrDgm; OUString maName; - virtual void visit(ConstraintAtom& rAtom); - virtual void visit(AlgAtom& rAtom); - virtual void visit(ForEachAtom& rAtom); - virtual void visit(ConditionAtom& rAtom); - virtual void visit(ChooseAtom& rAtom); - virtual void visit(LayoutNode& rAtom); + virtual void visit(ConstraintAtom& rAtom) SAL_OVERRIDE; + virtual void visit(AlgAtom& rAtom) SAL_OVERRIDE; + virtual void visit(ForEachAtom& rAtom) SAL_OVERRIDE; + virtual void visit(ConditionAtom& rAtom) SAL_OVERRIDE; + virtual void visit(ChooseAtom& rAtom) SAL_OVERRIDE; + virtual void visit(LayoutNode& rAtom) SAL_OVERRIDE; public: ShapeLayoutingVisitor(const ShapePtr& rParentShape, @@ -542,12 +542,12 @@ class ShallowPresNameVisitor : public LayoutAtomVisitor size_t mnCnt; void defaultVisit(LayoutAtom& rAtom); - virtual void visit(ConstraintAtom& rAtom); - virtual void visit(AlgAtom& rAtom); - virtual void visit(ForEachAtom& rAtom); - virtual void visit(ConditionAtom& rAtom); - virtual void visit(ChooseAtom& rAtom); - virtual void visit(LayoutNode& rAtom); + virtual void visit(ConstraintAtom& rAtom) SAL_OVERRIDE; + virtual void visit(AlgAtom& rAtom) SAL_OVERRIDE; + virtual void visit(ForEachAtom& rAtom) SAL_OVERRIDE; + virtual void visit(ConditionAtom& rAtom) SAL_OVERRIDE; + virtual void visit(ChooseAtom& rAtom) SAL_OVERRIDE; + virtual void visit(LayoutNode& rAtom) SAL_OVERRIDE; public: ShallowPresNameVisitor(const Diagram& rDgm) : diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx index efecaeb7b72c..56ce61bc459a 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx @@ -110,7 +110,7 @@ public: virtual ~ConstraintAtom() { } - virtual void accept( LayoutAtomVisitor& ); + virtual void accept( LayoutAtomVisitor& ) SAL_OVERRIDE; void setFor( sal_Int32 nToken ) { mnFor = nToken; } @@ -160,7 +160,7 @@ public: typedef std::map<sal_Int32,sal_Int32> ParamMap; - virtual void accept( LayoutAtomVisitor& ); + virtual void accept( LayoutAtomVisitor& ) SAL_OVERRIDE; void setType( sal_Int32 nToken ) { mnType = nToken; } @@ -186,7 +186,7 @@ public: IteratorAttr & iterator() { return maIter; } - virtual void accept( LayoutAtomVisitor& ); + virtual void accept( LayoutAtomVisitor& ) SAL_OVERRIDE; private: IteratorAttr maIter; @@ -203,15 +203,15 @@ public: virtual ~ConditionAtom() { } bool test(); - virtual void accept( LayoutAtomVisitor& ); + virtual void accept( LayoutAtomVisitor& ) SAL_OVERRIDE; IteratorAttr & iterator() { return maIter; } ConditionAttr & cond() { return maCond; } void readElseBranch() { mbElse=true; } - virtual void addChild( const LayoutAtomPtr & pNode ); - virtual const std::vector<LayoutAtomPtr>& getChildren() const; + virtual void addChild( const LayoutAtomPtr & pNode ) SAL_OVERRIDE; + virtual const std::vector<LayoutAtomPtr>& getChildren() const SAL_OVERRIDE; private: bool mbElse; IteratorAttr maIter; @@ -229,7 +229,7 @@ class ChooseAtom public: virtual ~ChooseAtom() { } - virtual void accept( LayoutAtomVisitor& ); + virtual void accept( LayoutAtomVisitor& ) SAL_OVERRIDE; }; class LayoutNode @@ -253,7 +253,7 @@ public: LayoutNode() : mnChildOrder(0) {} virtual ~LayoutNode() { } - virtual void accept( LayoutAtomVisitor& ); + virtual void accept( LayoutAtomVisitor& ) SAL_OVERRIDE; VarMap & variables() { return mVariables; } void setMoveWith( const OUString & sName ) @@ -299,12 +299,12 @@ class ShapeCreationVisitor : public LayoutAtomVisitor sal_Int32 mnCurrIdx; void defaultVisit(LayoutAtom& rAtom); - virtual void visit(ConstraintAtom& rAtom); - virtual void visit(AlgAtom& rAtom); - virtual void visit(ForEachAtom& rAtom); - virtual void visit(ConditionAtom& rAtom); - virtual void visit(ChooseAtom& rAtom); - virtual void visit(LayoutNode& rAtom); + virtual void visit(ConstraintAtom& rAtom) SAL_OVERRIDE; + virtual void visit(AlgAtom& rAtom) SAL_OVERRIDE; + virtual void visit(ForEachAtom& rAtom) SAL_OVERRIDE; + virtual void visit(ConditionAtom& rAtom) SAL_OVERRIDE; + virtual void visit(ChooseAtom& rAtom) SAL_OVERRIDE; + virtual void visit(LayoutNode& rAtom) SAL_OVERRIDE; public: ShapeCreationVisitor(const ShapePtr& rParentShape, diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx index 17c16efeae15..10de2df161e7 100644 --- a/oox/source/drawingml/diagram/layoutnodecontext.cxx +++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx @@ -167,7 +167,7 @@ public: } virtual ContextHandlerRef onCreateContext( ::sal_Int32 aElement, const AttributeList& rAttribs ) - throw (SAXException, RuntimeException) + throw (SAXException, RuntimeException) SAL_OVERRIDE { sal_Int32 nIdx = LayoutNodeContext::tagToVarIdx( getBaseToken( aElement ) ); if( nIdx != -1 ) diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx index b69c43c2a6e6..d3fe84806507 100644 --- a/oox/source/export/ColorPropertySet.cxx +++ b/oox/source/export/ColorPropertySet.cxx @@ -43,9 +43,9 @@ public: protected: // ____ XPropertySetInfo ____ - virtual Sequence< Property > SAL_CALL getProperties() throw (RuntimeException, std::exception); - virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception); + virtual Sequence< Property > SAL_CALL getProperties() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception) SAL_OVERRIDE; private: OUString m_aColorPropName; diff --git a/oox/source/export/ColorPropertySet.hxx b/oox/source/export/ColorPropertySet.hxx index 9228cd7504d1..0463163133d9 100644 --- a/oox/source/export/ColorPropertySet.hxx +++ b/oox/source/export/ColorPropertySet.hxx @@ -44,7 +44,7 @@ public: protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) @@ -52,55 +52,55 @@ protected: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XPropertyState ____ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< diff --git a/oox/source/helper/progressbar.cxx b/oox/source/helper/progressbar.cxx index 9ea041bca878..ab616772d7c9 100644 --- a/oox/source/helper/progressbar.cxx +++ b/oox/source/helper/progressbar.cxx @@ -86,11 +86,11 @@ class SubSegment : public ISegmentProgressBar public: explicit SubSegment( IProgressBar& rParentProgress, double fStartPos, double fLength ); - virtual double getPosition() const; - virtual void setPosition( double fPosition ); + virtual double getPosition() const SAL_OVERRIDE; + virtual void setPosition( double fPosition ) SAL_OVERRIDE; - virtual double getFreeLength() const; - virtual ISegmentProgressBarRef createSegment( double fLength ); + virtual double getFreeLength() const SAL_OVERRIDE; + virtual ISegmentProgressBarRef createSegment( double fLength ) SAL_OVERRIDE; private: IProgressBar& mrParentProgress; diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 7c26267d4678..05c3b135ea54 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -104,18 +104,18 @@ public: explicit GenericPropertySet( const PropertyMap& rPropMap ); // XPropertySet - virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception); - virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception); + virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySetInfo - virtual Sequence< Property > SAL_CALL getProperties() throw (RuntimeException, std::exception); - virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception); + virtual Sequence< Property > SAL_CALL getProperties() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception) SAL_OVERRIDE; private: osl::Mutex mMutex; diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx index ab966a9befaf..c368a205cd66 100644 --- a/oox/source/helper/textinputstream.cxx +++ b/oox/source/helper/textinputstream.cxx @@ -47,15 +47,15 @@ public: explicit UnoBinaryInputStream( BinaryInputStream& rInStrm ); virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL available() - throw (NotConnectedException, IOException, RuntimeException, std::exception); + throw (NotConnectedException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeInput() - throw (NotConnectedException, IOException, RuntimeException, std::exception); + throw (NotConnectedException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; private: void ensureConnected() const throw (NotConnectedException); diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx index 4b8d3886e266..9ff7bc883630 100644 --- a/oox/source/ole/olestorage.cxx +++ b/oox/source/ole/olestorage.cxx @@ -65,13 +65,13 @@ public: const OUString& rElementName ); virtual ~OleOutputStream(); - virtual void SAL_CALL seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException, std::exception ); - virtual sal_Int64 SAL_CALL getPosition() throw( IOException, RuntimeException, std::exception ); - virtual sal_Int64 SAL_CALL getLength() throw( IOException, RuntimeException, std::exception ); + virtual void SAL_CALL seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getPosition() throw( IOException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getLength() throw( IOException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ); - virtual void SAL_CALL flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ); - virtual void SAL_CALL closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ); + virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) SAL_OVERRIDE; private: void ensureSeekable() const throw( IOException ); diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx index dc1c9adc199f..5fb00c0a1b75 100644 --- a/oox/source/ole/vbamodule.cxx +++ b/oox/source/ole/vbamodule.cxx @@ -60,7 +60,7 @@ class OleIdToNameContainer : public OleIdToNameContainer_BASE public: OleIdToNameContainer() {} // XIndexContainer Methods - virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) + virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); OUString sOleName; @@ -68,7 +68,7 @@ public: throw IllegalArgumentException(); ObjIdToNameHash[ Index ] = sOleName; } - virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) + virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByIndex( Index ) ) @@ -76,7 +76,7 @@ public: ObjIdToNameHash.erase( ObjIdToNameHash.find( Index ) ); } // XIndexReplace Methods - virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) + virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByIndex( Index ) ) @@ -87,12 +87,12 @@ public: ObjIdToNameHash[ Index ] = sOleName; } // XIndexAccess Methods - virtual ::sal_Int32 SAL_CALL getCount( ) throw (RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); return ObjIdToNameHash.size(); } - virtual Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) + virtual Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByIndex( Index ) ) @@ -100,11 +100,11 @@ public: return makeAny( ObjIdToNameHash[ Index ] ); } // XElementAccess Methods - virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) + virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) SAL_OVERRIDE { return ::getCppuType( static_cast< const OUString* >( 0 ) ); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); return ( getCount() > 0 ); diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx index 7affdf9d6478..714eb9ede7eb 100644 --- a/oox/source/ppt/animvariantcontext.hxx +++ b/oox/source/ppt/animvariantcontext.hxx @@ -34,8 +34,8 @@ namespace oox { namespace ppt { public: AnimVariantContext( ::oox::core::FragmentHandler2& rParent, ::sal_Int32 aElement, ::com::sun::star::uno::Any & aValue ); ~AnimVariantContext( ) throw( ); - virtual void onEndElement(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual void onEndElement() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: ::sal_Int32 mnElement; diff --git a/oox/source/ppt/buildlistcontext.hxx b/oox/source/ppt/buildlistcontext.hxx index 1ee2d9a9c9b9..84a040a4f892 100644 --- a/oox/source/ppt/buildlistcontext.hxx +++ b/oox/source/ppt/buildlistcontext.hxx @@ -34,9 +34,9 @@ namespace oox { namespace ppt { ~BuildListContext( ); - virtual void onEndElement(); + virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: bool mbInBldGraphic; bool mbBuildAsOne; diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx index cbfaf7f90046..d1b58e56ed87 100644 --- a/oox/source/ppt/commonbehaviorcontext.hxx +++ b/oox/source/ppt/commonbehaviorcontext.hxx @@ -46,11 +46,11 @@ namespace oox { namespace ppt { ~CommonBehaviorContext( ) throw( ); - virtual void onEndElement(); + virtual void onEndElement() SAL_OVERRIDE; - virtual void onCharacters( const OUString& aChars ); + virtual void onCharacters( const OUString& aChars ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: bool mbInAttrList; diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx index d72d0a2cd3f6..21699447daf4 100644 --- a/oox/source/ppt/commontimenodecontext.hxx +++ b/oox/source/ppt/commontimenodecontext.hxx @@ -35,9 +35,9 @@ namespace oox { namespace ppt { CommonTimeNodeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32 aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode); ~CommonTimeNodeContext( ) throw( ); - virtual void onEndElement(); + virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: bool mbIterate; diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx index 710869a275d3..a55f0c98518a 100644 --- a/oox/source/ppt/conditioncontext.hxx +++ b/oox/source/ppt/conditioncontext.hxx @@ -40,7 +40,7 @@ namespace oox { namespace ppt { const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode, AnimationCondition & aCond ); ~CondContext( ) throw( ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: ::com::sun::star::animations::Event maEvent; @@ -60,7 +60,7 @@ namespace oox { namespace ppt { const TimeNodePtr & pNode, AnimationConditionList & aCondList ); ~CondListContext( ) throw( ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: AnimationConditionList & maConditions; diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx index 70ecf0cfa953..b616ecae6139 100644 --- a/oox/source/ppt/customshowlistcontext.cxx +++ b/oox/source/ppt/customshowlistcontext.cxx @@ -34,7 +34,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, CustomShow& rCustomShow ); ~CustomShowContext( ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; }; CustomShowContext::CustomShowContext( FragmentHandler2& rParent, diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index 4be3d26e49a3..7f32e6e95fe4 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -187,7 +187,7 @@ class PptGraphicHelper : public GraphicHelper { public: explicit PptGraphicHelper( const PowerPointImport& rFilter ); - virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const; + virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const SAL_OVERRIDE; private: const PowerPointImport& mrFilter; }; diff --git a/oox/source/ppt/timeanimvaluecontext.hxx b/oox/source/ppt/timeanimvaluecontext.hxx index c74d2fbc43c5..c948ebedc8b6 100644 --- a/oox/source/ppt/timeanimvaluecontext.hxx +++ b/oox/source/ppt/timeanimvaluecontext.hxx @@ -36,9 +36,9 @@ namespace oox { namespace ppt { ~TimeAnimValueListContext( ); - virtual void onEndElement(); + virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: TimeAnimationValueList & maTavList; diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index aaeacb8b3edb..f25c7edd7cb9 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -133,7 +133,7 @@ namespace oox { namespace ppt { } } - virtual void onEndElement() + virtual void onEndElement() SAL_OVERRIDE { sal_Int32 aElement = getCurrentElement(); if( aElement == PPT_TOKEN( audio ) ) @@ -146,7 +146,7 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -198,7 +198,7 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -244,7 +244,7 @@ namespace oox { namespace ppt { { } - virtual void onEndElement() + virtual void onEndElement() SAL_OVERRIDE { if( isCurrentElement( PPT_TOKEN( cmd ) ) ) { @@ -317,7 +317,7 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -360,7 +360,7 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -398,7 +398,7 @@ namespace oox { namespace ppt { { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -435,7 +435,7 @@ namespace oox { namespace ppt { { } - virtual void onEndElement() + virtual void onEndElement() SAL_OVERRIDE { //xParentNode if( isCurrentElement( mnElement ) ) @@ -454,7 +454,7 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -600,7 +600,7 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -642,7 +642,7 @@ namespace oox { namespace ppt { { } - virtual void onEndElement() + virtual void onEndElement() SAL_OVERRIDE { if( isCurrentElement( mnElement ) ) { @@ -661,7 +661,7 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -742,7 +742,7 @@ namespace oox { namespace ppt { { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -802,7 +802,7 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { @@ -888,7 +888,7 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch ( aElementToken ) { diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx index e8c59a8913df..719b36de207a 100644 --- a/oox/source/ppt/timetargetelementcontext.cxx +++ b/oox/source/ppt/timetargetelementcontext.cxx @@ -47,7 +47,7 @@ namespace oox { namespace ppt { , maShapeTarget(aValue) { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE { switch( aElementToken ) { diff --git a/oox/source/ppt/timetargetelementcontext.hxx b/oox/source/ppt/timetargetelementcontext.hxx index d3e592d9c179..0ea1f3231aaf 100644 --- a/oox/source/ppt/timetargetelementcontext.hxx +++ b/oox/source/ppt/timetargetelementcontext.hxx @@ -32,7 +32,7 @@ namespace oox { namespace ppt { public: TimeTargetElementContext( ::oox::core::FragmentHandler2& rParent, const AnimTargetElementPtr & aValue ); ~TimeTargetElementContext( ) throw( ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: AnimTargetElementPtr mpTarget; diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx index a2719c316d70..c0637a7f98d6 100644 --- a/oox/source/shape/ShapeContextHandler.hxx +++ b/oox/source/shape/ShapeContextHandler.hxx @@ -57,86 +57,86 @@ public: // ::com::sun::star::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL supportsService - (const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception); + (const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::xml::sax::XFastContextHandler: virtual void SAL_CALL startFastElement (::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL startUnknownElement (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endFastElement(::sal_Int32 Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endUnknownElement (const OUString & Namespace, const OUString & Name) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext (::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL characters(const OUString & aChars) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; // ::com::sun::star::xml::sax::XFastShapeContextHandler: virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getShape() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDrawPage (const css::uno::Reference< css::drawing::XDrawPage > & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setModel (const css::uno::Reference< css::frame::XModel > & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getInputStream() throw (css::uno::RuntimeException, std::exception); + getInputStream() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setInputStream (const css::uno::Reference< css::io::XInputStream > & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getRelationFragmentPath() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setRelationFragmentPath (const OUString & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getStartToken() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStartToken( ::sal_Int32 _starttoken ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getStartToken() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStartToken( ::sal_Int32 _starttoken ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::awt::Point SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPosition(const css::awt::Point& rPosition) throw (css::uno::RuntimeException, std::exception); + virtual css::awt::Point SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPosition(const css::awt::Point& rPosition) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ShapeContextHandler(ShapeContextHandler &); // not defined diff --git a/oox/source/shape/ShapeFilterBase.cxx b/oox/source/shape/ShapeFilterBase.cxx index a0694208109d..c40131f9100c 100644 --- a/oox/source/shape/ShapeFilterBase.cxx +++ b/oox/source/shape/ShapeFilterBase.cxx @@ -77,7 +77,7 @@ class ShapeGraphicHelper : public GraphicHelper { public: explicit ShapeGraphicHelper( const ShapeFilterBase& rFilter ); - virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const; + virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const SAL_OVERRIDE; private: const ShapeFilterBase& mrFilter; }; diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx index 796db69c4046..2021e475e818 100644 --- a/oox/source/shape/ShapeFilterBase.hxx +++ b/oox/source/shape/ShapeFilterBase.hxx @@ -44,27 +44,27 @@ public: virtual ~ShapeFilterBase(); /** Has to be implemented by each filter, returns the current theme. */ - virtual const ::oox::drawingml::Theme* getCurrentTheme() const; + virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; void setCurrentTheme(::oox::drawingml::ThemePtr pTheme); /** Has to be implemented by each filter to return the collection of VML shapes. */ - virtual ::oox::vml::Drawing* getVmlDrawing(); + virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; /** Has to be implemented by each filter to return TableStyles. */ - virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles(); + virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; - virtual ::oox::drawingml::chart::ChartConverter* getChartConverter(); + virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; - virtual bool importDocument() { return true; } - virtual bool exportDocument() { return true; } + virtual bool importDocument() SAL_OVERRIDE { return true; } + virtual bool exportDocument() SAL_OVERRIDE { return true; } sal_Int32 getSchemeColor( sal_Int32 nToken ) const; private: - virtual ::oox::ole::VbaProject* implCreateVbaProject() const; - virtual OUString implGetImplementationName() const; - virtual GraphicHelper* implCreateGraphicHelper() const; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; + virtual OUString implGetImplementationName() const SAL_OVERRIDE; + virtual GraphicHelper* implCreateGraphicHelper() const SAL_OVERRIDE; ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; ::oox::drawingml::ThemePtr mpTheme; |