From 567ef6d5782cdb729b49005caf6005610ce03e22 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 27 Mar 2014 18:12:18 +0100 Subject: Second batch of adding SAL_OVERRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f --- sd/inc/CustomAnimationEffect.hxx | 30 ++++++++-------- sd/inc/Outliner.hxx | 4 +-- sd/inc/anminfo.hxx | 2 +- sd/inc/drawdoc.hxx | 30 ++++++++-------- sd/inc/imapinfo.hxx | 2 +- sd/inc/pglink.hxx | 4 +-- sd/inc/sdattr.hxx | 22 ++++++------ sd/inc/sdcgmfilter.hxx | 2 +- sd/inc/sdgrffilter.hxx | 2 +- sd/inc/sdhtmlfilter.hxx | 2 +- sd/inc/sdmod.hxx | 8 ++--- sd/inc/sdpage.hxx | 46 ++++++++++++------------- sd/inc/sdpptwrp.hxx | 2 +- sd/inc/sdundo.hxx | 2 +- sd/inc/sdxmlwrp.hxx | 2 +- sd/inc/shapelist.hxx | 2 +- sd/inc/stlfamily.hxx | 54 ++++++++++++++--------------- sd/inc/stlpool.hxx | 32 ++++++++--------- sd/inc/stlsheet.hxx | 74 ++++++++++++++++++++-------------------- sd/inc/undo/undofactory.hxx | 12 +++---- sd/inc/undo/undomanager.hxx | 4 +-- sd/inc/undo/undoobjects.hxx | 36 +++++++++---------- sd/inc/undoanim.hxx | 18 +++++----- 23 files changed, 196 insertions(+), 196 deletions(-) (limited to 'sd/inc') diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index 5c67fcb6693b..fd7d5c69afc2 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -370,10 +370,10 @@ public: InteractiveSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer >& xSequenceRoot, MainSequence* pMainSequence ); /** this method rebuilds the animation nodes */ - virtual void rebuild(); + virtual void rebuild() SAL_OVERRIDE; private: - virtual void implRebuild(); + virtual void implRebuild() SAL_OVERRIDE; MainSequence* mpMainSequence; }; @@ -392,23 +392,23 @@ public: MainSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTimingRootNode ); ~MainSequence(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRootNode(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRootNode() SAL_OVERRIDE; void reset( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTimingRootNode ); /** this method rebuilds the animation nodes */ - virtual void rebuild(); + virtual void rebuild() SAL_OVERRIDE; - virtual CustomAnimationEffectPtr findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const; + virtual CustomAnimationEffectPtr findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const SAL_OVERRIDE; - virtual bool disposeShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); - virtual void insertTextRange( const com::sun::star::uno::Any& aTarget ); - virtual void disposeTextRange( const com::sun::star::uno::Any& aTarget ); - virtual bool hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); - virtual void onTextChanged( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); + virtual bool disposeShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) SAL_OVERRIDE; + virtual void insertTextRange( const com::sun::star::uno::Any& aTarget ) SAL_OVERRIDE; + virtual void disposeTextRange( const com::sun::star::uno::Any& aTarget ) SAL_OVERRIDE; + virtual bool hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) SAL_OVERRIDE; + virtual void onTextChanged( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) SAL_OVERRIDE; const InteractiveSequenceList& getInteractiveSequenceList() const { return maInteractiveSequenceList; } - virtual void notify_change(); + virtual void notify_change() SAL_OVERRIDE; bool setTrigger( const CustomAnimationEffectPtr& pEffect, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTriggerShape ); @@ -418,8 +418,8 @@ public: /** starts a timer that rebuilds the API core from the internal structure after 1 second */ void startRebuildTimer(); - virtual sal_Int32 getOffsetFromEffect( const CustomAnimationEffectPtr& xEffect ) const; - virtual CustomAnimationEffectPtr getEffectFromOffset( sal_Int32 nOffset ) const; + virtual sal_Int32 getOffsetFromEffect( const CustomAnimationEffectPtr& xEffect ) const SAL_OVERRIDE; + virtual CustomAnimationEffectPtr getEffectFromOffset( sal_Int32 nOffset ) const SAL_OVERRIDE; protected: /** permits rebuilds until unlockRebuilds() is called. All rebuild calls during a locked sequence are @@ -429,12 +429,12 @@ protected: DECL_LINK(onTimerHdl, void *); - virtual void implRebuild(); + virtual void implRebuild() SAL_OVERRIDE; void init(); void createMainSequence(); - virtual void reset(); + virtual void reset() SAL_OVERRIDE; InteractiveSequencePtr createInteractiveSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index 12cd4bb8b9e2..1360a8eb6c4c 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -150,7 +150,7 @@ public: void EndSpelling (void); /** callback for textconversion */ - bool ConvertNextDocument (void); + bool ConvertNextDocument (void) SAL_OVERRIDE; /** Starts the text conversion (hangul/hanja or Chinese simplified/traditional) for the current viewshell */ @@ -526,7 +526,7 @@ private: required. When all text objects have been processed then is returned. */ - virtual bool SpellNextDocument (void); + virtual bool SpellNextDocument (void) SAL_OVERRIDE; /** Show the given message box and make it modal. It is assumed that the parent of the given dialog is NULL, i.e. the application diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx index 0e1c65f5fcbc..794b2d19a4d7 100644 --- a/sd/inc/anminfo.hxx +++ b/sd/inc/anminfo.hxx @@ -67,7 +67,7 @@ public: SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rObject); virtual ~SdAnimationInfo(); - virtual SdrObjUserData* Clone(SdrObject* pObject) const; + virtual SdrObjUserData* Clone(SdrObject* pObject) const SAL_OVERRIDE; }; #endif // INCLUDED_SD_INC_ANMINFO_HXX diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index a9db2d1ec6e9..f6311628a69b 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -204,7 +204,7 @@ private: protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() SAL_OVERRIDE; public: @@ -213,9 +213,9 @@ public: SdDrawDocument(DocumentType eType, SfxObjectShell* pDocSh); ~SdDrawDocument(); - virtual SdrModel* AllocModel() const; - virtual SdrPage* AllocPage(bool bMasterPage); - virtual bool IsReadOnly() const; + virtual SdrModel* AllocModel() const SAL_OVERRIDE; + virtual SdrPage* AllocPage(bool bMasterPage) SAL_OVERRIDE; + virtual bool IsReadOnly() const SAL_OVERRIDE; virtual void SetChanged(bool bFlag = true) SAL_OVERRIDE; SfxItemPool& GetPool() { return( *pItemPool ); } @@ -228,7 +228,7 @@ public: LanguageType GetLanguage( const sal_uInt16 nId ) const; void SetLanguage( const LanguageType eLang, const sal_uInt16 nId ); - SvxNumType GetPageNumType() const; + SvxNumType GetPageNumType() const SAL_OVERRIDE; void SetPageNumType(SvxNumType eType) { mePageNumType = eType; } SD_DLLPUBLIC OUString CreatePageNumValue(sal_uInt16 nNum) const; @@ -246,13 +246,13 @@ public: SD_DLLPUBLIC void CreateFirstPages( SdDrawDocument* pRefDocument = 0 ); SD_DLLPUBLIC sal_Bool CreateMissingNotesAndHandoutPages(); - void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos); - void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); - void DeletePage(sal_uInt16 nPgNum); - SdrPage* RemovePage(sal_uInt16 nPgNum); + void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) SAL_OVERRIDE; + void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF) SAL_OVERRIDE; + void DeletePage(sal_uInt16 nPgNum) SAL_OVERRIDE; + SdrPage* RemovePage(sal_uInt16 nPgNum) SAL_OVERRIDE; - virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); - virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum); + virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF) SAL_OVERRIDE; + virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum) SAL_OVERRIDE; void RemoveUnnecessaryMasterPages( SdPage* pMaster=NULL, sal_Bool bOnlyDuplicatePages=sal_False, sal_Bool bUndo=sal_True ); SD_DLLPUBLIC void SetMasterPage(sal_uInt16 nSdPageNum, const OUString& rLayoutName, @@ -456,7 +456,7 @@ public: sal_uInt16 nFirstPageNum=0, sal_uInt16 nLastPageNum=0xFFFF, sal_uInt16 nDestPos=0xFFFF, bool bMergeMasterPages = false, bool bAllMasterPages = false, - bool bUndo = true, bool bTreadSourceAsConst = false); + bool bUndo = true, bool bTreadSourceAsConst = false) SAL_OVERRIDE; SD_DLLPUBLIC ::com::sun::star::text::WritingMode GetDefaultWritingMode() const; void SetDefaultWritingMode( ::com::sun::star::text::WritingMode eMode ); @@ -657,9 +657,9 @@ private: sal_Bool bIsPageBack, sal_Bool bIsPageObj); - virtual void PageListChanged(); - virtual void MasterPageListChanged(); - virtual ImageMap* GetImageMapForObject(SdrObject* pObj); + virtual void PageListChanged() SAL_OVERRIDE; + virtual void MasterPageListChanged() SAL_OVERRIDE; + virtual ImageMap* GetImageMapForObject(SdrObject* pObj) SAL_OVERRIDE; }; namespace sd diff --git a/sd/inc/imapinfo.hxx b/sd/inc/imapinfo.hxx index 2efbe1a837ad..16f539a8d8f6 100644 --- a/sd/inc/imapinfo.hxx +++ b/sd/inc/imapinfo.hxx @@ -45,7 +45,7 @@ public: virtual ~SdIMapInfo() {}; - virtual SdrObjUserData* Clone( SdrObject* ) const { return new SdIMapInfo( *this ); } + virtual SdrObjUserData* Clone( SdrObject* ) const SAL_OVERRIDE { return new SdIMapInfo( *this ); } void SetImageMap( const ImageMap& rIMap ) { aImageMap = rIMap; } const ImageMap& GetImageMap() const { return aImageMap; } diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx index 97c597e5446d..c1a6507289c3 100644 --- a/sd/inc/pglink.hxx +++ b/sd/inc/pglink.hxx @@ -34,9 +34,9 @@ public: SdPageLink(SdPage* pPg, const OUString& rFileName, const OUString& rBookmarkName); virtual ~SdPageLink(); - virtual void Closed(); + virtual void Closed() SAL_OVERRIDE; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ); + const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; bool Connect() { return 0 != SvBaseLink::GetRealObject(); } }; diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index 3ccc8e925e9f..f405dc6f6e7e 100644 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -95,9 +95,9 @@ public: DiaEffectItem( ::com::sun::star::presentation::FadeEffect eFade = com::sun::star::presentation::FadeEffect_NONE ); DiaEffectItem( SvStream& rIn ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; - sal_uInt16 GetValueCount() const { return FADE_EFFECT_COUNT; } + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; + sal_uInt16 GetValueCount() const SAL_OVERRIDE { return FADE_EFFECT_COUNT; } ::com::sun::star::presentation::FadeEffect GetValue() const { return (::com::sun::star::presentation::FadeEffect) SfxEnumItem::GetValue(); } }; @@ -110,9 +110,9 @@ public: DiaSpeedItem( FadeSpeed = FADE_SPEED_MEDIUM ); DiaSpeedItem( SvStream& rIn ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; - sal_uInt16 GetValueCount() const { return FADE_SPEED_COUNT; } + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; + sal_uInt16 GetValueCount() const SAL_OVERRIDE { return FADE_SPEED_COUNT; } FadeSpeed GetValue() const { return (FadeSpeed) SfxEnumItem::GetValue(); } }; @@ -125,9 +125,9 @@ public: DiaAutoItem( PresChange = PRESCHANGE_MANUAL ); DiaAutoItem( SvStream& rIn ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; - sal_uInt16 GetValueCount() const { return PRESCHANGE_COUNT; } + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; + sal_uInt16 GetValueCount() const SAL_OVERRIDE { return PRESCHANGE_COUNT; } PresChange GetValue() const { return (PresChange) SfxEnumItem::GetValue(); } }; @@ -138,8 +138,8 @@ public: TYPEINFO_OVERRIDE(); DiaTimeItem( sal_uInt32 nValue = 0L ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; }; #endif // INCLUDED_SD_INC_SDATTR_HXX diff --git a/sd/inc/sdcgmfilter.hxx b/sd/inc/sdcgmfilter.hxx index f7379408f40a..ab79181c829f 100644 --- a/sd/inc/sdcgmfilter.hxx +++ b/sd/inc/sdcgmfilter.hxx @@ -33,7 +33,7 @@ public: virtual ~SdCGMFilter (void); sal_Bool Import(); - sal_Bool Export(); + sal_Bool Export() SAL_OVERRIDE; }; #endif // INCLUDED_SD_INC_SDCGMFILTER_HXX diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx index 2355b603252a..83c18b1fbf0d 100644 --- a/sd/inc/sdgrffilter.hxx +++ b/sd/inc/sdgrffilter.hxx @@ -34,7 +34,7 @@ public: virtual ~SdGRFFilter (void); sal_Bool Import(); - sal_Bool Export(); + sal_Bool Export() SAL_OVERRIDE; static void HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong nStreamError = ERRCODE_NONE ); }; diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx index 840f226f5256..449067e1a5e0 100644 --- a/sd/inc/sdhtmlfilter.hxx +++ b/sd/inc/sdhtmlfilter.hxx @@ -34,7 +34,7 @@ public: sal_Bool bShowProgress); virtual ~SdHTMLFilter (void); - virtual sal_Bool Export(); + virtual sal_Bool Export() SAL_OVERRIDE; private: DECL_LINK( IOProgressHdl, sal_uInt16* ); diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index ca93858750b3..10c7fde59f8b 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -114,9 +114,9 @@ public: SD_DLLPUBLIC SvNumberFormatter* GetNumberFormatter(); // virtual methods for the option dialog - virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ); - virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ); - virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ); + virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; protected: @@ -133,7 +133,7 @@ protected: */ OutputDevice* mpVirtualRefDevice; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; private: SfxFrame* ExecuteNewDocument( SfxRequest& rReq ); diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 1c895723d43e..313d8c7c9abf 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -138,7 +138,7 @@ protected: /** a helper class to manipulate effects inside the main sequence */ boost::shared_ptr< sd::MainSequence > mpMainSequence; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() SAL_OVERRIDE; SfxItemSet* mpItems; @@ -159,17 +159,17 @@ public: SdPage(SdDrawDocument& rNewDoc, sal_Bool bMasterPage=sal_False); SdPage(const SdPage& rSrcPage); ~SdPage(); - virtual SdrPage* Clone() const; - virtual SdrPage* Clone(SdrModel* pNewModel) const; - - virtual void SetSize(const Size& aSize); - virtual void SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 Lwr); - virtual void SetLftBorder(sal_Int32 nBorder); - virtual void SetRgtBorder(sal_Int32 nBorder); - virtual void SetUppBorder(sal_Int32 nBorder); - virtual void SetLwrBorder(sal_Int32 nBorder); - virtual void SetModel(SdrModel* pNewModel); - virtual bool IsReadOnly() const; + virtual SdrPage* Clone() const SAL_OVERRIDE; + virtual SdrPage* Clone(SdrModel* pNewModel) const SAL_OVERRIDE; + + virtual void SetSize(const Size& aSize) SAL_OVERRIDE; + virtual void SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 Lwr) SAL_OVERRIDE; + virtual void SetLftBorder(sal_Int32 nBorder) SAL_OVERRIDE; + virtual void SetRgtBorder(sal_Int32 nBorder) SAL_OVERRIDE; + virtual void SetUppBorder(sal_Int32 nBorder) SAL_OVERRIDE; + virtual void SetLwrBorder(sal_Int32 nBorder) SAL_OVERRIDE; + virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; + virtual bool IsReadOnly() const SAL_OVERRIDE; sd::ShapeList& GetPresentationShapeList() { return maPresentationShapeList; } @@ -198,14 +198,14 @@ public: SdrObject* InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind, bool bVertical, Rectangle aRect, bool bInit ); virtual void NbcInsertObject(SdrObject* pObj, sal_uLong nPos=CONTAINER_APPEND, - const SdrInsertReason* pReason=NULL); - virtual SdrObject* NbcRemoveObject(sal_uLong nObjNum); - virtual SdrObject* RemoveObject(sal_uLong nObjNum); + const SdrInsertReason* pReason=NULL) SAL_OVERRIDE; + virtual SdrObject* NbcRemoveObject(sal_uLong nObjNum) SAL_OVERRIDE; + virtual SdrObject* RemoveObject(sal_uLong nObjNum) SAL_OVERRIDE; /** Also overload ReplaceObject methods to realize when objects are removed with this mechanism instead of RemoveObject*/ - virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum); - virtual SdrObject* ReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum); + virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum) SAL_OVERRIDE; + virtual SdrObject* ReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum) SAL_OVERRIDE; void SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const OUString& rStr ); @@ -258,10 +258,10 @@ public: void setTransitionDuration( double fTranstionDuration ); virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, - const Rectangle& rOldBoundRect); + const Rectangle& rOldBoundRect) SAL_OVERRIDE; void SetLayoutName(const OUString& aName); - virtual OUString GetLayoutName() const { return maLayoutName; } + virtual OUString GetLayoutName() const SAL_OVERRIDE { return maLayoutName; } void SetFileName(const OUString& aName) { maFileName = aName; } virtual OUString GetFileName() const { return maFileName; } @@ -291,10 +291,10 @@ public: void SetPaperBin(sal_uInt16 nBin) { mnPaperBin = nBin; } sal_uInt16 GetPaperBin() const { return mnPaperBin; } - virtual void SetOrientation(Orientation eOrient); - virtual Orientation GetOrientation() const; + virtual void SetOrientation(Orientation eOrient) SAL_OVERRIDE; + virtual Orientation GetOrientation() const SAL_OVERRIDE; - virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const; + virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const SAL_OVERRIDE; sal_Bool setAlienAttributes( const com::sun::star::uno::Any& rAttributes ); void getAlienAttributes( com::sun::star::uno::Any& rAttributes ); @@ -337,7 +337,7 @@ public: virtual bool checkVisibility( const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo, - bool bEdit ); + bool bEdit ) SAL_OVERRIDE; /** callback from the sd::View when a new paragraph for one object on this page is created */ void onParagraphInserted( ::Outliner* pOutliner, Paragraph* pPara, SdrObject* pObj ); diff --git a/sd/inc/sdpptwrp.hxx b/sd/inc/sdpptwrp.hxx index 49cc8b8d89c9..89e71fc50ddb 100644 --- a/sd/inc/sdpptwrp.hxx +++ b/sd/inc/sdpptwrp.hxx @@ -34,7 +34,7 @@ public: /// these methods are necessary for the export to PowerPoint sal_Bool Import(); - sal_Bool Export(); + sal_Bool Export() SAL_OVERRIDE; /// restores the original basic storage void PreSaveBasic(); diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx index 02c874eb158f..75636404b0bc 100644 --- a/sd/inc/sdundo.hxx +++ b/sd/inc/sdundo.hxx @@ -34,7 +34,7 @@ public: virtual ~SdUndoAction() {} void SetComment(OUString& rStr) { maComment = rStr; } - virtual OUString GetComment() const { return maComment; } + virtual OUString GetComment() const SAL_OVERRIDE { return maComment; } virtual SdUndoAction* Clone() const { return NULL; } protected: diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx index 46a125c24a4f..dfa7dc9e1989 100644 --- a/sd/inc/sdxmlwrp.hxx +++ b/sd/inc/sdxmlwrp.hxx @@ -42,7 +42,7 @@ public: virtual ~SdXMLFilter (void); sal_Bool Import( ErrCode& nError ); - sal_Bool Export(); + sal_Bool Export() SAL_OVERRIDE; private: SdXMLFilterMode meFilterMode; diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx index 92cc2719e0ae..1e8020a82be2 100644 --- a/sd/inc/shapelist.hxx +++ b/sd/inc/shapelist.hxx @@ -63,7 +63,7 @@ namespace sd const std::list< SdrObject* >& getList() const { return maShapeList; } private: - virtual void ObjectInDestruction(const SdrObject& rObject); + virtual void ObjectInDestruction(const SdrObject& rObject) SAL_OVERRIDE; typedef std::list< SdrObject* > ListImpl; ListImpl maShapeList; diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx index 9996e9dae17a..9f5e743fe2d5 100644 --- a/sd/inc/stlfamily.hxx +++ b/sd/inc/stlfamily.hxx @@ -55,51 +55,51 @@ public: virtual ~SdStyleFamily(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed - virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception); + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) ; - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeByName( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeByName( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSingleServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual css::uno::Reference SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName,const css::uno::Reference&aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName,const css::uno::Reference&aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void throwIfDisposed() const throw(css::uno::RuntimeException); diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index 9d513d000afc..0ddcd2717fd0 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -97,37 +97,37 @@ public: void throwIfDisposed() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - 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); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire (void) throw (); - virtual void SAL_CALL release (void) throw (); + virtual void SAL_CALL acquire (void) throw () SAL_OVERRIDE; + virtual void SAL_CALL release (void) throw () SAL_OVERRIDE; protected: void RenameAndCopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix); void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily ); void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets ); void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix ); - virtual SfxStyleSheetBase* Create(const OUString& rName, SfxStyleFamily eFamily, sal_uInt16 nMask); + virtual SfxStyleSheetBase* Create(const OUString& rName, SfxStyleFamily eFamily, sal_uInt16 nMask) SAL_OVERRIDE; virtual SfxStyleSheetBase* Create(const SdStyleSheet& rStyle); using SfxStyleSheetPool::Create; diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index 5e0344b1c6a7..2db8d3dc59af 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -54,14 +54,14 @@ public: SdStyleSheet( const OUString& rDisplayName, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily, sal_uInt16 nMask ); SdStyleSheet( const SdStyleSheet& ); - virtual bool SetParent (const OUString& rParentName); - virtual SfxItemSet& GetItemSet(); - virtual bool IsUsed() const; - virtual bool HasFollowSupport() const; - virtual bool HasParentSupport() const; - virtual bool HasClearParentSupport() const; - virtual bool SetName( const OUString& ); - virtual void SetHelpId( const OUString& r, sal_uLong nId ); + virtual bool SetParent (const OUString& rParentName) SAL_OVERRIDE; + virtual SfxItemSet& GetItemSet() SAL_OVERRIDE; + virtual bool IsUsed() const SAL_OVERRIDE; + virtual bool HasFollowSupport() const SAL_OVERRIDE; + virtual bool HasParentSupport() const SAL_OVERRIDE; + virtual bool HasClearParentSupport() const SAL_OVERRIDE; + virtual bool SetName( const OUString& ) SAL_OVERRIDE; + virtual void SetHelpId( const OUString& r, sal_uLong nId ) SAL_OVERRIDE; void AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingItems = sal_True); @@ -76,56 +76,56 @@ public: static SdStyleSheet* CreateEmptyUserStyle( SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily ); // XInterface - virtual void SAL_CALL release( ) throw (); + virtual void SAL_CALL release( ) throw () SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStyle - virtual sal_Bool SAL_CALL isUserDefined( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isInUse( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getParentStyle( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isUserDefined( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isInUse( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getParentStyle( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - 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); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void notifyModifyListener(); protected: const SfxItemPropertySimpleEntry* getPropertyMapEntry( const OUString& rPropertyName ) const throw(); - virtual void Load (SvStream& rIn, sal_uInt16 nVersion); - virtual void Store(SvStream& rOut); + virtual void Load (SvStream& rIn, sal_uInt16 nVersion) SAL_OVERRIDE; + virtual void Store(SvStream& rOut) SAL_OVERRIDE; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; virtual ~SdStyleSheet(); void throwIfDisposed() throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/inc/undo/undofactory.hxx b/sd/inc/undo/undofactory.hxx index 0c2390d7eecc..4db4cbf10c45 100644 --- a/sd/inc/undo/undofactory.hxx +++ b/sd/inc/undo/undofactory.hxx @@ -28,12 +28,12 @@ namespace sd class UndoFactory : public SdrUndoFactory { public: - virtual SdrUndoAction* CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect = false); - virtual SdrUndoAction* CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect = false); - virtual SdrUndoAction* CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ); - virtual SdrUndoAction* CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect = false ); - virtual SdrUndoAction* CreateUndoGeoObject( SdrObject& rObject ); - virtual SdrUndoAction* CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1 = false, bool bSaveText = false ); + virtual SdrUndoAction* CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect = false) SAL_OVERRIDE; + virtual SdrUndoAction* CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect = false) SAL_OVERRIDE; + virtual SdrUndoAction* CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ) SAL_OVERRIDE; + virtual SdrUndoAction* CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect = false ) SAL_OVERRIDE; + virtual SdrUndoAction* CreateUndoGeoObject( SdrObject& rObject ) SAL_OVERRIDE; + virtual SdrUndoAction* CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1 = false, bool bSaveText = false ) SAL_OVERRIDE; }; diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index b0f68d1f53bb..a3f68f929b03 100644 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -31,9 +31,9 @@ class UndoManager : public SdrUndoManager public: UndoManager( sal_uInt16 nMaxUndoActionCount = 20 ); - virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0); + virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0) SAL_OVERRIDE; - virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ); + virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ) SAL_OVERRIDE; /** Set or reset the undo manager linked with the called undo manager. */ diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx index c0270b8f17f8..3e45400dd378 100644 --- a/sd/inc/undo/undoobjects.hxx +++ b/sd/inc/undo/undoobjects.hxx @@ -51,8 +51,8 @@ class UndoRemoveObject : public SdrUndoRemoveObj, public UndoRemovePresObjectImp public: UndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; private: SdrObjectWeakRef mxSdrObject; @@ -63,8 +63,8 @@ class UndoDeleteObject : public SdrUndoDelObj, public UndoRemovePresObjectImpl public: UndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; private: SdrObjectWeakRef mxSdrObject; @@ -76,8 +76,8 @@ class UndoReplaceObject : public SdrUndoReplaceObj, public UndoRemovePresObjectI public: UndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; private: SdrObjectWeakRef mxSdrObject; @@ -90,8 +90,8 @@ public: UndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ); virtual ~UndoObjectSetText(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; private: SfxUndoAction* mpUndoAnimation; @@ -107,8 +107,8 @@ class UndoObjectUserCall : public SdrUndoObj public: UndoObjectUserCall(SdrObject& rNewObj); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; protected: SdrObjUserCall* mpOldUserCall; @@ -124,8 +124,8 @@ class UndoObjectPresentationKind : public SdrUndoObj public: UndoObjectPresentationKind(SdrObject& rObject); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; protected: PresObjKind meOldKind; @@ -143,8 +143,8 @@ class UndoAutoLayoutPosAndSize : public SfxUndoAction public: UndoAutoLayoutPosAndSize( SdPage& rPage ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; protected: SdrPageWeakRef mxPage; @@ -156,8 +156,8 @@ class UndoGeoObject : public SdrUndoGeoObj public: UndoGeoObject( SdrObject& rNewObj ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; protected: SdrPageWeakRef mxPage; @@ -170,8 +170,8 @@ class UndoAttrObject : public SdrUndoAttrObj public: UndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; protected: SdrPageWeakRef mxPage; diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx index 1445d81780fd..d08f64071965 100644 --- a/sd/inc/undoanim.hxx +++ b/sd/inc/undoanim.hxx @@ -40,10 +40,10 @@ public: UndoAnimation( SdDrawDocument* pDoc, SdPage* pThePage ); virtual ~UndoAnimation(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: boost::scoped_ptr mpImpl; @@ -56,10 +56,10 @@ public: UndoAnimationPath( SdDrawDocument* pDoc, SdPage* pThePage, const com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); virtual ~UndoAnimationPath(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: boost::scoped_ptr mpImpl; @@ -73,10 +73,10 @@ public: UndoTransition( SdDrawDocument* pDoc, SdPage* pThePage ); virtual ~UndoTransition(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: boost::scoped_ptr mpImpl; -- cgit v1.2.3