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 /writerfilter/source | |
| 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 'writerfilter/source')
45 files changed, 408 insertions, 408 deletions
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx index bfe50bd1f251..f00b5b3a1ea8 100644 --- a/writerfilter/source/dmapper/BorderHandler.hxx +++ b/writerfilter/source/dmapper/BorderHandler.hxx @@ -61,8 +61,8 @@ private: void appendGrabBag(const OUString& aKey, const OUString& aValue); // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; public: BorderHandler( bool bOOXML ); diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx index 9c2b28a8fc3b..4ba0ba87607e 100644 --- a/writerfilter/source/dmapper/CellColorHandler.hxx +++ b/writerfilter/source/dmapper/CellColorHandler.hxx @@ -43,8 +43,8 @@ private: std::vector<beans::PropertyValue> m_aInteropGrabBag; // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; void createGrabBag(const OUString& aName, uno::Any aValue); diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx index 2b2258ec327d..34f758f5a803 100644 --- a/writerfilter/source/dmapper/CellMarginHandler.hxx +++ b/writerfilter/source/dmapper/CellMarginHandler.hxx @@ -39,8 +39,8 @@ private: std::vector<beans::PropertyValue> m_aInteropGrabBag; // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; void createGrabBag(const OUString& aName); diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx index 320fcc495b5d..ddaa1af4df68 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx @@ -94,12 +94,12 @@ public: virtual ~DomainMapperTableHandler(); virtual void startTable(unsigned int nRows, unsigned int nDepth, - TablePropertyMapPtr pProps); - virtual void endTable(unsigned int nestedTableLevel); - virtual void startRow(unsigned int nCells, TablePropertyMapPtr pProps); - virtual void endRow(); - virtual void startCell(const Handle_t & start, TablePropertyMapPtr pProps); - virtual void endCell(const Handle_t & end); + TablePropertyMapPtr pProps) SAL_OVERRIDE; + virtual void endTable(unsigned int nestedTableLevel) SAL_OVERRIDE; + virtual void startRow(unsigned int nCells, TablePropertyMapPtr pProps) SAL_OVERRIDE; + virtual void endRow() SAL_OVERRIDE; + virtual void startCell(const Handle_t & start, TablePropertyMapPtr pProps) SAL_OVERRIDE; + virtual void endCell(const Handle_t & end) SAL_OVERRIDE; virtual Handle_t* getTable( ) { diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index e9e9779f6561..ad6dedb5f82a 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -69,7 +69,7 @@ class DomainMapperTableManager : public DomainMapperTableManager_Base_t TablePropertiesHandler *m_pTablePropsHandler; PropertyMapPtr m_pStyleProps; - virtual void clearData(); + virtual void clearData() SAL_OVERRIDE; public: @@ -80,13 +80,13 @@ public: // but in the provided properties map. inline void SetStyleProperties( PropertyMapPtr pProperties ) { m_pStyleProps = pProperties; }; - virtual bool sprm(Sprm & rSprm); + virtual bool sprm(Sprm & rSprm) SAL_OVERRIDE; - virtual void startLevel( ); - virtual void endLevel( ); + virtual void startLevel( ) SAL_OVERRIDE; + virtual void endLevel( ) SAL_OVERRIDE; - virtual void endOfCellAction(); - virtual void endOfRowAction(); + virtual void endOfCellAction() SAL_OVERRIDE; + virtual void endOfRowAction() SAL_OVERRIDE; IntVectorPtr getCurrentGrid( ); IntVectorPtr getCurrentSpans( ); @@ -95,7 +95,7 @@ public: const OUString& getTableStyleName() const { return m_sTableStyleName; } const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getCurrentTablePosition(); - inline virtual void cellProps(TablePropertyMapPtr pProps) + inline virtual void cellProps(TablePropertyMapPtr pProps) SAL_OVERRIDE { if ( m_pStyleProps.get( ) ) m_pStyleProps->InsertProps(pProps); @@ -103,7 +103,7 @@ public: DomainMapperTableManager_Base_t::cellProps( pProps ); }; - inline virtual void cellPropsByCell(unsigned int i, TablePropertyMapPtr pProps) + inline virtual void cellPropsByCell(unsigned int i, TablePropertyMapPtr pProps) SAL_OVERRIDE { if ( m_pStyleProps.get( ) ) m_pStyleProps->InsertProps(pProps); @@ -111,7 +111,7 @@ public: DomainMapperTableManager_Base_t::cellPropsByCell( i, pProps ); }; - inline virtual void insertRowProps(TablePropertyMapPtr pProps) + inline virtual void insertRowProps(TablePropertyMapPtr pProps) SAL_OVERRIDE { if ( m_pStyleProps.get( ) ) m_pStyleProps->InsertProps(pProps); @@ -119,7 +119,7 @@ public: DomainMapperTableManager_Base_t::insertRowProps( pProps ); }; - inline virtual void insertTableProps(TablePropertyMapPtr pProps) + inline virtual void insertTableProps(TablePropertyMapPtr pProps) SAL_OVERRIDE { if ( m_pStyleProps.get( ) ) m_pStyleProps->InsertProps(pProps); diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx index aeff21f62073..31e1a1729689 100644 --- a/writerfilter/source/dmapper/FFDataHandler.hxx +++ b/writerfilter/source/dmapper/FFDataHandler.hxx @@ -77,10 +77,10 @@ private: OUString m_sTextDefault; // sprm - void lcl_sprm(Sprm & r_sprm); + void lcl_sprm(Sprm & r_sprm) SAL_OVERRIDE; // attribute - void lcl_attribute(Id name, Value & val); + void lcl_attribute(Id name, Value & val) SAL_OVERRIDE; }; diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx index 617cbd4774e6..07cf04eae0a8 100644 --- a/writerfilter/source/dmapper/FontTable.hxx +++ b/writerfilter/source/dmapper/FontTable.hxx @@ -68,30 +68,30 @@ class FontTable : public LoggedProperties, public LoggedTable private: // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; void resolveSprm(Sprm & r_sprm); // Table - virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref); + virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE; // Stream - virtual void lcl_startSectionGroup(); - virtual void lcl_endSectionGroup(); - virtual void lcl_startParagraphGroup(); - virtual void lcl_endParagraphGroup(); - virtual void lcl_startCharacterGroup(); - virtual void lcl_endCharacterGroup(); - virtual void lcl_text(const sal_uInt8 * data, size_t len); - virtual void lcl_utext(const sal_uInt8 * data, size_t len); - virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref); + virtual void lcl_startSectionGroup() SAL_OVERRIDE; + virtual void lcl_endSectionGroup() SAL_OVERRIDE; + virtual void lcl_startParagraphGroup() SAL_OVERRIDE; + virtual void lcl_endParagraphGroup() SAL_OVERRIDE; + virtual void lcl_startCharacterGroup() SAL_OVERRIDE; + virtual void lcl_endCharacterGroup() SAL_OVERRIDE; + virtual void lcl_text(const sal_uInt8 * data, size_t len) SAL_OVERRIDE; + virtual void lcl_utext(const sal_uInt8 * data, size_t len) SAL_OVERRIDE; + virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE; virtual void lcl_table(Id name, - writerfilter::Reference<Table>::Pointer_t ref); + writerfilter::Reference<Table>::Pointer_t ref) SAL_OVERRIDE; virtual void lcl_substream(Id name, - ::writerfilter::Reference<Stream>::Pointer_t ref); - virtual void lcl_info(const string & info); - virtual void lcl_startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - virtual void lcl_endShape( ); + ::writerfilter::Reference<Stream>::Pointer_t ref) SAL_OVERRIDE; + virtual void lcl_info(const string & info) SAL_OVERRIDE; + virtual void lcl_startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ) SAL_OVERRIDE; + virtual void lcl_endShape( ) SAL_OVERRIDE; }; typedef boost::shared_ptr< FontTable > FontTablePtr; @@ -102,8 +102,8 @@ public: EmbeddedFontHandler( const OUString& fontName, const char* style ); virtual ~EmbeddedFontHandler(); private: - virtual void lcl_attribute( Id name, Value& val ); - virtual void lcl_sprm( Sprm& rSprm ); + virtual void lcl_attribute( Id name, Value& val ) SAL_OVERRIDE; + virtual void lcl_sprm( Sprm& rSprm ) SAL_OVERRIDE; OUString fontName; const char* const style; OUString id; diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx index adaba624bc81..a69e3385cf02 100644 --- a/writerfilter/source/dmapper/GraphicHelpers.hxx +++ b/writerfilter/source/dmapper/GraphicHelpers.hxx @@ -44,8 +44,8 @@ public: sal_Int16 relation() const; sal_Int32 position() const; private: - virtual void lcl_attribute( Id aName, Value& rVal ); - virtual void lcl_sprm( Sprm& rSprm ); + virtual void lcl_attribute( Id aName, Value& rVal ) SAL_OVERRIDE; + virtual void lcl_sprm( Sprm& rSprm ) SAL_OVERRIDE; sal_Int16 m_nOrient; sal_Int16 m_nRelation; sal_Int32 m_nPosition; @@ -66,8 +66,8 @@ public: sal_Int32 getWrapMode( ); private: - virtual void lcl_attribute( Id aName, Value& rVal ); - virtual void lcl_sprm( Sprm& rSprm ); + virtual void lcl_attribute( Id aName, Value& rVal ) SAL_OVERRIDE; + virtual void lcl_sprm( Sprm& rSprm ) SAL_OVERRIDE; }; typedef boost::shared_ptr<WrapHandler> WrapHandlerPtr; diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 99ea05dfa42a..7ca59dbe4ce5 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -82,11 +82,11 @@ public: XInputStreamHelper(const sal_uInt8* buf, size_t len, bool bBmp); ~XInputStreamHelper(); - virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception); - virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL available( ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception); - virtual void SAL_CALL closeInput( ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL available( ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeInput( ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) SAL_OVERRIDE; }; XInputStreamHelper::XInputStreamHelper(const sal_uInt8* buf, size_t len, bool bBmp) : diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx index 0e5b1fa3221c..416f3983ff24 100644 --- a/writerfilter/source/dmapper/GraphicImport.hxx +++ b/writerfilter/source/dmapper/GraphicImport.hxx @@ -89,7 +89,7 @@ public: virtual ~GraphicImport(); // BinaryObj - virtual void data(const sal_uInt8* buffer, size_t len, writerfilter::Reference<Properties>::Pointer_t ref); + virtual void data(const sal_uInt8* buffer, size_t len, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE; css::uno::Reference<css::text::XTextContent> GetGraphicObject(); css::uno::Reference<css::drawing::XShape> GetXShapeObject(); @@ -97,28 +97,28 @@ public: private: // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; // Table - virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref); + virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE; // Stream - virtual void lcl_startSectionGroup(); - virtual void lcl_endSectionGroup(); - virtual void lcl_startParagraphGroup(); - virtual void lcl_endParagraphGroup(); - virtual void lcl_startCharacterGroup(); - virtual void lcl_endCharacterGroup(); - virtual void lcl_text(const sal_uInt8 * data, size_t len); - virtual void lcl_utext(const sal_uInt8 * data, size_t len); - virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref); + virtual void lcl_startSectionGroup() SAL_OVERRIDE; + virtual void lcl_endSectionGroup() SAL_OVERRIDE; + virtual void lcl_startParagraphGroup() SAL_OVERRIDE; + virtual void lcl_endParagraphGroup() SAL_OVERRIDE; + virtual void lcl_startCharacterGroup() SAL_OVERRIDE; + virtual void lcl_endCharacterGroup() SAL_OVERRIDE; + virtual void lcl_text(const sal_uInt8 * data, size_t len) SAL_OVERRIDE; + virtual void lcl_utext(const sal_uInt8 * data, size_t len) SAL_OVERRIDE; + virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE; virtual void lcl_table(Id name, - writerfilter::Reference<Table>::Pointer_t ref); - virtual void lcl_substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref); - virtual void lcl_info(const string & info); - virtual void lcl_startShape(css::uno::Reference<css::drawing::XShape> xShape); - virtual void lcl_endShape(); + writerfilter::Reference<Table>::Pointer_t ref) SAL_OVERRIDE; + virtual void lcl_substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref) SAL_OVERRIDE; + virtual void lcl_info(const string & info) SAL_OVERRIDE; + virtual void lcl_startShape(css::uno::Reference<css::drawing::XShape> xShape) SAL_OVERRIDE; + virtual void lcl_endShape() SAL_OVERRIDE; void handleWrapTextValue(sal_uInt32 nVal); }; diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx index 289dab60f3ce..edb78e375b20 100644 --- a/writerfilter/source/dmapper/LatentStyleHandler.hxx +++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx @@ -25,8 +25,8 @@ class LatentStyleHandler std::vector<beans::PropertyValue> m_aAttributes; // Properties - virtual void lcl_attribute(Id Name, Value& val); - virtual void lcl_sprm(Sprm& sprm); + virtual void lcl_attribute(Id Name, Value& val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm& sprm) SAL_OVERRIDE; public: LatentStyleHandler(); diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx index d688f3971d7a..acba84c020b3 100644 --- a/writerfilter/source/dmapper/MeasureHandler.hxx +++ b/writerfilter/source/dmapper/MeasureHandler.hxx @@ -41,8 +41,8 @@ class MeasureHandler : public LoggedProperties std::vector<beans::PropertyValue> m_aInteropGrabBag; // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; public: MeasureHandler(); diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/writerfilter/source/dmapper/ModelEventListener.hxx index 630f23613e49..129531aa38f1 100644 --- a/writerfilter/source/dmapper/ModelEventListener.hxx +++ b/writerfilter/source/dmapper/ModelEventListener.hxx @@ -36,8 +36,8 @@ public: ModelEventListener(bool bIndexes, bool bControls); ~ModelEventListener(); - virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; }//namespace writerfilter diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx index 59edda016de9..0267c0aba58e 100644 --- a/writerfilter/source/dmapper/NumberingManager.hxx +++ b/writerfilter/source/dmapper/NumberingManager.hxx @@ -199,7 +199,7 @@ public: com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue > > GetPropertyValues( ); + com::sun::star::beans::PropertyValue > > GetPropertyValues( ) SAL_OVERRIDE; void CreateNumberingRules( DomainMapper& rDMapper, @@ -237,11 +237,11 @@ private: AbstractListDef::Pointer GetAbstractList( sal_Int32 nId ); // Properties - virtual void lcl_attribute( Id nName, Value & rVal ); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute( Id nName, Value & rVal ) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; // Table - virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref); + virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE; public: diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx index 63be85b0ed0a..f8651f6380b9 100644 --- a/writerfilter/source/dmapper/OLEHandler.hxx +++ b/writerfilter/source/dmapper/OLEHandler.hxx @@ -66,8 +66,8 @@ class OLEHandler : public LoggedProperties ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream; // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; // Interoperability virtual void saveInteropProperties( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > xTextDocument, diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx index 6e9d5985806d..deb41d5f8144 100644 --- a/writerfilter/source/dmapper/PageBordersHandler.hxx +++ b/writerfilter/source/dmapper/PageBordersHandler.hxx @@ -56,8 +56,8 @@ private: vector<_PgBorder> m_aBorders; // Properties - virtual void lcl_attribute( Id eName, Value& rVal ); - virtual void lcl_sprm( Sprm& rSprm ); + virtual void lcl_attribute( Id eName, Value& rVal ) SAL_OVERRIDE; + virtual void lcl_sprm( Sprm& rSprm ) SAL_OVERRIDE; public: PageBordersHandler( ); diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index 8d9a32bd684b..3ce29bcd0718 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -548,7 +548,7 @@ public: bool getValue( TablePropertyMapTarget eWhich, sal_Int32& nFill ); void setValue( TablePropertyMapTarget eWhich, sal_Int32 nSet ); - virtual void insertTableProperties( const PropertyMap* ); + virtual void insertTableProperties( const PropertyMap* ) SAL_OVERRIDE; }; typedef boost::shared_ptr<TablePropertyMap> TablePropertyMapPtr; } //namespace dmapper diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx index 347534571dd4..77bbaf650d49 100644 --- a/writerfilter/source/dmapper/SectionColumnHandler.hxx +++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx @@ -45,8 +45,8 @@ class SectionColumnHandler : public LoggedProperties _Column aTempColumn; // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; public: SectionColumnHandler(); diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx index 54cd0a0b3eb5..41dca03c1751 100644 --- a/writerfilter/source/dmapper/SettingsTable.hxx +++ b/writerfilter/source/dmapper/SettingsTable.hxx @@ -83,11 +83,11 @@ class SettingsTable : public LoggedProperties, public LoggedTable private: // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; // Table - virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref); + virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE; }; typedef boost::shared_ptr< SettingsTable > SettingsTablePtr; diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index 42b3817735f4..1eeac648e4bb 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -111,11 +111,11 @@ public: private: // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; // Table - virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref); + virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE; void applyDefaults(bool bParaProperties); }; diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx index cedb63ca8dd6..eac84b505ed0 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.hxx +++ b/writerfilter/source/dmapper/TDefTableHandler.hxx @@ -69,8 +69,8 @@ private: void localResolve(Id Name, writerfilter::Reference<Properties>::Pointer_t pProperties); // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; public: TDefTableHandler( bool bOOXML ); diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx index b04b09093f49..2037e4dbfc17 100644 --- a/writerfilter/source/dmapper/TablePositionHandler.hxx +++ b/writerfilter/source/dmapper/TablePositionHandler.hxx @@ -35,8 +35,8 @@ class TablePositionHandler sal_Int32 m_nBottomFromText; // Properties - virtual void lcl_attribute(Id Name, Value& val); - virtual void lcl_sprm(Sprm& sprm); + virtual void lcl_attribute(Id Name, Value& val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm& sprm) SAL_OVERRIDE; public: TablePositionHandler(); diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx index e9d39c9275e7..2b8445ab1105 100644 --- a/writerfilter/source/dmapper/TblStylePrHandler.hxx +++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx @@ -61,8 +61,8 @@ private: std::vector<beans::PropertyValue> m_aInteropGrabBag; // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; public: TblStylePrHandler( DomainMapper & rDMapper ); diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx index 4d402b4562a0..3929ca0d03db 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.hxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx @@ -40,8 +40,8 @@ private: void convertElementIdToPropertyId(sal_Int32 aElementId); // LoggedProperties - virtual void lcl_attribute(Id aName, Value& aValue); - virtual void lcl_sprm(Sprm& sprm); + virtual void lcl_attribute(Id aName, Value& aValue) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm& sprm) SAL_OVERRIDE; public: TextEffectsHandler(sal_uInt32 aElementId); diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx index 176ea68bbcdd..2064e41a7589 100644 --- a/writerfilter/source/dmapper/ThemeTable.hxx +++ b/writerfilter/source/dmapper/ThemeTable.hxx @@ -47,11 +47,11 @@ public: private: // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; // Table - virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref); + virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref) SAL_OVERRIDE; // Helper methods OUString fromLocaleToScriptTag(const OUString& sLocale); diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/writerfilter/source/dmapper/TrackChangesHandler.hxx index db4ba4800f7b..0a70962e4292 100644 --- a/writerfilter/source/dmapper/TrackChangesHandler.hxx +++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx @@ -29,8 +29,8 @@ class TrackChangesHandler : public LoggedProperties RedlineParamsPtr m_pRedlineParams; // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; public: TrackChangesHandler( sal_Int32 nToken ); diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx index dca767fd4a0d..68db34aa0f9f 100644 --- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx +++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx @@ -74,8 +74,8 @@ private: sal_Int32 mnY; // Properties - virtual void lcl_attribute(Id Name, Value & val); - virtual void lcl_sprm(Sprm & sprm); + virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; + virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; }; diff --git a/writerfilter/source/filter/RtfFilter.hxx b/writerfilter/source/filter/RtfFilter.hxx index 9ce28be36d99..33faa57afc81 100644 --- a/writerfilter/source/filter/RtfFilter.hxx +++ b/writerfilter/source/filter/RtfFilter.hxx @@ -53,29 +53,29 @@ public: // XFilter virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL cancel( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XImporter virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XExporter virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + 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); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/writerfilter/source/filter/WriterFilter.hxx b/writerfilter/source/filter/WriterFilter.hxx index 026dd4bcf0d5..efec97733c07 100644 --- a/writerfilter/source/filter/WriterFilter.hxx +++ b/writerfilter/source/filter/WriterFilter.hxx @@ -53,29 +53,29 @@ public: // XFilter virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL cancel( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XImporter virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XExporter virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + 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); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void putPropertiesToDocumentGrabBag( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ); diff --git a/writerfilter/source/filter/WriterFilterDetection.hxx b/writerfilter/source/filter/WriterFilterDetection.hxx index 3179bcd27e1e..26cd114b0a70 100644 --- a/writerfilter/source/filter/WriterFilterDetection.hxx +++ b/writerfilter/source/filter/WriterFilterDetection.hxx @@ -40,15 +40,15 @@ public: //XExtendedFilterDetection virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + 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); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; OUString WriterFilterDetection_getImplementationName() diff --git a/writerfilter/source/ooxml/Handler.hxx b/writerfilter/source/ooxml/Handler.hxx index 7fc7e0110410..21283d9a0791 100644 --- a/writerfilter/source/ooxml/Handler.hxx +++ b/writerfilter/source/ooxml/Handler.hxx @@ -33,8 +33,8 @@ public: OOXMLFootnoteHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLFootnoteHandler(); - virtual void attribute(Id name, Value & val); - virtual void sprm(Sprm & sprm); + virtual void attribute(Id name, Value & val) SAL_OVERRIDE; + virtual void sprm(Sprm & sprm) SAL_OVERRIDE; }; class OOXMLEndnoteHandler : public Properties @@ -44,8 +44,8 @@ public: OOXMLEndnoteHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLEndnoteHandler(); - virtual void attribute(Id name, Value & val); - virtual void sprm(Sprm & sprm); + virtual void attribute(Id name, Value & val) SAL_OVERRIDE; + virtual void sprm(Sprm & sprm) SAL_OVERRIDE; }; class OOXMLFooterHandler : public Properties @@ -56,8 +56,8 @@ class OOXMLFooterHandler : public Properties public: OOXMLFooterHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLFooterHandler(); - virtual void attribute(Id name, Value & val); - virtual void sprm(Sprm & sprm); + virtual void attribute(Id name, Value & val) SAL_OVERRIDE; + virtual void sprm(Sprm & sprm) SAL_OVERRIDE; }; class OOXMLHeaderHandler : public Properties @@ -68,8 +68,8 @@ class OOXMLHeaderHandler : public Properties public: OOXMLHeaderHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLHeaderHandler(); - virtual void attribute(Id name, Value & val); - virtual void sprm(Sprm & sprm); + virtual void attribute(Id name, Value & val) SAL_OVERRIDE; + virtual void sprm(Sprm & sprm) SAL_OVERRIDE; }; class OOXMLCommentHandler : public Properties @@ -79,8 +79,8 @@ class OOXMLCommentHandler : public Properties public: OOXMLCommentHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLCommentHandler(); - virtual void attribute(Id name, Value & val); - virtual void sprm(Sprm & sprm); + virtual void attribute(Id name, Value & val) SAL_OVERRIDE; + virtual void sprm(Sprm & sprm) SAL_OVERRIDE; }; class OOXMLOLEHandler : public Properties @@ -91,8 +91,8 @@ public: OOXMLOLEHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLOLEHandler(); - virtual void attribute(Id name, Value & val); - virtual void sprm(Sprm & sprm); + virtual void attribute(Id name, Value & val) SAL_OVERRIDE; + virtual void sprm(Sprm & sprm) SAL_OVERRIDE; }; class OOXMLEmbeddedFontHandler : public Properties @@ -103,8 +103,8 @@ public: OOXMLEmbeddedFontHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLEmbeddedFontHandler(); - virtual void attribute(Id name, Value & val); - virtual void sprm(Sprm & sprm); + virtual void attribute(Id name, Value & val) SAL_OVERRIDE; + virtual void sprm(Sprm & sprm) SAL_OVERRIDE; }; class OOXMLBreakHandler : public Properties @@ -114,8 +114,8 @@ class OOXMLBreakHandler : public Properties public: OOXMLBreakHandler(Stream & rStream); virtual ~OOXMLBreakHandler(); - virtual void attribute(Id name, Value & val); - virtual void sprm(Sprm & sprm); + virtual void attribute(Id name, Value & val) SAL_OVERRIDE; + virtual void sprm(Sprm & sprm) SAL_OVERRIDE; }; class OOXMLPictureHandler : public Properties @@ -125,8 +125,8 @@ public: OOXMLPictureHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLPictureHandler(); - virtual void attribute(Id name, Value & val); - virtual void sprm(Sprm & sprm); + virtual void attribute(Id name, Value & val) SAL_OVERRIDE; + virtual void sprm(Sprm & sprm) SAL_OVERRIDE; }; class OOXMLHyperlinkHandler : public Properties @@ -139,8 +139,8 @@ public: OOXMLHyperlinkHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLHyperlinkHandler(); - virtual void attribute(Id name, Value & val); - virtual void sprm(Sprm & sprm); + virtual void attribute(Id name, Value & val) SAL_OVERRIDE; + virtual void sprm(Sprm & sprm) SAL_OVERRIDE; }; diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx index d32d81a0b7bc..44f127421cf6 100644 --- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx +++ b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx @@ -38,9 +38,9 @@ public: OOXMLBinaryObjectReference(OOXMLStream::Pointer_t pStream); virtual ~OOXMLBinaryObjectReference(); - virtual void resolve(BinaryObj & rHandler); + virtual void resolve(BinaryObj & rHandler) SAL_OVERRIDE; - virtual string getType() const; + virtual string getType() const SAL_OVERRIDE; }; }} diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx index 5858890352fd..80782f8a7797 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx @@ -95,54 +95,54 @@ public: OOXMLDocumentImpl(OOXMLStream::Pointer_t pStream, const uno::Reference<task::XStatusIndicator>& xStatusIndicator); virtual ~OOXMLDocumentImpl(); - virtual void resolve(Stream & rStream); + virtual void resolve(Stream & rStream) SAL_OVERRIDE; - virtual string getType() const; + virtual string getType() const SAL_OVERRIDE; virtual void resolveFootnote(Stream & rStream, const Id & rType, - const sal_Int32 nNoteId); + const sal_Int32 nNoteId) SAL_OVERRIDE; virtual void resolveEndnote(Stream & rStream, const Id & rType, - const sal_Int32 nNoteId); + const sal_Int32 nNoteId) SAL_OVERRIDE; virtual void resolveHeader(Stream & rStream, const sal_Int32 type, - const OUString & rId); + const OUString & rId) SAL_OVERRIDE; virtual void resolveFooter(Stream & rStream, const sal_Int32 type, - const OUString & rId); + const OUString & rId) SAL_OVERRIDE; - virtual void resolveComment(Stream & rStream, const sal_Int32 nId); + virtual void resolveComment(Stream & rStream, const sal_Int32 nId) SAL_OVERRIDE; virtual OOXMLPropertySet * getPicturePropSet (const OUString & rId); - virtual void resolvePicture(Stream & rStream, const OUString & rId); - - virtual OUString getTargetForId(const OUString & rId); - - virtual void setModel(uno::Reference<frame::XModel> xModel); - virtual uno::Reference<frame::XModel> getModel(); - virtual void setDrawPage(uno::Reference<drawing::XDrawPage> xDrawPage); - virtual uno::Reference<drawing::XDrawPage> getDrawPage(); - virtual uno::Reference<io::XInputStream> getInputStream(); - virtual uno::Reference<io::XInputStream> getStorageStream(); - virtual uno::Reference<io::XInputStream> getInputStreamForId(const OUString & rId); - virtual void setXNoteId(const sal_Int32 nId); - virtual sal_Int32 getXNoteId() const; - virtual void setXNoteType(const Id & rId); - virtual const Id & getXNoteType() const; - virtual const OUString & getTarget() const; - virtual uno::Reference<xml::sax::XFastShapeContextHandler> getShapeContext( ); - virtual void setShapeContext( uno::Reference<xml::sax::XFastShapeContextHandler> xContext ); - virtual void setThemeDom(uno::Reference<xml::dom::XDocument> xThemeDom); - virtual uno::Reference<xml::dom::XDocument> getThemeDom(); - virtual uno::Sequence<uno::Reference<xml::dom::XDocument> > getCustomXmlDomList(); - virtual uno::Sequence<uno::Reference<xml::dom::XDocument> > getCustomXmlDomPropsList(); - virtual uno::Sequence<uno::Reference<xml::dom::XDocument> > getActiveXDomList(); - virtual uno::Sequence<uno::Reference<io::XInputStream> > getActiveXBinList(); - virtual uno::Reference<xml::dom::XDocument> getGlossaryDocDom(); - virtual uno::Sequence<uno::Sequence< uno::Any> > getGlossaryDomList(); - virtual uno::Sequence<beans::PropertyValue > getEmbeddingsList(); + virtual void resolvePicture(Stream & rStream, const OUString & rId) SAL_OVERRIDE; + + virtual OUString getTargetForId(const OUString & rId) SAL_OVERRIDE; + + virtual void setModel(uno::Reference<frame::XModel> xModel) SAL_OVERRIDE; + virtual uno::Reference<frame::XModel> getModel() SAL_OVERRIDE; + virtual void setDrawPage(uno::Reference<drawing::XDrawPage> xDrawPage) SAL_OVERRIDE; + virtual uno::Reference<drawing::XDrawPage> getDrawPage() SAL_OVERRIDE; + virtual uno::Reference<io::XInputStream> getInputStream() SAL_OVERRIDE; + virtual uno::Reference<io::XInputStream> getStorageStream() SAL_OVERRIDE; + virtual uno::Reference<io::XInputStream> getInputStreamForId(const OUString & rId) SAL_OVERRIDE; + virtual void setXNoteId(const sal_Int32 nId) SAL_OVERRIDE; + virtual sal_Int32 getXNoteId() const SAL_OVERRIDE; + virtual void setXNoteType(const Id & rId) SAL_OVERRIDE; + virtual const Id & getXNoteType() const SAL_OVERRIDE; + virtual const OUString & getTarget() const SAL_OVERRIDE; + virtual uno::Reference<xml::sax::XFastShapeContextHandler> getShapeContext( ) SAL_OVERRIDE; + virtual void setShapeContext( uno::Reference<xml::sax::XFastShapeContextHandler> xContext ) SAL_OVERRIDE; + virtual void setThemeDom(uno::Reference<xml::dom::XDocument> xThemeDom) SAL_OVERRIDE; + virtual uno::Reference<xml::dom::XDocument> getThemeDom() SAL_OVERRIDE; + virtual uno::Sequence<uno::Reference<xml::dom::XDocument> > getCustomXmlDomList() SAL_OVERRIDE; + virtual uno::Sequence<uno::Reference<xml::dom::XDocument> > getCustomXmlDomPropsList() SAL_OVERRIDE; + virtual uno::Sequence<uno::Reference<xml::dom::XDocument> > getActiveXDomList() SAL_OVERRIDE; + virtual uno::Sequence<uno::Reference<io::XInputStream> > getActiveXBinList() SAL_OVERRIDE; + virtual uno::Reference<xml::dom::XDocument> getGlossaryDocDom() SAL_OVERRIDE; + virtual uno::Sequence<uno::Sequence< uno::Any> > getGlossaryDomList() SAL_OVERRIDE; + virtual uno::Sequence<beans::PropertyValue > getEmbeddingsList() SAL_OVERRIDE; void incrementProgress(); }; diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index c7e7729a9670..80c1c3c021dd 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -83,36 +83,36 @@ public: virtual void SAL_CALL startFastElement (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL startUnknownElement (const OUString & Namespace, const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endFastElement(Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endUnknownElement (const OUString & Namespace, const OUString & Name) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createFastChildContext (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext (const OUString & Namespace, const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL characters(const OUString & aChars) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; static const uno::Sequence< sal_Int8 > & getUnoTunnelId(); virtual sal_Int64 SAL_CALL getSomething(const uno::Sequence<sal_Int8> & rId) @@ -316,18 +316,18 @@ public: OOXMLFastContextHandlerStream(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerStream(); - virtual ResourceEnum_t getResource() const { return STREAM; } + virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return STREAM; } OOXMLPropertySet::Pointer_t getPropertySetAttrs() const; - virtual void newProperty(const Id & rId, OOXMLValue::Pointer_t pVal); + virtual void newProperty(const Id & rId, OOXMLValue::Pointer_t pVal) SAL_OVERRIDE; virtual void sendProperty(Id nId); - virtual OOXMLPropertySet::Pointer_t getPropertySet() const; + virtual OOXMLPropertySet::Pointer_t getPropertySet() const SAL_OVERRIDE; void handleHyperlink(); protected: - virtual void resolvePropertySetAttrs(); + virtual void resolvePropertySetAttrs() SAL_OVERRIDE; private: mutable OOXMLPropertySet::Pointer_t mpPropertySetAttrs; @@ -339,10 +339,10 @@ public: OOXMLFastContextHandlerProperties(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerProperties(); - virtual OOXMLValue::Pointer_t getValue() const; - virtual ResourceEnum_t getResource() const { return PROPERTIES; } + virtual OOXMLValue::Pointer_t getValue() const SAL_OVERRIDE; + virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return PROPERTIES; } - virtual void newProperty(const Id & nId, OOXMLValue::Pointer_t pVal); + virtual void newProperty(const Id & nId, OOXMLValue::Pointer_t pVal) SAL_OVERRIDE; void handleXNotes(); void handleHdrFtr(); @@ -352,8 +352,8 @@ public: void handleOLE(); void handleFontRel(); - virtual void setPropertySet(OOXMLPropertySet::Pointer_t pPropertySet); - virtual OOXMLPropertySet::Pointer_t getPropertySet() const; + virtual void setPropertySet(OOXMLPropertySet::Pointer_t pPropertySet) SAL_OVERRIDE; + virtual OOXMLPropertySet::Pointer_t getPropertySet() const SAL_OVERRIDE; #if OSL_DEBUG_LEVEL > 1 virtual void dumpXml( const TagLogger::Pointer_t pLogger ) const; @@ -364,8 +364,8 @@ protected: OOXMLPropertySet::Pointer_t mpPropertySet; virtual void lcl_endFastElement(Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException); - virtual void setParent(OOXMLFastContextHandler * pParent); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; + virtual void setParent(OOXMLFastContextHandler * pParent) SAL_OVERRIDE; private: @@ -383,7 +383,7 @@ protected: OOXMLTableImpl mTable; virtual void lcl_endFastElement(Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; }; class OOXMLFastContextHandlerValue : @@ -395,17 +395,17 @@ public: virtual ~OOXMLFastContextHandlerValue(); virtual void setValue(OOXMLValue::Pointer_t pValue); - virtual OOXMLValue::Pointer_t getValue() const; + virtual OOXMLValue::Pointer_t getValue() const SAL_OVERRIDE; virtual void lcl_endFastElement(Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; - virtual string getType() const { return "Value"; } + virtual string getType() const SAL_OVERRIDE { return "Value"; } - virtual void setDefaultBooleanValue(); - virtual void setDefaultIntegerValue(); - virtual void setDefaultHexValue(); - virtual void setDefaultStringValue(); + virtual void setDefaultBooleanValue() SAL_OVERRIDE; + virtual void setDefaultIntegerValue() SAL_OVERRIDE; + virtual void setDefaultHexValue() SAL_OVERRIDE; + virtual void setDefaultStringValue() SAL_OVERRIDE; protected: OOXMLValue::Pointer_t mpValue; @@ -421,7 +421,7 @@ public: createFastChildContext (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void newPropertySet(OOXMLPropertySet::Pointer_t pPropertySet); protected: @@ -430,11 +430,11 @@ protected: RefAndPointer_t mCurrentChild; virtual void lcl_endFastElement(Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; - virtual ResourceEnum_t getResource() const { return TABLE; } + virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return TABLE; } - virtual string getType() const { return "Table"; } + virtual string getType() const SAL_OVERRIDE { return "Table"; } void addCurrentChild(); }; @@ -449,7 +449,7 @@ public: void checkType(OOXMLValue::Pointer_t pValue); - virtual string getType() const { return "XNote"; } + virtual string getType() const SAL_OVERRIDE { return "XNote"; } private: bool mbForwardEventsSaved; @@ -459,12 +459,12 @@ private: virtual void lcl_startFastElement (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; virtual void lcl_endFastElement(Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; - virtual ResourceEnum_t getResource() const { return STREAM; } + virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return STREAM; } }; class OOXMLFastContextHandlerTextTableCell : public OOXMLFastContextHandler @@ -474,7 +474,7 @@ public: (OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerTextTableCell(); - virtual string getType() const { return "TextTableCell"; } + virtual string getType() const SAL_OVERRIDE { return "TextTableCell"; } void startCell(); void endCell(); @@ -487,7 +487,7 @@ public: (OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerTextTableRow(); - virtual string getType() const { return "TextTableRow"; } + virtual string getType() const SAL_OVERRIDE { return "TextTableRow"; } void startRow(); void endRow(); @@ -501,16 +501,16 @@ public: virtual ~OOXMLFastContextHandlerTextTable(); - virtual string getType() const { return "TextTable"; } + virtual string getType() const SAL_OVERRIDE { return "TextTable"; } protected: virtual void lcl_startFastElement (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; virtual void lcl_endFastElement(Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; }; class OOXMLFastContextHandlerShape: public OOXMLFastContextHandlerProperties @@ -524,30 +524,30 @@ public: (OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerShape(); - virtual string getType() const { return "Shape"; } + virtual string getType() const SAL_OVERRIDE { return "Shape"; } // ::com::sun::star::xml::sax::XFastContextHandler: virtual void SAL_CALL startUnknownElement (const OUString & Namespace, const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endUnknownElement (const OUString & Namespace, const OUString & Name) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext (const OUString & Namespace, const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; - virtual void setToken(Token_t nToken); + virtual void setToken(Token_t nToken) SAL_OVERRIDE; - virtual ResourceEnum_t getResource() const { return SHAPE; } + virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return SHAPE; } void sendShape( Token_t Element ); bool isShapeSent( ) { return m_bShapeSent; } @@ -559,19 +559,19 @@ protected: virtual void lcl_startFastElement (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; virtual void lcl_endFastElement(Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; virtual uno::Reference< xml::sax::XFastContextHandler > lcl_createFastChildContext (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; virtual void lcl_characters(const OUString & aChars) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; }; @@ -595,58 +595,58 @@ public: (const OUString & Namespace, const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endUnknownElement (const OUString & Namespace, const OUString & Name) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext (const OUString & Namespace, const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void attributes (const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; - virtual ResourceEnum_t getResource() const; + virtual ResourceEnum_t getResource() const SAL_OVERRIDE; void addNamespace(const Id & nId); void addToken( Token_t Element ); - virtual void newProperty(const Id & rId, OOXMLValue::Pointer_t pVal); - virtual void setPropertySet(OOXMLPropertySet::Pointer_t pPropertySet); - virtual OOXMLPropertySet::Pointer_t getPropertySet() const; + virtual void newProperty(const Id & rId, OOXMLValue::Pointer_t pVal) SAL_OVERRIDE; + virtual void setPropertySet(OOXMLPropertySet::Pointer_t pPropertySet) SAL_OVERRIDE; + virtual OOXMLPropertySet::Pointer_t getPropertySet() const SAL_OVERRIDE; - virtual string getType() const; + virtual string getType() const SAL_OVERRIDE; protected: virtual void lcl_startFastElement (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; virtual void lcl_endFastElement(Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; virtual uno::Reference< xml::sax::XFastContextHandler > lcl_createFastChildContext (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; virtual void lcl_characters(const OUString & aChars) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; - virtual void setId(Id nId); - virtual Id getId() const; + virtual void setId(Id nId) SAL_OVERRIDE; + virtual Id getId() const SAL_OVERRIDE; - virtual void setToken(Token_t nToken); - virtual Token_t getToken() const; + virtual void setToken(Token_t nToken) SAL_OVERRIDE; + virtual Token_t getToken() const SAL_OVERRIDE; private: uno::Reference<XFastContextHandler> mxContext; @@ -680,7 +680,7 @@ public: /** Return the type of the class, as written in model.xml . */ - virtual string getType() const = 0; + virtual string getType() const SAL_OVERRIDE = 0; protected: /** @@ -690,15 +690,15 @@ protected: virtual void process() = 0; virtual void lcl_startFastElement(Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; - virtual void lcl_endFastElement(Token_t Element) throw (uno::RuntimeException, xml::sax::SAXException); + virtual void lcl_endFastElement(Token_t Element) throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; virtual uno::Reference< xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException); + throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; - virtual void lcl_characters(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException); + virtual void lcl_characters(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException) SAL_OVERRIDE; // should be private, but not much point in making deep copies of it oox::formulaimport::XmlStreamBuilder buffer; @@ -711,9 +711,9 @@ class OOXMLFastContextHandlerMath: public OOXMLFastContextHandlerLinear { public: explicit OOXMLFastContextHandlerMath(OOXMLFastContextHandler * pContext); - virtual string getType() const { return "Math"; } + virtual string getType() const SAL_OVERRIDE { return "Math"; } protected: - virtual void process(); + virtual void process() SAL_OVERRIDE; }; }} diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx index 78aa3583678d..e9889fe685fe 100644 --- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx @@ -49,42 +49,42 @@ public: // ::com::sun::star::xml::sax::XFastDocumentHandler: virtual void SAL_CALL startDocument() - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endDocument() - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDocumentLocator (const uno::Reference< xml::sax::XLocator > & xLocator) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; // ::com::sun::star::xml::sax::XFastContextHandler: virtual void SAL_CALL startFastElement (::sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL startUnknownElement (const OUString & Namespace, const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endFastElement(::sal_Int32 Element) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endUnknownElement (const OUString & Namespace, const OUString & Name) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createFastChildContext (::sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext (const OUString & Namespace, const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL characters(const OUString & aChars) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception); + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE; void setIsSubstream( bool bSubstream ); diff --git a/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx b/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx index f9d0ce90c486..c5aced0ec1c2 100644 --- a/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx @@ -39,13 +39,13 @@ public: explicit OOXMLFastTokenHandler(css::uno::Reference< css::uno::XComponentContext > const & context); // ::com::sun::star::xml::sax::XFastTokenHandler: - virtual ::sal_Int32 SAL_CALL getToken(const OUString & Identifier) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getIdentifier(::sal_Int32 Token) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getUTF8Identifier(::sal_Int32 Token) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getTokenFromUTF8(const css::uno::Sequence< ::sal_Int8 > & Identifier) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getToken(const OUString & Identifier) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getIdentifier(::sal_Int32 Token) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getUTF8Identifier(::sal_Int32 Token) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getTokenFromUTF8(const css::uno::Sequence< ::sal_Int8 > & Identifier) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Much faster direct C++ shortcut to the method that matters - virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const; + virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const SAL_OVERRIDE; private: OOXMLFastTokenHandler(OOXMLFastTokenHandler &); // not defined diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx index d07a69cddec5..b8f99708a720 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx @@ -32,13 +32,13 @@ public: virtual ~OOXMLProperty(); - virtual sal_uInt32 getId() const = 0; - virtual Value::Pointer_t getValue() = 0; - virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() = 0; - virtual writerfilter::Reference<Stream>::Pointer_t getStream() = 0; - virtual writerfilter::Reference<Properties>::Pointer_t getProps() = 0; - virtual string getName() const = 0; - virtual string toString() const = 0; + virtual sal_uInt32 getId() const SAL_OVERRIDE = 0; + virtual Value::Pointer_t getValue() SAL_OVERRIDE = 0; + virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE = 0; + virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE = 0; + virtual writerfilter::Reference<Properties>::Pointer_t getProps() SAL_OVERRIDE = 0; + virtual string getName() const SAL_OVERRIDE = 0; + virtual string toString() const SAL_OVERRIDE = 0; virtual void resolve(Properties & rProperties) = 0; virtual Sprm * clone() = 0; @@ -51,8 +51,8 @@ public: virtual ~OOXMLPropertySet(); - virtual void resolve(Properties & rHandler) = 0; - virtual string getType() const = 0; + virtual void resolve(Properties & rHandler) SAL_OVERRIDE = 0; + virtual string getType() const SAL_OVERRIDE = 0; virtual void add(OOXMLProperty::Pointer_t pProperty) = 0; virtual void add(OOXMLPropertySet::Pointer_t pPropertySet) = 0; virtual OOXMLPropertySet * clone() const = 0; @@ -66,7 +66,7 @@ class OOXMLTable : public writerfilter::Reference<Table> public: virtual ~OOXMLTable(); - virtual void resolve(Table & rTable) = 0; + virtual void resolve(Table & rTable) SAL_OVERRIDE = 0; virtual OOXMLTable * clone() const = 0; }; }} diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx index c3ce87fac200..3bb6de564cbd 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx @@ -44,14 +44,14 @@ public: OOXMLValue(); virtual ~OOXMLValue(); - virtual int getInt() const; + virtual int getInt() const SAL_OVERRIDE; virtual bool getBool() const; - virtual OUString getString() const; - virtual uno::Any getAny() const; - virtual writerfilter::Reference<Properties>::Pointer_t getProperties(); - virtual writerfilter::Reference<Stream>::Pointer_t getStream(); - virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary(); - virtual string toString() const; + virtual OUString getString() const SAL_OVERRIDE; + virtual uno::Any getAny() const SAL_OVERRIDE; + virtual writerfilter::Reference<Properties>::Pointer_t getProperties() SAL_OVERRIDE; + virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE; + virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE; + virtual string toString() const SAL_OVERRIDE; virtual OOXMLValue * clone() const; }; @@ -71,16 +71,16 @@ public: OOXMLPropertyImpl(const OOXMLPropertyImpl & rSprm); virtual ~OOXMLPropertyImpl(); - virtual sal_uInt32 getId() const; - virtual Value::Pointer_t getValue(); - virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary(); - virtual writerfilter::Reference<Stream>::Pointer_t getStream(); - virtual writerfilter::Reference<Properties>::Pointer_t getProps(); - virtual string getName() const; - virtual Kind getKind(); - virtual string toString() const; - virtual Sprm * clone(); - virtual void resolve(Properties & rProperties); + virtual sal_uInt32 getId() const SAL_OVERRIDE; + virtual Value::Pointer_t getValue() SAL_OVERRIDE; + virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE; + virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE; + virtual writerfilter::Reference<Properties>::Pointer_t getProps() SAL_OVERRIDE; + virtual string getName() const SAL_OVERRIDE; + virtual Kind getKind() SAL_OVERRIDE; + virtual string toString() const SAL_OVERRIDE; + virtual Sprm * clone() SAL_OVERRIDE; + virtual void resolve(Properties & rProperties) SAL_OVERRIDE; }; class OOXMLBinaryValue : public OOXMLValue @@ -91,9 +91,9 @@ public: explicit OOXMLBinaryValue(OOXMLBinaryObjectReference::Pointer_t pBinaryObj); virtual ~OOXMLBinaryValue(); - virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary(); - virtual string toString() const; - virtual OOXMLValue * clone() const; + virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE; + virtual string toString() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const SAL_OVERRIDE; }; class OOXMLBooleanValue : public OOXMLValue @@ -105,11 +105,11 @@ public: explicit OOXMLBooleanValue(const OUString & rValue); virtual ~OOXMLBooleanValue(); - virtual int getInt() const; - virtual bool getBool() const; - virtual uno::Any getAny() const; - virtual string toString() const; - virtual OOXMLValue * clone() const; + virtual int getInt() const SAL_OVERRIDE; + virtual bool getBool() const SAL_OVERRIDE; + virtual uno::Any getAny() const SAL_OVERRIDE; + virtual string toString() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const SAL_OVERRIDE; }; class OOXMLStringValue : public OOXMLValue @@ -120,10 +120,10 @@ public: explicit OOXMLStringValue(const OUString & rStr); virtual ~OOXMLStringValue(); - virtual uno::Any getAny() const; - virtual OUString getString() const; - virtual string toString() const; - virtual OOXMLValue * clone() const; + virtual uno::Any getAny() const SAL_OVERRIDE; + virtual OUString getString() const SAL_OVERRIDE; + virtual string toString() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const SAL_OVERRIDE; }; class OOXMLInputStreamValue : public OOXMLValue @@ -135,9 +135,9 @@ public: explicit OOXMLInputStreamValue(uno::Reference<io::XInputStream> xInputStream); virtual ~OOXMLInputStreamValue(); - virtual uno::Any getAny() const; - virtual string toString() const; - virtual OOXMLValue * clone() const; + virtual uno::Any getAny() const SAL_OVERRIDE; + virtual string toString() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const SAL_OVERRIDE; }; struct OOXMLPropertySetImplCompare @@ -157,20 +157,20 @@ public: OOXMLPropertySetImpl(); virtual ~OOXMLPropertySetImpl(); - virtual void resolve(Properties & rHandler); - virtual string getType() const; - virtual void add(OOXMLProperty::Pointer_t pProperty); - virtual void add(OOXMLPropertySet::Pointer_t pPropertySet); - virtual OOXMLPropertySet * clone() const; + virtual void resolve(Properties & rHandler) SAL_OVERRIDE; + virtual string getType() const SAL_OVERRIDE; + virtual void add(OOXMLProperty::Pointer_t pProperty) SAL_OVERRIDE; + virtual void add(OOXMLPropertySet::Pointer_t pPropertySet) SAL_OVERRIDE; + virtual OOXMLPropertySet * clone() const SAL_OVERRIDE; OOXMLProperties_t::iterator begin(); OOXMLProperties_t::iterator end(); OOXMLProperties_t::const_iterator begin() const; OOXMLProperties_t::const_iterator end() const; - virtual void setType(const string & rsType); + virtual void setType(const string & rsType) SAL_OVERRIDE; - virtual string toString(); + virtual string toString() SAL_OVERRIDE; }; class OOXMLPropertySetValue : public OOXMLValue @@ -180,9 +180,9 @@ public: OOXMLPropertySetValue(OOXMLPropertySet::Pointer_t pPropertySet); virtual ~OOXMLPropertySetValue(); - virtual writerfilter::Reference<Properties>::Pointer_t getProperties(); - virtual string toString() const; - virtual OOXMLValue * clone() const; + virtual writerfilter::Reference<Properties>::Pointer_t getProperties() SAL_OVERRIDE; + virtual string toString() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const SAL_OVERRIDE; }; class OOXMLIntegerValue : public OOXMLValue @@ -194,10 +194,10 @@ public: explicit OOXMLIntegerValue(const OUString & rValue); virtual ~OOXMLIntegerValue(); - virtual int getInt() const; - virtual uno::Any getAny() const; - virtual string toString() const; - virtual OOXMLValue * clone() const; + virtual int getInt() const SAL_OVERRIDE; + virtual uno::Any getAny() const SAL_OVERRIDE; + virtual string toString() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const SAL_OVERRIDE; }; class OOXMLHexValue : public OOXMLValue @@ -209,9 +209,9 @@ public: explicit OOXMLHexValue(const OUString & rValue); virtual ~OOXMLHexValue(); - virtual int getInt() const; - virtual string toString() const; - virtual OOXMLValue * clone() const; + virtual int getInt() const SAL_OVERRIDE; + virtual string toString() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const SAL_OVERRIDE; }; /// Handles OOXML's ST_UniversalMeasure value. @@ -223,9 +223,9 @@ public: explicit OOXMLUniversalMeasureValue(const OUString& rValue); virtual ~OOXMLUniversalMeasureValue(); - virtual int getInt() const; - virtual string toString() const; - virtual OOXMLValue* clone() const; + virtual int getInt() const SAL_OVERRIDE; + virtual string toString() const SAL_OVERRIDE; + virtual OOXMLValue* clone() const SAL_OVERRIDE; }; class OOXMLShapeValue : public OOXMLValue @@ -236,9 +236,9 @@ public: explicit OOXMLShapeValue(uno::Reference<XShape> rShape); virtual ~OOXMLShapeValue(); - virtual uno::Any getAny() const; - virtual string toString() const; - virtual OOXMLValue * clone() const; + virtual uno::Any getAny() const SAL_OVERRIDE; + virtual string toString() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const SAL_OVERRIDE; }; class OOXMLStarMathValue : public OOXMLValue @@ -249,9 +249,9 @@ public: explicit OOXMLStarMathValue( uno::Reference< embed::XEmbeddedObject > component ); virtual ~OOXMLStarMathValue(); - virtual uno::Any getAny() const; - virtual string toString() const; - virtual OOXMLValue * clone() const; + virtual uno::Any getAny() const SAL_OVERRIDE; + virtual string toString() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const SAL_OVERRIDE; }; class OOXMLTableImpl : public OOXMLTable @@ -266,10 +266,10 @@ public: OOXMLTableImpl(); virtual ~OOXMLTableImpl(); - virtual void resolve(Table & rTable); + virtual void resolve(Table & rTable) SAL_OVERRIDE; virtual void add(ValuePointer_t pPropertySet); - virtual string getType() const; - virtual OOXMLTable * clone() const; + virtual string getType() const SAL_OVERRIDE; + virtual OOXMLTable * clone() const SAL_OVERRIDE; }; class OOXMLPropertySetEntryToString : public Properties @@ -281,8 +281,8 @@ public: OOXMLPropertySetEntryToString(Id nId); virtual ~OOXMLPropertySetEntryToString(); - virtual void sprm(Sprm & rSprm); - virtual void attribute(Id nId, Value & rValue); + virtual void sprm(Sprm & rSprm) SAL_OVERRIDE; + virtual void attribute(Id nId, Value & rValue) SAL_OVERRIDE; const OUString & getString() const; }; @@ -295,8 +295,8 @@ public: OOXMLPropertySetEntryToInteger(Id nId); virtual ~OOXMLPropertySetEntryToInteger(); - virtual void sprm(Sprm & rSprm); - virtual void attribute(Id nId, Value & rValue); + virtual void sprm(Sprm & rSprm) SAL_OVERRIDE; + virtual void attribute(Id nId, Value & rValue) SAL_OVERRIDE; int getValue() const; }; diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx index 2230944efef0..0ba6ccba29f2 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx @@ -74,16 +74,16 @@ public: virtual ~OOXMLStreamImpl(); - virtual uno::Reference<xml::sax::XParser> getParser(); - virtual uno::Reference<xml::sax::XFastParser> getFastParser(); - virtual uno::Reference<io::XInputStream> getDocumentStream(); - virtual uno::Reference<io::XInputStream> getStorageStream(); - virtual uno::Reference<uno::XComponentContext> getContext(); - virtual OUString getTargetForId(const OUString & rId); - virtual const OUString & getTarget() const; + virtual uno::Reference<xml::sax::XParser> getParser() SAL_OVERRIDE; + virtual uno::Reference<xml::sax::XFastParser> getFastParser() SAL_OVERRIDE; + virtual uno::Reference<io::XInputStream> getDocumentStream() SAL_OVERRIDE; + virtual uno::Reference<io::XInputStream> getStorageStream() SAL_OVERRIDE; + virtual uno::Reference<uno::XComponentContext> getContext() SAL_OVERRIDE; + virtual OUString getTargetForId(const OUString & rId) SAL_OVERRIDE; + virtual const OUString & getTarget() const SAL_OVERRIDE; virtual uno::Reference<xml::sax::XFastTokenHandler> - getFastTokenHandler(uno::Reference<uno::XComponentContext> rContext); + getFastTokenHandler(uno::Reference<uno::XComponentContext> rContext) SAL_OVERRIDE; void setInputStream(uno::Reference<io::XInputStream> rxInputStream); uno::Reference<io::XStream> accessDocumentStream(); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index 0fc84e2f9c97..d33869394e77 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -310,26 +310,26 @@ namespace writerfilter { virtual ~RTFDocumentImpl(); // RTFDocument - virtual void resolve(Stream & rHandler); - virtual std::string getType() const; + virtual void resolve(Stream & rHandler) SAL_OVERRIDE; + virtual std::string getType() const SAL_OVERRIDE; // RTFListener - virtual int dispatchDestination(RTFKeyword nKeyword); - virtual int dispatchFlag(RTFKeyword nKeyword); - virtual int dispatchSymbol(RTFKeyword nKeyword); - virtual int dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam); - virtual int dispatchValue(RTFKeyword nKeyword, int nParam); - virtual int resolveChars(char ch); - virtual int pushState(); - virtual int popState(); - virtual RTFDestinationState getDestinationState(); - virtual void setDestinationState(RTFDestinationState nDestinationState); - virtual RTFInternalState getInternalState(); - virtual void setInternalState(RTFInternalState nInternalState); - virtual bool getSkipUnknown(); - virtual void setSkipUnknown(bool bSkipUnknown); - virtual void finishSubstream(); - virtual bool isSubstream() const; + virtual int dispatchDestination(RTFKeyword nKeyword) SAL_OVERRIDE; + virtual int dispatchFlag(RTFKeyword nKeyword) SAL_OVERRIDE; + virtual int dispatchSymbol(RTFKeyword nKeyword) SAL_OVERRIDE; + virtual int dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam) SAL_OVERRIDE; + virtual int dispatchValue(RTFKeyword nKeyword, int nParam) SAL_OVERRIDE; + virtual int resolveChars(char ch) SAL_OVERRIDE; + virtual int pushState() SAL_OVERRIDE; + virtual int popState() SAL_OVERRIDE; + virtual RTFDestinationState getDestinationState() SAL_OVERRIDE; + virtual void setDestinationState(RTFDestinationState nDestinationState) SAL_OVERRIDE; + virtual RTFInternalState getInternalState() SAL_OVERRIDE; + virtual void setInternalState(RTFInternalState nInternalState) SAL_OVERRIDE; + virtual bool getSkipUnknown() SAL_OVERRIDE; + virtual void setSkipUnknown(bool bSkipUnknown) SAL_OVERRIDE; + virtual void finishSubstream() SAL_OVERRIDE; + virtual bool isSubstream() const SAL_OVERRIDE; Stream& Mapper(); void setSubstream(bool bIsSubtream); diff --git a/writerfilter/source/rtftok/rtflookahead.hxx b/writerfilter/source/rtftok/rtflookahead.hxx index 64ccfba89539..6746ebe29538 100644 --- a/writerfilter/source/rtftok/rtflookahead.hxx +++ b/writerfilter/source/rtftok/rtflookahead.hxx @@ -26,22 +26,22 @@ namespace writerfilter { public: RTFLookahead(SvStream& rStream, sal_Size nGroupStart); virtual ~RTFLookahead(); - virtual int dispatchDestination(RTFKeyword nKeyword); - virtual int dispatchFlag(RTFKeyword nKeyword); - virtual int dispatchSymbol(RTFKeyword nKeyword); - virtual int dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam); - virtual int dispatchValue(RTFKeyword nKeyword, int nParam); - virtual int resolveChars(char ch); - virtual int pushState(); - virtual int popState(); - virtual RTFDestinationState getDestinationState(); - virtual void setDestinationState(RTFDestinationState nDestinationState); - virtual RTFInternalState getInternalState(); - virtual void setInternalState(RTFInternalState nInternalState); - virtual bool getSkipUnknown(); - virtual void setSkipUnknown(bool bSkipUnknown); - virtual void finishSubstream(); - virtual bool isSubstream() const; + virtual int dispatchDestination(RTFKeyword nKeyword) SAL_OVERRIDE; + virtual int dispatchFlag(RTFKeyword nKeyword) SAL_OVERRIDE; + virtual int dispatchSymbol(RTFKeyword nKeyword) SAL_OVERRIDE; + virtual int dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam) SAL_OVERRIDE; + virtual int dispatchValue(RTFKeyword nKeyword, int nParam) SAL_OVERRIDE; + virtual int resolveChars(char ch) SAL_OVERRIDE; + virtual int pushState() SAL_OVERRIDE; + virtual int popState() SAL_OVERRIDE; + virtual RTFDestinationState getDestinationState() SAL_OVERRIDE; + virtual void setDestinationState(RTFDestinationState nDestinationState) SAL_OVERRIDE; + virtual RTFInternalState getInternalState() SAL_OVERRIDE; + virtual void setInternalState(RTFInternalState nInternalState) SAL_OVERRIDE; + virtual bool getSkipUnknown() SAL_OVERRIDE; + virtual void setSkipUnknown(bool bSkipUnknown) SAL_OVERRIDE; + virtual void finishSubstream() SAL_OVERRIDE; + virtual bool isSubstream() const SAL_OVERRIDE; bool hasTable(); private: boost::shared_ptr<RTFTokenizer> m_pTokenizer; diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.hxx b/writerfilter/source/rtftok/rtfreferenceproperties.hxx index 18af0ac91512..cfc88dff51db 100644 --- a/writerfilter/source/rtftok/rtfreferenceproperties.hxx +++ b/writerfilter/source/rtftok/rtfreferenceproperties.hxx @@ -22,8 +22,8 @@ namespace writerfilter { RTFReferenceProperties(RTFSprms rAttributes, RTFSprms rSprms); RTFReferenceProperties(RTFSprms rAttributes); virtual ~RTFReferenceProperties(); - virtual void resolve(Properties & rHandler); - virtual std::string getType() const; + virtual void resolve(Properties & rHandler) SAL_OVERRIDE; + virtual std::string getType() const SAL_OVERRIDE; RTFSprms& getAttributes(); RTFSprms& getSprms(); private: diff --git a/writerfilter/source/rtftok/rtfreferencetable.hxx b/writerfilter/source/rtftok/rtfreferencetable.hxx index 04521e7fb0fb..494370aba3ad 100644 --- a/writerfilter/source/rtftok/rtfreferencetable.hxx +++ b/writerfilter/source/rtftok/rtfreferencetable.hxx @@ -24,8 +24,8 @@ namespace writerfilter { typedef std::pair<int, writerfilter::Reference<Properties>::Pointer_t> Entry_t; RTFReferenceTable(Entries_t const& rEntries); virtual ~RTFReferenceTable(); - virtual void resolve(Table & rHandler); - virtual std::string getType() const; + virtual void resolve(Table & rHandler) SAL_OVERRIDE; + virtual std::string getType() const SAL_OVERRIDE; private: Entries_t m_aEntries; }; diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx index eb18f6d82c96..42cbd6b32483 100644 --- a/writerfilter/source/rtftok/rtfsprm.hxx +++ b/writerfilter/source/rtftok/rtfsprm.hxx @@ -83,14 +83,14 @@ namespace writerfilter { public: RTFSprm(Id nKeyword, RTFValue::Pointer_t& pValue); virtual ~RTFSprm() {} - virtual sal_uInt32 getId() const; - virtual Value::Pointer_t getValue(); - virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary(); - virtual writerfilter::Reference<Stream>::Pointer_t getStream(); - virtual writerfilter::Reference<Properties>::Pointer_t getProps(); - virtual Kind getKind(); - virtual std::string getName() const; - virtual std::string toString() const; + virtual sal_uInt32 getId() const SAL_OVERRIDE; + virtual Value::Pointer_t getValue() SAL_OVERRIDE; + virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE; + virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE; + virtual writerfilter::Reference<Properties>::Pointer_t getProps() SAL_OVERRIDE; + virtual Kind getKind() SAL_OVERRIDE; + virtual std::string getName() const SAL_OVERRIDE; + virtual std::string toString() const SAL_OVERRIDE; private: Id m_nKeyword; RTFValue::Pointer_t& m_pValue; diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx index adfd4b0d307e..dc0662a402e2 100644 --- a/writerfilter/source/rtftok/rtfvalue.hxx +++ b/writerfilter/source/rtftok/rtfvalue.hxx @@ -38,13 +38,13 @@ namespace writerfilter { RTFValue(RTFShape aShape); virtual ~RTFValue(); void setString(const OUString& sValue); - virtual int getInt() const; - virtual OUString getString() const; - virtual uno::Any getAny() const; - virtual writerfilter::Reference<Properties>::Pointer_t getProperties(); - virtual writerfilter::Reference<Stream>::Pointer_t getStream(); - virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary(); - virtual std::string toString() const; + virtual int getInt() const SAL_OVERRIDE; + virtual OUString getString() const SAL_OVERRIDE; + virtual uno::Any getAny() const SAL_OVERRIDE; + virtual writerfilter::Reference<Properties>::Pointer_t getProperties() SAL_OVERRIDE; + virtual writerfilter::Reference<Stream>::Pointer_t getStream() SAL_OVERRIDE; + virtual writerfilter::Reference<BinaryObj>::Pointer_t getBinary() SAL_OVERRIDE; + virtual std::string toString() const SAL_OVERRIDE; virtual RTFValue* Clone(); RTFSprms& getAttributes(); RTFSprms& getSprms(); |