diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
| commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
| tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /sw/source/core/inc | |
| parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) | |
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'sw/source/core/inc')
77 files changed, 971 insertions, 971 deletions
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index ed4afd7b6ad9..0d9dc6f0e1cd 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -36,66 +36,66 @@ namespace sw { public: MarkManager(/*[in/out]*/ SwDoc& rDoc); // IDocumentMarkAccess - virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rName, IDocumentMarkAccess::MarkType eMark); + virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rName, IDocumentMarkAccess::MarkType eMark) SAL_OVERRIDE; virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM, const OUString& rName, - const OUString& rType); + const OUString& rType) SAL_OVERRIDE; virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM, const OUString& rName, - const OUString& rType); + const OUString& rType) SAL_OVERRIDE; - virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, IDocumentMarkAccess::MarkType eMark); + virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, IDocumentMarkAccess::MarkType eMark) SAL_OVERRIDE; virtual sw::mark::IMark* makeAnnotationMark( const SwPaM& rPaM, - const ::rtl::OUString& rName ); + const ::rtl::OUString& rName ) SAL_OVERRIDE; - virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM); - virtual bool renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName); - virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset); - virtual void correctMarksRelative(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset); + virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM) SAL_OVERRIDE; + virtual bool renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName) SAL_OVERRIDE; + virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset) SAL_OVERRIDE; + virtual void correctMarksRelative(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset) SAL_OVERRIDE; - virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx); + virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx) SAL_OVERRIDE; // deleters virtual ::boost::shared_ptr<ILazyDeleter> - deleteMark(const const_iterator_t ppMark); - virtual void deleteMark(const ::sw::mark::IMark* const pMark); - virtual void clearAllMarks(); + deleteMark(const const_iterator_t ppMark) SAL_OVERRIDE; + virtual void deleteMark(const ::sw::mark::IMark* const pMark) SAL_OVERRIDE; + virtual void clearAllMarks() SAL_OVERRIDE; // marks - virtual const_iterator_t getAllMarksBegin() const; - virtual const_iterator_t getAllMarksEnd() const; - virtual sal_Int32 getAllMarksCount() const; - virtual const_iterator_t findMark(const OUString& rName) const; + virtual const_iterator_t getAllMarksBegin() const SAL_OVERRIDE; + virtual const_iterator_t getAllMarksEnd() const SAL_OVERRIDE; + virtual sal_Int32 getAllMarksCount() const SAL_OVERRIDE; + virtual const_iterator_t findMark(const OUString& rName) const SAL_OVERRIDE; virtual bool hasMark(const OUString& rName) const; // bookmarks - virtual const_iterator_t getBookmarksBegin() const; - virtual const_iterator_t getBookmarksEnd() const; - virtual sal_Int32 getBookmarksCount() const; - virtual const_iterator_t findBookmark(const OUString& rName) const; + virtual const_iterator_t getBookmarksBegin() const SAL_OVERRIDE; + virtual const_iterator_t getBookmarksEnd() const SAL_OVERRIDE; + virtual sal_Int32 getBookmarksCount() const SAL_OVERRIDE; + virtual const_iterator_t findBookmark(const OUString& rName) const SAL_OVERRIDE; // Fieldmarks - virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& rPos) const; - virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition& rPos) const; - virtual ::sw::mark::IFieldmark* getFieldmarkAfter(const SwPosition& rPos) const; + virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& rPos) const SAL_OVERRIDE; + virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition& rPos) const SAL_OVERRIDE; + virtual ::sw::mark::IFieldmark* getFieldmarkAfter(const SwPosition& rPos) const SAL_OVERRIDE; void dumpAsXml(xmlTextWriterPtr w); // Marks exclusive annotation marks - virtual const_iterator_t getCommonMarksBegin() const; - virtual const_iterator_t getCommonMarksEnd() const; - virtual sal_Int32 getCommonMarksCount() const; + virtual const_iterator_t getCommonMarksBegin() const SAL_OVERRIDE; + virtual const_iterator_t getCommonMarksEnd() const SAL_OVERRIDE; + virtual sal_Int32 getCommonMarksCount() const SAL_OVERRIDE; // Annotation Marks - virtual const_iterator_t getAnnotationMarksBegin() const; - virtual const_iterator_t getAnnotationMarksEnd() const; - virtual sal_Int32 getAnnotationMarksCount() const; - virtual const_iterator_t findAnnotationMark( const ::rtl::OUString& rName ) const; + virtual const_iterator_t getAnnotationMarksBegin() const SAL_OVERRIDE; + virtual const_iterator_t getAnnotationMarksEnd() const SAL_OVERRIDE; + virtual sal_Int32 getAnnotationMarksCount() const SAL_OVERRIDE; + virtual const_iterator_t findAnnotationMark( const ::rtl::OUString& rName ) const SAL_OVERRIDE; - virtual void assureSortedMarkContainers() const; + virtual void assureSortedMarkContainers() const SAL_OVERRIDE; private: // make names diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx index 25c5991857c4..17c566b6a430 100644 --- a/sw/source/core/inc/SwGrammarMarkUp.hxx +++ b/sw/source/core/inc/SwGrammarMarkUp.hxx @@ -42,8 +42,8 @@ public: SwGrammarMarkUp( const SwGrammarMarkUp* ); virtual ~SwGrammarMarkUp(); - virtual SwWrongList* Clone(); - virtual void CopyFrom( const SwWrongList& rCopy ); + virtual SwWrongList* Clone() SAL_OVERRIDE; + virtual void CopyFrom( const SwWrongList& rCopy ) SAL_OVERRIDE; /* SwWrongList::Move() + handling of maSentence */ void MoveGrammar( sal_Int32 nPos, sal_Int32 nDiff ); diff --git a/sw/source/core/inc/SwUndoFmt.hxx b/sw/source/core/inc/SwUndoFmt.hxx index 808b6b30da75..a76ed647e6e3 100644 --- a/sw/source/core/inc/SwUndoFmt.hxx +++ b/sw/source/core/inc/SwUndoFmt.hxx @@ -45,10 +45,10 @@ public: SwDoc * pDoc); virtual ~SwUndoFmtCreate(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; virtual SwFmt * Create(SwFmt * pDerivedFrom) = 0; virtual void Delete() = 0; @@ -69,10 +69,10 @@ public: SwUndoFmtDelete(SwUndoId nUndoId, SwFmt * pOld, SwDoc * pDoc); ~SwUndoFmtDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; virtual SwFmt * Create(SwFmt * pDerivedFrom) = 0; virtual void Delete(SwFmt * pFmt) = 0; @@ -91,10 +91,10 @@ public: SwDoc * pDoc); ~SwUndoRenameFmt(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - SwRewriter GetRewriter() const; + SwRewriter GetRewriter() const SAL_OVERRIDE; virtual SwFmt * Find(const OUString & rName) const = 0; }; @@ -105,9 +105,9 @@ public: SwUndoTxtFmtCollCreate(SwTxtFmtColl * pNew, SwTxtFmtColl * pDerivedFrom, SwDoc * pDoc); - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE; + virtual void Delete() SAL_OVERRIDE; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoTxtFmtCollDelete : public SwUndoFmtDelete @@ -115,9 +115,9 @@ class SwUndoTxtFmtCollDelete : public SwUndoFmtDelete public: SwUndoTxtFmtCollDelete(SwTxtFmtColl * pOld, SwDoc * pDoc); - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(SwFmt * pFmt); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE; + virtual void Delete(SwFmt * pFmt) SAL_OVERRIDE; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoRenameFmtColl : public SwUndoRenameFmt @@ -127,7 +127,7 @@ public: const OUString & sNewName, SwDoc * pDoc); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoCharFmtCreate : public SwUndoFmtCreate @@ -136,9 +136,9 @@ public: SwUndoCharFmtCreate(SwCharFmt * pNew, SwCharFmt * pDerivedFrom, SwDoc * pDoc); - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE; + virtual void Delete() SAL_OVERRIDE; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoCharFmtDelete : public SwUndoFmtDelete @@ -146,9 +146,9 @@ class SwUndoCharFmtDelete : public SwUndoFmtDelete public: SwUndoCharFmtDelete(SwCharFmt * pOld, SwDoc * pDoc); - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(SwFmt * pFmt); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE; + virtual void Delete(SwFmt * pFmt) SAL_OVERRIDE; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoRenameCharFmt : public SwUndoRenameFmt @@ -158,7 +158,7 @@ public: const OUString & sNewName, SwDoc * pDoc); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoFrmFmtCreate : public SwUndoFmtCreate @@ -169,9 +169,9 @@ public: SwUndoFrmFmtCreate(SwFrmFmt * pNew, SwFrmFmt * pDerivedFrom, SwDoc * pDoc); - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE; + virtual void Delete() SAL_OVERRIDE; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoFrmFmtDelete : public SwUndoFmtDelete @@ -179,9 +179,9 @@ class SwUndoFrmFmtDelete : public SwUndoFmtDelete public: SwUndoFrmFmtDelete(SwFrmFmt * pOld, SwDoc * pDoc); - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(SwFmt * pFmt); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE; + virtual void Delete(SwFmt * pFmt) SAL_OVERRIDE; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoRenameFrmFmt : public SwUndoRenameFmt @@ -191,7 +191,7 @@ public: const OUString & sNewName, SwDoc * pDoc); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoNumruleCreate : public SwUndo @@ -204,10 +204,10 @@ class SwUndoNumruleCreate : public SwUndo public: SwUndoNumruleCreate(const SwNumRule * pNew, SwDoc * pDoc); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - SwRewriter GetRewriter() const; + SwRewriter GetRewriter() const SAL_OVERRIDE; }; class SwUndoNumruleDelete : public SwUndo @@ -218,10 +218,10 @@ class SwUndoNumruleDelete : public SwUndo public: SwUndoNumruleDelete(const SwNumRule & aRule, SwDoc * pDoc); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - SwRewriter GetRewriter() const; + SwRewriter GetRewriter() const SAL_OVERRIDE; }; class SwUndoNumruleRename : public SwUndo @@ -233,10 +233,10 @@ class SwUndoNumruleRename : public SwUndo SwUndoNumruleRename(const OUString & aOldName, const OUString & aNewName, SwDoc * pDoc); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - SwRewriter GetRewriter() const; + SwRewriter GetRewriter() const SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_SWUNDOFMT_HXX diff --git a/sw/source/core/inc/SwUndoPageDesc.hxx b/sw/source/core/inc/SwUndoPageDesc.hxx index 6efaf6d32b56..a8c7c13668a6 100644 --- a/sw/source/core/inc/SwUndoPageDesc.hxx +++ b/sw/source/core/inc/SwUndoPageDesc.hxx @@ -40,10 +40,10 @@ public: SwDoc * pDoc); virtual ~SwUndoPageDesc(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; }; class SwUndoPageDescCreate : public SwUndo @@ -58,11 +58,11 @@ public: SwUndoPageDescCreate(const SwPageDesc * pNew, SwDoc * pDoc); virtual ~SwUndoPageDescCreate(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; }; class SwUndoPageDescDelete : public SwUndo @@ -76,11 +76,11 @@ public: SwUndoPageDescDelete(const SwPageDesc & aOld, SwDoc * pDoc); virtual ~SwUndoPageDescDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; }; #endif // _SW_UNDO_PAGE_DESC_CHANGE_HXX diff --git a/sw/source/core/inc/SwUndoTOXChange.hxx b/sw/source/core/inc/SwUndoTOXChange.hxx index 08cc3e15c852..ed6aeca07608 100644 --- a/sw/source/core/inc/SwUndoTOXChange.hxx +++ b/sw/source/core/inc/SwUndoTOXChange.hxx @@ -34,9 +34,9 @@ public: SwUndoTOXChange(SwTOXBase * pTOX, const SwTOXBase & rNew); virtual ~SwUndoTOXChange(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_SWUNDOTOXCHANGE_HXX diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx index c3901088273b..ff62ced64fd8 100644 --- a/sw/source/core/inc/SwXMLBlockExport.hxx +++ b/sw/source/core/inc/SwXMLBlockExport.hxx @@ -37,10 +37,10 @@ public: com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); virtual ~SwXMLBlockListExport ( void ) {} - sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass); - void _ExportAutoStyles() {} - void _ExportMasterStyles () {} - void _ExportContent() {} + sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE; + void _ExportAutoStyles() SAL_OVERRIDE {} + void _ExportMasterStyles () SAL_OVERRIDE {} + void _ExportContent() SAL_OVERRIDE {} }; class SwXMLTextBlockExport : public SvXMLExport @@ -56,11 +56,11 @@ public: com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); virtual ~SwXMLTextBlockExport ( void ) {} - sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) {return 0;} + sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) SAL_OVERRIDE {return 0;} sal_uInt32 exportDoc(const OUString & rText); - void _ExportAutoStyles() {} - void _ExportMasterStyles () {} - void _ExportContent() {} + void _ExportAutoStyles() SAL_OVERRIDE {} + void _ExportMasterStyles () SAL_OVERRIDE {} + void _ExportContent() SAL_OVERRIDE {} }; #endif diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index 81801c413ea3..726db195a613 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -34,7 +34,7 @@ protected: virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; public: SwXMLBlockListImport( @@ -60,7 +60,7 @@ protected: virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; public: sal_Bool bTextOnly; @@ -76,7 +76,7 @@ public: virtual ~SwXMLTextBlockImport ( void ) throw(); virtual void SAL_CALL endDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/inc/SwXMLBlockListContext.hxx b/sw/source/core/inc/SwXMLBlockListContext.hxx index 52605b31dda1..6577c81c80b1 100644 --- a/sw/source/core/inc/SwXMLBlockListContext.hxx +++ b/sw/source/core/inc/SwXMLBlockListContext.hxx @@ -40,7 +40,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; }; @@ -69,7 +69,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; ~SwXMLTextBlockDocumentContext ( void ); }; @@ -87,7 +87,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; ~SwXMLTextBlockBodyContext ( void ); }; @@ -105,7 +105,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; ~SwXMLTextBlockTextContext ( void ); }; @@ -120,7 +120,7 @@ public: const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - virtual void Characters( const OUString& rChars ); + virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; ~SwXMLTextBlockParContext ( void ); }; diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index 5afd8f1b4d08..df3c20ffa9fa 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -54,41 +54,41 @@ public: SwXMLTextBlocks( const OUString& rFile ); SwXMLTextBlocks( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString& rFile ); void AddName( const OUString&, const OUString&, const OUString&, sal_Bool bOnlyTxt = sal_False ); - virtual void AddName( const OUString&, const OUString&, sal_Bool bOnlyTxt = sal_False ); + virtual void AddName( const OUString&, const OUString&, sal_Bool bOnlyTxt = sal_False ) SAL_OVERRIDE; OUString GeneratePackageName ( const OUString& rShort ); virtual ~SwXMLTextBlocks(); //virtual sal_Bool IsOld() const; - virtual sal_uLong Delete( sal_uInt16 ); - virtual sal_uLong Rename( sal_uInt16, const OUString&, const OUString& ); - virtual sal_uLong CopyBlock( SwImpBlocks& rImp, OUString& rShort, const OUString& rLong); - virtual void ClearDoc(); - virtual sal_uLong GetDoc( sal_uInt16 ); - virtual sal_uLong BeginPutDoc( const OUString&, const OUString& ); - virtual sal_uLong PutDoc(); - virtual sal_uLong GetText( sal_uInt16, OUString& ); - virtual sal_uLong PutText( const OUString&, const OUString&, const OUString& ); - virtual sal_uLong MakeBlockList(); - - virtual short GetFileType ( void ) const; - virtual sal_uLong OpenFile( sal_Bool bReadOnly = sal_True ); - virtual void CloseFile(); + virtual sal_uLong Delete( sal_uInt16 ) SAL_OVERRIDE; + virtual sal_uLong Rename( sal_uInt16, const OUString&, const OUString& ) SAL_OVERRIDE; + virtual sal_uLong CopyBlock( SwImpBlocks& rImp, OUString& rShort, const OUString& rLong) SAL_OVERRIDE; + virtual void ClearDoc() SAL_OVERRIDE; + virtual sal_uLong GetDoc( sal_uInt16 ) SAL_OVERRIDE; + virtual sal_uLong BeginPutDoc( const OUString&, const OUString& ) SAL_OVERRIDE; + virtual sal_uLong PutDoc() SAL_OVERRIDE; + virtual sal_uLong GetText( sal_uInt16, OUString& ) SAL_OVERRIDE; + virtual sal_uLong PutText( const OUString&, const OUString&, const OUString& ) SAL_OVERRIDE; + virtual sal_uLong MakeBlockList() SAL_OVERRIDE; + + virtual short GetFileType ( void ) const SAL_OVERRIDE; + virtual sal_uLong OpenFile( sal_Bool bReadOnly = sal_True ) SAL_OVERRIDE; + virtual void CloseFile() SAL_OVERRIDE; static sal_Bool IsFileUCBStorage( const OUString & rFileName); // Methods for the new Autocorrecter sal_uLong GetText( const OUString& rShort, OUString& ); - virtual sal_Bool IsOnlyTextBlock( const OUString& rShort ) const; + virtual sal_Bool IsOnlyTextBlock( const OUString& rShort ) const SAL_OVERRIDE; virtual sal_Bool IsOnlyTextBlock( sal_uInt16 nIdx ) const; virtual void SetIsTextOnly( const OUString& rShort, sal_Bool bNewValue ); virtual void SetIsTextOnly( sal_uInt16 nIdx, sal_Bool bNewValue ); virtual sal_uLong GetMacroTable( sal_uInt16, SvxMacroTableDtor& rMacroTbl, - sal_Bool bFileAlreadyOpen = sal_False ); + sal_Bool bFileAlreadyOpen = sal_False ) SAL_OVERRIDE; virtual sal_uLong SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTable, - sal_Bool bFileAlreadyOpen = sal_False ); - virtual sal_Bool PutMuchEntries( sal_Bool bOn ); + sal_Bool bFileAlreadyOpen = sal_False ) SAL_OVERRIDE; + virtual sal_Bool PutMuchEntries( sal_Bool bOn ) SAL_OVERRIDE; public: SwDoc* GetDoc() const { return pDoc; } diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx index 4aeb9161e0f6..c70565a7cd19 100644 --- a/sw/source/core/inc/SwXTextDefaults.hxx +++ b/sw/source/core/inc/SwXTextDefaults.hxx @@ -43,34 +43,34 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx index e2336e9860d2..f55513fe75f1 100644 --- a/sw/source/core/inc/UndoAttribute.hxx +++ b/sw/source/core/inc/UndoAttribute.hxx @@ -52,9 +52,9 @@ public: virtual ~SwUndoAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SaveRedlineData( const SwPaM& rPam, sal_Bool bInsCntnt ); @@ -75,9 +75,9 @@ public: virtual ~SwUndoResetAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SetAttrs( const std::set<sal_uInt16> &rAttrs ); @@ -121,11 +121,11 @@ public: virtual ~SwUndoFmtAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; void PutAttr( const SfxPoolItem& rItem ); SwFmt* GetFmt( SwDoc& rDoc ); // checks if it is still in the Doc! @@ -139,8 +139,8 @@ class SwUndoFmtResetAttr : public SwUndo const sal_uInt16 nWhichId ); ~SwUndoFmtResetAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; private: // format at which a certain attribute is reset. @@ -161,9 +161,9 @@ class SwUndoDontExpandFmt : public SwUndo public: SwUndoDontExpandFmt( const SwPosition& rPos ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; // helper class to receive changed attribute sets @@ -177,7 +177,7 @@ class SwUndoFmtAttrHelper : public SwClient public: SwUndoFmtAttrHelper( SwFmt& rFmt, bool bSaveDrawPt = true ); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; SwUndoFmtAttr* GetUndo() const { return m_pUndo.get(); } // release the undo object (so it is not deleted here), and return it @@ -196,9 +196,9 @@ public: virtual ~SwUndoMoveLeftMargin(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; SwHistory& GetHistory() { return *m_pHistory; } @@ -217,8 +217,8 @@ public: virtual ~SwUndoDefaultAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; class SwUndoChangeFootNote : public SwUndo, private SwUndRng @@ -235,9 +235,9 @@ public: sal_uInt16 nNum, bool bIsEndNote ); virtual ~SwUndoChangeFootNote(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; SwHistory& GetHistory() { return *m_pHistory; } }; @@ -253,8 +253,8 @@ public: virtual ~SwUndoFootNoteInfo(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; class SwUndoEndNoteInfo : public SwUndo @@ -268,8 +268,8 @@ public: virtual ~SwUndoEndNoteInfo(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOATTRIBUTE_HXX diff --git a/sw/source/core/inc/UndoBookmark.hxx b/sw/source/core/inc/UndoBookmark.hxx index e910ecba3e8c..0d2234f64825 100644 --- a/sw/source/core/inc/UndoBookmark.hxx +++ b/sw/source/core/inc/UndoBookmark.hxx @@ -55,7 +55,7 @@ public: @return the rewriter for this undo object */ - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; }; class SwUndoInsBookmark : public SwUndoBookmark @@ -63,8 +63,8 @@ class SwUndoInsBookmark : public SwUndoBookmark public: SwUndoInsBookmark( const ::sw::mark::IMark& ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOBOOKMARK_HXX diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx index 5f85dda679b0..64b2b95fd222 100644 --- a/sw/source/core/inc/UndoCore.hxx +++ b/sw/source/core/inc/UndoCore.hxx @@ -127,9 +127,9 @@ public: const bool bResetListAttrs ); virtual ~SwUndoFmtColl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; /** Returns the rewriter for this undo object. @@ -144,7 +144,7 @@ public: @return the rewriter for this undo object */ - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; SwHistory* GetHistory() { return pHistory; } @@ -162,17 +162,17 @@ class SwUndoSetFlyFmt : public SwUndo, public SwClient bool bAnchorChgd; void PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem ); - void Modify( const SfxPoolItem*, const SfxPoolItem* ); + void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; void GetAnchor( SwFmtAnchor& rAnhor, sal_uLong nNode, sal_Int32 nCntnt ); public: SwUndoSetFlyFmt( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFrmFmt ); virtual ~SwUndoSetFlyFmt(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; void DeRegisterFromFormat( SwFmt& ); }; @@ -183,9 +183,9 @@ class SwUndoOutlineLeftRight : public SwUndo, private SwUndRng public: SwUndoOutlineLeftRight( const SwPaM& rPam, short nOffset ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; const int nUndoStringLength = 20; diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx index 7a13c427d5e9..719bd53f0cb2 100644 --- a/sw/source/core/inc/UndoDelete.hxx +++ b/sw/source/core/inc/UndoDelete.hxx @@ -70,9 +70,9 @@ public: sal_Bool bCalledByTblCpy = sal_False ); virtual ~SwUndoDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; /** Returns rewriter for this undo object. @@ -84,7 +84,7 @@ public: @return rewriter for this undo object */ - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; sal_Bool CanGrouping( SwDoc*, const SwPaM& ); diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx index b9d9c3ae063e..632fd5ec682b 100644 --- a/sw/source/core/inc/UndoDraw.hxx +++ b/sw/source/core/inc/UndoDraw.hxx @@ -42,10 +42,10 @@ public: virtual ~SwSdrUndo(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; class SwUndoDrawGroup : public SwUndo @@ -59,8 +59,8 @@ public: virtual ~SwUndoDrawGroup(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void AddObj( sal_uInt16 nPos, SwDrawFrmFmt*, SdrObject* ); void SetGroupFmt( SwDrawFrmFmt* ); @@ -88,8 +88,8 @@ public: virtual ~SwUndoDrawUnGroup(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void AddObj( sal_uInt16 nPos, SwDrawFrmFmt* ); }; @@ -104,8 +104,8 @@ public: virtual ~SwUndoDrawUnGroupConnectToLayout(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt, SdrObject* pDrawObject ); @@ -123,8 +123,8 @@ public: virtual ~SwUndoDrawDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void AddObj( sal_uInt16 nPos, SwDrawFrmFmt*, const SdrMark& ); }; diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx index 7ce1169531e7..2c4c797bfc35 100644 --- a/sw/source/core/inc/UndoInsert.hxx +++ b/sw/source/core/inc/UndoInsert.hxx @@ -61,9 +61,9 @@ public: SwUndoInsert( const SwNodeIndex& rNode ); virtual ~SwUndoInsert(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; /** Returns rewriter for this undo object. @@ -76,7 +76,7 @@ public: @return rewriter for this undo object */ - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; void SetWithRsid() { m_bWithRsid = true; } @@ -96,8 +96,8 @@ public: virtual ~SwUndoReplace(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; /** Returns the rewriter of this undo object. @@ -118,7 +118,7 @@ public: @return the rewriter of this undo object */ - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; void SetEnd( const SwPaM& rPam ); @@ -143,8 +143,8 @@ public: virtual ~SwUndoReRead(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; class SwUndoInsertLabel : public SwUndo @@ -185,9 +185,9 @@ public: const sal_Bool bCpyBrd ); virtual ~SwUndoInsertLabel(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; /** Returns the rewriter of this undo object. @@ -201,7 +201,7 @@ public: @return the rewriter of this undo object */ - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; void SetNodePos( sal_uLong nNd ) { if( LTYPE_OBJECT != eType ) NODE.nNode = nNd; } diff --git a/sw/source/core/inc/UndoManager.hxx b/sw/source/core/inc/UndoManager.hxx index 4514b2895668..65d3b03422c1 100644 --- a/sw/source/core/inc/UndoManager.hxx +++ b/sw/source/core/inc/UndoManager.hxx @@ -41,42 +41,42 @@ public: IDocumentState & rState); /** IDocumentUndoRedo */ - virtual void DoUndo(bool const bDoUndo); - virtual bool DoesUndo() const; - virtual void DoGroupUndo(bool const bDoUndo); - virtual bool DoesGroupUndo() const; - virtual void DoDrawUndo(bool const bDoUndo); - virtual bool DoesDrawUndo() const; - virtual void SetUndoNoModifiedPosition(); - virtual void LockUndoNoModifiedPosition(); - virtual void UnLockUndoNoModifiedPosition(); - virtual void SetUndoNoResetModified(); - virtual bool IsUndoNoResetModified() const; + virtual void DoUndo(bool const bDoUndo) SAL_OVERRIDE; + virtual bool DoesUndo() const SAL_OVERRIDE; + virtual void DoGroupUndo(bool const bDoUndo) SAL_OVERRIDE; + virtual bool DoesGroupUndo() const SAL_OVERRIDE; + virtual void DoDrawUndo(bool const bDoUndo) SAL_OVERRIDE; + virtual bool DoesDrawUndo() const SAL_OVERRIDE; + virtual void SetUndoNoModifiedPosition() SAL_OVERRIDE; + virtual void LockUndoNoModifiedPosition() SAL_OVERRIDE; + virtual void UnLockUndoNoModifiedPosition() SAL_OVERRIDE; + virtual void SetUndoNoResetModified() SAL_OVERRIDE; + virtual bool IsUndoNoResetModified() const SAL_OVERRIDE; virtual SwUndoId StartUndo(SwUndoId const eUndoId, - SwRewriter const*const pRewriter); + SwRewriter const*const pRewriter) SAL_OVERRIDE; virtual SwUndoId EndUndo(SwUndoId const eUndoId, - SwRewriter const*const pRewriter); - virtual void DelAllUndoObj(); + SwRewriter const*const pRewriter) SAL_OVERRIDE; + virtual void DelAllUndoObj() SAL_OVERRIDE; virtual bool GetLastUndoInfo(OUString *const o_pStr, - SwUndoId *const o_pId) const; - virtual SwUndoComments_t GetUndoComments() const; + SwUndoId *const o_pId) const SAL_OVERRIDE; + virtual SwUndoComments_t GetUndoComments() const SAL_OVERRIDE; virtual bool GetFirstRedoInfo(OUString *const o_pStr, - SwUndoId *const o_pId = 0) const; - virtual SwUndoComments_t GetRedoComments() const; + SwUndoId *const o_pId = 0) const SAL_OVERRIDE; + virtual SwUndoComments_t GetRedoComments() const SAL_OVERRIDE; virtual bool Repeat(::sw::RepeatContext & rContext, - sal_uInt16 const nRepeatCnt); - virtual SwUndoId GetRepeatInfo(OUString *const o_pStr) const; - virtual void AppendUndo(SwUndo *const pUndo); - virtual void ClearRedo(); - virtual bool IsUndoNodes(SwNodes const& rNodes) const; + sal_uInt16 const nRepeatCnt) SAL_OVERRIDE; + virtual SwUndoId GetRepeatInfo(OUString *const o_pStr) const SAL_OVERRIDE; + virtual void AppendUndo(SwUndo *const pUndo) SAL_OVERRIDE; + virtual void ClearRedo() SAL_OVERRIDE; + virtual bool IsUndoNodes(SwNodes const& rNodes) const SAL_OVERRIDE; // ::svl::IUndoManager virtual void AddUndoAction(SfxUndoAction *pAction, - bool bTryMerg = false); - virtual bool Undo(); - virtual bool Redo(); - virtual void EnableUndo(bool bEnable); + bool bTryMerg = false) SAL_OVERRIDE; + virtual bool Undo() SAL_OVERRIDE; + virtual bool Redo() SAL_OVERRIDE; + virtual void EnableUndo(bool bEnable) SAL_OVERRIDE; SwUndo * RemoveLastUndo(); SwUndo * GetLastUndo(); diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx index bf92ea626613..53614c4f9fe2 100644 --- a/sw/source/core/inc/UndoNumbering.hxx +++ b/sw/source/core/inc/UndoNumbering.hxx @@ -45,11 +45,11 @@ public: virtual ~SwUndoInsNum(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; SwHistory* GetHistory(); // will be created if necessary void SetSttNum( sal_uLong nNdIdx ) { nSttSet = nNdIdx; } @@ -75,9 +75,9 @@ public: virtual ~SwUndoDelNum(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void AddNode( const SwTxtNode& rNd, sal_Bool bResetLRSpace ); SwHistory* GetHistory() { return pHistory; } @@ -91,9 +91,9 @@ class SwUndoMoveNum : public SwUndo, private SwUndRng public: SwUndoMoveNum( const SwPaM& rPam, long nOffset, bool bIsOutlMv = false ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SetStartNode( sal_uLong nValue ) { nNewStt = nValue; } }; @@ -105,9 +105,9 @@ class SwUndoNumUpDown : public SwUndo, private SwUndRng public: SwUndoNumUpDown( const SwPaM& rPam, short nOffset ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; class SwUndoNumOrNoNum : public SwUndo @@ -119,9 +119,9 @@ public: SwUndoNumOrNoNum( const SwNodeIndex& rIdx, sal_Bool mbOldNum, sal_Bool mbNewNum ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; class SwUndoNumRuleStart : public SwUndo @@ -135,9 +135,9 @@ public: SwUndoNumRuleStart( const SwPosition& rPos, sal_Bool bDelete ); SwUndoNumRuleStart( const SwPosition& rPos, sal_uInt16 nStt ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDONUMBERING_HXX diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx index 91f9c1aa0bc3..639ee22d72f6 100644 --- a/sw/source/core/inc/UndoOverwrite.hxx +++ b/sw/source/core/inc/UndoOverwrite.hxx @@ -45,9 +45,9 @@ public: virtual ~SwUndoOverwrite(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; /** Returns the rewriter of this undo object. @@ -60,7 +60,7 @@ public: @return the rewriter of this undo object */ - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; sal_Bool CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns ); }; @@ -79,9 +79,9 @@ public: virtual ~SwUndoTransliterate(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void AddChanges( SwTxtNode& rTNd, sal_Int32 nStart, sal_Int32 nLen, ::com::sun::star::uno::Sequence <sal_Int32>& rOffsets ); diff --git a/sw/source/core/inc/UndoRedline.hxx b/sw/source/core/inc/UndoRedline.hxx index 0a943276d98f..1b5ed47b923e 100644 --- a/sw/source/core/inc/UndoRedline.hxx +++ b/sw/source/core/inc/UndoRedline.hxx @@ -43,8 +43,8 @@ public: virtual ~SwUndoRedline(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; SwUndoId GetUserId() const { return mnUserId; } sal_uInt16 GetRedlSaveCount() const; @@ -56,8 +56,8 @@ class SwUndoRedlineDelete : public SwUndoRedline sal_Bool bIsDelim : 1; sal_Bool bIsBackspace : 1; - virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam); - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam); + virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; public: SwUndoRedlineDelete( const SwPaM& rRange, SwUndoId nUserId = UNDO_EMPTY ); @@ -75,15 +75,15 @@ class SwUndoRedlineSort : public SwUndoRedline sal_uLong nSaveEndNode, nOffset; sal_Int32 nSaveEndCntnt; - virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam); - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam); + virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; public: SwUndoRedlineSort( const SwPaM& rRange, const SwSortOptions& rOpt ); virtual ~SwUndoRedlineSort(); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SetSaveRange( const SwPaM& rRange ); void SetOffset( const SwNodeIndex& rIdx ); @@ -92,23 +92,23 @@ public: class SwUndoAcceptRedline : public SwUndoRedline { private: - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam); + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; public: SwUndoAcceptRedline( const SwPaM& rRange ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; class SwUndoRejectRedline : public SwUndoRedline { private: - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam); + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; public: SwUndoRejectRedline( const SwPaM& rRange ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; class SwUndoCompDoc : public SwUndo, public SwUndRng @@ -124,8 +124,8 @@ public: virtual ~SwUndoCompDoc(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOREDLINE_HXX diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx index ea681525192f..478161cb78f8 100644 --- a/sw/source/core/inc/UndoSection.hxx +++ b/sw/source/core/inc/UndoSection.hxx @@ -52,9 +52,9 @@ public: virtual ~SwUndoInsSection(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SetSectNdPos(sal_uLong const nPos) { m_nSectionNodePos = nPos; } void SaveSplitNode(SwTxtNode *const pTxtNd, bool const bAtStart); diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx index 5deb7ea8a5a1..b750741bb710 100644 --- a/sw/source/core/inc/UndoSort.hxx +++ b/sw/source/core/inc/UndoSort.hxx @@ -73,9 +73,9 @@ public: virtual ~SwUndoSort(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void Insert( const OUString& rOrgPos, const OUString& rNewPos ); void Insert( sal_uLong nOrgPos, sal_uLong nNewPos ); diff --git a/sw/source/core/inc/UndoSplitMove.hxx b/sw/source/core/inc/UndoSplitMove.hxx index 6d0027951cba..918ab0c293d2 100644 --- a/sw/source/core/inc/UndoSplitMove.hxx +++ b/sw/source/core/inc/UndoSplitMove.hxx @@ -37,9 +37,9 @@ public: virtual ~SwUndoSplitNode(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SetTblFlag() { bTblFlag = sal_True; } }; @@ -66,8 +66,8 @@ public: SwUndoMove( const SwPaM&, const SwPosition& ); SwUndoMove( SwDoc* pDoc, const SwNodeRange&, const SwNodeIndex& ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; /// set the destination range after the move void SetDestRange( const SwPaM&, const SwPosition&, sal_Bool, sal_Bool ); diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx index 4d7d89bcecf9..5eff20981281 100644 --- a/sw/source/core/inc/UndoTable.hxx +++ b/sw/source/core/inc/UndoTable.hxx @@ -65,11 +65,11 @@ public: virtual ~SwUndoInsTbl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; }; class SwUndoTxtToTbl : public SwUndo, public SwUndRng @@ -90,9 +90,9 @@ public: virtual ~SwUndoTxtToTbl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; SwHistory& GetHistory(); // will be created if necessary void AddFillBox( const SwTableBox& rBox ); @@ -116,9 +116,9 @@ public: virtual ~SwUndoTblToTxt(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SetRange( const SwNodeRange& ); void AddBoxPos( SwDoc& rDoc, sal_uLong nNdIdx, sal_uLong nEndIdx, @@ -136,8 +136,8 @@ public: virtual ~SwUndoAttrTbl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; class SwUndoTblNumFmt; @@ -157,8 +157,8 @@ public: virtual ~SwUndoTblAutoFmt(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void SaveBoxCntnt( const SwTableBox& rBox ); }; @@ -195,8 +195,8 @@ public: virtual ~SwUndoTblNdsChg(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void SaveNewBoxes( const SwTableNode& rTblNd, const SwTableSortBoxes& rOld ); void SaveNewBoxes( const SwTableNode& rTblNd, const SwTableSortBoxes& rOld, @@ -229,8 +229,8 @@ public: virtual ~SwUndoTblMerge(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void MoveBoxCntnt( SwDoc* pDoc, SwNodeRange& rRg, SwNodeIndex& rPos ); @@ -262,8 +262,8 @@ public: virtual ~SwUndoTblNumFmt(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void SetNumFmt( sal_uLong nNewNumFmtIdx, const double& rNewNumber ) { nFmtIdx = nNewNumFmtIdx; fNum = rNewNumber; } @@ -287,8 +287,8 @@ public: virtual ~SwUndoTblCpyTbl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void AddBoxBefore( const SwTableBox& rBox, bool bDelCntnt ); void AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx, @@ -308,8 +308,8 @@ public: virtual ~SwUndoCpyTbl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void SetTableSttIdx( sal_uLong nIdx ) { nTblNode = nIdx; } }; @@ -329,9 +329,9 @@ public: virtual ~SwUndoSplitTbl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SetTblNodeOffset( sal_uLong nIdx ) { nOffset = nIdx - nTblNode; } SwHistory* GetHistory() { return pHistory; } @@ -353,9 +353,9 @@ public: virtual ~SwUndoMergeTbl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SaveFormula( SwHistory& rHistory ); }; @@ -369,9 +369,9 @@ class SwUndoTblHeadline : public SwUndo public: SwUndoTblHeadline( const SwTable&, sal_uInt16 nOldHdl, sal_uInt16 nNewHdl ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOTABLE_HXX diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index ed678567c145..f3cd2f09d63e 100644 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -57,15 +57,15 @@ public: SwAutoCorrDoc( SwEditShell& rEditShell, SwPaM& rPam, sal_Unicode cIns = 0 ); ~SwAutoCorrDoc(); - virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ); - virtual bool Insert( sal_Int32 nPos, const OUString& rTxt ); - virtual bool Replace( sal_Int32 nPos, const OUString& rTxt ); - virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt ); + virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ) SAL_OVERRIDE; + virtual bool Insert( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE; + virtual bool Replace( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE; + virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt ) SAL_OVERRIDE; virtual bool SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId, - SfxPoolItem& ); + SfxPoolItem& ) SAL_OVERRIDE; - virtual bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ); + virtual bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ) SAL_OVERRIDE; // return text of a previous paragraph // If it does not exist or if there is nothing before, return blank. @@ -76,15 +76,15 @@ public: virtual bool ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos, SvxAutoCorrect& rACorrect, - OUString* pPara ); + OUString* pPara ) SAL_OVERRIDE; // Will be called after swapping characters by the functions // - FnCptlSttWrd and // - FnCptlSttSntnc. // Afterwards the words can be added into exception list if needed. virtual void SaveCpltSttWord( sal_uLong nFlag, sal_Int32 nPos, - const OUString& rExceptWord, sal_Unicode cChar ); - virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara ) const; + const OUString& rExceptWord, sal_Unicode cChar ) SAL_OVERRIDE; + virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara ) const SAL_OVERRIDE; }; class SwAutoCorrExceptWord diff --git a/sw/source/core/inc/annotationmark.hxx b/sw/source/core/inc/annotationmark.hxx index 49adf05a7855..903c0516ea5e 100755..100644 --- a/sw/source/core/inc/annotationmark.hxx +++ b/sw/source/core/inc/annotationmark.hxx @@ -36,7 +36,7 @@ namespace sw { namespace mark virtual ~AnnotationMark(); - virtual void InitDoc(SwDoc* const io_Doc); + virtual void InitDoc(SwDoc* const io_Doc) SAL_OVERRIDE; const SwFmtFld* GetAnnotationFmtFld() const; }; diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx index 70bbcbd985f0..882a0283c6ad 100644 --- a/sw/source/core/inc/ascharanchoredobjectposition.hxx +++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx @@ -125,7 +125,7 @@ namespace objectpositioning <mnLineAlignment> are calculated. calculated position is set at the given object. */ - virtual void CalcPosition(); + virtual void CalcPosition() SAL_OVERRIDE; // calculated anchored position for object position type AS_CHAR Point GetAnchorPos() const; diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx index 769fe1ea4eb2..da73d4f1dce1 100644 --- a/sw/source/core/inc/bodyfrm.hxx +++ b/sw/source/core/inc/bodyfrm.hxx @@ -27,12 +27,12 @@ class SwBorderAttrs; class SwBodyFrm: public SwLayoutFrm { protected: - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; public: SwBodyFrm( SwFrmFmt*, SwFrm* ); - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL(SwBodyFrm) }; diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index 9df8878743cc..3184a10ada16 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -48,16 +48,16 @@ namespace sw { { public: //getters - virtual SwPosition& GetMarkPos() const + virtual SwPosition& GetMarkPos() const SAL_OVERRIDE { return *m_pPos1; } - virtual const OUString& GetName() const + virtual const OUString& GetName() const SAL_OVERRIDE { return m_aName; } - virtual SwPosition& GetOtherMarkPos() const + virtual SwPosition& GetOtherMarkPos() const SAL_OVERRIDE { OSL_PRECOND(IsExpanded(), "<SwPosition::GetOtherMarkPos(..)> - I have no other Pos set." ); return *m_pPos2; } - virtual SwPosition& GetMarkStart() const + virtual SwPosition& GetMarkStart() const SAL_OVERRIDE { if( !IsExpanded() ) return GetMarkPos( ); if ( GetMarkPos( ) < GetOtherMarkPos( ) ) @@ -65,7 +65,7 @@ namespace sw { else return GetOtherMarkPos( ); } - virtual SwPosition& GetMarkEnd() const + virtual SwPosition& GetMarkEnd() const SAL_OVERRIDE { if( !IsExpanded() ) return GetMarkPos(); if ( GetMarkPos( ) >= GetOtherMarkPos( ) ) @@ -74,8 +74,8 @@ namespace sw { return GetOtherMarkPos( ); } - virtual bool IsCoveringPosition(const SwPosition& rPos) const; - virtual bool IsExpanded() const + virtual bool IsCoveringPosition(const SwPosition& rPos) const SAL_OVERRIDE; + virtual bool IsExpanded() const SAL_OVERRIDE { return static_cast< bool >(m_pPos2); } virtual void SetName(const OUString& rName) @@ -85,7 +85,7 @@ namespace sw { virtual void ClearOtherMarkPos() { m_pPos2.reset(); } - virtual OUString ToString( ) const; + virtual OUString ToString( ) const SAL_OVERRIDE; virtual void Swap() { @@ -108,7 +108,7 @@ namespace sw { protected: // SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; MarkBase(const SwPaM& rPaM, const OUString& rName); ::boost::scoped_ptr<SwPosition> m_pPos1; @@ -167,24 +167,24 @@ namespace sw { const KeyCode& rCode, const OUString& rName, const OUString& rShortName); - virtual void InitDoc(SwDoc* const io_Doc); + virtual void InitDoc(SwDoc* const io_Doc) SAL_OVERRIDE; - virtual const OUString& GetShortName() const + virtual const OUString& GetShortName() const SAL_OVERRIDE { return m_sShortName; } - virtual const KeyCode& GetKeyCode() const + virtual const KeyCode& GetKeyCode() const SAL_OVERRIDE { return m_aCode; } - virtual void SetShortName(const OUString& rShortName) + virtual void SetShortName(const OUString& rShortName) SAL_OVERRIDE { m_sShortName = rShortName; } - virtual void SetKeyCode(const KeyCode& rCode) + virtual void SetKeyCode(const KeyCode& rCode) SAL_OVERRIDE { m_aCode = rCode; } // ::sfx2::Metadatable - virtual ::sfx2::IXmlIdRegistry& GetRegistry(); - virtual bool IsInClipboard() const; - virtual bool IsInUndo() const; - virtual bool IsInContent() const; + virtual ::sfx2::IXmlIdRegistry& GetRegistry() SAL_OVERRIDE; + virtual bool IsInClipboard() const SAL_OVERRIDE; + virtual bool IsInUndo() const SAL_OVERRIDE; + virtual bool IsInContent() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > MakeUnoObject(); + ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE; private: KeyCode m_aCode; @@ -198,20 +198,20 @@ namespace sw { public: Fieldmark(const SwPaM& rPaM); - virtual OUString GetFieldname() const + virtual OUString GetFieldname() const SAL_OVERRIDE { return m_aFieldname; } - virtual OUString GetFieldHelptext() const + virtual OUString GetFieldHelptext() const SAL_OVERRIDE { return m_aFieldHelptext; } - virtual IFieldmark::parameter_map_t* GetParameters() + virtual IFieldmark::parameter_map_t* GetParameters() SAL_OVERRIDE { return &m_vParams; } - virtual const IFieldmark::parameter_map_t* GetParameters() const + virtual const IFieldmark::parameter_map_t* GetParameters() const SAL_OVERRIDE { return &m_vParams; } - virtual void SetFieldname(const OUString& aFieldname) + virtual void SetFieldname(const OUString& aFieldname) SAL_OVERRIDE { m_aFieldname = aFieldname; } - virtual void SetFieldHelptext(const OUString& aFieldHelptext) + virtual void SetFieldHelptext(const OUString& aFieldHelptext) SAL_OVERRIDE { m_aFieldHelptext = aFieldHelptext; } virtual void ReleaseDoc(SwDoc* const) = 0; @@ -219,8 +219,8 @@ namespace sw { void SetMarkStartPos( const SwPosition& rNewStartPos ); void SetMarkEndPos( const SwPosition& rNewEndPos ); - virtual void Invalidate(); - virtual OUString ToString() const; + virtual void Invalidate() SAL_OVERRIDE; + virtual OUString ToString() const SAL_OVERRIDE; private: OUString m_aFieldname; @@ -233,8 +233,8 @@ namespace sw { { public: TextFieldmark(const SwPaM& rPaM); - virtual void InitDoc(SwDoc* const io_pDoc); - virtual void ReleaseDoc(SwDoc* const pDoc); + virtual void InitDoc(SwDoc* const io_pDoc) SAL_OVERRIDE; + virtual void ReleaseDoc(SwDoc* const pDoc) SAL_OVERRIDE; }; class CheckboxFieldmark @@ -243,10 +243,10 @@ namespace sw { { public: CheckboxFieldmark(const SwPaM& rPaM); - virtual void InitDoc(SwDoc* const io_pDoc); - virtual void ReleaseDoc(SwDoc* const pDoc); - bool IsChecked() const; - void SetChecked(bool checked); + virtual void InitDoc(SwDoc* const io_pDoc) SAL_OVERRIDE; + virtual void ReleaseDoc(SwDoc* const pDoc) SAL_OVERRIDE; + bool IsChecked() const SAL_OVERRIDE; + void SetChecked(bool checked) SAL_OVERRIDE; virtual OUString toString( ) const; }; diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx index b362fc74e371..7b551940eccf 100644 --- a/sw/source/core/inc/cellfrm.hxx +++ b/sw/source/core/inc/cellfrm.hxx @@ -33,20 +33,20 @@ class SwCellFrm: public SwLayoutFrm const SwTableBox* pTabBox; protected: - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: SwCellFrm( const SwTableBox &, SwFrm*, bool bInsertContent = true ); ~SwCellFrm(); - virtual bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0, bool bTestBackground = false ) const; + virtual bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; virtual void Paint( SwRect const&, - SwPrintData const*const pPrintData = NULL ) const; - virtual void CheckDirection( bool bVert ); + SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; + virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; // #i103961# - virtual void Cut(); + virtual void Cut() SAL_OVERRIDE; const SwTableBox *GetTabBox() const { return pTabBox; } diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx index a045636ed738..e36c89196c19 100644 --- a/sw/source/core/inc/cntfrm.hxx +++ b/sw/source/core/inc/cntfrm.hxx @@ -45,21 +45,21 @@ class SwCntntFrm: public SwFrm, public SwFlowFrm sal_Bool bTstMove, const bool bObjsInNewUpper ); - virtual void MakeAll(); + virtual void MakeAll() SAL_OVERRIDE; void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 ); - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool& ); + virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool& ) SAL_OVERRIDE; const SwCntntFrm* ImplGetNextCntntFrm( bool bFwd ) const; protected: sal_Bool MakePrtArea( const SwBorderAttrs & ); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); - virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; SwCntntFrm( SwCntntNode * const, SwFrm* ); @@ -67,8 +67,8 @@ public: virtual ~SwCntntFrm(); TYPEINFO_OVERRIDE(); // already in base class - virtual void Cut(); - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); + virtual void Cut() SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; inline const SwCntntNode *GetNode() const; inline SwCntntNode *GetNode(); diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx index 93ee8b163668..774a8e57b1ca 100644 --- a/sw/source/core/inc/colfrm.hxx +++ b/sw/source/core/inc/colfrm.hxx @@ -29,8 +29,8 @@ public: SwColumnFrm( SwFrmFmt*, SwFrm* ); ~SwColumnFrm(); - virtual void PaintBreak() const; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; + virtual void PaintBreak() const SAL_OVERRIDE; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL(SwColumnFrm) }; diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx index 79212d38b06c..b43775de0f78 100644 --- a/sw/source/core/inc/crossrefbookmark.hxx +++ b/sw/source/core/inc/crossrefbookmark.hxx @@ -37,22 +37,22 @@ namespace sw { const OUString& rPrefix); // getters - virtual SwPosition& GetOtherMarkPos() const; - virtual SwPosition& GetMarkStart() const + virtual SwPosition& GetOtherMarkPos() const SAL_OVERRIDE; + virtual SwPosition& GetMarkStart() const SAL_OVERRIDE { return *m_pPos1; } - virtual SwPosition& GetMarkEnd() const + virtual SwPosition& GetMarkEnd() const SAL_OVERRIDE { return *m_pPos1; } - virtual bool IsExpanded() const + virtual bool IsExpanded() const SAL_OVERRIDE { return false; } - virtual void SetMarkPos(const SwPosition& rNewPos); - virtual void SetOtherMarkPos(const SwPosition&) + virtual void SetMarkPos(const SwPosition& rNewPos) SAL_OVERRIDE; + virtual void SetOtherMarkPos(const SwPosition&) SAL_OVERRIDE { OSL_PRECOND(false, "<CrossRefBookmark::SetOtherMarkPos(..)>" " - misusage of CrossRefBookmark: other bookmark position isn't allowed to be set." ); } - virtual void ClearOtherMarkPos() + virtual void ClearOtherMarkPos() SAL_OVERRIDE { OSL_PRECOND(false, "<SwCrossRefBookmark::ClearOtherMarkPos(..)>" diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index 451c9a936878..7532f9f9a5a6 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -36,12 +36,12 @@ const sal_uInt16 SwFlyDrawObjIdentifier = 0x0001; class SwFlyDrawObj : public SdrObject { private: - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; protected: // #i95264# SwFlyDrawObj needs an own VC since createViewIndependentPrimitive2DSequence() // is called when RecalcBoundRect() is used - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -50,8 +50,8 @@ public: ~SwFlyDrawObj(); // for instantiation of this class while loading (via factory) - virtual sal_uInt32 GetObjInventor() const; - virtual sal_uInt16 GetObjIdentifier() const; + virtual sal_uInt32 GetObjInventor() const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; }; // virtual objects for Flys @@ -66,7 +66,7 @@ protected: // AW: Need own sdr::contact::ViewContact since AnchorPos from parent is // not used but something own (top left of new SnapRect minus top left // of original SnapRect) - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; public: // for paints triggered form ExecutePrimitive @@ -82,26 +82,26 @@ public: ~SwVirtFlyDrawObj(); // overloaded method of base class SdrVirtObj - virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const; + virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const SAL_OVERRIDE; // we treat the size calculation completely on ourself here - virtual const Rectangle& GetCurrentBoundRect() const; - virtual const Rectangle& GetLastBoundRect() const; - virtual void RecalcBoundRect(); - virtual void RecalcSnapRect(); - virtual const Rectangle& GetSnapRect() const; - virtual void SetSnapRect(const Rectangle& rRect); - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual const Rectangle& GetLogicRect() const; - virtual void SetLogicRect(const Rectangle& rRect); - virtual void NbcSetLogicRect(const Rectangle& rRect); - virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const; - virtual void NbcMove (const Size& rSiz); + virtual const Rectangle& GetCurrentBoundRect() const SAL_OVERRIDE; + virtual const Rectangle& GetLastBoundRect() const SAL_OVERRIDE; + virtual void RecalcBoundRect() SAL_OVERRIDE; + virtual void RecalcSnapRect() SAL_OVERRIDE; + virtual const Rectangle& GetSnapRect() const SAL_OVERRIDE; + virtual void SetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual const Rectangle& GetLogicRect() const SAL_OVERRIDE; + virtual void SetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; + virtual void NbcMove (const Size& rSiz) SAL_OVERRIDE; virtual void NbcResize(const Point& rRef, const Fraction& xFact, - const Fraction& yFact); - virtual void Move (const Size& rSiz); + const Fraction& yFact) SAL_OVERRIDE; + virtual void Move (const Size& rSiz) SAL_OVERRIDE; virtual void Resize(const Point& rRef, const Fraction& xFact, - const Fraction& yFact, bool bUnsetRelative = true); + const Fraction& yFact, bool bUnsetRelative = true) SAL_OVERRIDE; const SwFrmFmt *GetFmt() const; SwFrmFmt *GetFmt(); @@ -113,13 +113,13 @@ public: void SetRect() const; // if an URL is attached to a graphic than this is a macro object - virtual bool HasMacro() const; - virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const; - virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; + virtual bool HasMacro() const SAL_OVERRIDE; + virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE; + virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE; // FullDrag support - virtual bool supportsFullDrag() const; - virtual SdrObject* getFullDragClone() const; + virtual bool supportsFullDrag() const SAL_OVERRIDE; + virtual SdrObject* getFullDragClone() const SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index 64e34fb5609a..f648389115f8 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -94,7 +94,7 @@ struct SwSortTxtElement : public SwSortElement SwSortTxtElement( const SwNodeIndex& rPos ); virtual ~SwSortTxtElement(); - virtual OUString GetKey( sal_uInt16 nKey ) const; + virtual OUString GetKey( sal_uInt16 nKey ) const SAL_OVERRIDE; }; // sort table @@ -105,8 +105,8 @@ struct SwSortBoxElement : public SwSortElement SwSortBoxElement( sal_uInt16 nRC ); virtual ~SwSortBoxElement(); - virtual OUString GetKey( sal_uInt16 nKey ) const; - virtual double GetValue( sal_uInt16 nKey ) const; + virtual OUString GetKey( sal_uInt16 nKey ) const SAL_OVERRIDE; + virtual double GetValue( sal_uInt16 nKey ) const SAL_OVERRIDE; }; // two-dimensional array of FndBoxes diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx index 311103b2d5bb..e15967b51f63 100644 --- a/sw/source/core/inc/dumpfilter.hxx +++ b/sw/source/core/inc/dumpfilter.hxx @@ -39,25 +39,25 @@ namespace sw { // XFilter virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL cancel( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XExporter virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx index 1d1617ad071f..a0f31ba1b9fe 100644 --- a/sw/source/core/inc/dview.hxx +++ b/sw/source/core/inc/dview.hxx @@ -69,32 +69,32 @@ class SwDrawView : public FmFormView protected: // add custom handles (used by other apps, e.g. AnchorPos) - virtual void AddCustomHdl(); + virtual void AddCustomHdl() SAL_OVERRIDE; // overloaded to allow extra handling when picking SwVirtFlyDrawObj's using FmFormView::CheckSingleSdrObjectHit; - virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uLong nOptions, const SetOfByte* pMVisLay) const; + virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uLong nOptions, const SetOfByte* pMVisLay) const SAL_OVERRIDE; // support enhanced text edit for draw objects - virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const; + virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const SAL_OVERRIDE; public: SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice* pOutDev=NULL ); // from base class - virtual SdrObject* GetMaxToTopObj(SdrObject* pObj) const; - virtual SdrObject* GetMaxToBtmObj(SdrObject* pObj) const; - virtual void MarkListHasChanged(); + virtual SdrObject* GetMaxToTopObj(SdrObject* pObj) const SAL_OVERRIDE; + virtual SdrObject* GetMaxToBtmObj(SdrObject* pObj) const SAL_OVERRIDE; + virtual void MarkListHasChanged() SAL_OVERRIDE; // #i7672# // Overload to resue edit background color in active text edit view (OutlinerView) - virtual void ModelHasChanged(); + virtual void ModelHasChanged() SAL_OVERRIDE; virtual void ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, - sal_uLong nNewPos ); - virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const; - virtual void MakeVisible( const Rectangle&, Window &rWin ); - virtual void CheckPossibilities(); + sal_uLong nNewPos ) SAL_OVERRIDE; + virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const SAL_OVERRIDE; + virtual void MakeVisible( const Rectangle&, Window &rWin ) SAL_OVERRIDE; + virtual void CheckPossibilities() SAL_OVERRIDE; const SwViewImp &Imp() const { return rImp; } SwViewImp &Imp() { return rImp; } @@ -102,7 +102,7 @@ public: // anchor and Xor for dragging void ShowDragAnchor(); - virtual void DeleteMarked(); + virtual void DeleteMarked() SAL_OVERRIDE; inline void ValidateMarkList() { FlushComeBackTimer(); } diff --git a/sw/source/core/inc/finalthreadmanager.hxx b/sw/source/core/inc/finalthreadmanager.hxx index 6d2b589aa7a6..def023c8b2db 100644 --- a/sw/source/core/inc/finalthreadmanager.hxx +++ b/sw/source/core/inc/finalthreadmanager.hxx @@ -53,24 +53,24 @@ public: explicit FinalThreadManager(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context); // ::com::sun::star::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XJobManager: - virtual void SAL_CALL registerJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL releaseJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL cancelAllJobs() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL registerJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL releaseJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancelAllJobs() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XTerminateListener2 - virtual void SAL_CALL cancelTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL cancelTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XTerminateListener (inherited via com::sun::star::frame::XTerminateListener2) - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun:star::lang::XEventListener (inherited via com::sun::star::frame::XTerminateListener) - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: FinalThreadManager(FinalThreadManager &); // not defined diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index 3ba5bf4b503f..74dc31913c93 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -121,7 +121,7 @@ protected: Point m_aContentPos; // content area's position relatively to Frm bool m_bValidContentPos; - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; void MakePrtArea( const SwBorderAttrs &rAttrs ); void MakeContentPos( const SwBorderAttrs &rAttrs ); @@ -141,15 +141,15 @@ protected: #i28701# */ - virtual void RegisterAtCorrectPage(); + virtual void RegisterAtCorrectPage() SAL_OVERRIDE; - virtual bool _SetObjTop( const SwTwips _nTop ); - virtual bool _SetObjLeft( const SwTwips _nLeft ); + virtual bool _SetObjTop( const SwTwips _nTop ) SAL_OVERRIDE; + virtual bool _SetObjLeft( const SwTwips _nLeft ) SAL_OVERRIDE; - virtual const SwRect GetObjBoundRect() const; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual const SwRect GetObjBoundRect() const SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; - virtual const IDocumentDrawModelAccess* getIDocumentDrawModelAccess( ); + virtual const IDocumentDrawModelAccess* getIDocumentDrawModelAccess( ) SAL_OVERRIDE; SwTwips CalcContentHeight(const SwBorderAttrs *pAttrs, const SwTwips nMinHeight, const SwTwips nUL); @@ -159,17 +159,17 @@ public: virtual ~SwFlyFrm(); // get client information - virtual bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; virtual void Paint( SwRect const&, - SwPrintData const*const pPrintData = NULL ) const; - virtual Size ChgSize( const Size& aNewSize ); + SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; + virtual Size ChgSize( const Size& aNewSize ) SAL_OVERRIDE; virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; - virtual void CheckDirection( bool bVert ); - virtual void Cut(); + virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; + virtual void Cut() SAL_OVERRIDE; #ifdef DBG_UTIL - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; #endif SwTwips _Shrink( SwTwips, sal_Bool bTst ); @@ -260,13 +260,13 @@ public: void InsertColumns(); // #i26791# - pure virtual methods of base class <SwAnchoredObject> - virtual void MakeObjPos(); - virtual void InvalidateObjPos(); + virtual void MakeObjPos() SAL_OVERRIDE; + virtual void InvalidateObjPos() SAL_OVERRIDE; - virtual SwFrmFmt& GetFrmFmt(); - virtual const SwFrmFmt& GetFrmFmt() const; + virtual SwFrmFmt& GetFrmFmt() SAL_OVERRIDE; + virtual const SwFrmFmt& GetFrmFmt() const SAL_OVERRIDE; - virtual const SwRect GetObjRect() const; + virtual const SwRect GetObjRect() const SAL_OVERRIDE; /** method to determine if a format on the Writer fly frame is possible @@ -275,18 +275,18 @@ public: <SwAnchoredObject::IsFormatPossible()> by: format isn't possible, if Writer fly frame is locked resp. col-locked. */ - virtual bool IsFormatPossible() const; + virtual bool IsFormatPossible() const SAL_OVERRIDE; static void GetAnchoredObjects( std::list<SwAnchoredObject*>&, const SwFmt& rFmt ); // overwriting "SwFrmFmt *SwLayoutFrm::GetFmt" to provide the correct derived return type. // (This is in order to skip on the otherwise necessary casting of the result to // 'SwFlyFrmFmt *' after calls to this function. The casting is now done in this function.) - virtual const SwFlyFrmFmt *GetFmt() const; - virtual SwFlyFrmFmt *GetFmt(); + virtual const SwFlyFrmFmt *GetFmt() const SAL_OVERRIDE; + virtual SwFlyFrmFmt *GetFmt() SAL_OVERRIDE; - virtual void dumpAsXml( xmlTextWriterPtr writer ) { SwLayoutFrm::dumpAsXml( writer ); }; + virtual void dumpAsXml( xmlTextWriterPtr writer ) SAL_OVERRIDE { SwLayoutFrm::dumpAsXml( writer ); }; - virtual void Calc() const; + virtual void Calc() const SAL_OVERRIDE; const Point& ContentPos() const { return m_aContentPos; } Point& ContentPos() { return m_aContentPos; } diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx index 28e007a148d8..b2388f3dcbd7 100644 --- a/sw/source/core/inc/flyfrms.hxx +++ b/sw/source/core/inc/flyfrms.hxx @@ -59,7 +59,7 @@ protected: // method <NotifyBackground> friend class SwFlyNotify; virtual void NotifyBackground( SwPageFrm *pPage, - const SwRect& rRect, PrepareHint eHint); + const SwRect& rRect, PrepareHint eHint) SAL_OVERRIDE; SwFlyFreeFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor ); public: @@ -68,7 +68,7 @@ public: virtual ~SwFlyFreeFrm(); - virtual void MakeAll(); + virtual void MakeAll() SAL_OVERRIDE; // #i37068# - accessors for member <mbNoMoveOnCheckClip> inline void SetNoMoveOnCheckClip( const bool _bNewNoMoveOnCheckClip ) @@ -115,7 +115,7 @@ public: format isn't possible, if Writer fly frame isn't registered at a page frame and its anchor frame isn't inside another Writer fly frame. */ - virtual bool IsFormatPossible() const; + virtual bool IsFormatPossible() const SAL_OVERRIDE; }; // Flys that are bound to LayoutFrms and not to Cntnt @@ -128,25 +128,25 @@ public: SwFlyLayFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor ); SwFlyLayFrm( SwFlyLayFrm& ); protected: - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; }; // Flys that are bound to Cntnt but not in Cntnt class SwFlyAtCntFrm : public SwFlyFreeFrm { protected: - virtual void MakeAll(); + virtual void MakeAll() SAL_OVERRIDE; // #i28701# - virtual bool _InvalidationAllowed( const InvalidationType _nInvalid ) const; + virtual bool _InvalidationAllowed( const InvalidationType _nInvalid ) const SAL_OVERRIDE; /** method to assure that anchored object is registered at the correct page frame #i28701# */ - virtual void RegisterAtCorrectPage(); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void RegisterAtCorrectPage() SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: // #i28701# @@ -157,7 +157,7 @@ public: void SetAbsPos( const Point &rNew ); // #i26791# - virtual void MakeObjPos(); + virtual void MakeObjPos() SAL_OVERRIDE; /** method to determine, if a format on the Writer fly frame is possible @@ -166,7 +166,7 @@ public: <SwFlyFreeFrm::IsFormatPossible()> by: format isn't possible, if method <MakeAll()> is already in progress. */ - virtual bool IsFormatPossible() const; + virtual bool IsFormatPossible() const SAL_OVERRIDE; }; // Flys that are bound to a character in Cntnt @@ -179,9 +179,9 @@ class SwFlyInCntFrm : public SwFlyFrm protected: virtual void NotifyBackground( SwPageFrm *pPage, - const SwRect& rRect, PrepareHint eHint); - virtual void MakeAll(); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + const SwRect& rRect, PrepareHint eHint) SAL_OVERRIDE; + virtual void MakeAll() SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: // #i28701# @@ -190,7 +190,7 @@ public: SwFlyInCntFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor ); virtual ~SwFlyInCntFrm(); - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; void SetRefPoint( const Point& rPoint, const Point &rRelAttr, const Point &rRelPos ); @@ -216,11 +216,11 @@ public: void AddRefOfst( long nOfst ) { aRef.Y() += nOfst; } // #i26791# - virtual void MakeObjPos(); + virtual void MakeObjPos() SAL_OVERRIDE; // invalidate anchor frame on invalidation of the position, because the // position is calculated during the format of the anchor frame - virtual void _ActionOnInvalidation( const InvalidationType _nInvalid ); + virtual void _ActionOnInvalidation( const InvalidationType _nInvalid ) SAL_OVERRIDE; }; inline void SwFlyInCntFrm::InvalidateLayout() const diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index c2e2155a8af3..42cbf2600b44 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -124,7 +124,7 @@ class SwFntAccess : public SwCacheAccess { SwViewShell *pShell; protected: - virtual SwCacheObj *NewObj( ); + virtual SwCacheObj *NewObj( ) SAL_OVERRIDE; public: SwFntAccess( const void * &rMagic, sal_uInt16 &rIndex, const void *pOwner, diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 514f64e2698e..51ace29eb259 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -428,7 +428,7 @@ protected: // draw shadow and borders void PaintShadow( const SwRect&, SwRect&, const SwBorderAttrs& ) const; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; virtual const IDocumentDrawModelAccess* getIDocumentDrawModelAccess( ); diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index a56db5fa4284..12e9eb963bf3 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -374,7 +374,7 @@ class SwBorderAttrAccess : public SwCacheAccess const SwFrm *pConstructor; //opt: for passing on to SwBorderAttrs protected: - virtual SwCacheObj *NewObj(); + virtual SwCacheObj *NewObj() SAL_OVERRIDE; public: SwBorderAttrAccess( SwCache &rCache, const SwFrm *pOwner ); diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx index 862b86357214..59fdb07eac22 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -38,12 +38,12 @@ public: const SwFtnFrm* FindFootNote() const; - virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); + virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; virtual void PaintBorder( const SwRect &, const SwPageFrm *pPage, - const SwBorderAttrs & ) const; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; + const SwBorderAttrs & ) const SAL_OVERRIDE; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; void PaintLine( const SwRect &, const SwPageFrm * ) const; }; @@ -64,17 +64,17 @@ class SwFtnFrm: public SwLayoutFrm bool mbUnlockPosOfLowerObjs : 1; #ifdef DBG_UTIL protected: - virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); + virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; #endif public: SwFtnFrm( SwFrmFmt*, SwFrm*, SwCntntFrm*, SwTxtFtn* ); - virtual void Cut(); - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); + virtual void Cut() SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; sal_Bool operator<( const SwTxtFtn* pTxtFtn ) const; diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx index ba6b3625aba6..776c772998b5 100644 --- a/sw/source/core/inc/hffrm.hxx +++ b/sw/source/core/inc/hffrm.hxx @@ -32,12 +32,12 @@ protected: public: SwHeadFootFrm(SwFrmFmt * pFrm, SwFrm*, sal_uInt16 aType); - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; virtual SwTwips GrowFrm( SwTwips, - sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); + sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; virtual SwTwips ShrinkFrm( SwTwips, - sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; + sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; }; /// Header in the document layout, inside a page. diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx index a840d03619f6..a5f1e5147253 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -50,14 +50,14 @@ class SwLayoutFrm: public SwFrm protected: void Destroy(); // for ~SwRootFrm - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); - virtual void MakeAll(); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void MakeAll() SAL_OVERRIDE; SwFrm *pLower; std::vector<SwAnchoredObject*> aVertPosOrientFrmsFor; - virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); + virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; long CalcRel( const SwFmtFrmSize &rSz, sal_Bool bWidth ) const; @@ -81,13 +81,13 @@ public: void PaintColLines( const SwRect &, const SwFmtCol &, const SwPageFrm * ) const; - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; - virtual void Cut(); - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); + virtual void Cut() SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; //sucht den dichtesten Cntnt zum SPoint, wird bei Seiten, Flys und Cells //benutzt wenn GetCrsrOfst versagt hat. @@ -101,7 +101,7 @@ public: virtual ~SwLayoutFrm(); virtual void Paint( SwRect const&, - SwPrintData const*const pPrintData = NULL ) const; + SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; const SwFrm *Lower() const { return pLower; } SwFrm *Lower() { return pLower; } const SwCntntFrm *ContainsCntnt() const; diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx index b0a2ed13b9b0..b78a3f7b48d2 100644 --- a/sw/source/core/inc/notxtfrm.hxx +++ b/sw/source/core/inc/notxtfrm.hxx @@ -36,22 +36,22 @@ class SwNoTxtFrm: public SwCntntFrm void InitCtor(); - void Format ( const SwBorderAttrs *pAttrs = 0 ); + void Format ( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; void PaintCntnt ( OutputDevice*, const SwRect&, const SwRect& ) const; void PaintPicture( OutputDevice*, const SwRect& ) const; protected: - virtual void MakeAll(); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void MakeAll() SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: SwNoTxtFrm( SwNoTxtNode * const, SwFrm* ); ~SwNoTxtFrm(); virtual void Paint( SwRect const&, - SwPrintData const*const pPrintData = NULL ) const; + SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; virtual bool GetCharRect( SwRect &, const SwPosition&, - SwCrsrMoveState* = 0) const; + SwCrsrMoveState* = 0) const SAL_OVERRIDE; virtual bool GetCrsrOfst(SwPosition* pPos, Point& aPoint, - SwCrsrMoveState* = 0, bool bTestBackground = false) const; + SwCrsrMoveState* = 0, bool bTestBackground = false) const SAL_OVERRIDE; const Size &GetGrfSize() const { return GetSize(); } void GetGrfArea( SwRect &rRect, SwRect * = 0, bool bMirror = true ) const; diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx index 4c7acb5aaa64..4096f3c9b02a 100644 --- a/sw/source/core/inc/observablethread.hxx +++ b/sw/source/core/inc/observablethread.hxx @@ -47,8 +47,8 @@ class ObservableThread : public osl::Thread, const oslInterlockedCount nThreadID ); // IReference - virtual oslInterlockedCount SAL_CALL acquire(); - virtual oslInterlockedCount SAL_CALL release(); + virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; + virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; protected: @@ -61,7 +61,7 @@ class ObservableThread : public osl::Thread, Otherwise, it's not guaranteed, that its ref-count is increased during the execution of the thread. */ - virtual void SAL_CALL run(); + virtual void SAL_CALL run() SAL_OVERRIDE; virtual void threadFunction() = 0; @@ -73,7 +73,7 @@ class ObservableThread : public osl::Thread, the end of its execution and that the observer is notified, that the thread has finished its work. */ - virtual void SAL_CALL onTerminated(); + virtual void SAL_CALL onTerminated() SAL_OVERRIDE; virtual void threadFinished(); diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index f022c5b1c6b6..a7526f6ea418 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -102,8 +102,8 @@ class SwPageFrm: public SwFtnBossFrm bool bRightSidebar ); protected: - virtual void MakeAll(); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void MakeAll() SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: DECL_FIXEDMEMPOOL_NEWDEL(SwPageFrm) @@ -161,20 +161,20 @@ public: void PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt ); virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; // erfrage vom Client Informationen - virtual bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; - virtual void Cut(); - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); - virtual void CheckDirection( bool bVert ); + virtual void Cut() SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; void CheckGrid( sal_Bool bInvalidate ); void PaintGrid( OutputDevice* pOut, SwRect &rRect ) const; sal_Bool HasGrid() const { return bHasGrid; } void PaintDecorators( ) const; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; - virtual void PaintBreak() const; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; + virtual void PaintBreak() const SAL_OVERRIDE; //Zeilennummern usw malen void RefreshExtraData( const SwRect & ) const; @@ -311,7 +311,7 @@ public: */ sw::sidebarwindows::SidebarPosition SidebarPosition() const; - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; inline sal_Int8 ShadowPxWidth() const { diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx index d37fd5509623..6fe273e35516 100644 --- a/sw/source/core/inc/retrieveinputstream.hxx +++ b/sw/source/core/inc/retrieveinputstream.hxx @@ -40,7 +40,7 @@ class SwAsyncRetrieveInputStreamThread : public ObservableThread protected: - virtual void threadFunction(); + virtual void threadFunction() SAL_OVERRIDE; private: diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index aebed31ff82d..0c36352df003 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -98,8 +98,8 @@ class SwHistorySetFmt : public SwHistoryHint public: SwHistorySetFmt( const SfxPoolItem* pFmtHt, sal_uLong nNode ); virtual ~SwHistorySetFmt(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - virtual OUString GetDescription() const; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual OUString GetDescription() const SAL_OVERRIDE; }; @@ -110,7 +110,7 @@ class SwHistoryResetFmt : public SwHistoryHint public: SwHistoryResetFmt( const SfxPoolItem* pFmtHt, sal_uLong nNodeIdx ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; @@ -128,7 +128,7 @@ class SwHistorySetTxt : public SwHistoryHint public: SwHistorySetTxt( SwTxtAttr* pTxtHt, sal_uLong nNode ); virtual ~SwHistorySetTxt(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; @@ -148,9 +148,9 @@ class SwHistorySetTxtFld : public SwHistoryHint public: SwHistorySetTxtFld( SwTxtFld* pTxtFld, sal_uLong nNode ); virtual ~SwHistorySetTxtFld(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; - virtual OUString GetDescription() const; + virtual OUString GetDescription() const SAL_OVERRIDE; }; @@ -163,7 +163,7 @@ class SwHistorySetRefMark : public SwHistoryHint public: SwHistorySetRefMark( SwTxtRefMark* pTxtHt, sal_uLong nNode ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; @@ -178,7 +178,7 @@ class SwHistorySetTOXMark : public SwHistoryHint public: SwHistorySetTOXMark( SwTxtTOXMark* pTxtHt, sal_uLong nNode ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; bool IsEqual( const SwTOXMark& rCmp ) const; }; @@ -193,7 +193,7 @@ class SwHistoryResetTxt : public SwHistoryHint public: SwHistoryResetTxt( sal_uInt16 nWhich, sal_Int32 nStt, sal_Int32 nEnd, sal_uLong nNode ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; sal_uInt16 GetWhich() const { return m_nAttr; } sal_uLong GetNode() const { return m_nNodeIndex; } @@ -215,9 +215,9 @@ public: SwHistorySetFootnote( SwTxtFtn* pTxtFtn, sal_uLong nNode ); SwHistorySetFootnote( const SwTxtFtn& ); virtual ~SwHistorySetFootnote(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; - virtual OUString GetDescription() const; + virtual OUString GetDescription() const SAL_OVERRIDE; }; @@ -229,7 +229,7 @@ class SwHistoryChangeFmtColl : public SwHistoryHint public: SwHistoryChangeFmtColl( SwFmtColl* pColl, sal_uLong nNode, sal_uInt8 nNodeWhich ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; @@ -242,7 +242,7 @@ class SwHistoryTxtFlyCnt : public SwHistoryHint public: SwHistoryTxtFlyCnt( SwFrmFmt* const pFlyFmt ); virtual ~SwHistoryTxtFlyCnt(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; SwUndoDelLayFmt* GetUDelLFmt() { return m_pUndo.get(); } }; @@ -252,7 +252,7 @@ class SwHistoryBookmark : public SwHistoryHint public: SwHistoryBookmark(const ::sw::mark::IMark& rBkmk, bool bSavePos, bool bSaveOtherPos); - virtual void SetInDoc(SwDoc * pDoc, bool); + virtual void SetInDoc(SwDoc * pDoc, bool) SAL_OVERRIDE; bool IsEqualBookmark(const ::sw::mark::IMark& rBkmk); const OUString& GetName() const; @@ -281,7 +281,7 @@ class SwHistorySetAttrSet : public SwHistoryHint public: SwHistorySetAttrSet( const SfxItemSet& rSet, sal_uLong nNode, const std::set<sal_uInt16> &rSetArr ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; @@ -296,7 +296,7 @@ public: SwHistoryResetAttrSet( const SfxItemSet& rSet, sal_uLong nNode, sal_Int32 nStt, sal_Int32 nEnd); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; const std::vector<sal_uInt16>& GetArr() const { return m_Array; } sal_uLong GetNode() const { return m_nNodeIndex; } @@ -312,7 +312,7 @@ class SwHistoryChangeFlyAnchor : public SwHistoryHint public: SwHistoryChangeFlyAnchor( SwFrmFmt& rFmt ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; class SwHistoryChangeFlyChain : public SwHistoryHint @@ -323,7 +323,7 @@ class SwHistoryChangeFlyChain : public SwHistoryHint public: SwHistoryChangeFlyChain( SwFlyFrmFmt& rFmt, const SwFmtChain& rAttr ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; class SwHistoryChangeCharFmt : public SwHistoryHint @@ -333,7 +333,7 @@ class SwHistoryChangeCharFmt : public SwHistoryHint public: SwHistoryChangeCharFmt( const SfxItemSet& rSet, const OUString & sFmt); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; @@ -412,7 +412,7 @@ private: void _MakeSetWhichIds(); protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE; public: SwRegHistory( SwHistory* pHst ); diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 227be352bdb3..fa955a0a62ae 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -143,7 +143,7 @@ class SwRootFrm: public SwLayoutFrm protected: - virtual void MakeAll(); + virtual void MakeAll() SAL_OVERRIDE; public: @@ -186,22 +186,22 @@ public: void SetDrawPage( SdrPage* pNew ){ pDrawPage = pNew; } virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; virtual void Paint( SwRect const&, - SwPrintData const*const pPrintData = NULL ) const; - virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); + SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; + virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; #ifdef DBG_UTIL - virtual void Cut(); - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); + virtual void Cut() SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; #endif - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; Point GetNextPrevCntntPos( const Point &rPoint, sal_Bool bNext ) const; - virtual Size ChgSize( const Size& aNewSize ); + virtual Size ChgSize( const Size& aNewSize ) SAL_OVERRIDE; void SetIdleFlags() { diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx index 083fda734a94..ac9a66adbad6 100644 --- a/sw/source/core/inc/rowfrm.hxx +++ b/sw/source/core/inc/rowfrm.hxx @@ -29,10 +29,10 @@ class SwBorderAttrs; /// SwRowFrm is one table row in the document layout. class SwRowFrm: public SwLayoutFrm { - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; //Aendern nur die Framesize, nicht die PrtArea-SSize - virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); + virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; const SwTableLine *pTabLine; SwRowFrm* pFollowRow; @@ -46,14 +46,14 @@ class SwRowFrm: public SwLayoutFrm bool mbIsRowSpanLine; protected: - virtual void MakeAll(); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void MakeAll() SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: SwRowFrm( const SwTableLine &, SwFrm*, bool bInsertContent = true ); ~SwRowFrm(); - virtual void Cut(); + virtual void Cut() SAL_OVERRIDE; //Zum Anmelden der Flys nachdem eine Zeile erzeugt _und_ eingefuegt wurde. //Muss vom Erzeuger gerufen werden, denn erst nach dem Konstruieren wird diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index 930d1bc83840..26e04ee1151e 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -54,11 +54,11 @@ class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm const SwSectionFmt* _GetEndSectFmt() const; bool IsEndnoteAtMyEnd() const; protected: - virtual void MakeAll(); - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ); - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); - virtual void SwClientNotify( const SwModify&, const SfxHint& ); + virtual void MakeAll() SAL_OVERRIDE; + virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) SAL_OVERRIDE; + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE; public: SwSectionFrm( SwSection &, SwFrm* ); //Inhalt wird nicht erzeugt! @@ -66,12 +66,12 @@ public: virtual ~SwSectionFrm(); void Init(); - virtual void CheckDirection( bool bVert ); + virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; - virtual void Cut(); - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); + virtual void Cut() SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; inline const SwSectionFrm *GetFollow() const; inline SwSectionFrm *GetFollow(); @@ -127,7 +127,7 @@ public: bool IsBalancedSection() const; - virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer); + virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) SAL_OVERRIDE; bool IsFtnAtEnd() const { return bFtnAtEnd; } bool IsEndnAtEnd() const { return bEndnAtEnd; } diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx index 07ef171962b6..58297497fc15 100644 --- a/sw/source/core/inc/swfntcch.hxx +++ b/sw/source/core/inc/swfntcch.hxx @@ -80,7 +80,7 @@ class SwFontAccess : public SwCacheAccess { SwViewShell *pShell; protected: - virtual SwCacheObj *NewObj( ); + virtual SwCacheObj *NewObj( ) SAL_OVERRIDE; public: SwFontAccess( const void *pOwner, SwViewShell *pSh ); diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index 02a454cb9943..510bd735125e 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -98,14 +98,14 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 ); - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ); + virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) SAL_OVERRIDE; protected: - virtual void MakeAll(); - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void MakeAll() SAL_OVERRIDE; + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; // only changes the Framesize, not the PrtArea size - virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); + virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; public: SwTabFrm( SwTable &, SwFrm* ); // calling Regist Flys always after creation _and_pasting! @@ -121,16 +121,16 @@ public: inline SwTabFrm *GetFollow(); SwTabFrm* FindMaster( bool bFirstMaster = false ) const; - virtual bool GetInfo( SfxPoolItem &rHnt ) const; + virtual bool GetInfo( SfxPoolItem &rHnt ) const SAL_OVERRIDE; virtual void Paint( SwRect const&, - SwPrintData const*const pPrintData = NULL ) const; - virtual void CheckDirection( bool bVert ); + SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; + virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; - virtual void Cut(); - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); + virtual void Cut() SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; virtual void Prepare( const PrepareHint ePrep = PREP_CLEAR, - const void *pVoid = 0, bool bNotify = true ); + const void *pVoid = 0, bool bNotify = true ) SAL_OVERRIDE; SwCntntFrm *FindLastCntnt(); inline const SwCntntFrm *FindLastCntnt() const; @@ -215,7 +215,7 @@ public: sal_uInt16 GetBottomLineSize() const; - virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer); + virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL(SwTabFrm) }; diff --git a/sw/source/core/inc/textapi.hxx b/sw/source/core/inc/textapi.hxx index c4158c9dadc5..412df33720f7 100644 --- a/sw/source/core/inc/textapi.hxx +++ b/sw/source/core/inc/textapi.hxx @@ -35,9 +35,9 @@ class SwTextAPIEditSource : public SvxEditSource { SwTextAPIEditSource_Impl* pImpl; - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); + virtual SvxEditSource* Clone() const SAL_OVERRIDE; + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual void UpdateData() SAL_OVERRIDE; explicit SwTextAPIEditSource( const SwTextAPIEditSource& rSource ); public: diff --git a/sw/source/core/inc/threadlistener.hxx b/sw/source/core/inc/threadlistener.hxx index dbfadb0be538..4f5a181652f3 100644 --- a/sw/source/core/inc/threadlistener.hxx +++ b/sw/source/core/inc/threadlistener.hxx @@ -43,7 +43,7 @@ class ThreadListener : public IFinishedThreadListener void ListenToThread( const oslInterlockedCount nThreadID, ObservableThread& rThread ); - virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ); + virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) SAL_OVERRIDE; private: diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx index 7d44dd70b54e..920bc889dd41 100644 --- a/sw/source/core/inc/threadmanager.hxx +++ b/sw/source/core/inc/threadmanager.hxx @@ -51,8 +51,8 @@ class ThreadManager : public IThreadListenerOwner ~ThreadManager(); // --> IThreadListenerOwner - virtual boost::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef(); - virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ); + virtual boost::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef() SAL_OVERRIDE; + virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) SAL_OVERRIDE; /** initialization diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx index 4673b52a8dcb..7b72f992f46a 100644 --- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx +++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx @@ -43,11 +43,11 @@ namespace objectpositioning const SwRect* mpToCharRect; SwTwips mnToCharTopOfLine; - virtual bool IsAnchoredToChar() const; - virtual const SwFrm* ToCharOrientFrm() const; - virtual const SwRect* ToCharRect() const; + virtual bool IsAnchoredToChar() const SAL_OVERRIDE; + virtual const SwFrm* ToCharOrientFrm() const SAL_OVERRIDE; + virtual const SwRect* ToCharRect() const SAL_OVERRIDE; // #i22341# - virtual SwTwips ToCharTopOfLine() const; + virtual SwTwips ToCharTopOfLine() const SAL_OVERRIDE; // method to cast <SwAnchoredObjectPosition::GetAnchorFrm()> to // the needed type @@ -77,7 +77,7 @@ namespace objectpositioning /** calculate position of object */ - virtual void CalcPosition(); + virtual void CalcPosition() SAL_OVERRIDE; /** frame, at which the vertical position is oriented at */ diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx index cab45c43763e..31ddfe88bb3d 100644 --- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx +++ b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx @@ -41,7 +41,7 @@ namespace objectpositioning /** calculate position for object */ - virtual void CalcPosition(); + virtual void CalcPosition() SAL_OVERRIDE; /** calculated relative position for object */ diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index 557e7da4ee33..31f396c2db42 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -186,13 +186,13 @@ struct SwTOXIndex : public SwTOXSortTabBase const ::com::sun::star::lang::Locale& rLocale ); virtual ~SwTOXIndex() {} - virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const; - virtual sal_uInt16 GetLevel() const; - virtual bool operator==( const SwTOXSortTabBase& ); - virtual bool operator<( const SwTOXSortTabBase& ); + virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE; + virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; + virtual bool operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE; + virtual bool operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE; private: - virtual TextAndReading GetText_Impl() const; + virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; sal_uInt8 nKeyLevel; }; @@ -204,12 +204,12 @@ struct SwTOXCustom : public SwTOXSortTabBase const ::com::sun::star::lang::Locale& rLocale ); virtual ~SwTOXCustom() {} - virtual sal_uInt16 GetLevel() const; - virtual bool operator==( const SwTOXSortTabBase& ); - virtual bool operator<( const SwTOXSortTabBase& ); + virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; + virtual bool operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE; + virtual bool operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE; private: - virtual TextAndReading GetText_Impl() const; + virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; TextAndReading m_aKey; sal_uInt16 nLev; @@ -225,10 +225,10 @@ struct SwTOXContent : public SwTOXSortTabBase const SwTOXInternational& rIntl ); virtual ~SwTOXContent() {} - virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const; - virtual sal_uInt16 GetLevel() const; + virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE; + virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; private: - virtual TextAndReading GetText_Impl() const; + virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; }; @@ -240,12 +240,12 @@ struct SwTOXPara : public SwTOXSortTabBase void SetStartIndex(sal_Int32 nSet) { nStartIndex = nSet; } void SetEndIndex(sal_Int32 nSet) { nEndIndex = nSet; } - virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const; - virtual sal_uInt16 GetLevel() const; + virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE; + virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; - virtual OUString GetURL() const; + virtual OUString GetURL() const SAL_OVERRIDE; private: - virtual TextAndReading GetText_Impl() const; + virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; SwTOXElement eType; sal_uInt16 m_nLevel; @@ -261,11 +261,11 @@ struct SwTOXTable : public SwTOXSortTabBase void SetLevel(sal_uInt16 nSet){nLevel = nSet;} - virtual sal_uInt16 GetLevel() const; + virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; - virtual OUString GetURL() const; + virtual OUString GetURL() const SAL_OVERRIDE; private: - virtual TextAndReading GetText_Impl() const; + virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; sal_uInt16 nLevel; }; @@ -274,8 +274,8 @@ struct SwTOXAuthority : public SwTOXSortTabBase { private: SwFmtFld& m_rField; - virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const; - virtual TextAndReading GetText_Impl() const; + virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE; + virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; public: SwTOXAuthority( const SwCntntNode& rNd, SwFmtFld& rField, const SwTOXInternational& rIntl ); @@ -283,9 +283,9 @@ public: SwFmtFld& GetFldFmt() {return m_rField;} - virtual bool operator==( const SwTOXSortTabBase& ); - virtual bool operator<( const SwTOXSortTabBase& ); - virtual sal_uInt16 GetLevel() const; + virtual bool operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE; + virtual bool operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE; + virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_TXMSRT_HXX diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 5b99ffd8bdbc..a35a81aff0fd 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -208,11 +208,11 @@ class SwTxtFrm: public SwCntntFrm sal_Int32 &nChgStart, sal_Int32 &nChgEnd, sal_Int32 &nInvStart, sal_Int32 &nInvEnd); protected: - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: - com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetTabStopInfo( SwTwips CurrentPos ); + com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetTabStopInfo( SwTwips CurrentPos ) SAL_OVERRIDE; //public, weil der eine oder andere die Methode rufen darf um das //Prepare zu sparen - mit Vorsicht zu geniessen! void Init(); @@ -229,7 +229,7 @@ public: // Additional information can be obtained by passing an SwCrsrMoveState object. // Returns false if rPos > number of character is string virtual bool GetCharRect( SwRect& rRect, const SwPosition& rPos, - SwCrsrMoveState* pCMS = 0 ) const; + SwCrsrMoveState* pCMS = 0 ) const SAL_OVERRIDE; // Eine etwas abgespeckte GetCharRect-Version fuer autopositionierte Rahmen bool GetAutoPos( SwRect &, const SwPosition& ) const; @@ -255,7 +255,7 @@ public: bool GetTopOfLine( SwTwips& _onTopOfLine, const SwPosition& _rPos ) const; - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; //Liefert in nOffset den Offset des Characters innerhalb des //gesetzten Textbuffers zurueck, welcher der durch aPoint @@ -263,7 +263,7 @@ public: //naechsten ist. Wenn der SPoint ausserhalb der SSize liegt, //liefert die Funktion false, true sonst. virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; // GetKeyCrsrOfst sorgt dafuer, dass der Frame nicht gewechselt wird // (z.B. Wechsel in den zeichengebundenen Frame). @@ -273,18 +273,18 @@ public: void PaintExtraData( const SwRect & rRect ) const; //Seitennummer usw. SwRect Paint(); virtual void Paint( SwRect const&, - SwPrintData const*const pPrintData = NULL ) const; - virtual bool GetInfo( SfxPoolItem & ) const; + SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; + virtual bool GetInfo( SfxPoolItem & ) const SAL_OVERRIDE; //Layoutorientiertes Cursortravelling: Linker, rechter Rand, //vorhergehende/naechste Zeile, gleiche horizontale Position. - virtual bool LeftMargin(SwPaM *) const; - virtual bool RightMargin(SwPaM *, bool bAPI = false) const; + virtual bool LeftMargin(SwPaM *) const SAL_OVERRIDE; + virtual bool RightMargin(SwPaM *, bool bAPI = false) const SAL_OVERRIDE; virtual bool UnitUp(SwPaM *, const SwTwips nOffset = 0, - bool bSetInReadOnly = false ) const; + bool bSetInReadOnly = false ) const SAL_OVERRIDE; virtual bool UnitDown(SwPaM *, const SwTwips nOffset = 0, - bool bSetInReadOnly = false ) const; + bool bSetInReadOnly = false ) const SAL_OVERRIDE; bool _UnitUp(SwPaM *, const SwTwips nOffset = 0, bool bSetInReadOnly = false ) const; bool _UnitDown(SwPaM *, const SwTwips nOffset = 0, @@ -324,12 +324,12 @@ public: // Wer den void* falsch casted ist selbst Schuld! // Auf jedenfall muss der void* auf 0 geprueft werden. virtual void Prepare( const PrepareHint ePrep = PREP_CLEAR, - const void *pVoid = 0, bool bNotify = true ); + const void *pVoid = 0, bool bNotify = true ) SAL_OVERRIDE; // nMaxHeight is the required height // bSplit indicates, that the paragraph has to be split // bTst indicates, that we are currently doing a test formatting - virtual bool WouldFit( SwTwips &nMaxHeight, bool &bSplit, bool bTst ); + virtual bool WouldFit( SwTwips &nMaxHeight, bool &bSplit, bool bTst ) SAL_OVERRIDE; // Hier das WouldFit-Aequivalent fuer mal kurz probeweise // umgehaengte TextFrames, auch hier liefert @@ -418,8 +418,8 @@ public: inline SwTwips GetLeftMargin() const; inline SwTwips GetRightMargin() const; - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); - virtual void CheckDirection( bool bVert ); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; // Liefert die Summe der Zeilenhoehen in pLine zurueck. sal_uInt16 GetParHeight() const; @@ -581,7 +581,7 @@ public: static void repaintTextFrames( const SwTxtNode& rNode ); - virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer); + virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) SAL_OVERRIDE; }; /************************************************************************* diff --git a/sw/source/core/inc/undoflystrattr.hxx b/sw/source/core/inc/undoflystrattr.hxx index 5d1ea5395fac..93611f173f35 100644 --- a/sw/source/core/inc/undoflystrattr.hxx +++ b/sw/source/core/inc/undoflystrattr.hxx @@ -33,10 +33,10 @@ class SwUndoFlyStrAttr : public SwUndo const OUString& sNewStr ); virtual ~SwUndoFlyStrAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; private: SwFlyFrmFmt& mrFlyFrmFmt; diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx index 639f6b6d7c67..51e5c7d3cb56 100644 --- a/sw/source/core/inc/unobookmark.hxx +++ b/sw/source/core/inc/unobookmark.hxx @@ -92,44 +92,44 @@ public: ::com::sun::star::lang::XUnoTunnel> & xUT); // MetadatableMixin - virtual ::sfx2::Metadatable* GetCoreObject(); + virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > GetModel(); + ::com::sun::star::frame::XModel > GetModel() SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -137,56 +137,56 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -201,20 +201,20 @@ class SwXFieldmarkParameters } // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; private: ::sw::mark::IFieldmark::parameter_map_t* getCoreParameters() throw (::com::sun::star::uno::RuntimeException); }; @@ -242,13 +242,13 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual OUString SAL_CALL getFieldType(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setFieldType(const OUString& description ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getParameters( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -256,13 +256,13 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class SwXODFCheckboxField : public SwXFieldmark diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx index 569710eb06ac..2ef2a690eccb 100644 --- a/sw/source/core/inc/unoevent.hxx +++ b/sw/source/core/inc/unoevent.hxx @@ -37,7 +37,7 @@ class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: virtual ~SwHyperlinkEventDescriptor(); public: @@ -71,12 +71,12 @@ public: ~SwFrameEventDescriptor(); virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: - virtual void setMacroItem(const SvxMacroItem& rItem); - virtual const SvxMacroItem& getMacroItem(); - virtual sal_uInt16 getMacroItemWhich() const; + virtual void setMacroItem(const SvxMacroItem& rItem) SAL_OVERRIDE; + virtual const SvxMacroItem& getMacroItem() SAL_OVERRIDE; + virtual sal_uInt16 getMacroItemWhich() const SAL_OVERRIDE; }; class SwFrameStyleEventDescriptor : public SvEventDescriptor @@ -91,12 +91,12 @@ public: ~SwFrameStyleEventDescriptor(); virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: - virtual void setMacroItem(const SvxMacroItem& rItem); - virtual const SvxMacroItem& getMacroItem(); - virtual sal_uInt16 getMacroItemWhich() const; + virtual void setMacroItem(const SvxMacroItem& rItem) SAL_OVERRIDE; + virtual const SvxMacroItem& getMacroItem() SAL_OVERRIDE; + virtual sal_uInt16 getMacroItemWhich() const SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx index 0065c2529ce4..e029d49ab18b 100644 --- a/sw/source/core/inc/unofield.hxx +++ b/sw/source/core/inc/unofield.hxx @@ -77,35 +77,35 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -113,40 +113,40 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -185,35 +185,35 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -221,68 +221,68 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUpdatable virtual void SAL_CALL update() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextField virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDependentTextField virtual void SAL_CALL attachTextFieldMaster( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xFieldMaster) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> SAL_CALL getTextFieldMaster() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -306,21 +306,21 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx index 4eae5ee007cd..09a6e7bc598f 100644 --- a/sw/source/core/inc/unoflatpara.hxx +++ b/sw/source/core/inc/unoflatpara.hxx @@ -57,32 +57,32 @@ public: SwXFlatParagraph( SwTxtNode& rTxtNode, const OUString& aExpandText, const ModelToViewHelper& rConversionMap ); virtual ~SwXFlatParagraph(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw(); - virtual void SAL_CALL release( ) throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // text::XTextMarkup: - virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, - const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception); + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & xRange, - const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception); + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // text::XFlatParagraph: - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setChecked(::sal_Int32 nType, ::sal_Bool bVal) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isChecked(::sal_Int32 nType) throw (css::uno::RuntimeException, std::exception); - virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); - virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); - virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); - virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); - virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setChecked(::sal_Int32 nType, ::sal_Bool bVal) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isChecked(::sal_Int32 nType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; const SwTxtNode* getTxtNode() const; @@ -90,7 +90,7 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething(const css::uno::Sequence< sal_Int8 >& rId) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: SwXFlatParagraph( const SwXFlatParagraph & ); // not defined @@ -115,15 +115,15 @@ public: virtual ~SwXFlatParagraphIterator(); // text::XFlatParagraphIterator: - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getFirstPara() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getNextPara() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getLastPara() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaBefore(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaAfter(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getFirstPara() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getNextPara() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getLastPara() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaBefore(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaAfter(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; protected: // SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; private: SwXFlatParagraphIterator( const SwXFlatParagraphIterator & ); // not defined diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx index 537ca3a4317a..bc8d40bb6ffe 100644 --- a/sw/source/core/inc/unofootnote.hxx +++ b/sw/source/core/inc/unofootnote.hxx @@ -57,12 +57,12 @@ private: protected: - virtual const SwStartNode *GetStartNode() const; + virtual const SwStartNode *GetStartNode() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > CreateCursor() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ~SwXFootnote(); @@ -81,52 +81,52 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType) - throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw() { OWeakObject::release(); } + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -134,80 +134,80 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFootnote virtual OUString SAL_CALL getLabel() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setLabel(const OUString& rLabel) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSimpleText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextPosition) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx index 0be41286f40a..a1b5d1d0d5ae 100644 --- a/sw/source/core/inc/unoidx.hxx +++ b/sw/source/core/inc/unoidx.hxx @@ -76,44 +76,44 @@ public: CreateXDocumentIndex(SwDoc & rDoc, SwTOXBaseSection const& rSection); // MetadatableMixin - virtual ::sfx2::Metadatable* GetCoreObject(); + virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - GetModel(); + GetModel() SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -121,74 +121,74 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRefreshable virtual void SAL_CALL refresh() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener>& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener>& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDocumentIndex virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL update() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -228,35 +228,35 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -264,56 +264,56 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDocumentIndexMark virtual OUString SAL_CALL getMarkEntry() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setMarkEntry(const OUString& rIndexEntry) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index 2d343de927bc..0eee4e645c86 100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -112,108 +112,108 @@ public: ::com::sun::star::uno::RuntimeException); // MetadatableMixin - virtual ::sfx2::Metadatable * GetCoreObject(); + virtual ::sfx2::Metadatable * GetCoreObject() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - GetModel(); + GetModel() SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setParent( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> const& xParent) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::NoSupportException, std::exception); + ::com::sun::star::lang::NoSupportException, std::exception) SAL_OVERRIDE; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > - SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception); + SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getString() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setString(const OUString& rString) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSimpleText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextPosition) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XText virtual void SAL_CALL insertTextContent( @@ -223,12 +223,12 @@ public: ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -266,31 +266,31 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -298,54 +298,54 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextField virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx index 953ee5589e96..a8d223393f3d 100644 --- a/sw/source/core/inc/unoparaframeenum.hxx +++ b/sw/source/core/inc/unoparaframeenum.hxx @@ -89,21 +89,21 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index fcaf6434dfe7..6011d0912f07 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -152,7 +152,7 @@ protected: virtual ~SwXTextPortion(); //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwXTextPortion(const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const& rParent, SwTextPortionType eType ); @@ -166,38 +166,38 @@ public: sal_Bool bIsEnd ); //XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XTolerantMultiPropertySet - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTextContent virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -210,16 +210,16 @@ public: //XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XContentEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void SetRefMark( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > xMark) @@ -284,27 +284,27 @@ public: //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; class SwXRedlinePortion : public SwXTextPortion @@ -333,14 +333,14 @@ public: SwRangeRedline const& rRedline, sal_Bool const bIsStart) throw(); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception); + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx index 8f5360e3bf78..75db5eee9fbc 100644 --- a/sw/source/core/inc/unorefmark.hxx +++ b/sw/source/core/inc/unorefmark.hxx @@ -68,35 +68,35 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -104,56 +104,56 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx index 017db44dd49d..651151ef76d1 100644 --- a/sw/source/core/inc/unosection.hxx +++ b/sw/source/core/inc/unosection.hxx @@ -73,44 +73,44 @@ public: const bool bIndexHeader = false); // MetadatableMixin - virtual ::sfx2::Metadatable* GetCoreObject(); + virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - GetModel(); + GetModel() SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -118,62 +118,62 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( @@ -184,55 +184,55 @@ public: throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextSection virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection > SAL_CALL getParentSection() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection > > SAL_CALL getChildSections() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx index 96980afef814..597cfefe0ad4 100644 --- a/sw/source/core/inc/unotextmarkup.hxx +++ b/sw/source/core/inc/unotextmarkup.hxx @@ -55,16 +55,16 @@ public: virtual ~SwXTextMarkup(); // ::com::sun::star::text::XTextMarkup: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception); + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & xRange, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception); + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::text::XMultiTextMarkup: - virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: SwXTextMarkup( const SwXTextMarkup & ); // not defined @@ -72,7 +72,7 @@ private: protected: //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; SwTxtNode* mpTxtNode; const ModelToViewHelper maConversionMap; @@ -88,12 +88,12 @@ public: SwXStringKeyMap(); // ::com::sun::star::container::XStringKeyMap: - virtual ::com::sun::star::uno::Any SAL_CALL getValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException, std::exception); - virtual ::sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL insertValue(const OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, std::exception); - virtual ::sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertValue(const OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; private: SwXStringKeyMap(SwXStringKeyMap &); // not defined diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx index b9ed68134c2e..e43fe77bd487 100644 --- a/sw/source/core/inc/visiturl.hxx +++ b/sw/source/core/inc/visiturl.hxx @@ -31,7 +31,7 @@ public: SwURLStateChanged( const SwDoc* pD ); virtual ~SwURLStateChanged(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; }; #endif |