diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
| commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
| tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /sw/source/core/inc | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/source/core/inc')
90 files changed, 1179 insertions, 1179 deletions
diff --git a/sw/source/core/inc/DocumentChartDataProviderManager.hxx b/sw/source/core/inc/DocumentChartDataProviderManager.hxx index 17b072d12e43..627178ed5a6e 100644 --- a/sw/source/core/inc/DocumentChartDataProviderManager.hxx +++ b/sw/source/core/inc/DocumentChartDataProviderManager.hxx @@ -45,11 +45,11 @@ public: DocumentChartDataProviderManager( SwDoc& i_rSwdoc ); - SwChartDataProvider * GetChartDataProvider( bool bCreate = false ) const SAL_OVERRIDE; + SwChartDataProvider * GetChartDataProvider( bool bCreate = false ) const override; - void CreateChartInternalDataProviders( const SwTable *pTable ) SAL_OVERRIDE; + void CreateChartInternalDataProviders( const SwTable *pTable ) override; - SwChartLockController_Helper & GetChartControllerHelper() SAL_OVERRIDE; + SwChartLockController_Helper & GetChartControllerHelper() override; virtual ~DocumentChartDataProviderManager(); diff --git a/sw/source/core/inc/DocumentContentOperationsManager.hxx b/sw/source/core/inc/DocumentContentOperationsManager.hxx index 3897b3fe24b2..51ed829fe27c 100644 --- a/sw/source/core/inc/DocumentContentOperationsManager.hxx +++ b/sw/source/core/inc/DocumentContentOperationsManager.hxx @@ -39,63 +39,63 @@ public: DocumentContentOperationsManager( SwDoc& i_rSwdoc ); //Interface methods: - bool CopyRange(SwPaM&, SwPosition&, const bool bCopyAll, bool bCheckPos ) const SAL_OVERRIDE; + bool CopyRange(SwPaM&, SwPosition&, const bool bCopyAll, bool bCheckPos ) const override; - void DeleteSection(SwNode* pNode) SAL_OVERRIDE; + void DeleteSection(SwNode* pNode) override; - bool DeleteRange(SwPaM&) SAL_OVERRIDE; + bool DeleteRange(SwPaM&) override; - bool DelFullPara(SwPaM&) SAL_OVERRIDE; + bool DelFullPara(SwPaM&) override; // Add optional parameter <bForceJoinNext>, default value <false> // Needed for hiding of deletion redlines bool DeleteAndJoin( SwPaM&, - const bool bForceJoinNext = false ) SAL_OVERRIDE; + const bool bForceJoinNext = false ) override; - bool MoveRange(SwPaM&, SwPosition&, SwMoveFlags) SAL_OVERRIDE; + bool MoveRange(SwPaM&, SwPosition&, SwMoveFlags) override; - bool MoveNodeRange(SwNodeRange&, SwNodeIndex&, SwMoveFlags) SAL_OVERRIDE; + bool MoveNodeRange(SwNodeRange&, SwNodeIndex&, SwMoveFlags) override; - bool MoveAndJoin(SwPaM&, SwPosition&, SwMoveFlags) SAL_OVERRIDE; + bool MoveAndJoin(SwPaM&, SwPosition&, SwMoveFlags) override; - bool Overwrite(const SwPaM &rRg, const OUString& rStr) SAL_OVERRIDE; + bool Overwrite(const SwPaM &rRg, const OUString& rStr) override; bool InsertString(const SwPaM &rRg, const OUString&, - const SwInsertFlags nInsertMode = SwInsertFlags::EMPTYEXPAND ) SAL_OVERRIDE; + const SwInsertFlags nInsertMode = SwInsertFlags::EMPTYEXPAND ) override; - void TransliterateText(const SwPaM& rPaM, utl::TransliterationWrapper&) SAL_OVERRIDE; + void TransliterateText(const SwPaM& rPaM, utl::TransliterationWrapper&) override; SwFlyFrameFormat* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, - const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrameFormat*) SAL_OVERRIDE; + const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrameFormat*) override; SwFlyFrameFormat* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet, - const SfxItemSet* pGrfAttrSet, SwFrameFormat*) SAL_OVERRIDE; + const SfxItemSet* pGrfAttrSet, SwFrameFormat*) override; - void ReRead(SwPaM&, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj) SAL_OVERRIDE; + void ReRead(SwPaM&, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj) override; - SwDrawFrameFormat* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) SAL_OVERRIDE; + SwDrawFrameFormat* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) override; SwFlyFrameFormat* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet, - const SfxItemSet* pGrfAttrSet, SwFrameFormat*) SAL_OVERRIDE; + const SfxItemSet* pGrfAttrSet, SwFrameFormat*) override; SwFlyFrameFormat* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet, - const SfxItemSet* pGrfAttrSet, SwFrameFormat*) SAL_OVERRIDE; + const SfxItemSet* pGrfAttrSet, SwFrameFormat*) override; - bool SplitNode(const SwPosition &rPos, bool bChkTableStart) SAL_OVERRIDE; + bool SplitNode(const SwPosition &rPos, bool bChkTableStart) override; - bool AppendTextNode(SwPosition& rPos) SAL_OVERRIDE; + bool AppendTextNode(SwPosition& rPos) override; bool ReplaceRange(SwPaM& rPam, const OUString& rNewStr, - const bool bRegExReplace) SAL_OVERRIDE; + const bool bRegExReplace) override; // Add a para for the char attribute exp... bool InsertPoolItem(const SwPaM &rRg, const SfxPoolItem&, - const SetAttrMode nFlags = SetAttrMode::DEFAULT, bool bExpandCharToPara=false) SAL_OVERRIDE; + const SetAttrMode nFlags = SetAttrMode::DEFAULT, bool bExpandCharToPara=false) override; bool InsertItemSet (const SwPaM &rRg, const SfxItemSet&, - const SetAttrMode nFlags = SetAttrMode::DEFAULT) SAL_OVERRIDE; + const SetAttrMode nFlags = SetAttrMode::DEFAULT) override; - void RemoveLeadingWhiteSpace(const SwPosition & rPos ) SAL_OVERRIDE; + void RemoveLeadingWhiteSpace(const SwPosition & rPos ) override; //Non-Interface methods diff --git a/sw/source/core/inc/DocumentDeviceManager.hxx b/sw/source/core/inc/DocumentDeviceManager.hxx index 5da2b2009be5..25a049c3dfb2 100644 --- a/sw/source/core/inc/DocumentDeviceManager.hxx +++ b/sw/source/core/inc/DocumentDeviceManager.hxx @@ -41,25 +41,25 @@ public: DocumentDeviceManager( SwDoc& i_rSwdoc ); - SfxPrinter* getPrinter(/*[in]*/ bool bCreate ) const SAL_OVERRIDE; + SfxPrinter* getPrinter(/*[in]*/ bool bCreate ) const override; - void setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged ) SAL_OVERRIDE; + void setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged ) override; - VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const SAL_OVERRIDE; + VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const override; - void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool ) SAL_OVERRIDE; + void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool ) override; - OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const SAL_OVERRIDE; + OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const override; - void setReferenceDeviceType(/*[in]*/ bool bNewVirtual, /*[in]*/ bool bNewHiRes ) SAL_OVERRIDE; + void setReferenceDeviceType(/*[in]*/ bool bNewVirtual, /*[in]*/ bool bNewHiRes ) override; - const JobSetup* getJobsetup() const SAL_OVERRIDE; + const JobSetup* getJobsetup() const override; - void setJobsetup(/*[in]*/ const JobSetup &rJobSetup ) SAL_OVERRIDE; + void setJobsetup(/*[in]*/ const JobSetup &rJobSetup ) override; - const SwPrintData & getPrintData() const SAL_OVERRIDE; + const SwPrintData & getPrintData() const override; - void setPrintData(/*[in]*/ const SwPrintData& rPrtData ) SAL_OVERRIDE; + void setPrintData(/*[in]*/ const SwPrintData& rPrtData ) override; virtual ~DocumentDeviceManager(); diff --git a/sw/source/core/inc/DocumentDrawModelManager.hxx b/sw/source/core/inc/DocumentDrawModelManager.hxx index dfa406ff80d3..486657e4b368 100644 --- a/sw/source/core/inc/DocumentDrawModelManager.hxx +++ b/sw/source/core/inc/DocumentDrawModelManager.hxx @@ -44,24 +44,24 @@ public: void DrawNotifyUndoHdl(); //IDocumentDrawModelAccess - virtual const SwDrawModel* GetDrawModel() const SAL_OVERRIDE; - virtual SwDrawModel* GetDrawModel() SAL_OVERRIDE; - virtual SwDrawModel* _MakeDrawModel() SAL_OVERRIDE; - virtual SwDrawModel* GetOrCreateDrawModel() SAL_OVERRIDE; - virtual SdrLayerID GetHeavenId() const SAL_OVERRIDE; - virtual SdrLayerID GetHellId() const SAL_OVERRIDE; - virtual SdrLayerID GetControlsId() const SAL_OVERRIDE; - virtual SdrLayerID GetInvisibleHeavenId() const SAL_OVERRIDE; - virtual SdrLayerID GetInvisibleHellId() const SAL_OVERRIDE; - virtual SdrLayerID GetInvisibleControlsId() const SAL_OVERRIDE; + virtual const SwDrawModel* GetDrawModel() const override; + virtual SwDrawModel* GetDrawModel() override; + virtual SwDrawModel* _MakeDrawModel() override; + virtual SwDrawModel* GetOrCreateDrawModel() override; + virtual SdrLayerID GetHeavenId() const override; + virtual SdrLayerID GetHellId() const override; + virtual SdrLayerID GetControlsId() const override; + virtual SdrLayerID GetInvisibleHeavenId() const override; + virtual SdrLayerID GetInvisibleHellId() const override; + virtual SdrLayerID GetInvisibleControlsId() const override; - virtual void NotifyInvisibleLayers( SdrPageView& _rSdrPageView ) SAL_OVERRIDE; + virtual void NotifyInvisibleLayers( SdrPageView& _rSdrPageView ) override; - virtual bool IsVisibleLayerId( const SdrLayerID& _nLayerId ) const SAL_OVERRIDE; + virtual bool IsVisibleLayerId( const SdrLayerID& _nLayerId ) const override; - virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId ) SAL_OVERRIDE; + virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId ) override; - virtual bool Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem) SAL_OVERRIDE; + virtual bool Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem) override; virtual ~DocumentDrawModelManager() {} diff --git a/sw/source/core/inc/DocumentExternalDataManager.hxx b/sw/source/core/inc/DocumentExternalDataManager.hxx index 3f36887eac75..781fb081ca67 100644 --- a/sw/source/core/inc/DocumentExternalDataManager.hxx +++ b/sw/source/core/inc/DocumentExternalDataManager.hxx @@ -31,8 +31,8 @@ class DocumentExternalDataManager : public IDocumentExternalData, { public: - void setExternalData( ::sw::tExternalDataType eType, ::sw::tExternalDataPointer pPayload) SAL_OVERRIDE; - ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType) SAL_OVERRIDE; + void setExternalData( ::sw::tExternalDataType eType, ::sw::tExternalDataPointer pPayload) override; + ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType) override; virtual ~DocumentExternalDataManager() {}; }; diff --git a/sw/source/core/inc/DocumentFieldsManager.hxx b/sw/source/core/inc/DocumentFieldsManager.hxx index 441a5766252c..78a7c85713d4 100644 --- a/sw/source/core/inc/DocumentFieldsManager.hxx +++ b/sw/source/core/inc/DocumentFieldsManager.hxx @@ -36,32 +36,32 @@ public: DocumentFieldsManager( SwDoc& i_rSwdoc ); - virtual const SwFieldTypes *GetFieldTypes() const SAL_OVERRIDE; - virtual SwFieldType *InsertFieldType(const SwFieldType &) SAL_OVERRIDE; - virtual SwFieldType *GetSysFieldType( const sal_uInt16 eWhich ) const SAL_OVERRIDE; - virtual SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const SAL_OVERRIDE; - virtual void RemoveFieldType(size_t nField) SAL_OVERRIDE; - virtual void UpdateFields( SfxPoolItem* pNewHt, bool bCloseDB) SAL_OVERRIDE; - virtual void InsDeletedFieldType(SwFieldType &) SAL_OVERRIDE; - virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich) SAL_OVERRIDE; - virtual bool UpdateField(SwTextField * rDstFormatField, SwField & rSrcField, SwMsgPoolItem * pMsgHint, bool bUpdateTableFields) SAL_OVERRIDE; - virtual void UpdateRefFields(SfxPoolItem* pHt) SAL_OVERRIDE; - virtual void UpdateTableFields(SfxPoolItem* pHt) SAL_OVERRIDE; - virtual void UpdateExpFields(SwTextField* pField, bool bUpdateRefFields) SAL_OVERRIDE; - virtual void UpdateUsrFields() SAL_OVERRIDE; - virtual void UpdatePageFields(SfxPoolItem*) SAL_OVERRIDE; - virtual void LockExpFields() SAL_OVERRIDE; - virtual void UnlockExpFields() SAL_OVERRIDE; - virtual bool IsExpFieldsLocked() const SAL_OVERRIDE; - virtual SwDocUpdateField& GetUpdateFields() const SAL_OVERRIDE; - virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen) SAL_OVERRIDE; - virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime) SAL_OVERRIDE; - virtual void FieldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) SAL_OVERRIDE; - virtual void FieldsToCalc(SwCalc& rCalc, const _SetGetExpField& rToThisField) SAL_OVERRIDE; - virtual void FieldsToExpand(SwHash**& ppTable, sal_uInt16& rTableSize, const _SetGetExpField& rToThisField) SAL_OVERRIDE; - virtual bool IsNewFieldLst() const SAL_OVERRIDE; - virtual void SetNewFieldLst( bool bFlag) SAL_OVERRIDE; - virtual void InsDelFieldInFieldLst(bool bIns, const SwTextField& rField) SAL_OVERRIDE; + virtual const SwFieldTypes *GetFieldTypes() const override; + virtual SwFieldType *InsertFieldType(const SwFieldType &) override; + virtual SwFieldType *GetSysFieldType( const sal_uInt16 eWhich ) const override; + virtual SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const override; + virtual void RemoveFieldType(size_t nField) override; + virtual void UpdateFields( SfxPoolItem* pNewHt, bool bCloseDB) override; + virtual void InsDeletedFieldType(SwFieldType &) override; + virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich) override; + virtual bool UpdateField(SwTextField * rDstFormatField, SwField & rSrcField, SwMsgPoolItem * pMsgHint, bool bUpdateTableFields) override; + virtual void UpdateRefFields(SfxPoolItem* pHt) override; + virtual void UpdateTableFields(SfxPoolItem* pHt) override; + virtual void UpdateExpFields(SwTextField* pField, bool bUpdateRefFields) override; + virtual void UpdateUsrFields() override; + virtual void UpdatePageFields(SfxPoolItem*) override; + virtual void LockExpFields() override; + virtual void UnlockExpFields() override; + virtual bool IsExpFieldsLocked() const override; + virtual SwDocUpdateField& GetUpdateFields() const override; + virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen) override; + virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime) override; + virtual void FieldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) override; + virtual void FieldsToCalc(SwCalc& rCalc, const _SetGetExpField& rToThisField) override; + virtual void FieldsToExpand(SwHash**& ppTable, sal_uInt16& rTableSize, const _SetGetExpField& rToThisField) override; + virtual bool IsNewFieldLst() const override; + virtual void SetNewFieldLst( bool bFlag) override; + virtual void InsDelFieldInFieldLst(bool bIns, const SwTextField& rField) override; //Non Interface methods diff --git a/sw/source/core/inc/DocumentLayoutManager.hxx b/sw/source/core/inc/DocumentLayoutManager.hxx index 325851735e84..c15b9ec2dcd2 100644 --- a/sw/source/core/inc/DocumentLayoutManager.hxx +++ b/sw/source/core/inc/DocumentLayoutManager.hxx @@ -37,21 +37,21 @@ public: DocumentLayoutManager( SwDoc& i_rSwdoc ); - virtual const SwViewShell *GetCurrentViewShell() const SAL_OVERRIDE; - virtual SwViewShell *GetCurrentViewShell() SAL_OVERRIDE; //< It must be able to communicate to a SwViewShell.This is going to be removed later. - virtual void SetCurrentViewShell( SwViewShell* pNew ) SAL_OVERRIDE; + virtual const SwViewShell *GetCurrentViewShell() const override; + virtual SwViewShell *GetCurrentViewShell() override; //< It must be able to communicate to a SwViewShell.This is going to be removed later. + virtual void SetCurrentViewShell( SwViewShell* pNew ) override; - virtual const SwRootFrm *GetCurrentLayout() const SAL_OVERRIDE; - virtual SwRootFrm *GetCurrentLayout() SAL_OVERRIDE; - virtual bool HasLayout() const SAL_OVERRIDE; + virtual const SwRootFrm *GetCurrentLayout() const override; + virtual SwRootFrm *GetCurrentLayout() override; + virtual bool HasLayout() const override; - virtual const SwLayouter* GetLayouter() const SAL_OVERRIDE; - virtual SwLayouter* GetLayouter() SAL_OVERRIDE; - virtual void SetLayouter( SwLayouter* pNew ) SAL_OVERRIDE; + virtual const SwLayouter* GetLayouter() const override; + virtual SwLayouter* GetLayouter() override; + virtual void SetLayouter( SwLayouter* pNew ) override; - virtual SwFrameFormat* MakeLayoutFormat( RndStdIds eRequest, const SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void DelLayoutFormat( SwFrameFormat *pFormat ) SAL_OVERRIDE; - virtual SwFrameFormat* CopyLayoutFormat( const SwFrameFormat& rSrc, const SwFormatAnchor& rNewAnchor, bool bSetTextFlyAtt, bool bMakeFrms ) SAL_OVERRIDE; + virtual SwFrameFormat* MakeLayoutFormat( RndStdIds eRequest, const SfxItemSet* pSet ) override; + virtual void DelLayoutFormat( SwFrameFormat *pFormat ) override; + virtual SwFrameFormat* CopyLayoutFormat( const SwFrameFormat& rSrc, const SwFormatAnchor& rNewAnchor, bool bSetTextFlyAtt, bool bMakeFrms ) override; //Non Interface methods void ClearSwLayouterEntries(); diff --git a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx index 54b5b21a3fb4..cac16e282e04 100644 --- a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx +++ b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx @@ -39,27 +39,27 @@ public: DocumentLinksAdministrationManager( SwDoc& i_rSwdoc ); - bool IsVisibleLinks() const SAL_OVERRIDE; + bool IsVisibleLinks() const override; - void SetVisibleLinks(bool bFlag) SAL_OVERRIDE; + void SetVisibleLinks(bool bFlag) override; - sfx2::LinkManager& GetLinkManager() SAL_OVERRIDE; + sfx2::LinkManager& GetLinkManager() override; - const sfx2::LinkManager& GetLinkManager() const SAL_OVERRIDE; + const sfx2::LinkManager& GetLinkManager() const override; - void UpdateLinks(bool bUI) SAL_OVERRIDE; + void UpdateLinks(bool bUI) override; - bool GetData(const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any& rValue) const SAL_OVERRIDE; + bool GetData(const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any& rValue) const override; - bool SetData(const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any& rValue) SAL_OVERRIDE; + bool SetData(const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any& rValue) override; - ::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem) SAL_OVERRIDE; + ::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem) override; - bool EmbedAllLinks() SAL_OVERRIDE; + bool EmbedAllLinks() override; - void SetLinksUpdated(const bool bNewLinksUpdated) SAL_OVERRIDE; + void SetLinksUpdated(const bool bNewLinksUpdated) override; - bool LinksUpdated() const SAL_OVERRIDE; + bool LinksUpdated() const override; //Non-Interface method bool SelectServerObj( const OUString& rStr, SwPaM*& rpPam, SwNodeRange*& rpRange ) const; diff --git a/sw/source/core/inc/DocumentListItemsManager.hxx b/sw/source/core/inc/DocumentListItemsManager.hxx index 0074881230be..c08c19e5318e 100644 --- a/sw/source/core/inc/DocumentListItemsManager.hxx +++ b/sw/source/core/inc/DocumentListItemsManager.hxx @@ -34,14 +34,14 @@ public: DocumentListItemsManager(); - void addListItem( const SwNodeNum& rNodeNum ) SAL_OVERRIDE; - void removeListItem( const SwNodeNum& rNodeNum ) SAL_OVERRIDE; + void addListItem( const SwNodeNum& rNodeNum ) override; + void removeListItem( const SwNodeNum& rNodeNum ) override; OUString getListItemText( const SwNodeNum& rNodeNum, const bool bWithNumber = true, - const bool bWithSpacesForLevel = false ) const SAL_OVERRIDE; + const bool bWithSpacesForLevel = false ) const override; - void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const SAL_OVERRIDE; + void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const override; virtual ~DocumentListItemsManager(); diff --git a/sw/source/core/inc/DocumentListsManager.hxx b/sw/source/core/inc/DocumentListsManager.hxx index 20927d33ee9e..bf11ae119989 100644 --- a/sw/source/core/inc/DocumentListsManager.hxx +++ b/sw/source/core/inc/DocumentListsManager.hxx @@ -39,17 +39,17 @@ class DocumentListsManager : public IDocumentListsAccess, DocumentListsManager( SwDoc& i_rSwdoc ); SwList* createList( const OUString& rListId, - const OUString& rDefaultListStyleName ) SAL_OVERRIDE; - void deleteList( const OUString& rListId ) SAL_OVERRIDE; - SwList* getListByName( const OUString& rListId ) const SAL_OVERRIDE; - - SwList* createListForListStyle( const OUString& rListStyleName ) SAL_OVERRIDE; - SwList* getListForListStyle( const OUString& rListStyleName ) const SAL_OVERRIDE; - void deleteListForListStyle( const OUString& rListStyleName ) SAL_OVERRIDE; - void deleteListsByDefaultListStyle( const OUString& rListStyleName ) SAL_OVERRIDE; + const OUString& rDefaultListStyleName ) override; + void deleteList( const OUString& rListId ) override; + SwList* getListByName( const OUString& rListId ) const override; + + SwList* createListForListStyle( const OUString& rListStyleName ) override; + SwList* getListForListStyle( const OUString& rListStyleName ) const override; + void deleteListForListStyle( const OUString& rListStyleName ) override; + void deleteListsByDefaultListStyle( const OUString& rListStyleName ) override; // #i91400# void trackChangeOfListStyleName( const OUString& rListStyleName, - const OUString& rNewListStyleName ) SAL_OVERRIDE; + const OUString& rNewListStyleName ) override; virtual ~DocumentListsManager(); private: diff --git a/sw/source/core/inc/DocumentOutlineNodesManager.hxx b/sw/source/core/inc/DocumentOutlineNodesManager.hxx index 237b435f1bf2..1b932aacb141 100644 --- a/sw/source/core/inc/DocumentOutlineNodesManager.hxx +++ b/sw/source/core/inc/DocumentOutlineNodesManager.hxx @@ -37,15 +37,15 @@ public: //typedef ::std::vector< const SwTextNode* > tSortedOutlineNodeList; - sal_Int32 getOutlineNodesCount() const SAL_OVERRIDE; + sal_Int32 getOutlineNodesCount() const override; - int getOutlineLevel( const sal_Int32 nIdx ) const SAL_OVERRIDE; + int getOutlineLevel( const sal_Int32 nIdx ) const override; OUString getOutlineText( const sal_Int32 nIdx, const bool bWithNumber = true, const bool bWithSpacesForLevel = false, - const bool bWithFootnote = true ) const SAL_OVERRIDE; - SwTextNode* getOutlineNode( const sal_Int32 nIdx ) const SAL_OVERRIDE; - void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const SAL_OVERRIDE; + const bool bWithFootnote = true ) const override; + SwTextNode* getOutlineNode( const sal_Int32 nIdx ) const override; + void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const override; virtual ~DocumentOutlineNodesManager(); diff --git a/sw/source/core/inc/DocumentRedlineManager.hxx b/sw/source/core/inc/DocumentRedlineManager.hxx index 23578fc814dc..30d04f6f2cb9 100644 --- a/sw/source/core/inc/DocumentRedlineManager.hxx +++ b/sw/source/core/inc/DocumentRedlineManager.hxx @@ -34,81 +34,81 @@ class DocumentRedlineManager : public IDocumentRedlineAccess, public: DocumentRedlineManager( SwDoc& i_rSwdoc ); - virtual RedlineMode_t GetRedlineMode() const SAL_OVERRIDE; + virtual RedlineMode_t GetRedlineMode() const override; - virtual void SetRedlineMode_intern(/*[in]*/RedlineMode_t eMode) SAL_OVERRIDE; + virtual void SetRedlineMode_intern(/*[in]*/RedlineMode_t eMode) override; - virtual void SetRedlineMode(/*[in]*/RedlineMode_t eMode) SAL_OVERRIDE; + virtual void SetRedlineMode(/*[in]*/RedlineMode_t eMode) override; - virtual bool IsRedlineOn() const SAL_OVERRIDE; + virtual bool IsRedlineOn() const override; - virtual bool IsIgnoreRedline() const SAL_OVERRIDE; + virtual bool IsIgnoreRedline() const override; - virtual const SwRedlineTable& GetRedlineTable() const SAL_OVERRIDE; - virtual SwRedlineTable& GetRedlineTable() SAL_OVERRIDE; - virtual const SwExtraRedlineTable& GetExtraRedlineTable() const SAL_OVERRIDE; - virtual SwExtraRedlineTable& GetExtraRedlineTable() SAL_OVERRIDE; - virtual bool HasExtraRedlineTable() const SAL_OVERRIDE; + virtual const SwRedlineTable& GetRedlineTable() const override; + virtual SwRedlineTable& GetRedlineTable() override; + virtual const SwExtraRedlineTable& GetExtraRedlineTable() const override; + virtual SwExtraRedlineTable& GetExtraRedlineTable() override; + virtual bool HasExtraRedlineTable() const override; - virtual bool IsInRedlines(const SwNode& rNode) const SAL_OVERRIDE; + virtual bool IsInRedlines(const SwNode& rNode) const override; - virtual bool AppendRedline(/*[in]*/SwRangeRedline* pPtr, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual bool AppendRedline(/*[in]*/SwRangeRedline* pPtr, /*[in]*/bool bCallDelete) override; - virtual bool AppendTableRowRedline(/*[in]*/SwTableRowRedline* pPtr, /*[in]*/bool bCallDelete) SAL_OVERRIDE; - virtual bool AppendTableCellRedline(/*[in]*/SwTableCellRedline* pPtr, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual bool AppendTableRowRedline(/*[in]*/SwTableRowRedline* pPtr, /*[in]*/bool bCallDelete) override; + virtual bool AppendTableCellRedline(/*[in]*/SwTableCellRedline* pPtr, /*[in]*/bool bCallDelete) override; - virtual bool SplitRedline(/*[in]*/const SwPaM& rPam) SAL_OVERRIDE; + virtual bool SplitRedline(/*[in]*/const SwPaM& rPam) override; virtual bool DeleteRedline( /*[in]*/const SwPaM& rPam, /*[in]*/bool bSaveInUndo, - /*[in]*/sal_uInt16 nDelType) SAL_OVERRIDE; + /*[in]*/sal_uInt16 nDelType) override; virtual bool DeleteRedline( /*[in]*/const SwStartNode& rSection, /*[in]*/bool bSaveInUndo, - /*[in]*/sal_uInt16 nDelType) SAL_OVERRIDE; + /*[in]*/sal_uInt16 nDelType) override; virtual sal_uInt16 GetRedlinePos( /*[in]*/const SwNode& rNode, - /*[in]*/sal_uInt16 nType) const SAL_OVERRIDE; + /*[in]*/sal_uInt16 nType) const override; - virtual void CompressRedlines() SAL_OVERRIDE; + virtual void CompressRedlines() override; virtual const SwRangeRedline* GetRedline( /*[in]*/const SwPosition& rPos, - /*[in]*/sal_uInt16* pFndPos) const SAL_OVERRIDE; + /*[in]*/sal_uInt16* pFndPos) const override; - virtual bool IsRedlineMove() const SAL_OVERRIDE; + virtual bool IsRedlineMove() const override; - virtual void SetRedlineMove(/*[in]*/bool bFlag) SAL_OVERRIDE; + virtual void SetRedlineMove(/*[in]*/bool bFlag) override; - virtual bool AcceptRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual bool AcceptRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete) override; - virtual bool AcceptRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual bool AcceptRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete) override; - virtual bool RejectRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual bool RejectRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete) override; - virtual bool RejectRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual bool RejectRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete) override; - virtual const SwRangeRedline* SelNextRedline(/*[in]*/SwPaM& rPam) const SAL_OVERRIDE; + virtual const SwRangeRedline* SelNextRedline(/*[in]*/SwPaM& rPam) const override; - virtual const SwRangeRedline* SelPrevRedline(/*[in]*/SwPaM& rPam) const SAL_OVERRIDE; + virtual const SwRangeRedline* SelPrevRedline(/*[in]*/SwPaM& rPam) const override; - virtual void UpdateRedlineAttr() SAL_OVERRIDE; + virtual void UpdateRedlineAttr() override; - virtual sal_uInt16 GetRedlineAuthor() SAL_OVERRIDE; + virtual sal_uInt16 GetRedlineAuthor() override; - virtual sal_uInt16 InsertRedlineAuthor(const OUString& rAuthor) SAL_OVERRIDE; + virtual sal_uInt16 InsertRedlineAuthor(const OUString& rAuthor) override; virtual bool SetRedlineComment( /*[in]*/const SwPaM& rPam, - /*[in]*/const OUString& rComment) SAL_OVERRIDE; + /*[in]*/const OUString& rComment) override; - virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const SAL_OVERRIDE; + virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const override; virtual void SetRedlinePassword( - /*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword) SAL_OVERRIDE; + /*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword) override; //Non Interface methods; diff --git a/sw/source/core/inc/DocumentSettingManager.hxx b/sw/source/core/inc/DocumentSettingManager.hxx index 9ff978c40b04..8a0f12db218e 100644 --- a/sw/source/core/inc/DocumentSettingManager.hxx +++ b/sw/source/core/inc/DocumentSettingManager.hxx @@ -159,27 +159,27 @@ public: virtual ~DocumentSettingManager(); // IDocumentSettingAccess - virtual bool get(/*[in]*/ DocumentSettingId id) const SAL_OVERRIDE; - virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value) SAL_OVERRIDE; - virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const SAL_OVERRIDE; - virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ) SAL_OVERRIDE; - virtual rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() SAL_OVERRIDE; - virtual const rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const SAL_OVERRIDE; - virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const SAL_OVERRIDE; - virtual void setLinkUpdateMode( /*[in]*/ sal_uInt16 nMode ) SAL_OVERRIDE; - virtual SwFieldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const SAL_OVERRIDE; - virtual void setFieldUpdateFlags( /*[in]*/ SwFieldUpdateFlags eMode ) SAL_OVERRIDE; - virtual SwCharCompressType getCharacterCompressionType() const SAL_OVERRIDE; - virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType ) SAL_OVERRIDE; + virtual bool get(/*[in]*/ DocumentSettingId id) const override; + virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value) override; + virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const override; + virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ) override; + virtual rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() override; + virtual const rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const override; + virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const override; + virtual void setLinkUpdateMode( /*[in]*/ sal_uInt16 nMode ) override; + virtual SwFieldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const override; + virtual void setFieldUpdateFlags( /*[in]*/ SwFieldUpdateFlags eMode ) override; + virtual SwCharCompressType getCharacterCompressionType() const override; + virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType ) override; // Replace all compatibility options with those from rSource. void ReplaceCompatibilityOptions(const DocumentSettingManager& rSource); - sal_uInt32 Getn32DummyCompatibilityOptions1() const SAL_OVERRIDE; - void Setn32DummyCompatibilityOptions1( const sal_uInt32 CompatibilityOptions1 ) SAL_OVERRIDE; - sal_uInt32 Getn32DummyCompatibilityOptions2() const SAL_OVERRIDE; - void Setn32DummyCompatibilityOptions2( const sal_uInt32 CompatibilityOptions2 ) SAL_OVERRIDE; + sal_uInt32 Getn32DummyCompatibilityOptions1() const override; + void Setn32DummyCompatibilityOptions1( const sal_uInt32 CompatibilityOptions1 ) override; + sal_uInt32 Getn32DummyCompatibilityOptions2() const override; + void Setn32DummyCompatibilityOptions2( const sal_uInt32 CompatibilityOptions2 ) override; }; diff --git a/sw/source/core/inc/DocumentStateManager.hxx b/sw/source/core/inc/DocumentStateManager.hxx index f5c834384f1f..6d2f831c569f 100644 --- a/sw/source/core/inc/DocumentStateManager.hxx +++ b/sw/source/core/inc/DocumentStateManager.hxx @@ -35,15 +35,15 @@ class DocumentStateManager : public IDocumentState, public: DocumentStateManager( SwDoc& i_rSwdoc ); - void SetModified() SAL_OVERRIDE; - void ResetModified() SAL_OVERRIDE; - bool IsModified() const SAL_OVERRIDE; - bool IsInCallModified() const SAL_OVERRIDE; - bool IsUpdateExpField() const SAL_OVERRIDE; - bool IsNewDoc() const SAL_OVERRIDE; - void SetNewDoc(bool b) SAL_OVERRIDE; - void SetUpdateExpFieldStat(bool b) SAL_OVERRIDE; - void SetLoaded(bool b) SAL_OVERRIDE; + void SetModified() override; + void ResetModified() override; + bool IsModified() const override; + bool IsInCallModified() const override; + bool IsUpdateExpField() const override; + bool IsNewDoc() const override; + void SetNewDoc(bool b) override; + void SetUpdateExpFieldStat(bool b) override; + void SetLoaded(bool b) override; private: SwDoc& m_rDoc; diff --git a/sw/source/core/inc/DocumentStatisticsManager.hxx b/sw/source/core/inc/DocumentStatisticsManager.hxx index c62170a348c1..b35aaf5729c1 100644 --- a/sw/source/core/inc/DocumentStatisticsManager.hxx +++ b/sw/source/core/inc/DocumentStatisticsManager.hxx @@ -37,12 +37,12 @@ public: DocumentStatisticsManager( SwDoc& i_rSwdoc ); - void DocInfoChgd(bool isEnableSetModified) SAL_OVERRIDE; - const SwDocStat &GetDocStat() const SAL_OVERRIDE; + void DocInfoChgd(bool isEnableSetModified) override; + const SwDocStat &GetDocStat() const override; SwDocStat & GetDocStat(); //Non const version of the above, not part of the interface. - const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false, bool bFields = true) SAL_OVERRIDE; - void SetDocStat(const SwDocStat& rStat) SAL_OVERRIDE; - void UpdateDocStat(bool bCompleteAsync = false, bool bFields = true) SAL_OVERRIDE; + const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false, bool bFields = true) override; + void SetDocStat(const SwDocStat& rStat) override; + void UpdateDocStat(bool bCompleteAsync = false, bool bFields = true) override; virtual ~DocumentStatisticsManager(); diff --git a/sw/source/core/inc/DocumentStylePoolManager.hxx b/sw/source/core/inc/DocumentStylePoolManager.hxx index 363fc959c8ac..0637765e80ec 100644 --- a/sw/source/core/inc/DocumentStylePoolManager.hxx +++ b/sw/source/core/inc/DocumentStylePoolManager.hxx @@ -35,15 +35,15 @@ public: DocumentStylePoolManager( SwDoc& i_rSwdoc ); - virtual SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) SAL_OVERRIDE; - virtual SwFormat* GetFormatFromPool( sal_uInt16 nId ) SAL_OVERRIDE; - virtual SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId ) SAL_OVERRIDE; - virtual SwCharFormat* GetCharFormatFromPool( sal_uInt16 nId ) SAL_OVERRIDE; - virtual SwPageDesc* GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) SAL_OVERRIDE; - virtual SwNumRule* GetNumRuleFromPool( sal_uInt16 nId ) SAL_OVERRIDE; - virtual bool IsPoolTextCollUsed( sal_uInt16 nId ) const SAL_OVERRIDE; - virtual bool IsPoolFormatUsed( sal_uInt16 nId ) const SAL_OVERRIDE; - virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const SAL_OVERRIDE; + virtual SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) override; + virtual SwFormat* GetFormatFromPool( sal_uInt16 nId ) override; + virtual SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId ) override; + virtual SwCharFormat* GetCharFormatFromPool( sal_uInt16 nId ) override; + virtual SwPageDesc* GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) override; + virtual SwNumRule* GetNumRuleFromPool( sal_uInt16 nId ) override; + virtual bool IsPoolTextCollUsed( sal_uInt16 nId ) const override; + virtual bool IsPoolFormatUsed( sal_uInt16 nId ) const override; + virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const override; virtual ~DocumentStylePoolManager(); diff --git a/sw/source/core/inc/DocumentTimerManager.hxx b/sw/source/core/inc/DocumentTimerManager.hxx index d3a276d3f762..a1dbf2e5aa6b 100644 --- a/sw/source/core/inc/DocumentTimerManager.hxx +++ b/sw/source/core/inc/DocumentTimerManager.hxx @@ -39,15 +39,15 @@ public: DocumentTimerManager( SwDoc& i_rSwdoc ); - void StartIdling() SAL_OVERRIDE; + void StartIdling() override; - void StopIdling() SAL_OVERRIDE; + void StopIdling() override; - void BlockIdling() SAL_OVERRIDE; + void BlockIdling() override; - void UnblockIdling() SAL_OVERRIDE; + void UnblockIdling() override; - void StartBackgroundJobs() SAL_OVERRIDE; + void StartBackgroundJobs() override; // Our own 'IdleTimer' calls the following method DECL_LINK_TYPED( DoIdleJobs, Idle *, void ); diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index 479a0ee0f3a9..78be5ea6b3c2 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -37,64 +37,64 @@ namespace sw { public: MarkManager(/*[in/out]*/ SwDoc& rDoc); // IDocumentMarkAccess - virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rName, IDocumentMarkAccess::MarkType eMark) SAL_OVERRIDE; + virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rName, IDocumentMarkAccess::MarkType eMark) override; virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM, const OUString& rName, - const OUString& rType) SAL_OVERRIDE; + const OUString& rType) override; virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM, const OUString& rName, - const OUString& rType) SAL_OVERRIDE; + const OUString& rType) override; - virtual ::sw::mark::IMark* getMarkForTextNode(const SwTextNode& rTextNode, IDocumentMarkAccess::MarkType eMark) SAL_OVERRIDE; + virtual ::sw::mark::IMark* getMarkForTextNode(const SwTextNode& rTextNode, IDocumentMarkAccess::MarkType eMark) override; virtual sw::mark::IMark* makeAnnotationMark( const SwPaM& rPaM, - const OUString& rName ) SAL_OVERRIDE; + const OUString& rName ) override; - 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 repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM) override; + virtual bool renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName) override; + virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset) override; + virtual void correctMarksRelative(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset) override; - virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx) SAL_OVERRIDE; + virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx) override; // deleters virtual std::shared_ptr<ILazyDeleter> - deleteMark(const const_iterator_t& ppMark) SAL_OVERRIDE; - virtual void deleteMark(const ::sw::mark::IMark* const pMark) SAL_OVERRIDE; - virtual void clearAllMarks() SAL_OVERRIDE; + deleteMark(const const_iterator_t& ppMark) override; + virtual void deleteMark(const ::sw::mark::IMark* const pMark) override; + virtual void clearAllMarks() override; // marks - 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 const_iterator_t getAllMarksBegin() const override; + virtual const_iterator_t getAllMarksEnd() const override; + virtual sal_Int32 getAllMarksCount() const override; + virtual const_iterator_t findMark(const OUString& rName) const override; // bookmarks - 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; + virtual const_iterator_t getBookmarksBegin() const override; + virtual const_iterator_t getBookmarksEnd() const override; + virtual sal_Int32 getBookmarksCount() const override; + virtual const_iterator_t findBookmark(const OUString& rName) const override; // Fieldmarks - 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; + virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& rPos) const override; + virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition& rPos) const override; + virtual ::sw::mark::IFieldmark* getFieldmarkAfter(const SwPosition& rPos) const override; - virtual ::sw::mark::IFieldmark* getDropDownFor(const SwPosition &rPos) const SAL_OVERRIDE; - virtual std::vector< ::sw::mark::IFieldmark* > getDropDownsFor(const SwPaM &rPaM) const SAL_OVERRIDE; + virtual ::sw::mark::IFieldmark* getDropDownFor(const SwPosition &rPos) const override; + virtual std::vector< ::sw::mark::IFieldmark* > getDropDownsFor(const SwPaM &rPaM) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const; // Annotation Marks - 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 OUString& rName ) const SAL_OVERRIDE; - virtual sw::mark::IMark* getAnnotationMarkFor(const SwPosition& rPos) const SAL_OVERRIDE; + virtual const_iterator_t getAnnotationMarksBegin() const override; + virtual const_iterator_t getAnnotationMarksEnd() const override; + virtual sal_Int32 getAnnotationMarksCount() const override; + virtual const_iterator_t findAnnotationMark( const OUString& rName ) const override; + virtual sw::mark::IMark* getAnnotationMarkFor(const SwPosition& rPos) const override; - virtual void assureSortedMarkContainers() const SAL_OVERRIDE; + virtual void assureSortedMarkContainers() const override; private: // make names diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx index 17c566b6a430..4ef492711bc9 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() SAL_OVERRIDE; - virtual void CopyFrom( const SwWrongList& rCopy ) SAL_OVERRIDE; + virtual SwWrongList* Clone() override; + virtual void CopyFrom( const SwWrongList& rCopy ) 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 48881f766d1c..a5f588ce815a 100644 --- a/sw/source/core/inc/SwUndoFmt.hxx +++ b/sw/source/core/inc/SwUndoFmt.hxx @@ -46,10 +46,10 @@ public: SwDoc * pDoc); virtual ~SwUndoFormatCreate(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; virtual SwFormat * Create(SwFormat * pDerivedFrom) = 0; virtual void Delete() = 0; @@ -70,10 +70,10 @@ public: SwUndoFormatDelete(SwUndoId nUndoId, SwFormat * pOld, SwDoc * pDoc); virtual ~SwUndoFormatDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; virtual SwFormat * Create(SwFormat * pDerivedFrom) = 0; virtual void Delete(SwFormat * pFormat) = 0; @@ -92,10 +92,10 @@ public: SwDoc * pDoc); virtual ~SwUndoRenameFormat(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - SwRewriter GetRewriter() const SAL_OVERRIDE; + SwRewriter GetRewriter() const override; virtual SwFormat * Find(const OUString & rName) const = 0; }; @@ -106,9 +106,9 @@ public: SwUndoTextFormatCollCreate(SwTextFormatColl * pNew, SwTextFormatColl * pDerivedFrom, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; - virtual void Delete() SAL_OVERRIDE; - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; + virtual void Delete() override; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoTextFormatCollDelete : public SwUndoFormatDelete @@ -116,23 +116,23 @@ class SwUndoTextFormatCollDelete : public SwUndoFormatDelete public: SwUndoTextFormatCollDelete(SwTextFormatColl * pOld, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; - virtual void Delete(SwFormat * pFormat) SAL_OVERRIDE; - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; + virtual void Delete(SwFormat * pFormat) override; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoCondTextFormatCollCreate : public SwUndoTextFormatCollCreate { public: SwUndoCondTextFormatCollCreate(SwConditionTextFormatColl * pNew, SwTextFormatColl * pDerivedFrom, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; }; class SwUndoCondTextFormatCollDelete : public SwUndoTextFormatCollDelete { public: SwUndoCondTextFormatCollDelete(SwTextFormatColl * pOld, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; }; class SwUndoRenameFormatColl : public SwUndoRenameFormat @@ -142,7 +142,7 @@ public: const OUString & sNewName, SwDoc * pDoc); - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoCharFormatCreate : public SwUndoFormatCreate @@ -151,9 +151,9 @@ public: SwUndoCharFormatCreate(SwCharFormat * pNew, SwCharFormat * pDerivedFrom, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; - virtual void Delete() SAL_OVERRIDE; - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; + virtual void Delete() override; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoCharFormatDelete : public SwUndoFormatDelete @@ -161,9 +161,9 @@ class SwUndoCharFormatDelete : public SwUndoFormatDelete public: SwUndoCharFormatDelete(SwCharFormat * pOld, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; - virtual void Delete(SwFormat * pFormat) SAL_OVERRIDE; - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; + virtual void Delete(SwFormat * pFormat) override; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoRenameCharFormat : public SwUndoRenameFormat @@ -173,7 +173,7 @@ public: const OUString & sNewName, SwDoc * pDoc); - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoFrameFormatCreate : public SwUndoFormatCreate @@ -184,9 +184,9 @@ public: SwUndoFrameFormatCreate(SwFrameFormat * pNew, SwFrameFormat * pDerivedFrom, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; - virtual void Delete() SAL_OVERRIDE; - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; + virtual void Delete() override; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoFrameFormatDelete : public SwUndoFormatDelete @@ -194,9 +194,9 @@ class SwUndoFrameFormatDelete : public SwUndoFormatDelete public: SwUndoFrameFormatDelete(SwFrameFormat * pOld, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; - virtual void Delete(SwFormat * pFormat) SAL_OVERRIDE; - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; + virtual void Delete(SwFormat * pFormat) override; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoRenameFrameFormat : public SwUndoRenameFormat @@ -206,7 +206,7 @@ public: const OUString & sNewName, SwDoc * pDoc); - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoNumruleCreate : public SwUndo @@ -219,10 +219,10 @@ class SwUndoNumruleCreate : public SwUndo public: SwUndoNumruleCreate(const SwNumRule * pNew, SwDoc * pDoc); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - SwRewriter GetRewriter() const SAL_OVERRIDE; + SwRewriter GetRewriter() const override; }; class SwUndoNumruleDelete : public SwUndo @@ -233,10 +233,10 @@ class SwUndoNumruleDelete : public SwUndo public: SwUndoNumruleDelete(const SwNumRule & aRule, SwDoc * pDoc); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - SwRewriter GetRewriter() const SAL_OVERRIDE; + SwRewriter GetRewriter() const override; }; class SwUndoNumruleRename : public SwUndo @@ -248,10 +248,10 @@ class SwUndoNumruleRename : public SwUndo SwUndoNumruleRename(const OUString & aOldName, const OUString & aNewName, SwDoc * pDoc); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - SwRewriter GetRewriter() const SAL_OVERRIDE; + SwRewriter GetRewriter() const 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 a8c7c13668a6..34b2851904f5 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 & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; }; class SwUndoPageDescCreate : public SwUndo @@ -58,11 +58,11 @@ public: SwUndoPageDescCreate(const SwPageDesc * pNew, SwDoc * pDoc); virtual ~SwUndoPageDescCreate(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; }; class SwUndoPageDescDelete : public SwUndo @@ -76,11 +76,11 @@ public: SwUndoPageDescDelete(const SwPageDesc & aOld, SwDoc * pDoc); virtual ~SwUndoPageDescDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const 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 ed6aeca07608..c3964a861124 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 & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) 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 9aed97903670..bb1d0232c4bd 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() {} - sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE; - void _ExportAutoStyles() SAL_OVERRIDE {} - void _ExportMasterStyles () SAL_OVERRIDE {} - void _ExportContent() SAL_OVERRIDE {} + sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass) override; + void _ExportAutoStyles() override {} + void _ExportMasterStyles () override {} + void _ExportContent() override {} }; class SwXMLTextBlockExport : public SvXMLExport @@ -56,11 +56,11 @@ public: com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); virtual ~SwXMLTextBlockExport() {} - sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) SAL_OVERRIDE {return 0;} + sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) override {return 0;} sal_uInt32 exportDoc(const OUString & rText); - void _ExportAutoStyles() SAL_OVERRIDE {} - void _ExportMasterStyles () SAL_OVERRIDE {} - void _ExportContent() SAL_OVERRIDE {} + void _ExportAutoStyles() override {} + void _ExportMasterStyles () override {} + void _ExportContent() override {} }; #endif diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index f6044938adb4..31c28c15b4e6 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -41,7 +41,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext* CreateFastContext( sal_Int32 Element, - const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) SAL_OVERRIDE; + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override; public: SwXMLBlockListImport( @@ -62,7 +62,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext* CreateFastContext( sal_Int32 Element, - const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) SAL_OVERRIDE; + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override; public: bool bTextOnly; @@ -74,7 +74,7 @@ public: virtual ~SwXMLTextBlockImport() throw(); virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; }; enum SwXMLTextBlockToken : sal_Int32 @@ -96,12 +96,12 @@ public: //XFastTokenHandler sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; //Much fast direct C++ shortcut to the method that matters - virtual sal_Int32 getTokenDirect( const char *pTag, sal_Int32 nLength ) const SAL_OVERRIDE; + virtual sal_Int32 getTokenDirect( const char *pTag, sal_Int32 nLength ) const override; }; enum SwXMLBlockListToken : sal_Int32 @@ -125,12 +125,12 @@ public: //XFastTokenHandler sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; //Much fast direct C++ shortcut to the method that matters - virtual sal_Int32 getTokenDirect( const char *pTag, sal_Int32 nLength ) const SAL_OVERRIDE; + virtual sal_Int32 getTokenDirect( const char *pTag, sal_Int32 nLength ) const override; }; #endif diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index 110dca125389..2767df653223 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -53,38 +53,38 @@ 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&, bool bOnlyText = false ); - virtual void AddName( const OUString&, const OUString&, bool bOnlyText = false ) SAL_OVERRIDE; + virtual void AddName( const OUString&, const OUString&, bool bOnlyText = false ) override; static OUString GeneratePackageName ( const OUString& rShort ); virtual ~SwXMLTextBlocks(); - 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 PutText( const OUString&, const OUString&, const OUString& ) SAL_OVERRIDE; - virtual sal_uLong MakeBlockList() SAL_OVERRIDE; - - virtual short GetFileType() const SAL_OVERRIDE; - virtual sal_uLong OpenFile( bool bReadOnly = true ) SAL_OVERRIDE; - virtual void CloseFile() SAL_OVERRIDE; + virtual sal_uLong Delete( sal_uInt16 ) override; + virtual sal_uLong Rename( sal_uInt16, const OUString&, const OUString& ) override; + virtual sal_uLong CopyBlock( SwImpBlocks& rImp, OUString& rShort, const OUString& rLong) override; + virtual void ClearDoc() override; + virtual sal_uLong GetDoc( sal_uInt16 ) override; + virtual sal_uLong BeginPutDoc( const OUString&, const OUString& ) override; + virtual sal_uLong PutDoc() override; + virtual sal_uLong PutText( const OUString&, const OUString&, const OUString& ) override; + virtual sal_uLong MakeBlockList() override; + + virtual short GetFileType() const override; + virtual sal_uLong OpenFile( bool bReadOnly = true ) override; + virtual void CloseFile() override; static bool IsFileUCBStorage( const OUString & rFileName); // Methods for the new Autocorrecter sal_uLong GetText( const OUString& rShort, OUString& ); - virtual bool IsOnlyTextBlock( const OUString& rShort ) const SAL_OVERRIDE; + virtual bool IsOnlyTextBlock( const OUString& rShort ) const override; bool IsOnlyTextBlock( sal_uInt16 nIdx ) const; void SetIsTextOnly( const OUString& rShort, bool bNewValue ); virtual sal_uLong GetMacroTable( sal_uInt16, SvxMacroTableDtor& rMacroTable, - bool bFileAlreadyOpen = false ) SAL_OVERRIDE; + bool bFileAlreadyOpen = false ) override; virtual sal_uLong SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTable, - bool bFileAlreadyOpen = false ) SAL_OVERRIDE; - virtual bool PutMuchEntries( bool bOn ) SAL_OVERRIDE; + bool bFileAlreadyOpen = false ) override; + virtual bool PutMuchEntries( bool bOn ) override; public: SwDoc* GetDoc() const { return pDoc; } diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx index 632f606a92d3..42eb62a61b2d 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) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + 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) 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) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo - 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; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx index a6ed6feed14c..f0320d924cfb 100644 --- a/sw/source/core/inc/UndoAttribute.hxx +++ b/sw/source/core/inc/UndoAttribute.hxx @@ -50,9 +50,9 @@ public: virtual ~SwUndoAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SaveRedlineData( const SwPaM& rPam, bool bInsContent ); @@ -71,9 +71,9 @@ public: virtual ~SwUndoResetAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SetAttrs( const std::set<sal_uInt16> &rAttrs ); @@ -115,11 +115,11 @@ public: virtual ~SwUndoFormatAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; void PutAttr( const SfxPoolItem& rItem ); SwFormat* GetFormat( SwDoc& rDoc ); // checks if it is still in the Doc! @@ -133,8 +133,8 @@ class SwUndoFormatResetAttr : public SwUndo const sal_uInt16 nWhichId ); virtual ~SwUndoFormatResetAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; private: // format at which a certain attribute is reset. @@ -153,9 +153,9 @@ class SwUndoDontExpandFormat : public SwUndo public: SwUndoDontExpandFormat( const SwPosition& rPos ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; // helper class to receive changed attribute sets @@ -167,7 +167,7 @@ class SwUndoFormatAttrHelper : public SwClient public: SwUndoFormatAttrHelper( SwFormat& rFormat, bool bSaveDrawPt = true ); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; SwUndoFormatAttr* GetUndo() const { return m_pUndo.get(); } // release the undo object (so it is not deleted here), and return it @@ -184,9 +184,9 @@ public: virtual ~SwUndoMoveLeftMargin(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; SwHistory& GetHistory() { return *m_pHistory; } @@ -203,8 +203,8 @@ public: virtual ~SwUndoDefaultAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; class SwUndoChangeFootNote : public SwUndo, private SwUndRng @@ -219,9 +219,9 @@ public: sal_uInt16 nNum, bool bIsEndNote ); virtual ~SwUndoChangeFootNote(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; SwHistory& GetHistory() { return *m_pHistory; } }; @@ -235,8 +235,8 @@ public: virtual ~SwUndoFootNoteInfo(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; class SwUndoEndNoteInfo : public SwUndo @@ -248,8 +248,8 @@ public: virtual ~SwUndoEndNoteInfo(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) 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 82524568d3d6..7cfb4624f5fe 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 SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; }; class SwUndoInsBookmark : public SwUndoBookmark @@ -63,8 +63,8 @@ class SwUndoInsBookmark : public SwUndoBookmark public: SwUndoInsBookmark( const ::sw::mark::IMark& ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; class SwUndoDeleteBookmark : public SwUndoBookmark @@ -72,8 +72,8 @@ class SwUndoDeleteBookmark : public SwUndoBookmark public: SwUndoDeleteBookmark( const ::sw::mark::IMark& ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; class SwUndoRenameBookmark : public SwUndo @@ -86,10 +86,10 @@ public: virtual ~SwUndoRenameBookmark(); private: - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; static void Rename( ::sw::UndoRedoContext &, const OUString& sFrom, const OUString& sTo ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) 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 c3e219e1f132..d97f7faa1ab7 100644 --- a/sw/source/core/inc/UndoCore.hxx +++ b/sw/source/core/inc/UndoCore.hxx @@ -162,9 +162,9 @@ public: const bool bResetListAttrs ); virtual ~SwUndoFormatColl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; /** Returns the rewriter for this undo object. @@ -179,7 +179,7 @@ public: @return the rewriter for this undo object */ - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; SwHistory* GetHistory() { return pHistory; } @@ -197,17 +197,17 @@ class SwUndoSetFlyFormat : public SwUndo, public SwClient bool bAnchorChgd; void PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem ); - void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; void GetAnchor( SwFormatAnchor& rAnhor, sal_uLong nNode, sal_Int32 nContent ); public: SwUndoSetFlyFormat( SwFrameFormat& rFlyFormat, SwFrameFormat& rNewFrameFormat ); virtual ~SwUndoSetFlyFormat(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; void DeRegisterFromFormat( SwFormat& ); }; @@ -218,9 +218,9 @@ class SwUndoOutlineLeftRight : public SwUndo, private SwUndRng public: SwUndoOutlineLeftRight( const SwPaM& rPam, short nOffset ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; const int nUndoStringLength = 20; diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx index 7316cc9d7b85..dd6724273265 100644 --- a/sw/source/core/inc/UndoDelete.hxx +++ b/sw/source/core/inc/UndoDelete.hxx @@ -70,9 +70,9 @@ public: bool bCalledByTableCpy = false ); virtual ~SwUndoDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; /** Returns rewriter for this undo object. @@ -84,7 +84,7 @@ public: @return rewriter for this undo object */ - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; bool CanGrouping( SwDoc*, const SwPaM& ); diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx index f1b8fa59d6f8..b603c263a132 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 & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; }; class SwUndoDrawGroup : public SwUndo @@ -59,8 +59,8 @@ public: virtual ~SwUndoDrawGroup(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void AddObj( sal_uInt16 nPos, SwDrawFrameFormat*, SdrObject* ); void SetGroupFormat( SwDrawFrameFormat* ); @@ -88,8 +88,8 @@ public: virtual ~SwUndoDrawUnGroup(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void AddObj( sal_uInt16 nPos, SwDrawFrameFormat* ); }; @@ -104,8 +104,8 @@ public: virtual ~SwUndoDrawUnGroupConnectToLayout(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void AddFormatAndObj( SwDrawFrameFormat* pDrawFrameFormat, SdrObject* pDrawObject ); @@ -123,8 +123,8 @@ public: virtual ~SwUndoDrawDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void AddObj( sal_uInt16 nPos, SwDrawFrameFormat*, const SdrMark& ); }; diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx index b3b21e502914..f9e7a3c90eb5 100644 --- a/sw/source/core/inc/UndoInsert.hxx +++ b/sw/source/core/inc/UndoInsert.hxx @@ -64,9 +64,9 @@ public: SwUndoInsert( const SwNodeIndex& rNode ); virtual ~SwUndoInsert(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; /** Returns rewriter for this undo object. @@ -79,7 +79,7 @@ public: @return rewriter for this undo object */ - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; void SetWithRsid() { m_bWithRsid = true; } @@ -99,8 +99,8 @@ public: virtual ~SwUndoReplace(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; /** Returns the rewriter of this undo object. @@ -121,7 +121,7 @@ public: @return the rewriter of this undo object */ - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; void SetEnd( const SwPaM& rPam ); @@ -146,8 +146,8 @@ public: virtual ~SwUndoReRead(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; class SwUndoInsertLabel : public SwUndo @@ -188,9 +188,9 @@ public: const bool bCpyBrd ); virtual ~SwUndoInsertLabel(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; /** Returns the rewriter of this undo object. @@ -204,7 +204,7 @@ public: @return the rewriter of this undo object */ - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; static SwRewriter CreateRewriter(const OUString &rStr); void SetNodePos( sal_uLong nNd ) diff --git a/sw/source/core/inc/UndoManager.hxx b/sw/source/core/inc/UndoManager.hxx index f025789ff36b..9987c519284d 100644 --- a/sw/source/core/inc/UndoManager.hxx +++ b/sw/source/core/inc/UndoManager.hxx @@ -42,43 +42,43 @@ public: IDocumentState & rState); /** IDocumentUndoRedo */ - 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 void DoUndo(bool const bDoUndo) override; + virtual bool DoesUndo() const override; + virtual void DoGroupUndo(bool const bDoUndo) override; + virtual bool DoesGroupUndo() const override; + virtual void DoDrawUndo(bool const bDoUndo) override; + virtual bool DoesDrawUndo() const override; + virtual void SetUndoNoModifiedPosition() override; + virtual void LockUndoNoModifiedPosition() override; + virtual void UnLockUndoNoModifiedPosition() override; + virtual void SetUndoNoResetModified() override; + virtual bool IsUndoNoResetModified() const override; virtual SwUndoId StartUndo(SwUndoId const eUndoId, - SwRewriter const*const pRewriter) SAL_OVERRIDE; + SwRewriter const*const pRewriter) override; virtual SwUndoId EndUndo(SwUndoId const eUndoId, - SwRewriter const*const pRewriter) SAL_OVERRIDE; - virtual void DelAllUndoObj() SAL_OVERRIDE; + SwRewriter const*const pRewriter) override; + virtual void DelAllUndoObj() override; virtual bool GetLastUndoInfo(OUString *const o_pStr, - SwUndoId *const o_pId) const SAL_OVERRIDE; - virtual SwUndoComments_t GetUndoComments() const SAL_OVERRIDE; + SwUndoId *const o_pId) const override; + virtual SwUndoComments_t GetUndoComments() const override; virtual bool GetFirstRedoInfo(OUString *const o_pStr, - SwUndoId *const o_pId = 0) const SAL_OVERRIDE; - virtual SwUndoComments_t GetRedoComments() const SAL_OVERRIDE; + SwUndoId *const o_pId = 0) const override; + virtual SwUndoComments_t GetRedoComments() const override; virtual bool Repeat(::sw::RepeatContext & rContext, - 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; - virtual size_t GetUndoActionCount(const bool bCurrentLevel = true) const SAL_OVERRIDE; + sal_uInt16 const nRepeatCnt) override; + virtual SwUndoId GetRepeatInfo(OUString *const o_pStr) const override; + virtual void AppendUndo(SwUndo *const pUndo) override; + virtual void ClearRedo() override; + virtual bool IsUndoNodes(SwNodes const& rNodes) const override; + virtual size_t GetUndoActionCount(const bool bCurrentLevel = true) const override; // ::svl::IUndoManager virtual void AddUndoAction(SfxUndoAction *pAction, - bool bTryMerg = false) SAL_OVERRIDE; - virtual bool Undo() SAL_OVERRIDE; - virtual bool Redo() SAL_OVERRIDE; - virtual void EnableUndo(bool bEnable) SAL_OVERRIDE; + bool bTryMerg = false) override; + virtual bool Undo() override; + virtual bool Redo() override; + virtual void EnableUndo(bool bEnable) override; SwUndo * RemoveLastUndo(); SwUndo * GetLastUndo(); diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx index eb2a48341426..5b5b7164d32e 100644 --- a/sw/source/core/inc/UndoNumbering.hxx +++ b/sw/source/core/inc/UndoNumbering.hxx @@ -43,11 +43,11 @@ public: virtual ~SwUndoInsNum(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; SwHistory* GetHistory(); // will be created if necessary void SaveOldNumRule( const SwNumRule& rOld ); @@ -72,9 +72,9 @@ public: virtual ~SwUndoDelNum(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void AddNode( const SwTextNode& rNd, bool bResetLRSpace ); SwHistory* GetHistory() { return pHistory; } @@ -88,9 +88,9 @@ class SwUndoMoveNum : public SwUndo, private SwUndRng public: SwUndoMoveNum( const SwPaM& rPam, long nOffset, bool bIsOutlMv = false ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SetStartNode( sal_uLong nValue ) { nNewStt = nValue; } }; @@ -102,9 +102,9 @@ class SwUndoNumUpDown : public SwUndo, private SwUndRng public: SwUndoNumUpDown( const SwPaM& rPam, short nOffset ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; class SwUndoNumOrNoNum : public SwUndo @@ -116,9 +116,9 @@ public: SwUndoNumOrNoNum( const SwNodeIndex& rIdx, bool mbOldNum, bool mbNewNum ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; class SwUndoNumRuleStart : public SwUndo @@ -132,9 +132,9 @@ public: SwUndoNumRuleStart( const SwPosition& rPos, bool bDelete ); SwUndoNumRuleStart( const SwPosition& rPos, sal_uInt16 nStt ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) 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 dabc8e1f452f..60c2eb67fad0 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 & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; /** Returns the rewriter of this undo object. @@ -60,7 +60,7 @@ public: @return the rewriter of this undo object */ - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; bool CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns ); }; @@ -79,9 +79,9 @@ public: virtual ~SwUndoTransliterate(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void AddChanges( SwTextNode& 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 9fd448f51e3b..44059e7c6f73 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 & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; sal_uInt16 GetRedlSaveCount() const; }; @@ -55,8 +55,8 @@ class SwUndoRedlineDelete : public SwUndoRedline bool bIsDelim : 1; bool bIsBackspace : 1; - virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; + virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) override; + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) override; public: SwUndoRedlineDelete( const SwPaM& rRange, SwUndoId nUserId = UNDO_EMPTY ); @@ -74,15 +74,15 @@ class SwUndoRedlineSort : public SwUndoRedline sal_uLong nSaveEndNode, nOffset; sal_Int32 nSaveEndContent; - virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; + virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) override; + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) override; public: SwUndoRedlineSort( const SwPaM& rRange, const SwSortOptions& rOpt ); virtual ~SwUndoRedlineSort(); - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SetSaveRange( const SwPaM& rRange ); void SetOffset( const SwNodeIndex& rIdx ); @@ -91,23 +91,23 @@ public: class SwUndoAcceptRedline : public SwUndoRedline { private: - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) override; public: SwUndoAcceptRedline( const SwPaM& rRange ); - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; class SwUndoRejectRedline : public SwUndoRedline { private: - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) override; public: SwUndoRejectRedline( const SwPaM& rRange ); - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; class SwUndoCompDoc : public SwUndo, public SwUndRng @@ -123,8 +123,8 @@ public: virtual ~SwUndoCompDoc(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) 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 16f1f1131c76..fa70a7303e86 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 & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SetSectNdPos(sal_uLong const nPos) { m_nSectionNodePos = nPos; } void SaveSplitNode(SwTextNode *const pTextNd, bool const bAtStart); diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx index 4bc178bf44e4..f5d4f528c77c 100644 --- a/sw/source/core/inc/UndoSort.hxx +++ b/sw/source/core/inc/UndoSort.hxx @@ -74,9 +74,9 @@ public: virtual ~SwUndoSort(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) 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 dbe69d0fef5d..cc13f1c60e63 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 & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SetTableFlag() { bTableFlag = true; } }; @@ -66,8 +66,8 @@ public: SwUndoMove( const SwPaM&, const SwPosition& ); SwUndoMove( SwDoc* pDoc, const SwNodeRange&, const SwNodeIndex& ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; /// set the destination range after the move void SetDestRange( const SwPaM&, const SwPosition&, bool, bool ); diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx index fbd5f05fdf38..201a00e33d89 100644 --- a/sw/source/core/inc/UndoTable.hxx +++ b/sw/source/core/inc/UndoTable.hxx @@ -65,11 +65,11 @@ public: virtual ~SwUndoInsTable(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; }; class SwUndoTextToTable : public SwUndo, public SwUndRng @@ -90,9 +90,9 @@ public: virtual ~SwUndoTextToTable(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; SwHistory& GetHistory(); // will be created if necessary void AddFillBox( const SwTableBox& rBox ); @@ -115,9 +115,9 @@ public: virtual ~SwUndoTableToText(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SetRange( const SwNodeRange& ); void AddBoxPos( SwDoc& rDoc, sal_uLong nNdIdx, sal_uLong nEndIdx, @@ -135,8 +135,8 @@ public: virtual ~SwUndoAttrTable(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; class SwUndoTableNumFormat; @@ -156,8 +156,8 @@ public: virtual ~SwUndoTableAutoFormat(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void SaveBoxContent( const SwTableBox& rBox ); }; @@ -194,8 +194,8 @@ public: virtual ~SwUndoTableNdsChg(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void SaveNewBoxes( const SwTableNode& rTableNd, const SwTableSortBoxes& rOld ); void SaveNewBoxes( const SwTableNode& rTableNd, const SwTableSortBoxes& rOld, @@ -228,8 +228,8 @@ public: virtual ~SwUndoTableMerge(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void MoveBoxContent( SwDoc* pDoc, SwNodeRange& rRg, SwNodeIndex& rPos ); @@ -261,8 +261,8 @@ public: virtual ~SwUndoTableNumFormat(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void SetNumFormat( sal_uLong nNewNumFormatIdx, const double& rNewNumber ) { nFormatIdx = nNewNumFormatIdx; fNum = rNewNumber; } @@ -286,8 +286,8 @@ public: virtual ~SwUndoTableCpyTable(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void AddBoxBefore( const SwTableBox& rBox, bool bDelContent ); void AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx, @@ -307,8 +307,8 @@ public: virtual ~SwUndoCpyTable(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void SetTableSttIdx( sal_uLong nIdx ) { nTableNode = nIdx; } }; @@ -328,9 +328,9 @@ public: virtual ~SwUndoSplitTable(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SetTableNodeOffset( sal_uLong nIdx ) { nOffset = nIdx - nTableNode; } SwHistory* GetHistory() { return pHistory; } @@ -352,9 +352,9 @@ public: virtual ~SwUndoMergeTable(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SaveFormula( SwHistory& rHistory ); }; @@ -368,9 +368,9 @@ class SwUndoTableHeadline : public SwUndo public: SwUndoTableHeadline( const SwTable&, sal_uInt16 nOldHdl, sal_uInt16 nNewHdl ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt16* pInsPos = 0 ); diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index f5129d96d973..0d3bc22d84ad 100644 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -57,34 +57,34 @@ public: SwAutoCorrDoc( SwEditShell& rEditShell, SwPaM& rPam, sal_Unicode cIns = 0 ); virtual ~SwAutoCorrDoc(); - virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ) SAL_OVERRIDE; - virtual bool Insert( sal_Int32 nPos, const OUString& rText ) SAL_OVERRIDE; - virtual bool Replace( sal_Int32 nPos, const OUString& rText ) SAL_OVERRIDE; - virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rText ) SAL_OVERRIDE; + virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ) override; + virtual bool Insert( sal_Int32 nPos, const OUString& rText ) override; + virtual bool Replace( sal_Int32 nPos, const OUString& rText ) override; + virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rText ) override; virtual bool SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId, - SfxPoolItem& ) SAL_OVERRIDE; + SfxPoolItem& ) override; - virtual bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ) SAL_OVERRIDE; + virtual bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ) override; // return text of a previous paragraph // If it does not exist or if there is nothing before, return blank. // - true: paragraph before "normal" insertion position // - false: paragraph in that the corrected word was inserted // (does not need to be the same paragraph) - virtual OUString const* GetPrevPara(bool bAtNormalPos) SAL_OVERRIDE; + virtual OUString const* GetPrevPara(bool bAtNormalPos) override; virtual bool ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos, SvxAutoCorrect& rACorrect, - OUString* pPara ) SAL_OVERRIDE; + OUString* pPara ) override; // Will be called after swapping characters by the functions // - FnCapitalStartWord and // - FnCapitalStartSentence. // 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 ) SAL_OVERRIDE; - virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara ) const SAL_OVERRIDE; + const OUString& rExceptWord, sal_Unicode cChar ) override; + virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara ) const override; }; class SwAutoCorrExceptWord diff --git a/sw/source/core/inc/annotationmark.hxx b/sw/source/core/inc/annotationmark.hxx index 8dc5508ba55d..7bd4ad8b4a51 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) SAL_OVERRIDE; + virtual void InitDoc(SwDoc* const io_Doc) override; const SwFormatField* GetAnnotationFormatField() const; }; diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx index fee7518d58cb..b346908ab86d 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() SAL_OVERRIDE; + virtual void CalcPosition() override; // calculated anchored position for object position type AS_CHAR const Point& GetAnchorPos() const { return maAnchorPos;} diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx index 375dec9ef4e9..4ac9df775543 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( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; public: SwBodyFrm( SwFrameFormat*, SwFrm* ); - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; DECL_FIXEDMEMPOOL_NEWDEL(SwBodyFrm) }; diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index df6671f9c097..8a960a5c1bd8 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -50,16 +50,16 @@ namespace sw { { public: //getters - virtual SwPosition& GetMarkPos() const SAL_OVERRIDE + virtual SwPosition& GetMarkPos() const override { return *m_pPos1; } - virtual const OUString& GetName() const SAL_OVERRIDE + virtual const OUString& GetName() const override { return m_aName; } - virtual SwPosition& GetOtherMarkPos() const SAL_OVERRIDE + virtual SwPosition& GetOtherMarkPos() const override { OSL_PRECOND(IsExpanded(), "<SwPosition::GetOtherMarkPos(..)> - I have no other Pos set." ); return *m_pPos2; } - virtual SwPosition& GetMarkStart() const SAL_OVERRIDE + virtual SwPosition& GetMarkStart() const override { if( !IsExpanded() ) return GetMarkPos( ); if ( GetMarkPos( ) < GetOtherMarkPos( ) ) @@ -67,7 +67,7 @@ namespace sw { else return GetOtherMarkPos( ); } - virtual SwPosition& GetMarkEnd() const SAL_OVERRIDE + virtual SwPosition& GetMarkEnd() const override { if( !IsExpanded() ) return GetMarkPos(); if ( GetMarkPos( ) >= GetOtherMarkPos( ) ) @@ -76,8 +76,8 @@ namespace sw { return GetOtherMarkPos( ); } - virtual bool IsCoveringPosition(const SwPosition& rPos) const SAL_OVERRIDE; - virtual bool IsExpanded() const SAL_OVERRIDE + virtual bool IsCoveringPosition(const SwPosition& rPos) const override; + virtual bool IsExpanded() const override { return static_cast< bool >(m_pPos2); } void SetName(const OUString& rName) @@ -87,8 +87,8 @@ namespace sw { virtual void ClearOtherMarkPos() { m_pPos2.reset(); } - virtual OUString ToString( ) const SAL_OVERRIDE; - virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; + virtual OUString ToString( ) const override; + virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; void Swap() { @@ -111,7 +111,7 @@ namespace sw { protected: // SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; MarkBase(const SwPaM& rPaM, const OUString& rName); std::unique_ptr<SwPosition> m_pPos1; @@ -170,26 +170,26 @@ namespace sw { const vcl::KeyCode& rCode, const OUString& rName, const OUString& rShortName); - virtual void InitDoc(SwDoc* const io_Doc) SAL_OVERRIDE; + virtual void InitDoc(SwDoc* const io_Doc) override; - virtual void DeregisterFromDoc(SwDoc* const io_pDoc) SAL_OVERRIDE; + virtual void DeregisterFromDoc(SwDoc* const io_pDoc) override; - virtual const OUString& GetShortName() const SAL_OVERRIDE + virtual const OUString& GetShortName() const override { return m_sShortName; } - virtual const vcl::KeyCode& GetKeyCode() const SAL_OVERRIDE + virtual const vcl::KeyCode& GetKeyCode() const override { return m_aCode; } - virtual void SetShortName(const OUString& rShortName) SAL_OVERRIDE + virtual void SetShortName(const OUString& rShortName) override { m_sShortName = rShortName; } - virtual void SetKeyCode(const vcl::KeyCode& rCode) SAL_OVERRIDE + virtual void SetKeyCode(const vcl::KeyCode& rCode) override { m_aCode = rCode; } // ::sfx2::Metadatable - 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 ::sfx2::IXmlIdRegistry& GetRegistry() override; + virtual bool IsInClipboard() const override; + virtual bool IsInUndo() const override; + virtual bool IsInContent() const override; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE; + ::com::sun::star::rdf::XMetadatable > MakeUnoObject() override; private: vcl::KeyCode m_aCode; @@ -203,20 +203,20 @@ namespace sw { public: Fieldmark(const SwPaM& rPaM); - virtual OUString GetFieldname() const SAL_OVERRIDE + virtual OUString GetFieldname() const override { return m_aFieldname; } - virtual OUString GetFieldHelptext() const SAL_OVERRIDE + virtual OUString GetFieldHelptext() const override { return m_aFieldHelptext; } - virtual IFieldmark::parameter_map_t* GetParameters() SAL_OVERRIDE + virtual IFieldmark::parameter_map_t* GetParameters() override { return &m_vParams; } - virtual const IFieldmark::parameter_map_t* GetParameters() const SAL_OVERRIDE + virtual const IFieldmark::parameter_map_t* GetParameters() const override { return &m_vParams; } - virtual void SetFieldname(const OUString& aFieldname) SAL_OVERRIDE + virtual void SetFieldname(const OUString& aFieldname) override { m_aFieldname = aFieldname; } - virtual void SetFieldHelptext(const OUString& aFieldHelptext) SAL_OVERRIDE + virtual void SetFieldHelptext(const OUString& aFieldHelptext) override { m_aFieldHelptext = aFieldHelptext; } virtual void ReleaseDoc(SwDoc* const) = 0; @@ -224,9 +224,9 @@ namespace sw { void SetMarkStartPos( const SwPosition& rNewStartPos ); void SetMarkEndPos( const SwPosition& rNewEndPos ); - virtual void Invalidate() SAL_OVERRIDE; - virtual OUString ToString() const SAL_OVERRIDE; - virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; + virtual void Invalidate() override; + virtual OUString ToString() const override; + virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; private: OUString m_aFieldname; @@ -239,8 +239,8 @@ namespace sw { { public: TextFieldmark(const SwPaM& rPaM); - virtual void InitDoc(SwDoc* const io_pDoc) SAL_OVERRIDE; - virtual void ReleaseDoc(SwDoc* const pDoc) SAL_OVERRIDE; + virtual void InitDoc(SwDoc* const io_pDoc) override; + virtual void ReleaseDoc(SwDoc* const pDoc) override; }; class CheckboxFieldmark @@ -249,10 +249,10 @@ namespace sw { { public: CheckboxFieldmark(const SwPaM& rPaM); - 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 void InitDoc(SwDoc* const io_pDoc) override; + virtual void ReleaseDoc(SwDoc* const pDoc) override; + bool IsChecked() const override; + void SetChecked(bool checked) override; }; } } diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx index 040cc032f1f5..573a84e322b5 100644 --- a/sw/source/core/inc/cellfrm.hxx +++ b/sw/source/core/inc/cellfrm.hxx @@ -32,23 +32,23 @@ class SwCellFrm: public SwLayoutFrm { const SwTableBox* m_pTabBox; - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwCellFrm(); protected: - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: SwCellFrm( const SwTableBox &, SwFrm*, bool bInsertContent = true ); - virtual bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; + virtual bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0, bool bTestBackground = false ) const override; virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, - SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; - virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; + SwPrintData const*const pPrintData = NULL ) const override; + virtual void CheckDirection( bool bVert ) override; // #i103961# - virtual void Cut() SAL_OVERRIDE; + virtual void Cut() override; const SwTableBox *GetTabBox() const { return m_pTabBox; } diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx index 76b3544ba2cf..cabf271d8436 100644 --- a/sw/source/core/inc/cntfrm.hxx +++ b/sw/source/core/inc/cntfrm.hxx @@ -45,32 +45,32 @@ class SwContentFrm: public SwFrm, public SwFlowFrm bool bTstMove, const bool bObjsInNewUpper ); - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 ); - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool& ) SAL_OVERRIDE; + virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool& ) override; const SwContentFrm* ImplGetNextContentFrm( bool bFwd ) const; protected: bool MakePrtArea( const SwBorderAttrs & ); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; + virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; SwContentFrm( SwContentNode * const, SwFrm* ); - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwContentFrm(); public: TYPEINFO_OVERRIDE(); // already in base class - virtual void Cut() SAL_OVERRIDE; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void Cut() override; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; inline const SwContentNode *GetNode() const; inline SwContentNode *GetNode(); diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx index 1a22e394e16c..66e4e387be59 100644 --- a/sw/source/core/inc/colfrm.hxx +++ b/sw/source/core/inc/colfrm.hxx @@ -26,14 +26,14 @@ class SwColumnFrm: public SwFootnoteBossFrm { private: - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwColumnFrm(); public: SwColumnFrm( SwFrameFormat*, SwFrm* ); - virtual void PaintBreak() const SAL_OVERRIDE; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; + virtual void PaintBreak() const override; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; DECL_FIXEDMEMPOOL_NEWDEL(SwColumnFrm) }; diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx index 9c90319eee4a..85bf999a5a34 100644 --- a/sw/source/core/inc/crossrefbookmark.hxx +++ b/sw/source/core/inc/crossrefbookmark.hxx @@ -38,22 +38,22 @@ namespace sw { const OUString& rPrefix); // getters - virtual SwPosition& GetOtherMarkPos() const SAL_OVERRIDE; - virtual SwPosition& GetMarkStart() const SAL_OVERRIDE + virtual SwPosition& GetOtherMarkPos() const override; + virtual SwPosition& GetMarkStart() const override { return *m_pPos1; } - virtual SwPosition& GetMarkEnd() const SAL_OVERRIDE + virtual SwPosition& GetMarkEnd() const override { return *m_pPos1; } - virtual bool IsExpanded() const SAL_OVERRIDE + virtual bool IsExpanded() const override { return false; } - virtual void SetMarkPos(const SwPosition& rNewPos) SAL_OVERRIDE; - virtual void SetOtherMarkPos(const SwPosition&) SAL_OVERRIDE + virtual void SetMarkPos(const SwPosition& rNewPos) override; + virtual void SetOtherMarkPos(const SwPosition&) override { assert(false && "<CrossRefBookmark::SetOtherMarkPos(..)>" " - misusage of CrossRefBookmark: other bookmark position isn't allowed to be set." ); } - virtual void ClearOtherMarkPos() SAL_OVERRIDE + virtual void ClearOtherMarkPos() override { assert(false && "<SwCrossRefBookmark::ClearOtherMarkPos(..)>" diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index 5a2c0d635ec0..36e9c7747721 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -37,12 +37,12 @@ const sal_uInt16 SwFlyDrawObjIdentifier = 0x0001; class SwFlyDrawObj : public SdrObject { private: - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override; protected: // #i95264# SwFlyDrawObj needs an own VC since createViewIndependentPrimitive2DSequence() // is called when RecalcBoundRect() is used - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; public: TYPEINFO_OVERRIDE(); @@ -51,8 +51,8 @@ public: virtual ~SwFlyDrawObj(); // for instantiation of this class while loading (via factory) - virtual sal_uInt32 GetObjInventor() const SAL_OVERRIDE; - virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual sal_uInt32 GetObjInventor() const override; + virtual sal_uInt16 GetObjIdentifier() const override; }; // virtual objects for Flys @@ -67,7 +67,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() SAL_OVERRIDE; + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; public: // for paints triggered form ExecutePrimitive @@ -84,29 +84,29 @@ public: virtual ~SwVirtFlyDrawObj(); // override method of base class SdrVirtObj - virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const SAL_OVERRIDE; + virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const override; // we treat the size calculation completely on ourself here - 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 const Rectangle& GetCurrentBoundRect() const override; + virtual const Rectangle& GetLastBoundRect() const override; + virtual void RecalcBoundRect() override; + virtual void RecalcSnapRect() override; + virtual const Rectangle& GetSnapRect() const override; + virtual void SetSnapRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const Rectangle& rRect) override; + virtual const Rectangle& GetLogicRect() const override; + virtual void SetLogicRect(const Rectangle& rRect) override; + virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const override; + virtual void NbcMove (const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, - const Fraction& yFact) SAL_OVERRIDE; - virtual void NbcCrop(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; - virtual void Move (const Size& rSiz) SAL_OVERRIDE; + const Fraction& yFact) override; + virtual void NbcCrop(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; + virtual void Move (const Size& rSiz) override; virtual void Resize(const Point& rRef, const Fraction& xFact, - const Fraction& yFact, bool bUnsetRelative = true) SAL_OVERRIDE; - virtual void Crop(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; - virtual void addCropHandles(SdrHdlList& rTarget) const SAL_OVERRIDE; + const Fraction& yFact, bool bUnsetRelative = true) override; + virtual void Crop(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; + virtual void addCropHandles(SdrHdlList& rTarget) const override; const SwFrameFormat *GetFormat() const; SwFrameFormat *GetFormat(); @@ -118,13 +118,13 @@ public: void SetRect() const; // if an URL is attached to a graphic than this is a macro object - virtual bool HasMacro() const SAL_OVERRIDE; - virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE; - virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE; + virtual bool HasMacro() const override; + virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const override; + virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const override; // FullDrag support - virtual bool supportsFullDrag() const SAL_OVERRIDE; - virtual SdrObject* getFullDragClone() const SAL_OVERRIDE; + virtual bool supportsFullDrag() const override; + virtual SdrObject* getFullDragClone() const override; }; #endif diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index 1dc937f72c90..8a9c48e0e1a5 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -99,7 +99,7 @@ struct SwSortTextElement : public SwSortElement SwSortTextElement( const SwNodeIndex& rPos ); virtual ~SwSortTextElement(); - virtual OUString GetKey( sal_uInt16 nKey ) const SAL_OVERRIDE; + virtual OUString GetKey( sal_uInt16 nKey ) const override; }; // sort table @@ -110,8 +110,8 @@ struct SwSortBoxElement : public SwSortElement SwSortBoxElement( sal_uInt16 nRC ); virtual ~SwSortBoxElement(); - virtual OUString GetKey( sal_uInt16 nKey ) const SAL_OVERRIDE; - virtual double GetValue( sal_uInt16 nKey ) const SAL_OVERRIDE; + virtual OUString GetKey( sal_uInt16 nKey ) const override; + virtual double GetValue( sal_uInt16 nKey ) const override; }; // two-dimensional array of FndBoxes diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx index f13dc85534bc..06cbff670c79 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL cancel( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; } diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx index aae273697353..0141db0cf85a 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() SAL_OVERRIDE; + virtual void AddCustomHdl() override; // override to allow extra handling when picking SwVirtFlyDrawObj's using FmFormView::CheckSingleSdrObjectHit; - virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, SdrSearchOptions nOptions, const SetOfByte* pMVisLay) const SAL_OVERRIDE; + virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, SdrSearchOptions nOptions, const SetOfByte* pMVisLay) const override; // support enhanced text edit for draw objects - virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const SAL_OVERRIDE; + virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const override; public: SwDrawView( SwViewShellImp &rI, SdrModel *pMd, OutputDevice* pOutDev=NULL ); // from base class - virtual SdrObject* GetMaxToTopObj(SdrObject* pObj) const SAL_OVERRIDE; - virtual SdrObject* GetMaxToBtmObj(SdrObject* pObj) const SAL_OVERRIDE; - virtual void MarkListHasChanged() SAL_OVERRIDE; + virtual SdrObject* GetMaxToTopObj(SdrObject* pObj) const override; + virtual SdrObject* GetMaxToBtmObj(SdrObject* pObj) const override; + virtual void MarkListHasChanged() override; // #i7672# // Override to reuse edit background color in active text edit view (OutlinerView) - virtual void ModelHasChanged() SAL_OVERRIDE; + virtual void ModelHasChanged() override; virtual void ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, - sal_uLong nNewPos ) SAL_OVERRIDE; - virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const SAL_OVERRIDE; - virtual void MakeVisible( const Rectangle&, vcl::Window &rWin ) SAL_OVERRIDE; - virtual void CheckPossibilities() SAL_OVERRIDE; + sal_uLong nNewPos ) override; + virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const override; + virtual void MakeVisible( const Rectangle&, vcl::Window &rWin ) override; + virtual void CheckPossibilities() override; const SwViewShellImp &Imp() const { return rImp; } SwViewShellImp &Imp() { return rImp; } @@ -102,7 +102,7 @@ public: // anchor and Xor for dragging void ShowDragAnchor(); - virtual void DeleteMarked() SAL_OVERRIDE; + virtual void DeleteMarked() override; inline void ValidateMarkList() { FlushComeBackTimer(); } diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index 054318b47b54..0e781ae4e29a 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( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; void MakePrtArea( const SwBorderAttrs &rAttrs ); void MakeContentPos( const SwBorderAttrs &rAttrs ); @@ -133,21 +133,21 @@ protected: SwFlyFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor ); - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwFlyFrm(); /** method to assure that anchored object is registered at the correct page frame */ - virtual void RegisterAtCorrectPage() SAL_OVERRIDE; + virtual void RegisterAtCorrectPage() override; - virtual bool _SetObjTop( const SwTwips _nTop ) SAL_OVERRIDE; - virtual bool _SetObjLeft( const SwTwips _nLeft ) SAL_OVERRIDE; + virtual bool _SetObjTop( const SwTwips _nTop ) override; + virtual bool _SetObjLeft( const SwTwips _nLeft ) override; - virtual const SwRect GetObjBoundRect() const SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual const SwRect GetObjBoundRect() const override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; - virtual const IDocumentDrawModelAccess& getIDocumentDrawModelAccess( ) SAL_OVERRIDE; + virtual const IDocumentDrawModelAccess& getIDocumentDrawModelAccess( ) override; SwTwips CalcContentHeight(const SwBorderAttrs *pAttrs, const SwTwips nMinHeight, const SwTwips nUL); @@ -156,17 +156,17 @@ public: TYPEINFO_OVERRIDE(); // get client information - virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool GetInfo( SfxPoolItem& ) const override; virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, - SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; - virtual Size ChgSize( const Size& aNewSize ) SAL_OVERRIDE; + SwPrintData const*const pPrintData = NULL ) const override; + virtual Size ChgSize( const Size& aNewSize ) override; virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const override; - virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; - virtual void Cut() SAL_OVERRIDE; + virtual void CheckDirection( bool bVert ) override; + virtual void Cut() override; #ifdef DBG_UTIL - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; #endif SwTwips _Shrink( SwTwips, bool bTst ); @@ -244,13 +244,13 @@ public: void InsertColumns(); // #i26791# - pure virtual methods of base class <SwAnchoredObject> - virtual void MakeObjPos() SAL_OVERRIDE; - virtual void InvalidateObjPos() SAL_OVERRIDE; + virtual void MakeObjPos() override; + virtual void InvalidateObjPos() override; - virtual SwFrameFormat& GetFrameFormat() SAL_OVERRIDE; - virtual const SwFrameFormat& GetFrameFormat() const SAL_OVERRIDE; + virtual SwFrameFormat& GetFrameFormat() override; + virtual const SwFrameFormat& GetFrameFormat() const override; - virtual const SwRect GetObjRect() const SAL_OVERRIDE; + virtual const SwRect GetObjRect() const override; /** method to determine if a format on the Writer fly frame is possible @@ -259,18 +259,18 @@ public: <SwAnchoredObject::IsFormatPossible()> by: format isn't possible, if Writer fly frame is locked resp. col-locked. */ - virtual bool IsFormatPossible() const SAL_OVERRIDE; + virtual bool IsFormatPossible() const override; static void GetAnchoredObjects( std::list<SwAnchoredObject*>&, const SwFormat& rFormat ); // overwriting "SwFrameFormat *SwLayoutFrm::GetFormat" to provide the correct derived return type. // (This is in order to skip on the otherwise necessary casting of the result to // 'SwFlyFrameFormat *' after calls to this function. The casting is now done in this function.) - virtual const SwFlyFrameFormat *GetFormat() const SAL_OVERRIDE; - virtual SwFlyFrameFormat *GetFormat() SAL_OVERRIDE; + virtual const SwFlyFrameFormat *GetFormat() const override; + virtual SwFlyFrameFormat *GetFormat() override; - virtual void dumpAsXml( xmlTextWriterPtr writer ) const SAL_OVERRIDE { SwLayoutFrm::dumpAsXml( writer ); }; + virtual void dumpAsXml( xmlTextWriterPtr writer ) const override { SwLayoutFrm::dumpAsXml( writer ); }; - virtual void Calc(vcl::RenderContext* pRenderContext) const SAL_OVERRIDE; + virtual void Calc(vcl::RenderContext* pRenderContext) const 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 01c3cb6a7e9d..080d2be0c039 100644 --- a/sw/source/core/inc/flyfrms.hxx +++ b/sw/source/core/inc/flyfrms.hxx @@ -61,17 +61,17 @@ protected: // method <NotifyBackground> friend class SwFlyNotify; virtual void NotifyBackground( SwPageFrm *pPage, - const SwRect& rRect, PrepareHint eHint) SAL_OVERRIDE; + const SwRect& rRect, PrepareHint eHint) override; SwFlyFreeFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor ); - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwFlyFreeFrm(); public: // #i28701# TYPEINFO_OVERRIDE(); - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; // #i37068# - accessors for member <mbNoMoveOnCheckClip> inline void SetNoMoveOnCheckClip( const bool _bNewNoMoveOnCheckClip ) @@ -118,7 +118,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 SAL_OVERRIDE; + virtual bool IsFormatPossible() const override; }; // Flys that are bound to LayoutFrms and not to Content @@ -131,25 +131,25 @@ public: SwFlyLayFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor ); protected: - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; }; // Flys that are bound to Content but not in Content class SwFlyAtCntFrm : public SwFlyFreeFrm { protected: - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; // #i28701# - virtual bool _InvalidationAllowed( const InvalidationType _nInvalid ) const SAL_OVERRIDE; + virtual bool _InvalidationAllowed( const InvalidationType _nInvalid ) const override; /** method to assure that anchored object is registered at the correct page frame #i28701# */ - virtual void RegisterAtCorrectPage() SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void RegisterAtCorrectPage() override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: // #i28701# @@ -160,7 +160,7 @@ public: void SetAbsPos( const Point &rNew ); // #i26791# - virtual void MakeObjPos() SAL_OVERRIDE; + virtual void MakeObjPos() override; /** method to determine, if a format on the Writer fly frame is possible @@ -169,7 +169,7 @@ public: <SwFlyFreeFrm::IsFormatPossible()> by: format isn't possible, if method <MakeAll()> is already in progress. */ - virtual bool IsFormatPossible() const SAL_OVERRIDE; + virtual bool IsFormatPossible() const override; }; // Flys that are bound to a character in Content @@ -180,14 +180,14 @@ class SwFlyInCntFrm : public SwFlyFrm bool bInvalidLayout :1; bool bInvalidContent :1; - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwFlyInCntFrm(); protected: virtual void NotifyBackground( SwPageFrm *pPage, - const SwRect& rRect, PrepareHint eHint) SAL_OVERRIDE; - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + const SwRect& rRect, PrepareHint eHint) override; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: // #i28701# @@ -195,7 +195,7 @@ public: SwFlyInCntFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor ); - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; void SetRefPoint( const Point& rPoint, const Point &rRelAttr, const Point &rRelPos ); @@ -217,11 +217,11 @@ public: void AddRefOfst( long nOfst ) { aRef.Y() += nOfst; } // #i26791# - virtual void MakeObjPos() SAL_OVERRIDE; + virtual void MakeObjPos() 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 ) SAL_OVERRIDE; + virtual void _ActionOnInvalidation( const InvalidationType _nInvalid ) override; }; inline void SwFlyInCntFrm::InvalidateLayout() const diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index a73901d3de94..1a70f1f6e358 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -130,7 +130,7 @@ class SwFntAccess : public SwCacheAccess { SwViewShell const *pShell; protected: - virtual SwCacheObj *NewObj( ) SAL_OVERRIDE; + virtual SwCacheObj *NewObj( ) 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 3e14805ec917..e6c245ee4d1c 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -411,7 +411,7 @@ protected: // draw shadow and borders void PaintShadow( const SwRect&, SwRect&, const SwBorderAttrs& ) const; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; virtual const IDocumentDrawModelAccess& getIDocumentDrawModelAccess( ); diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index 68e9cc0413e2..b8d1b727db1a 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -379,7 +379,7 @@ class SwBorderAttrAccess : public SwCacheAccess const SwFrm *pConstructor; //opt: for passing on to SwBorderAttrs protected: - virtual SwCacheObj *NewObj() SAL_OVERRIDE; + virtual SwCacheObj *NewObj() 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 fe5b10eddfdf..d17c70804ee9 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -40,12 +40,12 @@ public: const SwFootnoteFrm* FindFootNote() const; - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; virtual void PaintBorder( const SwRect &, const SwPageFrm *pPage, - const SwBorderAttrs & ) const SAL_OVERRIDE; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; + const SwBorderAttrs & ) const override; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; void PaintLine( const SwRect &, const SwPageFrm * ) const; }; @@ -66,17 +66,17 @@ class SwFootnoteFrm: public SwLayoutFrm bool mbUnlockPosOfLowerObjs : 1; #ifdef DBG_UTIL protected: - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; + virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; #endif public: SwFootnoteFrm( SwFrameFormat*, SwFrm*, SwContentFrm*, SwTextFootnote* ); - virtual void Cut() SAL_OVERRIDE; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void Cut() override; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; bool operator<( const SwTextFootnote* pTextFootnote ) const; diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx index 3adcec787e7c..50315e12fc51 100644 --- a/sw/source/core/inc/hffrm.hxx +++ b/sw/source/core/inc/hffrm.hxx @@ -32,12 +32,12 @@ protected: public: SwHeadFootFrm(SwFrameFormat * pFrm, SwFrm*, sal_uInt16 aType); - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; virtual SwTwips GrowFrm( SwTwips, - bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; + bool bTst = false, bool bInfo = false ) override; virtual SwTwips ShrinkFrm( SwTwips, - bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; + bool bTst = false, bool bInfo = false ) override; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const 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 0a39fc113997..bcc568c12785 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -48,17 +48,17 @@ class SwLayoutFrm: public SwFrm protected: - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwLayoutFrm(); - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; SwFrm * m_pLower; std::vector<SwAnchoredObject*> m_VertPosOrientFrmsFor; - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; + virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; long CalcRel( const SwFormatFrmSize &rSz, bool bWidth ) const; @@ -82,13 +82,13 @@ public: void PaintColLines( const SwRect &, const SwFormatCol &, const SwPageFrm * ) const; - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const override; virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const override; - virtual void Cut() SAL_OVERRIDE; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void Cut() override; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; /** * Finds the closest Content for the SPoint @@ -103,7 +103,7 @@ public: SwLayoutFrm( SwFrameFormat*, SwFrm* ); virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, - SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; + SwPrintData const*const pPrintData = NULL ) const override; const SwFrm *Lower() const { return m_pLower; } SwFrm *Lower() { return m_pLower; } const SwContentFrm *ContainsContent() const; diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx index f4241e096e6f..72638294e1ae 100644 --- a/sw/source/core/inc/notxtfrm.hxx +++ b/sw/source/core/inc/notxtfrm.hxx @@ -34,24 +34,24 @@ class SwNoTextFrm: public SwContentFrm void InitCtor(); - void Format ( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + void Format ( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; void PaintPicture( vcl::RenderContext*, const SwRect& ) const; - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwNoTextFrm(); protected: - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: SwNoTextFrm( SwNoTextNode * const, SwFrm* ); virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, - SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; + SwPrintData const*const pPrintData = NULL ) const override; virtual bool GetCharRect( SwRect &, const SwPosition&, - SwCrsrMoveState* = 0) const SAL_OVERRIDE; + SwCrsrMoveState* = 0) const override; virtual bool GetCrsrOfst(SwPosition* pPos, Point& aPoint, - SwCrsrMoveState* = 0, bool bTestBackground = false) const SAL_OVERRIDE; + SwCrsrMoveState* = 0, bool bTestBackground = false) const override; 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 1f41868696ed..408b256b8738 100644 --- a/sw/source/core/inc/observablethread.hxx +++ b/sw/source/core/inc/observablethread.hxx @@ -63,7 +63,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() SAL_OVERRIDE; + virtual void SAL_CALL run() override; virtual void threadFunction() = 0; @@ -75,7 +75,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() SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() override; private: diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index 1318e1444cbd..d2e797e53b6f 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -102,13 +102,13 @@ class SwPageFrm: public SwFootnoteBossFrm bool bPaintRightShadow, bool bRightSidebar ); - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwPageFrm(); protected: - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; - virtual void SwClientNotify(const SwModify&, const SfxHint&) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; + virtual void SwClientNotify(const SwModify&, const SfxHint&) override; public: DECL_FIXEDMEMPOOL_NEWDEL(SwPageFrm) @@ -165,20 +165,20 @@ public: void PlaceFly( SwFlyFrm* pFly, SwFlyFrameFormat* pFormat ); virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const override; /// Get info from Client - virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool GetInfo( SfxPoolItem& ) const override; - virtual void Cut() SAL_OVERRIDE; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; - virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; + virtual void Cut() override; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; + virtual void CheckDirection( bool bVert ) override; void CheckGrid( bool bInvalidate ); void PaintGrid( OutputDevice* pOut, SwRect &rRect ) const; bool HasGrid() const { return bHasGrid; } void PaintDecorators( ) const; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; - virtual void PaintBreak() const SAL_OVERRIDE; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; + virtual void PaintBreak() const override; /// Paint line number etc. void RefreshExtraData( const SwRect & ) const; @@ -316,7 +316,7 @@ public: */ sw::sidebarwindows::SidebarPosition SidebarPosition() const; - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const override; const SwRect PrtWithoutHeaderAndFooter() const; diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx index 6fe273e35516..3e4e94af960b 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() SAL_OVERRIDE; + virtual void threadFunction() override; private: diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index 6d4ca2f1f6b6..c955e61eaa42 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -97,8 +97,8 @@ class SwHistorySetFormat : public SwHistoryHint public: SwHistorySetFormat( const SfxPoolItem* pFormatHt, sal_uLong nNode ); virtual ~SwHistorySetFormat(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; - virtual OUString GetDescription() const SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; + virtual OUString GetDescription() const override; }; @@ -109,7 +109,7 @@ class SwHistoryResetFormat : public SwHistoryHint public: SwHistoryResetFormat( const SfxPoolItem* pFormatHt, sal_uLong nNodeIdx ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; @@ -125,7 +125,7 @@ class SwHistorySetText : public SwHistoryHint public: SwHistorySetText( SwTextAttr* pTextHt, sal_uLong nNode ); virtual ~SwHistorySetText(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; @@ -143,9 +143,9 @@ class SwHistorySetTextField : public SwHistoryHint public: SwHistorySetTextField( SwTextField* pTextField, sal_uLong nNode ); virtual ~SwHistorySetTextField(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; - virtual OUString GetDescription() const SAL_OVERRIDE; + virtual OUString GetDescription() const override; }; @@ -158,7 +158,7 @@ class SwHistorySetRefMark : public SwHistoryHint public: SwHistorySetRefMark( SwTextRefMark* pTextHt, sal_uLong nNode ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; @@ -173,7 +173,7 @@ class SwHistorySetTOXMark : public SwHistoryHint public: SwHistorySetTOXMark( SwTextTOXMark* pTextHt, sal_uLong nNode ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; bool IsEqual( const SwTOXMark& rCmp ) const; }; @@ -188,7 +188,7 @@ class SwHistoryResetText : public SwHistoryHint public: SwHistoryResetText( sal_uInt16 nWhich, sal_Int32 nStt, sal_Int32 nEnd, sal_uLong nNode ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; sal_uInt16 GetWhich() const { return m_nAttr; } sal_uLong GetNode() const { return m_nNodeIndex; } @@ -208,9 +208,9 @@ public: SwHistorySetFootnote( SwTextFootnote* pTextFootnote, sal_uLong nNode ); SwHistorySetFootnote( const SwTextFootnote& ); virtual ~SwHistorySetFootnote(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; - virtual OUString GetDescription() const SAL_OVERRIDE; + virtual OUString GetDescription() const override; }; @@ -222,7 +222,7 @@ class SwHistoryChangeFormatColl : public SwHistoryHint public: SwHistoryChangeFormatColl( SwFormatColl* pColl, sal_uLong nNode, sal_uInt8 nNodeWhich ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; @@ -233,7 +233,7 @@ class SwHistoryTextFlyCnt : public SwHistoryHint public: SwHistoryTextFlyCnt( SwFrameFormat* const pFlyFormat ); virtual ~SwHistoryTextFlyCnt(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; SwUndoDelLayFormat* GetUDelLFormat() { return m_pUndo.get(); } }; @@ -243,7 +243,7 @@ class SwHistoryBookmark : public SwHistoryHint public: SwHistoryBookmark(const ::sw::mark::IMark& rBkmk, bool bSavePos, bool bSaveOtherPos); - virtual void SetInDoc(SwDoc * pDoc, bool) SAL_OVERRIDE; + virtual void SetInDoc(SwDoc * pDoc, bool) override; bool IsEqualBookmark(const ::sw::mark::IMark& rBkmk); const OUString& GetName() const { return m_aName;} @@ -272,7 +272,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 ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; @@ -287,7 +287,7 @@ public: SwHistoryResetAttrSet( const SfxItemSet& rSet, sal_uLong nNode, sal_Int32 nStt, sal_Int32 nEnd); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; const std::vector<sal_uInt16>& GetArr() const { return m_Array; } sal_uLong GetNode() const { return m_nNodeIndex; } @@ -303,7 +303,7 @@ class SwHistoryChangeFlyAnchor : public SwHistoryHint public: SwHistoryChangeFlyAnchor( SwFrameFormat& rFormat ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; class SwHistoryChangeFlyChain : public SwHistoryHint @@ -314,7 +314,7 @@ class SwHistoryChangeFlyChain : public SwHistoryHint public: SwHistoryChangeFlyChain( SwFlyFrameFormat& rFormat, const SwFormatChain& rAttr ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; class SwHistoryChangeCharFormat : public SwHistoryHint @@ -324,7 +324,7 @@ class SwHistoryChangeCharFormat : public SwHistoryHint public: SwHistoryChangeCharFormat( const SfxItemSet& rSet, const OUString & sFormat); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; @@ -398,7 +398,7 @@ private: void _MakeSetWhichIds(); protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override; public: SwRegHistory( SwHistory* pHst ); diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 61cac40a16cb..30fb92d92932 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -145,12 +145,12 @@ class SwRootFrm: public SwLayoutFrm void _DeleteEmptySct(); // Destroys the registered SectionFrms void _RemoveFromList( SwSectionFrm* pSct ); // Removes SectionFrms from the Delete List - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwRootFrm(); protected: - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; public: @@ -197,22 +197,22 @@ public: void SetDrawPage( SdrPage* pNew ){ mpDrawPage = pNew; } virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const override; virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, - SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; + SwPrintData const*const pPrintData = NULL ) const override; + virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; #ifdef DBG_UTIL - virtual void Cut() SAL_OVERRIDE; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void Cut() override; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; #endif - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const override; Point GetNextPrevContentPos( const Point &rPoint, bool bNext ) const; - virtual Size ChgSize( const Size& aNewSize ) SAL_OVERRIDE; + virtual Size ChgSize( const Size& aNewSize ) override; void SetIdleFlags() { diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx index d86379b77008..78f88aaac0f9 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( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; /// Only change the Frame size, not the PrtArea SSize - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; + virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; const SwTableLine * m_pTabLine; SwRowFrm * m_pFollowRow; @@ -45,17 +45,17 @@ class SwRowFrm: public SwLayoutFrm bool m_bIsRepeatedHeadline; bool m_bIsRowSpanLine; - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwRowFrm(); protected: - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: SwRowFrm( const SwTableLine &, SwFrm*, bool bInsertContent = true ); - virtual void Cut() SAL_OVERRIDE; + virtual void Cut() override; /** * Register Flys after a line was created _AND_ inserted diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index cbdfbe27365c..208c32562b79 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -54,27 +54,27 @@ class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm const SwSectionFormat* _GetEndSectFormat() const; bool IsEndnoteAtMyEnd() const; - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwSectionFrm(); protected: - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) SAL_OVERRIDE; - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; - virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; + virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) override; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; + virtual void SwClientNotify( const SwModify&, const SfxHint& ) override; public: SwSectionFrm( SwSection &, SwFrm* ); // Content is not created! SwSectionFrm( SwSectionFrm &, bool bMaster ); // _ONLY_ for creating Master/Follows! void Init(); - virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; + virtual void CheckDirection( bool bVert ) override; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; - virtual void Cut() SAL_OVERRIDE; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void Cut() override; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; inline const SwSectionFrm *GetFollow() const; inline SwSectionFrm *GetFollow(); @@ -138,7 +138,7 @@ public: bool IsBalancedSection() const; - virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const SAL_OVERRIDE; + virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const override; bool IsFootnoteAtEnd() const { return bFootnoteAtEnd; } bool IsEndnAtEnd() const { return bEndnAtEnd; } diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx index 24b39d0405c7..69338d5c3f86 100644 --- a/sw/source/core/inc/swfntcch.hxx +++ b/sw/source/core/inc/swfntcch.hxx @@ -68,7 +68,7 @@ class SwFontAccess : public SwCacheAccess { SwViewShell *pShell; protected: - virtual SwCacheObj *NewObj( ) SAL_OVERRIDE; + virtual SwCacheObj *NewObj( ) 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 a6e9363e8d4f..e88bd4d826cc 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -99,17 +99,17 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 ); - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) SAL_OVERRIDE; + virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) override; - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwTabFrm(); protected: - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; // only changes the Framesize, not the PrtArea size - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; + virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; public: SwTabFrm( SwTable &, SwFrm* ); // calling Regist Flys always after creation _and_pasting! @@ -124,16 +124,16 @@ public: inline SwTabFrm *GetFollow(); SwTabFrm* FindMaster( bool bFirstMaster = false ) const; - virtual bool GetInfo( SfxPoolItem &rHint ) const SAL_OVERRIDE; + virtual bool GetInfo( SfxPoolItem &rHint ) const override; virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, - SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; - virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; + SwPrintData const*const pPrintData = NULL ) const override; + virtual void CheckDirection( bool bVert ) override; - virtual void Cut() SAL_OVERRIDE; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void Cut() override; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; virtual bool Prepare( const PrepareHint ePrep = PREP_CLEAR, - const void *pVoid = 0, bool bNotify = true ) SAL_OVERRIDE; + const void *pVoid = 0, bool bNotify = true ) override; SwContentFrm *FindLastContent(); inline const SwContentFrm *FindLastContent() const; @@ -218,7 +218,7 @@ public: sal_uInt16 GetBottomLineSize() const; - virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const SAL_OVERRIDE; + virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const override; DECL_FIXEDMEMPOOL_NEWDEL(SwTabFrm) }; diff --git a/sw/source/core/inc/textapi.hxx b/sw/source/core/inc/textapi.hxx index 412df33720f7..8600e9b40034 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 SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual void UpdateData() SAL_OVERRIDE; + virtual SvxEditSource* Clone() const override; + virtual SvxTextForwarder* GetTextForwarder() override; + virtual void UpdateData() override; explicit SwTextAPIEditSource( const SwTextAPIEditSource& rSource ); public: diff --git a/sw/source/core/inc/threadlistener.hxx b/sw/source/core/inc/threadlistener.hxx index 7d39c45e08c6..0dd65310b539 100644 --- a/sw/source/core/inc/threadlistener.hxx +++ b/sw/source/core/inc/threadlistener.hxx @@ -44,7 +44,7 @@ class ThreadListener : public IFinishedThreadListener void ListenToThread( const oslInterlockedCount nThreadID, ObservableThread& rThread ); - virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) SAL_OVERRIDE; + virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) override; private: diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx index 077d5fbd14c9..e332af4c4b9c 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 SAL_OVERRIDE; - virtual const SwFrm* ToCharOrientFrm() const SAL_OVERRIDE; - virtual const SwRect* ToCharRect() const SAL_OVERRIDE; + virtual bool IsAnchoredToChar() const override; + virtual const SwFrm* ToCharOrientFrm() const override; + virtual const SwRect* ToCharRect() const override; // #i22341# - virtual SwTwips ToCharTopOfLine() const SAL_OVERRIDE; + virtual SwTwips ToCharTopOfLine() const override; // method to cast <SwAnchoredObjectPosition::GetAnchorFrm()> to // the needed type @@ -76,7 +76,7 @@ namespace objectpositioning /** calculate position of object */ - virtual void CalcPosition() SAL_OVERRIDE; + virtual void CalcPosition() 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 ca89944a37f4..debc00fb6e79 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() SAL_OVERRIDE; + virtual void CalcPosition() override; /** calculated relative position for object */ diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index 1fd7a0816b5b..c0235ad5a1fd 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -182,13 +182,13 @@ struct SwTOXIndex : public SwTOXSortTabBase const ::com::sun::star::lang::Locale& rLocale ); virtual ~SwTOXIndex() {} - virtual void FillText( SwTextNode& 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; + virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const override; + virtual sal_uInt16 GetLevel() const override; + virtual bool operator==( const SwTOXSortTabBase& ) override; + virtual bool operator<( const SwTOXSortTabBase& ) override; private: - virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; + virtual TextAndReading GetText_Impl() const override; sal_uInt8 nKeyLevel; }; @@ -200,12 +200,12 @@ struct SwTOXCustom : public SwTOXSortTabBase const ::com::sun::star::lang::Locale& rLocale ); virtual ~SwTOXCustom() {} - virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; - virtual bool operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE; - virtual bool operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE; + virtual sal_uInt16 GetLevel() const override; + virtual bool operator==( const SwTOXSortTabBase& ) override; + virtual bool operator<( const SwTOXSortTabBase& ) override; private: - virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; + virtual TextAndReading GetText_Impl() const override; TextAndReading m_aKey; sal_uInt16 nLev; @@ -220,10 +220,10 @@ struct SwTOXContent : public SwTOXSortTabBase const SwTOXInternational& rIntl ); virtual ~SwTOXContent() {} - virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE; - virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; + virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const override; + virtual sal_uInt16 GetLevel() const override; private: - virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; + virtual TextAndReading GetText_Impl() const override; }; @@ -235,12 +235,12 @@ struct SwTOXPara : public SwTOXSortTabBase void SetStartIndex(sal_Int32 nSet) { nStartIndex = nSet; } void SetEndIndex(sal_Int32 nSet) { nEndIndex = nSet; } - virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE; - virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; + virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const override; + virtual sal_uInt16 GetLevel() const override; - virtual OUString GetURL() const SAL_OVERRIDE; + virtual OUString GetURL() const override; private: - virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; + virtual TextAndReading GetText_Impl() const override; SwTOXElement eType; sal_uInt16 m_nLevel; @@ -256,11 +256,11 @@ struct SwTOXTable : public SwTOXSortTabBase void SetLevel(sal_uInt16 nSet){nLevel = nSet;} - virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; + virtual sal_uInt16 GetLevel() const override; - virtual OUString GetURL() const SAL_OVERRIDE; + virtual OUString GetURL() const override; private: - virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; + virtual TextAndReading GetText_Impl() const override; sal_uInt16 nLevel; }; @@ -269,8 +269,8 @@ struct SwTOXAuthority : public SwTOXSortTabBase { private: SwFormatField& m_rField; - virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE; - virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; + virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const override; + virtual TextAndReading GetText_Impl() const override; public: SwTOXAuthority( const SwContentNode& rNd, SwFormatField& rField, const SwTOXInternational& rIntl ); @@ -278,9 +278,9 @@ public: SwFormatField& GetFieldFormat() {return m_rField;} - virtual bool operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE; - virtual bool operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE; - virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; + virtual bool operator==( const SwTOXSortTabBase& ) override; + virtual bool operator<( const SwTOXSortTabBase& ) override; + virtual sal_uInt16 GetLevel() const 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 72446daa9690..978ba81f944c 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -196,15 +196,15 @@ class SwTextFrm: public SwContentFrm */ void _CalcHeightOfLastLine( const bool _bUseFont = false ); - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwTextFrm(); protected: - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: - com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetTabStopInfo( SwTwips CurrentPos ) SAL_OVERRIDE; + com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetTabStopInfo( SwTwips CurrentPos ) override; /** * This is public, as it needs to be called by some methods in order to save the Prepare @@ -228,7 +228,7 @@ public: * Returns false if rPos > number of character is string */ virtual bool GetCharRect( SwRect& rRect, const SwPosition& rPos, - SwCrsrMoveState* pCMS = 0 ) const SAL_OVERRIDE; + SwCrsrMoveState* pCMS = 0 ) const override; /// A slimmer version of GetCharRect for autopositioning Frames bool GetAutoPos( SwRect &, const SwPosition& ) const; @@ -256,7 +256,7 @@ public: bool GetTopOfLine( SwTwips& _onTopOfLine, const SwPosition& _rPos ) const; - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const override; /** * In nOffset returns the offset of the char within the set @@ -267,7 +267,7 @@ public: * returns true */ virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const override; /** * Makes sure that the Frame is not switched (e.g. switched for a @@ -279,21 +279,21 @@ public: void PaintExtraData( const SwRect & rRect ) const; /// Page number etc. SwRect Paint(); virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, - SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; - virtual bool GetInfo( SfxPoolItem & ) const SAL_OVERRIDE; + SwPrintData const*const pPrintData = NULL ) const override; + virtual bool GetInfo( SfxPoolItem & ) const override; /** * Layout oriented cursor travelling: * Left border, right border, previous Line, following Line, * same horizontal position */ - virtual bool LeftMargin(SwPaM *) const SAL_OVERRIDE; - virtual bool RightMargin(SwPaM *, bool bAPI = false) const SAL_OVERRIDE; + virtual bool LeftMargin(SwPaM *) const override; + virtual bool RightMargin(SwPaM *, bool bAPI = false) const override; virtual bool UnitUp(SwPaM *, const SwTwips nOffset = 0, - bool bSetInReadOnly = false ) const SAL_OVERRIDE; + bool bSetInReadOnly = false ) const override; virtual bool UnitDown(SwPaM *, const SwTwips nOffset = 0, - bool bSetInReadOnly = false ) const SAL_OVERRIDE; + bool bSetInReadOnly = false ) const override; bool _UnitUp(SwPaM *, const SwTwips nOffset = 0, bool bSetInReadOnly = false ) const; bool _UnitDown(SwPaM *, const SwTwips nOffset = 0, @@ -338,14 +338,14 @@ public: * potentially destroyed and replaced by Prepare */ virtual bool Prepare( const PrepareHint ePrep = PREP_CLEAR, - const void *pVoid = 0, bool bNotify = true ) SAL_OVERRIDE; + const void *pVoid = 0, bool bNotify = true ) 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 ) SAL_OVERRIDE; + virtual bool WouldFit( SwTwips &nMaxHeight, bool &bSplit, bool bTst ) override; /** * The WouldFit equivalent for temporarily rewired TextFrames @@ -433,8 +433,8 @@ public: */ SwTwips GetFootnoteLine( const SwTextFootnote *pFootnote ) const; - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; - virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; + virtual void CheckDirection( bool bVert ) override; /// Returns the sum of line height in pLine sal_uInt16 GetParHeight() const; @@ -629,7 +629,7 @@ public: static void repaintTextFrames( const SwTextNode& rNode ); - virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const SAL_OVERRIDE; + virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const override; }; //use this to protect a SwTextFrm for a given scope from getting merged with diff --git a/sw/source/core/inc/undoflystrattr.hxx b/sw/source/core/inc/undoflystrattr.hxx index 66440e8696eb..130a1f95779e 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 & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; private: SwFlyFrameFormat& mrFlyFrameFormat; diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx index 22bf7de4b6bc..612cacb898a4 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() SAL_OVERRIDE; + virtual ::sfx2::Metadatable* GetCoreObject() override; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > GetModel() SAL_OVERRIDE; + ::com::sun::star::frame::XModel > GetModel() 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) 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; + 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) 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) 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) SAL_OVERRIDE; + 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) 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) 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; + 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) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess - 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; + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; protected: //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; private: ::sw::mark::IFieldmark::parameter_map_t* getCoreParameters() throw (::com::sun::star::uno::RuntimeException); }; @@ -246,13 +246,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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException) override; virtual OUString SAL_CALL getFieldType() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setFieldType(const OUString& description ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getParameters( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -260,13 +260,13 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; }; class SwXODFCheckboxField : public SwXFieldmark diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx index 26fb808c7ebf..db01ae888c96 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() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; protected: virtual ~SwHyperlinkEventDescriptor(); public: @@ -71,12 +71,12 @@ public: virtual ~SwFrameEventDescriptor(); virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; protected: - virtual void setMacroItem(const SvxMacroItem& rItem) SAL_OVERRIDE; - virtual const SvxMacroItem& getMacroItem() SAL_OVERRIDE; - virtual sal_uInt16 getMacroItemWhich() const SAL_OVERRIDE; + virtual void setMacroItem(const SvxMacroItem& rItem) override; + virtual const SvxMacroItem& getMacroItem() override; + virtual sal_uInt16 getMacroItemWhich() const override; }; class SwFrameStyleEventDescriptor : public SvEventDescriptor @@ -91,12 +91,12 @@ public: virtual ~SwFrameStyleEventDescriptor(); virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; protected: - virtual void setMacroItem(const SvxMacroItem& rItem) SAL_OVERRIDE; - virtual const SvxMacroItem& getMacroItem() SAL_OVERRIDE; - virtual sal_uInt16 getMacroItemWhich() const SAL_OVERRIDE; + virtual void setMacroItem(const SvxMacroItem& rItem) override; + virtual const SvxMacroItem& getMacroItem() override; + virtual sal_uInt16 getMacroItemWhich() const override; }; #endif diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx index b2aa572d9cdb..7669abd6f018 100644 --- a/sw/source/core/inc/unofield.hxx +++ b/sw/source/core/inc/unofield.hxx @@ -76,35 +76,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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -112,40 +112,40 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XUpdatable virtual void SAL_CALL update() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XTextField virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> SAL_CALL getTextFieldMaster() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; @@ -306,21 +306,21 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx index a9cd27892fe6..b173d03bc930 100644 --- a/sw/source/core/inc/unoflatpara.hxx +++ b/sw/source/core/inc/unoflatpara.hxx @@ -61,7 +61,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -69,60 +69,60 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // text::XTextMarkup: - virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override; // text::XFlatParagraph: - 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; + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setChecked(::sal_Int32 nType, sal_Bool bVal) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isChecked(::sal_Int32 nType) throw (css::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) 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) 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) override; + virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException, std::exception) override; using SwXTextMarkup::GetTextNode; @@ -130,7 +130,7 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething(const css::uno::Sequence< sal_Int8 >& rId) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: SwXFlatParagraph( const SwXFlatParagraph & ) = delete; @@ -151,15 +151,15 @@ public: virtual ~SwXFlatParagraphIterator(); // text::XFlatParagraphIterator: - 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; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getFirstPara() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getNextPara() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getLastPara() throw (css::uno::RuntimeException, std::exception) 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) 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) override; protected: // SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; private: SwXFlatParagraphIterator( const SwXFlatParagraphIterator & ) = delete; diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx index 67eae2330250..d687dbb644b2 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 SAL_OVERRIDE; + virtual const SwStartNode *GetStartNode() const override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > CreateCursor() - throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException) override; virtual ~SwXFootnote(); @@ -78,52 +78,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) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } + throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -131,80 +131,80 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XFootnote virtual OUString SAL_CALL getLabel() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setLabel(const OUString& rLabel) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XSimpleText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx index fb0f948d974a..8d662c25988b 100644 --- a/sw/source/core/inc/unoidx.hxx +++ b/sw/source/core/inc/unoidx.hxx @@ -76,44 +76,44 @@ public: TOXTypes eTypes = TOX_INDEX); // MetadatableMixin - virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE; + virtual ::sfx2::Metadatable* GetCoreObject() override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - GetModel() SAL_OVERRIDE; + GetModel() 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XRefreshable virtual void SAL_CALL refresh() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XDocumentIndex virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL update() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XDocumentIndexMark virtual OUString SAL_CALL getMarkEntry() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setMarkEntry(const OUString& rIndexEntry) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index 029999d61444..c80ea70f7e03 100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -113,108 +113,108 @@ public: ::com::sun::star::uno::RuntimeException); // MetadatableMixin - virtual ::sfx2::Metadatable * GetCoreObject() SAL_OVERRIDE; + virtual ::sfx2::Metadatable * GetCoreObject() override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - GetModel() SAL_OVERRIDE; + GetModel() 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::lang::NoSupportException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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_OVERRIDE; + SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) 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; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getString() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setString(const OUString& rString) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XSimpleText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XText virtual void SAL_CALL insertTextContent( @@ -224,12 +224,12 @@ public: ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; }; @@ -268,31 +268,31 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -300,54 +300,54 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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 ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XTextField virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index 036ab7e4b9a6..ac180a65433e 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -144,7 +144,7 @@ protected: virtual ~SwXTextPortion(); //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; public: SwXTextPortion(const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const& rParent, SwTextPortionType eType ); @@ -158,51 +158,51 @@ public: 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 ) 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; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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) 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; + 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) 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) 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) 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) 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; + 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) 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) 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) 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) 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) override; //XPropertySet - 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; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) 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) 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; + 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) 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) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) 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) override; //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) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; //XServiceInfo - 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; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + 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 ) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; void SetRefMark( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > xMark) @@ -266,24 +266,24 @@ 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) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; //XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; }; class SwXRedlinePortion : public SwXTextPortion @@ -312,14 +312,14 @@ public: SwRangeRedline const& rRedline, bool const bIsStart) throw(); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx index 29641aa16384..cac6f29d3dae 100644 --- a/sw/source/core/inc/unorefmark.hxx +++ b/sw/source/core/inc/unorefmark.hxx @@ -65,35 +65,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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -101,56 +101,56 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx index 3c0fea4cecc0..31fa12473e0e 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() SAL_OVERRIDE; + virtual ::sfx2::Metadatable* GetCoreObject() override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - GetModel() SAL_OVERRIDE; + GetModel() 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XTextSection virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection > SAL_CALL getParentSection() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx index f24fc9731a9b..55ecb9036f55 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) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + 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) override; private: SwXTextMarkup( const SwXTextMarkup & ) = delete; @@ -89,12 +89,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) 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; + 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) override; + virtual sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) override; + virtual ::sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) 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) override; private: SwXStringKeyMap(SwXStringKeyMap &) = delete; diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx index 109b9b55cf80..f9647fbcaf8c 100644 --- a/sw/source/core/inc/visiturl.hxx +++ b/sw/source/core/inc/visiturl.hxx @@ -31,7 +31,7 @@ public: SwURLStateChanged( SwDoc* pD ); virtual ~SwURLStateChanged(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; }; #endif |