From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- writerfilter/source/dmapper/BorderHandler.hxx | 4 +- writerfilter/source/dmapper/CellColorHandler.hxx | 4 +- writerfilter/source/dmapper/CellMarginHandler.hxx | 4 +- writerfilter/source/dmapper/DomainMapper.hxx | 50 +++---- .../source/dmapper/DomainMapperTableManager.hxx | 20 +-- writerfilter/source/dmapper/FFDataHandler.hxx | 4 +- writerfilter/source/dmapper/FontTable.hxx | 38 +++--- writerfilter/source/dmapper/GraphicHelpers.hxx | 8 +- writerfilter/source/dmapper/GraphicImport.cxx | 10 +- writerfilter/source/dmapper/GraphicImport.hxx | 36 +++--- writerfilter/source/dmapper/LatentStyleHandler.hxx | 4 +- writerfilter/source/dmapper/LoggedResources.hxx | 42 +++--- writerfilter/source/dmapper/MeasureHandler.hxx | 4 +- writerfilter/source/dmapper/ModelEventListener.hxx | 4 +- writerfilter/source/dmapper/NumberingManager.hxx | 8 +- writerfilter/source/dmapper/OLEHandler.hxx | 4 +- writerfilter/source/dmapper/PageBordersHandler.hxx | 4 +- writerfilter/source/dmapper/PropertyMap.hxx | 2 +- .../source/dmapper/SectionColumnHandler.hxx | 4 +- writerfilter/source/dmapper/SettingsTable.hxx | 6 +- writerfilter/source/dmapper/StyleSheetTable.hxx | 6 +- writerfilter/source/dmapper/TDefTableHandler.hxx | 4 +- .../source/dmapper/TablePositionHandler.hxx | 4 +- writerfilter/source/dmapper/TblStylePrHandler.hxx | 4 +- writerfilter/source/dmapper/TextEffectsHandler.hxx | 4 +- writerfilter/source/dmapper/ThemeTable.hxx | 6 +- .../source/dmapper/TrackChangesHandler.hxx | 4 +- writerfilter/source/dmapper/WrapPolygonHandler.hxx | 4 +- writerfilter/source/filter/RtfFilter.cxx | 16 +-- writerfilter/source/filter/WriterFilter.cxx | 16 +-- .../source/filter/WriterFilterDetection.cxx | 8 +- writerfilter/source/ooxml/Handler.hxx | 40 +++--- .../source/ooxml/OOXMLBinaryObjectReference.hxx | 2 +- writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 60 ++++----- .../source/ooxml/OOXMLFastContextHandler.hxx | 144 ++++++++++----------- .../source/ooxml/OOXMLFastDocumentHandler.hxx | 20 +-- writerfilter/source/ooxml/OOXMLPropertySet.hxx | 14 +- writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx | 116 ++++++++--------- writerfilter/source/ooxml/OOXMLStreamImpl.hxx | 16 +-- writerfilter/source/rtftok/rtfdocumentimpl.hxx | 34 ++--- writerfilter/source/rtftok/rtflookahead.hxx | 32 ++--- .../source/rtftok/rtfreferenceproperties.hxx | 2 +- writerfilter/source/rtftok/rtfreferencetable.hxx | 2 +- writerfilter/source/rtftok/rtfsprm.hxx | 10 +- writerfilter/source/rtftok/rtfvalue.hxx | 12 +- 45 files changed, 420 insertions(+), 420 deletions(-) (limited to 'writerfilter/source') diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx index 07b5b195d1eb..ae9736aa524e 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) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; public: explicit BorderHandler( bool bOOXML ); diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx index c55d280d0b79..98fe7916b181 100644 --- a/writerfilter/source/dmapper/CellColorHandler.hxx +++ b/writerfilter/source/dmapper/CellColorHandler.hxx @@ -43,8 +43,8 @@ private: std::vector m_aInteropGrabBag; // Properties - virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; void createGrabBag(const OUString& aName, const css::uno::Any& rValue); diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx index de97ac89009f..a33f92d64b4d 100644 --- a/writerfilter/source/dmapper/CellMarginHandler.hxx +++ b/writerfilter/source/dmapper/CellMarginHandler.hxx @@ -39,8 +39,8 @@ private: std::vector m_aInteropGrabBag; // Properties - virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; void createGrabBag(const OUString& aName); diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx index 0cd287825193..e0583691be94 100644 --- a/writerfilter/source/dmapper/DomainMapper.hxx +++ b/writerfilter/source/dmapper/DomainMapper.hxx @@ -85,12 +85,12 @@ public: virtual ~DomainMapper(); // Stream - virtual void markLastParagraphInSection() SAL_OVERRIDE; - virtual void markLastSectionGroup() SAL_OVERRIDE; + virtual void markLastParagraphInSection() override; + virtual void markLastSectionGroup() override; // BinaryObj virtual void data(const sal_uInt8* buf, size_t len, - writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; + writerfilter::Reference::Pointer_t ref) override; void sprmWithProps( Sprm& sprm, ::std::shared_ptr pContext ); @@ -132,34 +132,34 @@ public: private: // Stream - 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_startShape(css::uno::Reference const& xShape) SAL_OVERRIDE; - virtual void lcl_endShape( ) 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_positionOffset(const OUString& rText, bool bVertical) SAL_OVERRIDE; - virtual css::awt::Point getPositionOffset() SAL_OVERRIDE; - virtual void lcl_align(const OUString& rText, bool bVertical) SAL_OVERRIDE; - virtual void lcl_positivePercentage(const OUString& rText) SAL_OVERRIDE; - virtual void lcl_props(writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; + virtual void lcl_startSectionGroup() override; + virtual void lcl_endSectionGroup() override; + virtual void lcl_startParagraphGroup() override; + virtual void lcl_endParagraphGroup() override; + virtual void lcl_startCharacterGroup() override; + virtual void lcl_endCharacterGroup() override; + virtual void lcl_startShape(css::uno::Reference const& xShape) override; + virtual void lcl_endShape( ) override; + + virtual void lcl_text(const sal_uInt8 * data, size_t len) override; + virtual void lcl_utext(const sal_uInt8 * data, size_t len) override; + virtual void lcl_positionOffset(const OUString& rText, bool bVertical) override; + virtual css::awt::Point getPositionOffset() override; + virtual void lcl_align(const OUString& rText, bool bVertical) override; + virtual void lcl_positivePercentage(const OUString& rText) override; + virtual void lcl_props(writerfilter::Reference::Pointer_t ref) override; virtual void lcl_table(Id name, - writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; + writerfilter::Reference
::Pointer_t ref) override; virtual void lcl_substream(Id name, - ::writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; - virtual void lcl_info(const std::string & info) SAL_OVERRIDE; + ::writerfilter::Reference::Pointer_t ref) override; + virtual void lcl_info(const std::string & info) override; // Properties - virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; + virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) override; static void handleUnderlineType(const Id nId, const ::std::shared_ptr& rContext); void handleParaJustification(const sal_Int32 nIntValue, const ::std::shared_ptr& rContext, const bool bExchangeLeftRight); diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index 14e20b8c12d9..18c4b4df0d4f 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -76,7 +76,7 @@ class DomainMapperTableManager : public TableManager std::unique_ptr m_pTablePropsHandler; PropertyMapPtr m_pStyleProps; - virtual void clearData() SAL_OVERRIDE; + virtual void clearData() override; public: @@ -87,14 +87,14 @@ public: // but in the provided properties map. inline void SetStyleProperties( PropertyMapPtr pProperties ) { m_pStyleProps = pProperties; }; - virtual bool sprm(Sprm & rSprm) SAL_OVERRIDE; + virtual bool sprm(Sprm & rSprm) override; bool attribute(Id nName, Value & val); - virtual void startLevel( ) SAL_OVERRIDE; - virtual void endLevel( ) SAL_OVERRIDE; + virtual void startLevel( ) override; + virtual void endLevel( ) override; - virtual void endOfCellAction() SAL_OVERRIDE; - virtual void endOfRowAction() SAL_OVERRIDE; + virtual void endOfCellAction() override; + virtual void endOfRowAction() override; IntVectorPtr getCurrentGrid( ); IntVectorPtr getCurrentSpans( ); @@ -105,7 +105,7 @@ public: const css::uno::Sequence getCurrentTablePosition(); TablePositionHandler* getCurrentTableRealPosition(); - virtual void cellProps(TablePropertyMapPtr pProps) SAL_OVERRIDE + virtual void cellProps(TablePropertyMapPtr pProps) override { if ( m_pStyleProps.get( ) ) m_pStyleProps->InsertProps(pProps); @@ -113,7 +113,7 @@ public: TableManager::cellProps( pProps ); }; - virtual void cellPropsByCell(unsigned int i, TablePropertyMapPtr pProps) SAL_OVERRIDE + virtual void cellPropsByCell(unsigned int i, TablePropertyMapPtr pProps) override { if ( m_pStyleProps.get( ) ) m_pStyleProps->InsertProps(pProps); @@ -121,7 +121,7 @@ public: TableManager::cellPropsByCell( i, pProps ); }; - virtual void insertRowProps(TablePropertyMapPtr pProps) SAL_OVERRIDE + virtual void insertRowProps(TablePropertyMapPtr pProps) override { if ( m_pStyleProps.get( ) ) m_pStyleProps->InsertProps(pProps); @@ -129,7 +129,7 @@ public: TableManager::insertRowProps( pProps ); }; - virtual void insertTableProps(TablePropertyMapPtr pProps) SAL_OVERRIDE + virtual void insertTableProps(TablePropertyMapPtr pProps) override { if ( m_pStyleProps.get( ) ) m_pStyleProps->InsertProps(pProps); diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx index 88991e3eeb79..a2149e9c7727 100644 --- a/writerfilter/source/dmapper/FFDataHandler.hxx +++ b/writerfilter/source/dmapper/FFDataHandler.hxx @@ -78,10 +78,10 @@ private: OUString m_sTextDefault; // sprm - void lcl_sprm(Sprm & r_sprm) SAL_OVERRIDE; + void lcl_sprm(Sprm & r_sprm) override; // attribute - void lcl_attribute(Id name, Value & val) SAL_OVERRIDE; + void lcl_attribute(Id name, Value & val) override; }; diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx index 52002cabea6b..ff416930e3ea 100644 --- a/writerfilter/source/dmapper/FontTable.hxx +++ b/writerfilter/source/dmapper/FontTable.hxx @@ -67,30 +67,30 @@ class FontTable : public LoggedProperties, public LoggedTable private: // Properties - virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; void resolveSprm(Sprm & r_sprm); // Table - virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; + virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) override; // Stream - 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::Pointer_t ref) SAL_OVERRIDE; + virtual void lcl_startSectionGroup() override; + virtual void lcl_endSectionGroup() override; + virtual void lcl_startParagraphGroup() override; + virtual void lcl_endParagraphGroup() override; + virtual void lcl_startCharacterGroup() override; + virtual void lcl_endCharacterGroup() override; + virtual void lcl_text(const sal_uInt8 * data, size_t len) override; + virtual void lcl_utext(const sal_uInt8 * data, size_t len) override; + virtual void lcl_props(writerfilter::Reference::Pointer_t ref) override; virtual void lcl_table(Id name, - writerfilter::Reference
::Pointer_t ref) SAL_OVERRIDE; + writerfilter::Reference
::Pointer_t ref) override; virtual void lcl_substream(Id name, - ::writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; - virtual void lcl_info(const std::string & info) SAL_OVERRIDE; - virtual void lcl_startShape(css::uno::Reference const& xShape) SAL_OVERRIDE; - virtual void lcl_endShape( ) SAL_OVERRIDE; + ::writerfilter::Reference::Pointer_t ref) override; + virtual void lcl_info(const std::string & info) override; + virtual void lcl_startShape(css::uno::Reference const& xShape) override; + virtual void lcl_endShape( ) override; }; typedef std::shared_ptr< FontTable > FontTablePtr; @@ -101,8 +101,8 @@ public: EmbeddedFontHandler( const OUString& fontName, const char* style ); virtual ~EmbeddedFontHandler(); private: - virtual void lcl_attribute( Id name, Value& val ) SAL_OVERRIDE; - virtual void lcl_sprm( Sprm& rSprm ) SAL_OVERRIDE; + virtual void lcl_attribute( Id name, Value& val ) override; + virtual void lcl_sprm( Sprm& rSprm ) override; OUString fontName; const char* const style; OUString id; diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx index f669bb175cef..95c33b416c6e 100644 --- a/writerfilter/source/dmapper/GraphicHelpers.hxx +++ b/writerfilter/source/dmapper/GraphicHelpers.hxx @@ -39,8 +39,8 @@ public: sal_Int16 relation() const { return m_nRelation;} sal_Int32 position() const { return m_nPosition;} private: - virtual void lcl_attribute( Id aName, Value& rVal ) SAL_OVERRIDE; - virtual void lcl_sprm( Sprm& rSprm ) SAL_OVERRIDE; + virtual void lcl_attribute( Id aName, Value& rVal ) override; + virtual void lcl_sprm( Sprm& rSprm ) override; sal_Int16 m_nOrient; sal_Int16 m_nRelation; sal_Int32 m_nPosition; @@ -61,8 +61,8 @@ public: sal_Int32 getWrapMode( ); private: - virtual void lcl_attribute( Id aName, Value& rVal ) SAL_OVERRIDE; - virtual void lcl_sprm( Sprm& rSprm ) SAL_OVERRIDE; + virtual void lcl_attribute( Id aName, Value& rVal ) override; + virtual void lcl_sprm( Sprm& rSprm ) override; }; typedef std::shared_ptr WrapHandlerPtr; diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 8161e55ffa36..a384deaf9e24 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -83,11 +83,11 @@ public: XInputStreamHelper(const sal_uInt8* buf, size_t len, bool bBmp); virtual ~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) 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; + 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) 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) override; + virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL available( ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL closeInput( ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) 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 736a5801ae60..71b86581fe64 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::Pointer_t ref) SAL_OVERRIDE; + virtual void data(const sal_uInt8* buffer, size_t len, writerfilter::Reference::Pointer_t ref) override; css::uno::Reference GetGraphicObject(); css::uno::Reference GetXShapeObject() { return m_xShape;} @@ -97,28 +97,28 @@ public: private: // Properties - virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; + virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) override; // Stream - 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::Pointer_t ref) SAL_OVERRIDE; + virtual void lcl_startSectionGroup() override; + virtual void lcl_endSectionGroup() override; + virtual void lcl_startParagraphGroup() override; + virtual void lcl_endParagraphGroup() override; + virtual void lcl_startCharacterGroup() override; + virtual void lcl_endCharacterGroup() override; + virtual void lcl_text(const sal_uInt8 * data, size_t len) override; + virtual void lcl_utext(const sal_uInt8 * data, size_t len) override; + virtual void lcl_props(writerfilter::Reference::Pointer_t ref) override; virtual void lcl_table(Id name, - writerfilter::Reference
::Pointer_t ref) SAL_OVERRIDE; - virtual void lcl_substream(Id name, writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; - virtual void lcl_info(const std::string & info) SAL_OVERRIDE; - virtual void lcl_startShape(css::uno::Reference const& xShape) SAL_OVERRIDE; - virtual void lcl_endShape() SAL_OVERRIDE; + writerfilter::Reference
::Pointer_t ref) override; + virtual void lcl_substream(Id name, writerfilter::Reference::Pointer_t ref) override; + virtual void lcl_info(const std::string & info) override; + virtual void lcl_startShape(css::uno::Reference const& xShape) override; + virtual void lcl_endShape() override; void handleWrapTextValue(sal_uInt32 nVal); }; diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx index 5759785e8c8e..95dc2fbfd0eb 100644 --- a/writerfilter/source/dmapper/LatentStyleHandler.hxx +++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx @@ -26,8 +26,8 @@ class LatentStyleHandler std::vector m_aAttributes; // Properties - virtual void lcl_attribute(Id Name, Value& val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm& sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value& val) override; + virtual void lcl_sprm(Sprm& sprm) override; public: LatentStyleHandler(); diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx index 2361fe00ee0a..09079b563a6e 100644 --- a/writerfilter/source/dmapper/LoggedResources.hxx +++ b/writerfilter/source/dmapper/LoggedResources.hxx @@ -52,23 +52,23 @@ public: explicit LoggedStream(const std::string & sPrefix); virtual ~LoggedStream(); - void startSectionGroup() SAL_OVERRIDE; - void endSectionGroup() SAL_OVERRIDE; - void startParagraphGroup() SAL_OVERRIDE; - void endParagraphGroup() SAL_OVERRIDE; - void startCharacterGroup() SAL_OVERRIDE; - void endCharacterGroup() SAL_OVERRIDE; - void startShape(css::uno::Reference const& xShape) SAL_OVERRIDE; - void endShape() SAL_OVERRIDE; - void text(const sal_uInt8 * data, size_t len) SAL_OVERRIDE; - void utext(const sal_uInt8 * data, size_t len) SAL_OVERRIDE; - void positionOffset(const OUString& rText, bool bVertical) SAL_OVERRIDE; - void align(const OUString& rText, bool bVertical) SAL_OVERRIDE; - void positivePercentage(const OUString& rText) SAL_OVERRIDE; - void props(writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; - void table(Id name, writerfilter::Reference
::Pointer_t ref) SAL_OVERRIDE; - void substream(Id name, writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; - void info(const std::string & info) SAL_OVERRIDE; + void startSectionGroup() override; + void endSectionGroup() override; + void startParagraphGroup() override; + void endParagraphGroup() override; + void startCharacterGroup() override; + void endCharacterGroup() override; + void startShape(css::uno::Reference const& xShape) override; + void endShape() override; + void text(const sal_uInt8 * data, size_t len) override; + void utext(const sal_uInt8 * data, size_t len) override; + void positionOffset(const OUString& rText, bool bVertical) override; + void align(const OUString& rText, bool bVertical) override; + void positivePercentage(const OUString& rText) override; + void props(writerfilter::Reference::Pointer_t ref) override; + void table(Id name, writerfilter::Reference
::Pointer_t ref) override; + void substream(Id name, writerfilter::Reference::Pointer_t ref) override; + void info(const std::string & info) override; protected: virtual void lcl_startSectionGroup() = 0; @@ -82,7 +82,7 @@ protected: virtual void lcl_text(const sal_uInt8 * data, size_t len) = 0; virtual void lcl_utext(const sal_uInt8 * data, size_t len) = 0; virtual void lcl_positionOffset(const OUString& /*rText*/, bool /*bVertical*/) { } - virtual css::awt::Point getPositionOffset() SAL_OVERRIDE { return css::awt::Point(); } + virtual css::awt::Point getPositionOffset() override { return css::awt::Point(); } virtual void lcl_align(const OUString& /*rText*/, bool /*bVertical*/) { } virtual void lcl_positivePercentage(const OUString& /*rText*/) { } virtual void lcl_props(writerfilter::Reference::Pointer_t ref) = 0; @@ -101,8 +101,8 @@ public: explicit LoggedProperties(const std::string & sPrefix); virtual ~LoggedProperties(); - void attribute(Id name, Value & val) SAL_OVERRIDE; - void sprm(Sprm & sprm) SAL_OVERRIDE; + void attribute(Id name, Value & val) override; + void sprm(Sprm & sprm) override; protected: virtual void lcl_attribute(Id name, Value & val) = 0; @@ -119,7 +119,7 @@ public: explicit LoggedTable(const std::string & sPrefix); virtual ~LoggedTable(); - void entry(int pos, writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; + void entry(int pos, writerfilter::Reference::Pointer_t ref) override; protected: virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) = 0; diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx index c9a392fa2475..6a8ff9dfd944 100644 --- a/writerfilter/source/dmapper/MeasureHandler.hxx +++ b/writerfilter/source/dmapper/MeasureHandler.hxx @@ -41,8 +41,8 @@ class MeasureHandler : public LoggedProperties std::vector m_aInteropGrabBag; // Properties - virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; public: MeasureHandler(); diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/writerfilter/source/dmapper/ModelEventListener.hxx index a04686b3fb7e..124f221ec388 100644 --- a/writerfilter/source/dmapper/ModelEventListener.hxx +++ b/writerfilter/source/dmapper/ModelEventListener.hxx @@ -34,8 +34,8 @@ public: ModelEventListener(bool bIndexes, bool bControls); virtual ~ModelEventListener(); - virtual void SAL_CALL notifyEvent(const css::document::EventObject& Event) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyEvent(const css::document::EventObject& Event) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override; }; }//namespace writerfilter diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx index 7887a7597180..caed77570a71 100644 --- a/writerfilter/source/dmapper/NumberingManager.hxx +++ b/writerfilter/source/dmapper/NumberingManager.hxx @@ -187,7 +187,7 @@ public: // Mapping functions static OUString GetStyleName( sal_Int32 nId ); - css::uno::Sequence< css::uno::Sequence > GetPropertyValues() SAL_OVERRIDE; + css::uno::Sequence< css::uno::Sequence > GetPropertyValues() override; void CreateNumberingRules(DomainMapper& rDMapper, css::uno::Reference const& xFactory); @@ -220,11 +220,11 @@ private: AbstractListDef::Pointer GetAbstractList( sal_Int32 nId ); // Properties - virtual void lcl_attribute( Id nName, Value & rVal ) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute( Id nName, Value & rVal ) override; + virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; + virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) override; public: diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx index 9b714daf378a..8e2cb1357aa2 100644 --- a/writerfilter/source/dmapper/OLEHandler.hxx +++ b/writerfilter/source/dmapper/OLEHandler.hxx @@ -73,8 +73,8 @@ class OLEHandler : public LoggedProperties DomainMapper& m_rDomainMapper; // Properties - virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; // Interoperability void saveInteropProperties(css::uno::Reference const& xTextDocument, diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx index ce3660ccafbe..669e5f0e972f 100644 --- a/writerfilter/source/dmapper/PageBordersHandler.hxx +++ b/writerfilter/source/dmapper/PageBordersHandler.hxx @@ -55,8 +55,8 @@ private: std::vector<_PgBorder> m_aBorders; // Properties - virtual void lcl_attribute( Id eName, Value& rVal ) SAL_OVERRIDE; - virtual void lcl_sprm( Sprm& rSprm ) SAL_OVERRIDE; + virtual void lcl_attribute( Id eName, Value& rVal ) override; + virtual void lcl_sprm( Sprm& rSprm ) override; public: PageBordersHandler( ); diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index 45805c58401c..cb6b94d17de4 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -517,7 +517,7 @@ public: bool getValue( TablePropertyMapTarget eWhich, sal_Int32& nFill ); void setValue( TablePropertyMapTarget eWhich, sal_Int32 nSet ); - virtual void insertTableProperties( const PropertyMap* ) SAL_OVERRIDE; + virtual void insertTableProperties( const PropertyMap* ) override; }; typedef std::shared_ptr TablePropertyMapPtr; } //namespace dmapper diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx index c8ab4f15b34c..372ea741de5c 100644 --- a/writerfilter/source/dmapper/SectionColumnHandler.hxx +++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx @@ -44,8 +44,8 @@ class SectionColumnHandler : public LoggedProperties _Column m_aTempColumn; // Properties - virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; public: SectionColumnHandler(); diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx index eaa88dc9cf7f..da22eac2ed9a 100644 --- a/writerfilter/source/dmapper/SettingsTable.hxx +++ b/writerfilter/source/dmapper/SettingsTable.hxx @@ -80,11 +80,11 @@ class SettingsTable : public LoggedProperties, public LoggedTable private: // Properties - virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; + virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) override; }; typedef std::shared_ptr< SettingsTable > SettingsTablePtr; diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index 7296ca3c13c0..87faa6912416 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -109,11 +109,11 @@ public: private: // Properties - virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; + virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) override; void applyDefaults(bool bParaProperties); }; diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx index 0765f66d1739..d4b0db1888be 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.hxx +++ b/writerfilter/source/dmapper/TDefTableHandler.hxx @@ -66,8 +66,8 @@ private: void localResolve(Id Name, writerfilter::Reference::Pointer_t pProperties); // Properties - virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; public: TDefTableHandler(); diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx index cdb239f7b711..c513221c5799 100644 --- a/writerfilter/source/dmapper/TablePositionHandler.hxx +++ b/writerfilter/source/dmapper/TablePositionHandler.hxx @@ -34,8 +34,8 @@ class TablePositionHandler sal_Int32 m_nBottomFromText; // Properties - virtual void lcl_attribute(Id Name, Value& val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm& sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value& val) override; + virtual void lcl_sprm(Sprm& sprm) override; public: sal_Int32 getY() diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx index 458badb813a0..e895604416ed 100644 --- a/writerfilter/source/dmapper/TblStylePrHandler.hxx +++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx @@ -61,8 +61,8 @@ private: std::vector m_aInteropGrabBag; // Properties - virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; public: explicit TblStylePrHandler( DomainMapper & rDMapper ); diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx index a0cddf3c8c51..d3c63182c6a4 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.hxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx @@ -39,8 +39,8 @@ private: void convertElementIdToPropertyId(sal_Int32 aElementId); // LoggedProperties - virtual void lcl_attribute(Id aName, Value& aValue) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm& sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id aName, Value& aValue) override; + virtual void lcl_sprm(Sprm& sprm) override; public: TextEffectsHandler(sal_uInt32 aElementId); diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx index 0bc0a47b9340..38d304134035 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) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) SAL_OVERRIDE; + virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) override; // Helper methods static OUString fromLocaleToScriptTag(const OUString& sLocale); diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/writerfilter/source/dmapper/TrackChangesHandler.hxx index 3b733e4e82b5..81130b984fca 100644 --- a/writerfilter/source/dmapper/TrackChangesHandler.hxx +++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx @@ -28,8 +28,8 @@ class TrackChangesHandler : public LoggedProperties RedlineParamsPtr m_pRedlineParams; // Properties - virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; public: explicit TrackChangesHandler( sal_Int32 nToken ); diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx index 67e74b545e2e..e6f91758c1a3 100644 --- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx +++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx @@ -68,8 +68,8 @@ private: sal_Int32 mnY; // Properties - virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; - virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void lcl_attribute(Id Name, Value & val) override; + virtual void lcl_sprm(Sprm & sprm) override; }; diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx index 752330c955ef..509c9b1b6896 100644 --- a/writerfilter/source/filter/RtfFilter.cxx +++ b/writerfilter/source/filter/RtfFilter.cxx @@ -57,22 +57,22 @@ public: virtual ~RtfFilter(); // XFilter - virtual sal_Bool SAL_CALL filter(const uno::Sequence& rDescriptor) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter(const uno::Sequence& rDescriptor) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) override; // XImporter - virtual void SAL_CALL setTargetDocument(const uno::Reference& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTargetDocument(const uno::Reference& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override; // XExporter - virtual void SAL_CALL setSourceDocument(const uno::Reference& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSourceDocument(const uno::Reference& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize(const uno::Sequence& rArguments) throw (uno::Exception, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize(const uno::Sequence& rArguments) throw (uno::Exception, uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual uno::Sequence SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (uno::RuntimeException, std::exception) override; + virtual uno::Sequence SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override; }; diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index 5ce5e642c0ff..cae3d13e5941 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -101,22 +101,22 @@ public: virtual ~WriterFilter() {} // XFilter - virtual sal_Bool SAL_CALL filter(const uno::Sequence& rDescriptor) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter(const uno::Sequence& rDescriptor) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) override; // XImporter - virtual void SAL_CALL setTargetDocument(const uno::Reference& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTargetDocument(const uno::Reference& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override; // XExporter - virtual void SAL_CALL setSourceDocument(const uno::Reference& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSourceDocument(const uno::Reference& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize(const uno::Sequence& rArguments) throw (uno::Exception, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize(const uno::Sequence& rArguments) throw (uno::Exception, uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual uno::Sequence SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override; + virtual uno::Sequence SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override; private: void putPropertiesToDocumentGrabBag(const comphelper::SequenceAsHashMap& rProperties); diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx index 95d46f73c4a8..2624c06bd997 100644 --- a/writerfilter/source/filter/WriterFilterDetection.cxx +++ b/writerfilter/source/filter/WriterFilterDetection.cxx @@ -40,12 +40,12 @@ public: virtual ~WriterFilterDetection(); //XExtendedFilterDetection - virtual OUString SAL_CALL detect(uno::Sequence& Descriptor) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL detect(uno::Sequence& Descriptor) throw (uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual uno::Sequence SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override; + virtual uno::Sequence SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override; }; uno::Sequence SAL_CALL WriterFilterDetection_getSupportedServiceNames() throw (uno::RuntimeException); diff --git a/writerfilter/source/ooxml/Handler.hxx b/writerfilter/source/ooxml/Handler.hxx index c021fbe76490..e2d59070621f 100644 --- a/writerfilter/source/ooxml/Handler.hxx +++ b/writerfilter/source/ooxml/Handler.hxx @@ -33,8 +33,8 @@ public: explicit OOXMLFootnoteHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLFootnoteHandler(); - virtual void attribute(Id name, Value & val) SAL_OVERRIDE; - virtual void sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void attribute(Id name, Value & val) override; + virtual void sprm(Sprm & sprm) override; }; class OOXMLEndnoteHandler : public Properties @@ -44,8 +44,8 @@ public: explicit OOXMLEndnoteHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLEndnoteHandler(); - virtual void attribute(Id name, Value & val) SAL_OVERRIDE; - virtual void sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void attribute(Id name, Value & val) override; + virtual void sprm(Sprm & sprm) override; }; class OOXMLFooterHandler : public Properties @@ -57,8 +57,8 @@ public: explicit OOXMLFooterHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLFooterHandler() {} void finalize(); - virtual void attribute(Id name, Value & val) SAL_OVERRIDE; - virtual void sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void attribute(Id name, Value & val) override; + virtual void sprm(Sprm & sprm) override; }; class OOXMLHeaderHandler : public Properties @@ -70,8 +70,8 @@ public: explicit OOXMLHeaderHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLHeaderHandler() {} void finalize(); - virtual void attribute(Id name, Value & val) SAL_OVERRIDE; - virtual void sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void attribute(Id name, Value & val) override; + virtual void sprm(Sprm & sprm) override; }; class OOXMLCommentHandler : public Properties @@ -80,8 +80,8 @@ class OOXMLCommentHandler : public Properties public: explicit OOXMLCommentHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLCommentHandler(); - virtual void attribute(Id name, Value & val) SAL_OVERRIDE; - virtual void sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void attribute(Id name, Value & val) override; + virtual void sprm(Sprm & sprm) override; }; class OOXMLOLEHandler : public Properties @@ -92,8 +92,8 @@ public: explicit OOXMLOLEHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLOLEHandler(); - virtual void attribute(Id name, Value & val) SAL_OVERRIDE; - virtual void sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void attribute(Id name, Value & val) override; + virtual void sprm(Sprm & sprm) override; }; class OOXMLEmbeddedFontHandler : public Properties @@ -104,8 +104,8 @@ public: explicit OOXMLEmbeddedFontHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLEmbeddedFontHandler(); - virtual void attribute(Id name, Value & val) SAL_OVERRIDE; - virtual void sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void attribute(Id name, Value & val) override; + virtual void sprm(Sprm & sprm) override; }; class OOXMLBreakHandler : public Properties @@ -115,8 +115,8 @@ class OOXMLBreakHandler : public Properties public: explicit OOXMLBreakHandler(Stream & rStream); virtual ~OOXMLBreakHandler(); - virtual void attribute(Id name, Value & val) SAL_OVERRIDE; - virtual void sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void attribute(Id name, Value & val) override; + virtual void sprm(Sprm & sprm) override; }; class OOXMLPictureHandler : public Properties @@ -126,8 +126,8 @@ public: explicit OOXMLPictureHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLPictureHandler(); - virtual void attribute(Id name, Value & val) SAL_OVERRIDE; - virtual void sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void attribute(Id name, Value & val) override; + virtual void sprm(Sprm & sprm) override; }; class OOXMLHyperlinkHandler : public Properties @@ -140,8 +140,8 @@ public: explicit OOXMLHyperlinkHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLHyperlinkHandler(); - virtual void attribute(Id name, Value & val) SAL_OVERRIDE; - virtual void sprm(Sprm & sprm) SAL_OVERRIDE; + virtual void attribute(Id name, Value & val) override; + virtual void sprm(Sprm & sprm) override; }; diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx index 96d4a4dba58f..3a1cc0318a8e 100644 --- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx +++ b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx @@ -38,7 +38,7 @@ public: explicit OOXMLBinaryObjectReference(OOXMLStream::Pointer_t pStream); virtual ~OOXMLBinaryObjectReference(); - virtual void resolve(BinaryObj & rHandler) SAL_OVERRIDE; + virtual void resolve(BinaryObj & rHandler) override; }; }} diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx index 340802b1c749..06ac16622ef5 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx @@ -94,48 +94,48 @@ public: OOXMLDocumentImpl(OOXMLStream::Pointer_t pStream, const css::uno::Reference& xStatusIndicator, bool bSkipImages); virtual ~OOXMLDocumentImpl(); - virtual void resolve(Stream & rStream) SAL_OVERRIDE; + virtual void resolve(Stream & rStream) override; virtual void resolveFootnote(Stream & rStream, const Id & rType, - const sal_Int32 nNoteId) SAL_OVERRIDE; + const sal_Int32 nNoteId) override; virtual void resolveEndnote(Stream & rStream, const Id & rType, - const sal_Int32 nNoteId) SAL_OVERRIDE; + const sal_Int32 nNoteId) override; virtual void resolveHeader(Stream & rStream, const sal_Int32 type, - const OUString & rId) SAL_OVERRIDE; + const OUString & rId) override; virtual void resolveFooter(Stream & rStream, const sal_Int32 type, - const OUString & rId) SAL_OVERRIDE; + const OUString & rId) override; - virtual void resolveComment(Stream & rStream, const sal_Int32 nId) SAL_OVERRIDE; + virtual void resolveComment(Stream & rStream, const sal_Int32 nId) override; OOXMLPropertySet * getPicturePropSet(const OUString & rId); - virtual void resolvePicture(Stream & rStream, const OUString & rId) SAL_OVERRIDE; - - virtual OUString getTargetForId(const OUString & rId) SAL_OVERRIDE; - - virtual void setModel(css::uno::Reference xModel) SAL_OVERRIDE; - virtual css::uno::Reference getModel() SAL_OVERRIDE; - virtual void setDrawPage(css::uno::Reference xDrawPage) SAL_OVERRIDE; - virtual css::uno::Reference getDrawPage() SAL_OVERRIDE; - virtual css::uno::Reference getStorageStream() SAL_OVERRIDE; - virtual css::uno::Reference 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 OUString & getTarget() const SAL_OVERRIDE; - virtual css::uno::Reference getShapeContext( ) SAL_OVERRIDE; - virtual void setShapeContext( css::uno::Reference xContext ) SAL_OVERRIDE; - virtual css::uno::Reference getThemeDom() SAL_OVERRIDE; - virtual css::uno::Sequence > getCustomXmlDomList() SAL_OVERRIDE; - virtual css::uno::Sequence > getCustomXmlDomPropsList() SAL_OVERRIDE; - virtual css::uno::Sequence > getActiveXDomList() SAL_OVERRIDE; - virtual css::uno::Sequence > getActiveXBinList() SAL_OVERRIDE; - virtual css::uno::Reference getGlossaryDocDom() SAL_OVERRIDE; - virtual css::uno::Sequence > getGlossaryDomList() SAL_OVERRIDE; - virtual css::uno::Sequence getEmbeddingsList() SAL_OVERRIDE; + virtual void resolvePicture(Stream & rStream, const OUString & rId) override; + + virtual OUString getTargetForId(const OUString & rId) override; + + virtual void setModel(css::uno::Reference xModel) override; + virtual css::uno::Reference getModel() override; + virtual void setDrawPage(css::uno::Reference xDrawPage) override; + virtual css::uno::Reference getDrawPage() override; + virtual css::uno::Reference getStorageStream() override; + virtual css::uno::Reference getInputStreamForId(const OUString & rId) override; + virtual void setXNoteId(const sal_Int32 nId) override; + virtual sal_Int32 getXNoteId() const override; + virtual void setXNoteType(const Id & rId) override; + virtual const OUString & getTarget() const override; + virtual css::uno::Reference getShapeContext( ) override; + virtual void setShapeContext( css::uno::Reference xContext ) override; + virtual css::uno::Reference getThemeDom() override; + virtual css::uno::Sequence > getCustomXmlDomList() override; + virtual css::uno::Sequence > getCustomXmlDomPropsList() override; + virtual css::uno::Sequence > getActiveXDomList() override; + virtual css::uno::Sequence > getActiveXBinList() override; + virtual css::uno::Reference getGlossaryDocDom() override; + virtual css::uno::Sequence > getGlossaryDomList() override; + virtual css::uno::Sequence getEmbeddingsList() override; void incrementProgress(); bool IsSkipImages() { return mbSkipImages; }; diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index aaf5bf713f1a..cecd52afe51f 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -58,27 +58,27 @@ public: // css::xml::sax::XFastContextHandler: virtual void SAL_CALL startFastElement (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL startUnknownElement(const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual css::uno::Reference SAL_CALL createFastChildContext(Token_t Element, const css::uno::Reference& Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext(const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL characters(const OUString & aChars) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; // local @@ -250,13 +250,13 @@ public: explicit OOXMLFastContextHandlerStream(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerStream(); - virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return STREAM; } + virtual ResourceEnum_t getResource() const override { return STREAM; } OOXMLPropertySet::Pointer_t getPropertySetAttrs() const { return mpPropertySetAttrs;} - virtual void newProperty(const Id & rId, OOXMLValue::Pointer_t pVal) SAL_OVERRIDE; + virtual void newProperty(const Id & rId, OOXMLValue::Pointer_t pVal) override; void sendProperty(Id nId); - virtual OOXMLPropertySet::Pointer_t getPropertySet() const SAL_OVERRIDE; + virtual OOXMLPropertySet::Pointer_t getPropertySet() const override; void handleHyperlink(); @@ -270,10 +270,10 @@ public: explicit OOXMLFastContextHandlerProperties(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerProperties(); - virtual OOXMLValue::Pointer_t getValue() const SAL_OVERRIDE; - virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return PROPERTIES; } + virtual OOXMLValue::Pointer_t getValue() const override; + virtual ResourceEnum_t getResource() const override { return PROPERTIES; } - virtual void newProperty(const Id & nId, OOXMLValue::Pointer_t pVal) SAL_OVERRIDE; + virtual void newProperty(const Id & nId, OOXMLValue::Pointer_t pVal) override; void handleXNotes(); void handleHdrFtr(); @@ -283,16 +283,16 @@ public: void handleOLE(); void handleFontRel(); - virtual void setPropertySet(OOXMLPropertySet::Pointer_t pPropertySet) SAL_OVERRIDE; - virtual OOXMLPropertySet::Pointer_t getPropertySet() const SAL_OVERRIDE; + virtual void setPropertySet(OOXMLPropertySet::Pointer_t pPropertySet) override; + virtual OOXMLPropertySet::Pointer_t getPropertySet() const override; protected: /// the properties OOXMLPropertySet::Pointer_t mpPropertySet; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; - virtual void setParent(OOXMLFastContextHandler * pParent) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void setParent(OOXMLFastContextHandler * pParent) override; private: @@ -310,7 +310,7 @@ protected: OOXMLTableImpl mTable; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; }; class OOXMLFastContextHandlerValue : @@ -321,17 +321,17 @@ public: virtual ~OOXMLFastContextHandlerValue(); void setValue(OOXMLValue::Pointer_t pValue); - virtual OOXMLValue::Pointer_t getValue() const SAL_OVERRIDE; + virtual OOXMLValue::Pointer_t getValue() const override; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; - virtual std::string getType() const SAL_OVERRIDE { return "Value"; } + virtual std::string getType() const override { return "Value"; } - virtual void setDefaultBooleanValue() SAL_OVERRIDE; - virtual void setDefaultIntegerValue() SAL_OVERRIDE; - virtual void setDefaultHexValue() SAL_OVERRIDE; - virtual void setDefaultStringValue() SAL_OVERRIDE; + virtual void setDefaultBooleanValue() override; + virtual void setDefaultIntegerValue() override; + virtual void setDefaultHexValue() override; + virtual void setDefaultStringValue() override; protected: OOXMLValue::Pointer_t mpValue; @@ -345,7 +345,7 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; protected: OOXMLTableImpl mTable; @@ -353,11 +353,11 @@ protected: css::uno::Reference mCurrentChild; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; - virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return TABLE; } + virtual ResourceEnum_t getResource() const override { return TABLE; } - virtual std::string getType() const SAL_OVERRIDE { return "Table"; } + virtual std::string getType() const override { return "Table"; } void addCurrentChild(); }; @@ -372,7 +372,7 @@ public: void checkType(OOXMLValue::Pointer_t pValue); - virtual std::string getType() const SAL_OVERRIDE { return "XNote"; } + virtual std::string getType() const override { return "XNote"; } private: bool mbForwardEventsSaved; @@ -380,12 +380,12 @@ private: sal_Int32 mnMyXNoteType; virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; - virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return STREAM; } + virtual ResourceEnum_t getResource() const override { return STREAM; } }; class OOXMLFastContextHandlerTextTableCell : public OOXMLFastContextHandler @@ -394,7 +394,7 @@ public: explicit OOXMLFastContextHandlerTextTableCell(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerTextTableCell(); - virtual std::string getType() const SAL_OVERRIDE { return "TextTableCell"; } + virtual std::string getType() const override { return "TextTableCell"; } static void startCell(); void endCell(); @@ -406,7 +406,7 @@ public: explicit OOXMLFastContextHandlerTextTableRow(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerTextTableRow(); - virtual std::string getType() const SAL_OVERRIDE { return "TextTableRow"; } + virtual std::string getType() const override { return "TextTableRow"; } static void startRow(); void endRow(); @@ -422,14 +422,14 @@ public: virtual ~OOXMLFastContextHandlerTextTable(); - virtual std::string getType() const SAL_OVERRIDE { return "TextTable"; } + virtual std::string getType() const override { return "TextTable"; } protected: virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; }; class OOXMLFastContextHandlerShape: public OOXMLFastContextHandlerProperties @@ -442,22 +442,22 @@ public: explicit OOXMLFastContextHandlerShape(OOXMLFastContextHandler * pContext); virtual ~OOXMLFastContextHandlerShape(); - virtual std::string getType() const SAL_OVERRIDE { return "Shape"; } + virtual std::string getType() const override { return "Shape"; } // css::xml::sax::XFastContextHandler: virtual void SAL_CALL startUnknownElement (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext(const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; - virtual void setToken(Token_t nToken) SAL_OVERRIDE; + virtual void setToken(Token_t nToken) override; - virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return SHAPE; } + virtual ResourceEnum_t getResource() const override { return SHAPE; } void sendShape( Token_t Element ); bool isShapeSent( ) { return m_bShapeSent; } @@ -466,16 +466,16 @@ protected: css::uno::Reference mrShapeContext; virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void lcl_characters(const OUString & aChars) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; }; @@ -493,47 +493,47 @@ public: // css::xml::sax::XFastContextHandler: virtual void SAL_CALL startUnknownElement(const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void attributes(const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException) override; - virtual ResourceEnum_t getResource() const SAL_OVERRIDE; + virtual ResourceEnum_t getResource() const override; void addNamespace(const Id & nId); void addToken( Token_t Element ); - 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 void newProperty(const Id & rId, OOXMLValue::Pointer_t pVal) override; + virtual void setPropertySet(OOXMLPropertySet::Pointer_t pPropertySet) override; + virtual OOXMLPropertySet::Pointer_t getPropertySet() const override; - virtual std::string getType() const SAL_OVERRIDE; + virtual std::string getType() const override; protected: virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void lcl_characters(const OUString & aChars) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; - virtual void setId(Id nId) SAL_OVERRIDE; - virtual Id getId() const SAL_OVERRIDE; + virtual void setId(Id nId) override; + virtual Id getId() const override; - virtual void setToken(Token_t nToken) SAL_OVERRIDE; - virtual Token_t getToken() const SAL_OVERRIDE; + virtual void setToken(Token_t nToken) override; + virtual Token_t getToken() const override; private: css::uno::Reference mxContext; @@ -567,7 +567,7 @@ public: /** Return the type of the class, as written in model.xml . */ - virtual std::string getType() const SAL_OVERRIDE = 0; + virtual std::string getType() const override = 0; protected: /** @@ -577,15 +577,15 @@ protected: virtual void process() = 0; virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; - virtual void lcl_endFastElement(Token_t Element) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + virtual void lcl_endFastElement(Token_t Element) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; - virtual void lcl_characters(const OUString & aChars) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + virtual void lcl_characters(const OUString & aChars) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; // should be private, but not much point in making deep copies of it oox::formulaimport::XmlStreamBuilder buffer; @@ -598,9 +598,9 @@ class OOXMLFastContextHandlerMath: public OOXMLFastContextHandlerLinear { public: explicit OOXMLFastContextHandlerMath(OOXMLFastContextHandler * pContext); - virtual std::string getType() const SAL_OVERRIDE { return "Math"; } + virtual std::string getType() const override { return "Math"; } protected: - virtual void process() SAL_OVERRIDE; + virtual void process() override; }; }} diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx index 6d7874c432f5..d2c73fd5b398 100644 --- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx @@ -46,42 +46,42 @@ public: // css::xml::sax::XFastDocumentHandler: virtual void SAL_CALL startDocument() - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL endDocument() - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL setDocumentLocator (const css::uno::Reference< css::xml::sax::XLocator > & xLocator) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; // css::xml::sax::XFastContextHandler: virtual void SAL_CALL startFastElement (::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL startUnknownElement (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL endFastElement(::sal_Int32 Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL endUnknownElement (const OUString & Namespace, const OUString & Name) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext (::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL characters(const OUString & aChars) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; void setIsSubstream( bool bSubstream ); diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx index 33ec78a92036..f65ac4875b03 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx @@ -32,12 +32,12 @@ public: virtual ~OOXMLProperty(); - virtual sal_uInt32 getId() const SAL_OVERRIDE = 0; - virtual Value::Pointer_t getValue() SAL_OVERRIDE = 0; - virtual writerfilter::Reference::Pointer_t getProps() SAL_OVERRIDE = 0; + virtual sal_uInt32 getId() const override = 0; + virtual Value::Pointer_t getValue() override = 0; + virtual writerfilter::Reference::Pointer_t getProps() override = 0; #ifdef DEBUG_WRITERFILTER - virtual std::string getName() const SAL_OVERRIDE = 0; - virtual std::string toString() const SAL_OVERRIDE = 0; + virtual std::string getName() const override = 0; + virtual std::string toString() const override = 0; #endif virtual void resolve(Properties & rProperties) = 0; }; @@ -49,7 +49,7 @@ public: virtual ~OOXMLPropertySet(); - virtual void resolve(Properties & rHandler) SAL_OVERRIDE = 0; + virtual void resolve(Properties & rHandler) override = 0; virtual void add(OOXMLProperty::Pointer_t pProperty) = 0; virtual void add(OOXMLPropertySet::Pointer_t pPropertySet) = 0; virtual OOXMLPropertySet * clone() const = 0; @@ -64,7 +64,7 @@ class OOXMLTable : public writerfilter::Reference
public: virtual ~OOXMLTable(); - virtual void resolve(Table & rTable) SAL_OVERRIDE = 0; + virtual void resolve(Table & rTable) override = 0; virtual OOXMLTable * clone() const = 0; }; }} diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx index 65c3ce2f141a..0efc3d96ccf0 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx @@ -42,14 +42,14 @@ public: OOXMLValue(); virtual ~OOXMLValue(); - virtual int getInt() const SAL_OVERRIDE; + virtual int getInt() const override; ; - virtual OUString getString() const SAL_OVERRIDE; - virtual css::uno::Any getAny() const SAL_OVERRIDE; - virtual writerfilter::Reference::Pointer_t getProperties() SAL_OVERRIDE; - virtual writerfilter::Reference::Pointer_t getBinary() SAL_OVERRIDE; + virtual OUString getString() const override; + virtual css::uno::Any getAny() const override; + virtual writerfilter::Reference::Pointer_t getProperties() override; + virtual writerfilter::Reference::Pointer_t getBinary() override; #ifdef DEBUG_WRITERFILTER - virtual std::string toString() const SAL_OVERRIDE; + virtual std::string toString() const override; #endif virtual OOXMLValue * clone() const; }; @@ -70,14 +70,14 @@ public: OOXMLPropertyImpl(const OOXMLPropertyImpl & rSprm); virtual ~OOXMLPropertyImpl(); - virtual sal_uInt32 getId() const SAL_OVERRIDE; - virtual Value::Pointer_t getValue() SAL_OVERRIDE; - virtual writerfilter::Reference::Pointer_t getProps() SAL_OVERRIDE; + virtual sal_uInt32 getId() const override; + virtual Value::Pointer_t getValue() override; + virtual writerfilter::Reference::Pointer_t getProps() override; #ifdef DEBUG_WRITERFILTER - virtual std::string getName() const SAL_OVERRIDE; - virtual std::string toString() const SAL_OVERRIDE; + virtual std::string getName() const override; + virtual std::string toString() const override; #endif - virtual void resolve(Properties & rProperties) SAL_OVERRIDE; + virtual void resolve(Properties & rProperties) override; }; class OOXMLBinaryValue : public OOXMLValue @@ -88,11 +88,11 @@ public: explicit OOXMLBinaryValue(OOXMLBinaryObjectReference::Pointer_t pBinaryObj); virtual ~OOXMLBinaryValue(); - virtual writerfilter::Reference::Pointer_t getBinary() SAL_OVERRIDE; + virtual writerfilter::Reference::Pointer_t getBinary() override; #ifdef DEBUG_WRITERFILTER - virtual std::string toString() const SAL_OVERRIDE; + virtual std::string toString() const override; #endif - virtual OOXMLValue * clone() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const override; }; class OOXMLBooleanValue : public OOXMLValue @@ -106,12 +106,12 @@ public: virtual ~OOXMLBooleanValue(); - virtual int getInt() const SAL_OVERRIDE; - virtual css::uno::Any getAny() const SAL_OVERRIDE; + virtual int getInt() const override; + virtual css::uno::Any getAny() const override; #ifdef DEBUG_WRITERFILTER - virtual std::string toString() const SAL_OVERRIDE; + virtual std::string toString() const override; #endif - virtual OOXMLValue * clone() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const override; }; class OOXMLStringValue : public OOXMLValue @@ -122,12 +122,12 @@ public: explicit OOXMLStringValue(const OUString & rStr); virtual ~OOXMLStringValue(); - virtual css::uno::Any getAny() const SAL_OVERRIDE; - virtual OUString getString() const SAL_OVERRIDE; + virtual css::uno::Any getAny() const override; + virtual OUString getString() const override; #ifdef DEBUG_WRITERFILTER - virtual std::string toString() const SAL_OVERRIDE; + virtual std::string toString() const override; #endif - virtual OOXMLValue * clone() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const override; }; class OOXMLInputStreamValue : public OOXMLValue @@ -139,11 +139,11 @@ public: explicit OOXMLInputStreamValue(css::uno::Reference xInputStream); virtual ~OOXMLInputStreamValue(); - virtual css::uno::Any getAny() const SAL_OVERRIDE; + virtual css::uno::Any getAny() const override; #ifdef DEBUG_WRITERFILTER - virtual std::string toString() const SAL_OVERRIDE; + virtual std::string toString() const override; #endif - virtual OOXMLValue * clone() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const override; }; struct OOXMLPropertySetImplCompare @@ -163,10 +163,10 @@ public: OOXMLPropertySetImpl(); virtual ~OOXMLPropertySetImpl(); - virtual void resolve(Properties & rHandler) 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; + virtual void resolve(Properties & rHandler) override; + virtual void add(OOXMLProperty::Pointer_t pProperty) override; + virtual void add(OOXMLPropertySet::Pointer_t pPropertySet) override; + virtual OOXMLPropertySet * clone() const override; OOXMLProperties_t::iterator begin(); OOXMLProperties_t::iterator end(); @@ -174,7 +174,7 @@ public: OOXMLProperties_t::const_iterator end() const; #ifdef DEBUG_WRITERFILTER - virtual std::string toString() SAL_OVERRIDE; + virtual std::string toString() override; #endif }; @@ -185,11 +185,11 @@ public: explicit OOXMLPropertySetValue(OOXMLPropertySet::Pointer_t pPropertySet); virtual ~OOXMLPropertySetValue(); - virtual writerfilter::Reference::Pointer_t getProperties() SAL_OVERRIDE; + virtual writerfilter::Reference::Pointer_t getProperties() override; #ifdef DEBUG_WRITERFILTER - virtual std::string toString() const SAL_OVERRIDE; + virtual std::string toString() const override; #endif - virtual OOXMLValue * clone() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const override; }; class OOXMLIntegerValue : public OOXMLValue @@ -201,12 +201,12 @@ public: static OOXMLValue::Pointer_t Create (sal_Int32 nValue); virtual ~OOXMLIntegerValue(); - virtual int getInt() const SAL_OVERRIDE; - virtual css::uno::Any getAny() const SAL_OVERRIDE; + virtual int getInt() const override; + virtual css::uno::Any getAny() const override; #ifdef DEBUG_WRITERFILTER - virtual std::string toString() const SAL_OVERRIDE; + virtual std::string toString() const override; #endif - virtual OOXMLValue * clone() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const override; }; class OOXMLHexValue : public OOXMLValue @@ -218,11 +218,11 @@ public: explicit OOXMLHexValue(const char * pValue); virtual ~OOXMLHexValue(); - virtual int getInt() const SAL_OVERRIDE; + virtual int getInt() const override; #ifdef DEBUG_WRITERFILTER - virtual std::string toString() const SAL_OVERRIDE; + virtual std::string toString() const override; #endif - virtual OOXMLValue * clone() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const override; }; /// Handles OOXML's ST_UniversalMeasure value. @@ -234,11 +234,11 @@ public: explicit OOXMLUniversalMeasureValue(const char * pValue); virtual ~OOXMLUniversalMeasureValue(); - virtual int getInt() const SAL_OVERRIDE; + virtual int getInt() const override; #ifdef DEBUG_WRITERFILTER - virtual std::string toString() const SAL_OVERRIDE; + virtual std::string toString() const override; #endif - virtual OOXMLValue* clone() const SAL_OVERRIDE; + virtual OOXMLValue* clone() const override; }; class OOXMLShapeValue : public OOXMLValue @@ -249,11 +249,11 @@ public: explicit OOXMLShapeValue(css::uno::Reference rShape); virtual ~OOXMLShapeValue(); - virtual css::uno::Any getAny() const SAL_OVERRIDE; + virtual css::uno::Any getAny() const override; #ifdef DEBUG_WRITERFILTER - virtual std::string toString() const SAL_OVERRIDE; + virtual std::string toString() const override; #endif - virtual OOXMLValue * clone() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const override; }; class OOXMLStarMathValue : public OOXMLValue @@ -264,11 +264,11 @@ public: explicit OOXMLStarMathValue( css::uno::Reference< css::embed::XEmbeddedObject > component ); virtual ~OOXMLStarMathValue(); - virtual css::uno::Any getAny() const SAL_OVERRIDE; + virtual css::uno::Any getAny() const override; #ifdef DEBUG_WRITERFILTER - virtual std::string toString() const SAL_OVERRIDE; + virtual std::string toString() const override; #endif - virtual OOXMLValue * clone() const SAL_OVERRIDE; + virtual OOXMLValue * clone() const override; }; class OOXMLTableImpl : public OOXMLTable @@ -283,9 +283,9 @@ public: OOXMLTableImpl(); virtual ~OOXMLTableImpl(); - virtual void resolve(Table & rTable) SAL_OVERRIDE; + virtual void resolve(Table & rTable) override; void add(ValuePointer_t pPropertySet); - virtual OOXMLTable * clone() const SAL_OVERRIDE; + virtual OOXMLTable * clone() const override; }; class OOXMLPropertySetEntryToString : public Properties @@ -297,8 +297,8 @@ public: explicit OOXMLPropertySetEntryToString(Id nId); virtual ~OOXMLPropertySetEntryToString(); - virtual void sprm(Sprm & rSprm) SAL_OVERRIDE; - virtual void attribute(Id nId, Value & rValue) SAL_OVERRIDE; + virtual void sprm(Sprm & rSprm) override; + virtual void attribute(Id nId, Value & rValue) override; const OUString & getString() const { return mStr;} }; @@ -311,8 +311,8 @@ public: explicit OOXMLPropertySetEntryToInteger(Id nId); virtual ~OOXMLPropertySetEntryToInteger(); - virtual void sprm(Sprm & rSprm) SAL_OVERRIDE; - virtual void attribute(Id nId, Value & rValue) SAL_OVERRIDE; + virtual void sprm(Sprm & rSprm) override; + virtual void attribute(Id nId, Value & rValue) override; int getValue() const { return mnValue;} }; @@ -325,8 +325,8 @@ public: explicit OOXMLPropertySetEntryToBool(Id nId); virtual ~OOXMLPropertySetEntryToBool(); - virtual void sprm(Sprm & rSprm) SAL_OVERRIDE; - virtual void attribute(Id nId, Value & rValue) SAL_OVERRIDE; + virtual void sprm(Sprm & rSprm) override; + virtual void attribute(Id nId, Value & rValue) override; bool getValue() const { return mValue; } }; diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx index dba1871e4e68..bbebd8712232 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx @@ -72,14 +72,14 @@ public: virtual ~OOXMLStreamImpl(); - virtual css::uno::Reference getFastParser() SAL_OVERRIDE; - virtual css::uno::Reference getDocumentStream() SAL_OVERRIDE; - virtual css::uno::Reference getStorageStream() SAL_OVERRIDE; - virtual css::uno::Reference getContext() SAL_OVERRIDE; - virtual OUString getTargetForId(const OUString & rId) SAL_OVERRIDE; - virtual const OUString & getTarget() const SAL_OVERRIDE; - - virtual css::uno::Reference getFastTokenHandler() SAL_OVERRIDE; + virtual css::uno::Reference getFastParser() override; + virtual css::uno::Reference getDocumentStream() override; + virtual css::uno::Reference getStorageStream() override; + virtual css::uno::Reference getContext() override; + virtual OUString getTargetForId(const OUString & rId) override; + virtual const OUString & getTarget() const override; + + virtual css::uno::Reference getFastTokenHandler() override; // Giving access to mxDocumentStream. It is needed by resolving custom xml to get list of customxml's used in document. css::uno::Reference accessDocumentStream() { return mxDocumentStream;} diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index b610de05293e..d0671a1b5bb4 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -336,25 +336,25 @@ public: virtual ~RTFDocumentImpl(); // RTFDocument - virtual void resolve(Stream& rHandler) SAL_OVERRIDE; + virtual void resolve(Stream& rHandler) override; // RTFListener - virtual RTFError dispatchDestination(RTFKeyword nKeyword) SAL_OVERRIDE; - virtual RTFError dispatchFlag(RTFKeyword nKeyword) SAL_OVERRIDE; - virtual RTFError dispatchSymbol(RTFKeyword nKeyword) SAL_OVERRIDE; - virtual RTFError dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam) SAL_OVERRIDE; - virtual RTFError dispatchValue(RTFKeyword nKeyword, int nParam) SAL_OVERRIDE; - virtual RTFError resolveChars(char ch) SAL_OVERRIDE; - virtual RTFError pushState() SAL_OVERRIDE; - virtual RTFError popState() SAL_OVERRIDE; - virtual Destination getDestination() SAL_OVERRIDE; - virtual void setDestination(Destination eDestination) 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; + virtual RTFError dispatchDestination(RTFKeyword nKeyword) override; + virtual RTFError dispatchFlag(RTFKeyword nKeyword) override; + virtual RTFError dispatchSymbol(RTFKeyword nKeyword) override; + virtual RTFError dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam) override; + virtual RTFError dispatchValue(RTFKeyword nKeyword, int nParam) override; + virtual RTFError resolveChars(char ch) override; + virtual RTFError pushState() override; + virtual RTFError popState() override; + virtual Destination getDestination() override; + virtual void setDestination(Destination eDestination) override; + virtual RTFInternalState getInternalState() override; + virtual void setInternalState(RTFInternalState nInternalState) override; + virtual bool getSkipUnknown() override; + virtual void setSkipUnknown(bool bSkipUnknown) override; + virtual void finishSubstream() override; + virtual bool isSubstream() const override; Stream& Mapper() { diff --git a/writerfilter/source/rtftok/rtflookahead.hxx b/writerfilter/source/rtftok/rtflookahead.hxx index 28c2f065d511..d982d687aa0f 100644 --- a/writerfilter/source/rtftok/rtflookahead.hxx +++ b/writerfilter/source/rtftok/rtflookahead.hxx @@ -29,22 +29,22 @@ class RTFLookahead : public RTFListener public: RTFLookahead(SvStream& rStream, sal_Size nGroupStart); virtual ~RTFLookahead(); - virtual RTFError dispatchDestination(RTFKeyword nKeyword) SAL_OVERRIDE; - virtual RTFError dispatchFlag(RTFKeyword nKeyword) SAL_OVERRIDE; - virtual RTFError dispatchSymbol(RTFKeyword nKeyword) SAL_OVERRIDE; - virtual RTFError dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam) SAL_OVERRIDE; - virtual RTFError dispatchValue(RTFKeyword nKeyword, int nParam) SAL_OVERRIDE; - virtual RTFError resolveChars(char ch) SAL_OVERRIDE; - virtual RTFError pushState() SAL_OVERRIDE; - virtual RTFError popState() SAL_OVERRIDE; - virtual Destination getDestination() SAL_OVERRIDE; - virtual void setDestination(Destination eDestination) 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; + virtual RTFError dispatchDestination(RTFKeyword nKeyword) override; + virtual RTFError dispatchFlag(RTFKeyword nKeyword) override; + virtual RTFError dispatchSymbol(RTFKeyword nKeyword) override; + virtual RTFError dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam) override; + virtual RTFError dispatchValue(RTFKeyword nKeyword, int nParam) override; + virtual RTFError resolveChars(char ch) override; + virtual RTFError pushState() override; + virtual RTFError popState() override; + virtual Destination getDestination() override; + virtual void setDestination(Destination eDestination) override; + virtual RTFInternalState getInternalState() override; + virtual void setInternalState(RTFInternalState nInternalState) override; + virtual bool getSkipUnknown() override; + virtual void setSkipUnknown(bool bSkipUnknown) override; + virtual void finishSubstream() override; + virtual bool isSubstream() const override; bool hasTable() { return m_bHasTable; diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.hxx b/writerfilter/source/rtftok/rtfreferenceproperties.hxx index a38db241c735..a10572fd7e83 100644 --- a/writerfilter/source/rtftok/rtfreferenceproperties.hxx +++ b/writerfilter/source/rtftok/rtfreferenceproperties.hxx @@ -24,7 +24,7 @@ public: RTFReferenceProperties(RTFSprms rAttributes, RTFSprms rSprms); RTFReferenceProperties(RTFSprms rAttributes); virtual ~RTFReferenceProperties(); - virtual void resolve(Properties& rHandler) SAL_OVERRIDE; + virtual void resolve(Properties& rHandler) override; RTFSprms& getAttributes() { return m_aAttributes; diff --git a/writerfilter/source/rtftok/rtfreferencetable.hxx b/writerfilter/source/rtftok/rtfreferencetable.hxx index f392ed93f6d8..5fe3318a1e35 100644 --- a/writerfilter/source/rtftok/rtfreferencetable.hxx +++ b/writerfilter/source/rtftok/rtfreferencetable.hxx @@ -26,7 +26,7 @@ public: typedef std::pair::Pointer_t> Entry_t; RTFReferenceTable(Entries_t const& rEntries); virtual ~RTFReferenceTable(); - virtual void resolve(Table& rHandler) SAL_OVERRIDE; + virtual void resolve(Table& rHandler) override; private: Entries_t m_aEntries; }; diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx index 995feec85f9d..05b39cb0b5ac 100644 --- a/writerfilter/source/rtftok/rtfsprm.hxx +++ b/writerfilter/source/rtftok/rtfsprm.hxx @@ -105,12 +105,12 @@ class RTFSprm public: RTFSprm(Id nKeyword, RTFValue::Pointer_t& pValue); virtual ~RTFSprm() {} - virtual sal_uInt32 getId() const SAL_OVERRIDE; - virtual Value::Pointer_t getValue() SAL_OVERRIDE; - virtual writerfilter::Reference::Pointer_t getProps() SAL_OVERRIDE; + virtual sal_uInt32 getId() const override; + virtual Value::Pointer_t getValue() override; + virtual writerfilter::Reference::Pointer_t getProps() override; #ifdef DEBUG_WRITERFILTER - virtual std::string getName() const SAL_OVERRIDE; - virtual std::string toString() const SAL_OVERRIDE; + virtual std::string getName() const override; + virtual std::string toString() const override; #endif private: Id m_nKeyword; diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx index 8012734471b6..64b43cd11670 100644 --- a/writerfilter/source/rtftok/rtfvalue.hxx +++ b/writerfilter/source/rtftok/rtfvalue.hxx @@ -42,13 +42,13 @@ public: RTFValue(const RTFShape& aShape); virtual ~RTFValue(); void setString(const OUString& sValue); - virtual int getInt() const SAL_OVERRIDE; - virtual OUString getString() const SAL_OVERRIDE; - virtual css::uno::Any getAny() const SAL_OVERRIDE; - virtual writerfilter::Reference::Pointer_t getProperties() SAL_OVERRIDE; - virtual writerfilter::Reference::Pointer_t getBinary() SAL_OVERRIDE; + virtual int getInt() const override; + virtual OUString getString() const override; + virtual css::uno::Any getAny() const override; + virtual writerfilter::Reference::Pointer_t getProperties() override; + virtual writerfilter::Reference::Pointer_t getBinary() override; #ifdef DEBUG_WRITERFILTER - virtual std::string toString() const SAL_OVERRIDE; + virtual std::string toString() const override; #endif RTFValue* Clone(); RTFValue* CloneWithSprms(RTFSprms const& rAttributes, RTFSprms const& rSprms); -- cgit