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/dmapper | |
parent | Introduce INetContentType::scan (diff) | |
download | core-567ef6d5782cdb729b49005caf6005610ce03e22.tar.gz core-567ef6d5782cdb729b49005caf6005610ce03e22.zip |
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/dmapper')
27 files changed, 108 insertions, 108 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; }; |