diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /svx/source/xml | |
parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) |
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'svx/source/xml')
-rw-r--r-- | svx/source/xml/xmleohlp.cxx | 6 | ||||
-rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 34 | ||||
-rw-r--r-- | svx/source/xml/xmlxtexp.cxx | 12 | ||||
-rw-r--r-- | svx/source/xml/xmlxtimp.cxx | 2 |
4 files changed, 27 insertions, 27 deletions
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index c5ac758f07ca..b9d6e4f0fe96 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -74,9 +74,9 @@ public: virtual ~OutputStorageWrapper_Impl(); // stario::XOutputStream - virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception); - virtual void SAL_CALL flush() throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception); - virtual void SAL_CALL closeOutput() throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception); + virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL flush() throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeOutput() throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; SvStream* GetStream(); }; diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 24d47a79376c..fcc7e673ca05 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -73,11 +73,11 @@ class SvXMLGraphicInputStream : public::cppu::WeakImplHelper1< XInputStream > { private: - virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception); - virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL available() throw(NotConnectedException, RuntimeException, std::exception); - virtual void SAL_CALL closeInput() throw(NotConnectedException, RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL available() throw(NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeInput() throw(NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -204,9 +204,9 @@ class SvXMLGraphicOutputStream : public::cppu::WeakImplHelper1< XOutputStream > private: // XOutputStream - 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: @@ -923,33 +923,33 @@ public: protected: // is called from WeakComponentImplHelper when XComponent::dispose() was // called from outside - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ____ XInitialization ____ // one argument is allowed, which is the XStorage virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; // ____ XGraphicObjectResolver ____ virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; // ____ XBinaryStreamResolver ____ virtual Reference< io::XInputStream > SAL_CALL getInputStream( const OUString& aURL ) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual Reference< io::XOutputStream > SAL_CALL createOutputStream() - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; private: SvXMLGraphicHelperMode m_eGraphicHelperMode; diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index aba306026912..062907373149 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -81,7 +81,7 @@ public: SvxXMLColorEntryExporter( SvXMLExport& rExport ); virtual ~SvxXMLColorEntryExporter(); - virtual void exportEntry( const OUString& rStrName, const Any& rValue ); + virtual void exportEntry( const OUString& rStrName, const Any& rValue ) SAL_OVERRIDE; }; class SvxXMLLineEndEntryExporter : public SvxXMLTableEntryExporter @@ -91,7 +91,7 @@ public: SvxXMLLineEndEntryExporter(); virtual ~SvxXMLLineEndEntryExporter(); - virtual void exportEntry( const OUString& rStrName, const Any& rValue ); + virtual void exportEntry( const OUString& rStrName, const Any& rValue ) SAL_OVERRIDE; private: XMLMarkerStyleExport maMarkerStyle; }; @@ -102,7 +102,7 @@ public: SvxXMLDashEntryExporter( SvXMLExport& rExport ); virtual ~SvxXMLDashEntryExporter(); - virtual void exportEntry( const OUString& rStrName, const Any& rValue ); + virtual void exportEntry( const OUString& rStrName, const Any& rValue ) SAL_OVERRIDE; private: XMLDashStyleExport maDashStyle; @@ -114,7 +114,7 @@ public: SvxXMLHatchEntryExporter( SvXMLExport& rExport ); virtual ~SvxXMLHatchEntryExporter(); - virtual void exportEntry( const OUString& rStrName, const Any& rValue ); + virtual void exportEntry( const OUString& rStrName, const Any& rValue ) SAL_OVERRIDE; private: XMLHatchStyleExport maHatchStyle; }; @@ -125,7 +125,7 @@ public: SvxXMLGradientEntryExporter( SvXMLExport& rExport ); virtual ~SvxXMLGradientEntryExporter(); - virtual void exportEntry( const OUString& rStrName, const Any& rValue ); + virtual void exportEntry( const OUString& rStrName, const Any& rValue ) SAL_OVERRIDE; private: XMLGradientStyleExport maGradientStyle; }; @@ -136,7 +136,7 @@ public: SvxXMLBitmapEntryExporter( SvXMLExport& rExport ); virtual ~SvxXMLBitmapEntryExporter(); - virtual void exportEntry( const OUString& rStrName, const Any& rValue ); + virtual void exportEntry( const OUString& rStrName, const Any& rValue ) SAL_OVERRIDE; private: XMLImageStyle maImageStyle; diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index c28a5968e26a..e8ad9d47ceae 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -87,7 +87,7 @@ public: bool bOOoFormat ); virtual ~SvxXMLTableImportContext(); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ); + virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) SAL_OVERRIDE; SvxXMLXTableImport& getImport() const { return *(SvxXMLXTableImport*)&GetImport(); } |