diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
| commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
| tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /sw | |
| parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) | |
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'sw')
606 files changed, 6664 insertions, 6662 deletions
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index 1c62794bf398..7932c07cc03a 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -38,27 +38,27 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin SwFmtFld* aField ); virtual ~SwAnnotationWin(); - virtual void UpdateData(); - virtual void SetPostItText(); - virtual void Delete(); - virtual void GotoPos(); + virtual void UpdateData() SAL_OVERRIDE; + virtual void SetPostItText() SAL_OVERRIDE; + virtual void Delete() SAL_OVERRIDE; + virtual void GotoPos() SAL_OVERRIDE; - virtual OUString GetAuthor(); - virtual Date GetDate(); - virtual Time GetTime(); + virtual OUString GetAuthor() SAL_OVERRIDE; + virtual Date GetDate() SAL_OVERRIDE; + virtual Time GetTime() SAL_OVERRIDE; - virtual sal_uInt32 MoveCaret(); + virtual sal_uInt32 MoveCaret() SAL_OVERRIDE; - virtual bool CalcFollow(); + virtual bool CalcFollow() SAL_OVERRIDE; void InitAnswer(OutlinerParaObject* pText); - virtual bool IsProtected(); + virtual bool IsProtected() SAL_OVERRIDE; protected: - virtual MenuButton* CreateMenuButton(); + virtual MenuButton* CreateMenuButton() SAL_OVERRIDE; private: - virtual SvxLanguageItem GetLanguage(void); + virtual SvxLanguageItem GetLanguage(void) SAL_OVERRIDE; sal_uInt32 CountFollowing(); SwFmtFld* mpFmtFld; diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 0355ae569ebe..907f6b2dc2bf 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -128,8 +128,8 @@ class SwNoteProps: public utl::ConfigItem return aNames; } - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; class SwPostItMgr: public SfxListener @@ -193,7 +193,7 @@ class SwPostItMgr: public SfxListener const_iterator begin() const { return mvPostItFlds.begin(); } const_iterator end() const { return mvPostItFlds.end(); } - void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; void LayoutPostIts(); bool CalcRects(); diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index f98a2ef88a1c..630ef1668242 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -174,16 +174,16 @@ class SwSidebarWin : public Window void SetLanguage(const SvxLanguageItem aNewItem); void ChangeSidebarItem( SwSidebarItem& rSidebarItem ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; protected: - virtual void DataChanged( const DataChangedEvent& aEvent); - virtual void LoseFocus(); - virtual void Paint( const Rectangle& rRect); - virtual void GetFocus(); + virtual void DataChanged( const DataChangedEvent& aEvent) SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; virtual MenuButton* CreateMenuButton() = 0; - void SetSizePixel( const Size& rNewSize ); + void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE; SfxItemSet DefaultItem(); DECL_LINK(ModifyHdl, void*); diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx index 7a0e24382197..08f473c36a71 100644 --- a/sw/inc/SwNodeNum.hxx +++ b/sw/inc/SwNodeNum.hxx @@ -39,17 +39,17 @@ public: void ChangeNumRule( SwNumRule& rNumRule ); SwTxtNode* GetTxtNode() const; - virtual bool IsNotificationEnabled() const; + virtual bool IsNotificationEnabled() const SAL_OVERRIDE; - virtual bool IsContinuous() const; + virtual bool IsContinuous() const SAL_OVERRIDE; - virtual bool IsCounted() const; + virtual bool IsCounted() const SAL_OVERRIDE; - virtual bool LessThan(const SwNumberTreeNode & rNode) const; + virtual bool LessThan(const SwNumberTreeNode & rNode) const SAL_OVERRIDE; - virtual bool IsRestart() const; + virtual bool IsRestart() const SAL_OVERRIDE; - virtual SwNumberTree::tSwNumTreeNumber GetStartValue() const; + virtual SwNumberTree::tSwNumTreeNumber GetStartValue() const SAL_OVERRIDE; SwPosition GetPosition() const; @@ -71,16 +71,16 @@ public: const SwNodeNum* GetPrecedingNodeNumOf( const SwTxtNode& rTxtNode ) const; protected: - virtual SwNumberTreeNode * Create() const; + virtual SwNumberTreeNode * Create() const SAL_OVERRIDE; // --> #i64010# - virtual bool HasCountedChildren() const; - virtual bool IsCountedForNumbering() const; + virtual bool HasCountedChildren() const SAL_OVERRIDE; + virtual bool IsCountedForNumbering() const SAL_OVERRIDE; // method called before this tree node has been added to the list tree - virtual void PreAdd(); + virtual void PreAdd() SAL_OVERRIDE; // method called at a child after this child has been removed from the list tree - virtual void PostRemove(); + virtual void PostRemove() SAL_OVERRIDE; private: SwTxtNode * mpTxtNode; SwNumRule * mpNumRule; @@ -90,11 +90,11 @@ private: SwNodeNum( const SwNodeNum& ); // no copy constructor SwNodeNum& operator=( const SwNodeNum& ); // no assignment operator - virtual bool IsCountPhantoms() const; + virtual bool IsCountPhantoms() const SAL_OVERRIDE; - virtual bool IsNotifiable() const; + virtual bool IsNotifiable() const SAL_OVERRIDE; - virtual void NotifyNode(); + virtual void NotifyNode() SAL_OVERRIDE; }; #endif // INCLUDED_SW_INC_SWNODENUM_HXX diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx index 485d2f43c9ed..c3e1640ed89a 100644 --- a/sw/inc/SwSmartTagMgr.hxx +++ b/sw/inc/SwSmartTagMgr.hxx @@ -40,10 +40,10 @@ public: static SwSmartTagMgr& Get(); // ::com::sun::star::util::XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XChangesListener - virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx index 923889f614da..9c3b6b6ce0c5 100644 --- a/sw/inc/SwUndoField.hxx +++ b/sw/inc/SwUndoField.hxx @@ -57,9 +57,9 @@ public: virtual ~SwUndoFieldFromDoc(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; class SwUndoFieldFromAPI : public SwUndoField @@ -76,9 +76,9 @@ public: sal_uInt16 nWhich); virtual ~SwUndoFieldFromAPI(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_INC_SWUNDOFIELD_HXX diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx index 9e63504598a5..63765c6e0ca3 100644 --- a/sw/inc/SwXMLSectionList.hxx +++ b/sw/inc/SwXMLSectionList.hxx @@ -30,7 +30,7 @@ protected: virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; public: std::vector<OUString*> &rSectionList; @@ -55,7 +55,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; ~SvXMLSectionListContext ( void ); }; @@ -72,7 +72,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; ~SvXMLIgnoreSectionListContext ( void ); }; #endif diff --git a/sw/inc/TextCursorHelper.hxx b/sw/inc/TextCursorHelper.hxx index aba4e3dc9083..e6563e3f4824 100644 --- a/sw/inc/TextCursorHelper.hxx +++ b/sw/inc/TextCursorHelper.hxx @@ -33,7 +33,7 @@ public: 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 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual const SwPaM* GetPaM() const = 0; virtual SwPaM* GetPaM() = 0; diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 08e8a3756f7a..edfed85948ac 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -263,12 +263,12 @@ public: // IAccessibleViewForwarder - virtual bool IsValid() const; - virtual Rectangle GetVisibleArea() const; - virtual Point LogicToPixel (const Point& rPoint) const; - virtual Size LogicToPixel (const Size& rSize) const; - virtual Point PixelToLogic (const Point& rPoint) const; - virtual Size PixelToLogic (const Size& rSize) const; + virtual bool IsValid() const SAL_OVERRIDE; + virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; + virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; + virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; + virtual Point PixelToLogic (const Point& rPoint) const SAL_OVERRIDE; + virtual Size PixelToLogic (const Size& rSize) const SAL_OVERRIDE; // IAccessibleParent virtual bool ReplaceChild ( @@ -276,13 +276,13 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (::com::sun::star::uno::RuntimeException); + ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel (::com::sun::star::beans::XPropertySet* pSet) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessibleCaption ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; // additional Core/Pixel conversions for internal use; also works // for preview @@ -312,7 +312,7 @@ private: void GetMapMode( const Point& _rPoint, MapMode& _orMapMode ) const; public: - virtual bool IsDocumentSelAll(); + virtual bool IsDocumentSelAll() SAL_OVERRIDE; ::com::sun::star::uno::WeakReference < ::com::sun::star::accessibility::XAccessible > GetCursorContext() const { return mxCursorContext; } diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx index 942b6812adda..28da2cabb061 100644 --- a/sw/inc/anchoreddrawobject.hxx +++ b/sw/inc/anchoreddrawobject.hxx @@ -106,19 +106,19 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject void _InvalidatePage( SwPageFrm* _pPageFrm ); protected: - virtual void ObjectAttachedToAnchorFrame(); + virtual void ObjectAttachedToAnchorFrame() SAL_OVERRIDE; /** method to assure that anchored object is registered at the correct page frame @author OD */ - virtual void RegisterAtCorrectPage(); + virtual void RegisterAtCorrectPage() SAL_OVERRIDE; - virtual bool _SetObjTop( const SwTwips _nTop); - virtual bool _SetObjLeft( const SwTwips _nLeft); + virtual bool _SetObjTop( const SwTwips _nTop) SAL_OVERRIDE; + virtual bool _SetObjLeft( const SwTwips _nLeft) SAL_OVERRIDE; - virtual const SwRect GetObjBoundRect() const; + virtual const SwRect GetObjBoundRect() const SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -127,19 +127,19 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject virtual ~SwAnchoredDrawObject(); // declaration of pure virtual methods of base class <SwAnchoredObject> - virtual void MakeObjPos(); - virtual void InvalidateObjPos(); + virtual void MakeObjPos() SAL_OVERRIDE; + virtual void InvalidateObjPos() SAL_OVERRIDE; inline bool IsValidPos() const { return mbValidPos; } // accessors to the format - virtual SwFrmFmt& GetFrmFmt(); - virtual const SwFrmFmt& GetFrmFmt() const; + virtual SwFrmFmt& GetFrmFmt() SAL_OVERRIDE; + virtual const SwFrmFmt& GetFrmFmt() const SAL_OVERRIDE; // accessors to the object area and its position - virtual const SwRect GetObjRect() const; + virtual const SwRect GetObjRect() const SAL_OVERRIDE; // Return value can be NULL. const Rectangle* GetLastObjRect() const; @@ -171,7 +171,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject */ virtual void NotifyBackground( SwPageFrm* _pPageFrm, const SwRect& _rRect, - PrepareHint _eHint ); + PrepareHint _eHint ) SAL_OVERRIDE; inline bool NotYetPositioned() const { @@ -180,7 +180,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject // change of layout direction needs to be tracked // for setting <mbCaptureAfterLayoutDirChange>. - virtual void UpdateLayoutDir(); + virtual void UpdateLayoutDir() SAL_OVERRIDE; bool IsOutsidePage() const; // new Loop control @@ -188,7 +188,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject /** The element name to show in the XML dump. */ - virtual const char* getElementName( ) { return "SwAnchoredDrawObject"; } + virtual const char* getElementName( ) SAL_OVERRIDE { return "SwAnchoredDrawObject"; } }; #endif diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index a26cc6d30122..2e3308fd112d 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -70,16 +70,16 @@ class SW_DLLPUBLIC SwAuthorityFieldType : public SwFieldType OUString m_sSortAlgorithm; protected: -virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); +virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; public: SwAuthorityFieldType(SwDoc* pDoc); ~SwAuthorityFieldType(); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) SAL_OVERRIDE; inline void SetDoc(SwDoc* pNewDoc) { m_pDoc = pNewDoc; } SwDoc* GetDoc(){ return m_pDoc; } @@ -146,8 +146,8 @@ class SwAuthorityField : public SwField sal_IntPtr m_nHandle; mutable sal_IntPtr m_nTempSequencePos; - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; public: /// For internal use only, in general continue using ExpandField() instead. @@ -159,15 +159,15 @@ public: OUString GetFieldText(ToxAuthorityField eField) const; - virtual void SetPar1(const OUString& rStr); - virtual SwFieldType* ChgTyp( SwFieldType* ); + virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; + virtual SwFieldType* ChgTyp( SwFieldType* ) SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) SAL_OVERRIDE; sal_IntPtr GetHandle() const { return m_nHandle; } - virtual OUString GetDescription() const; + virtual OUString GetDescription() const SAL_OVERRIDE; }; // --- inlines ----------------------------------------------------------- diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index 26320f9e657f..0b7f0dd50558 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -127,7 +127,7 @@ class SW_DLLPUBLIC SwModify: public SwClient sal_Bool bInSwFntCache : 1; // mba: IMHO this method should be pure virtual - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwModify(); @@ -152,7 +152,7 @@ public: const SwClient* GetDepends() const { return pRoot; } // get information about attribute - virtual bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; void LockModify() { bModifyLocked = true; } void UnlockModify() { bModifyLocked = false; } @@ -184,10 +184,10 @@ public: SwClient* GetToTell() { return pToTell; } /** get Client information */ - virtual bool GetInfo( SfxPoolItem & ) const; + virtual bool GetInfo( SfxPoolItem & ) const SAL_OVERRIDE; protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ); - virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ) SAL_OVERRIDE; + virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ) SAL_OVERRIDE; }; class SwClientIter diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index 446f58c046a3..6ef9207bb3d6 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -58,8 +58,8 @@ public: TYPEINFO_OVERRIDE(); - 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; static const CommandStruct* GetCmds(); diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index 2ba21cf95884..fef1f0171f31 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -36,8 +36,8 @@ public: sal_Bool bAuto = sal_False ); // "pure virtual methods" of SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; inline SwTblBoxNumFormat& operator=( const SwTblBoxNumFormat& rAttr ) { @@ -60,14 +60,14 @@ public: ~SwTblBoxFormula() {}; // "pure virtual methods" of SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; inline const SwModify* GetDefinedIn() const { return pDefinedIn; } inline void ChgDefinedIn( const SwModify* pNew ) { pDefinedIn = (SwModify*)pNew; } // BoxAttribut -> BoxStartNode - virtual const SwNode* GetNodeOfFormula() const; + virtual const SwNode* GetNodeOfFormula() const SAL_OVERRIDE; SwTableBox* GetTableBox(); const SwTableBox* GetTableBox() const @@ -85,8 +85,8 @@ public: SwTblBoxValue( const double aVal ); // "pure virtual methods" of SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; inline SwTblBoxValue& operator=( const SwTblBoxValue& rCmp ) { diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx index 891e43e57a05..6faccfcd9c03 100644 --- a/sw/inc/chpfld.hxx +++ b/sw/inc/chpfld.hxx @@ -41,7 +41,7 @@ class SwChapterFieldType : public SwFieldType public: SwChapterFieldType(); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; @@ -54,8 +54,8 @@ class SW_DLLPUBLIC SwChapterField : public SwField OUString sPre; OUString sPost; - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; public: SwChapterField(SwChapterFieldType*, sal_uInt32 nFmt = 0); @@ -71,8 +71,8 @@ public: inline OUString GetNumber() const; inline OUString GetTitle() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; inline sal_uInt8 SwChapterField::GetLevel() const { return nLevel; } diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx index 30559a47c681..4069ebc20a57 100644 --- a/sw/inc/colwd.hxx +++ b/sw/inc/colwd.hxx @@ -33,7 +33,7 @@ class SwTableWidthDlg : public SvxStandardDialog SwTableFUNC &rFnc; protected: - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; DECL_LINK(LoseFocusHdl, void * = 0); public: diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index d2fa00d8e41c..dd1bca59f910 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -301,7 +301,7 @@ protected: SAL_DLLPRIVATE void UpdateMarkedListLevel(); protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -311,8 +311,8 @@ public: virtual ~SwCrsrShell(); // create new cursor and append the old one - virtual SwPaM & CreateNewShellCursor(); - virtual SwPaM & GetCurrentShellCursor(); + virtual SwPaM & CreateNewShellCursor() SAL_OVERRIDE; + virtual SwPaM & GetCurrentShellCursor() SAL_OVERRIDE; SwPaM * CreateCrsr(); ///< delete the current cursor and make the following into the current @@ -403,12 +403,12 @@ public: * scrolling is done. The passed Rectangle lays on pixel borders to avoid * pixel errors. */ - virtual void VisPortChgd( const SwRect & ); + virtual void VisPortChgd( const SwRect & ) SAL_OVERRIDE; /* * virtual paint method to make selection visible again after Paint */ - void Paint( const Rectangle & rRect ); + void Paint( const Rectangle & rRect ) SAL_OVERRIDE; // Areas inline void SetMark(); diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index 31314d2db46c..6861248b5d9e 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -43,8 +43,8 @@ public: SwDBFieldType(SwDoc* pDocPtr, const OUString& rColumnName, const SwDBData& rDBData); ~SwDBFieldType(); - virtual OUString GetName() const; - virtual SwFieldType* Copy() const; + virtual OUString GetName() const SAL_OVERRIDE; + virtual SwFieldType* Copy() const SAL_OVERRIDE; inline void AddRef() { nRefCnt++; } void ReleaseRef(); @@ -52,8 +52,8 @@ public: OUString GetColumnName() const {return sColumn;} const SwDBData& GetDBData() const {return aDBData;} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -70,22 +70,22 @@ class SW_DLLPUBLIC SwDBField : public SwValueField bool bValidValue : 1; bool bInitialized : 1; - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; public: SwDBField(SwDBFieldType*, sal_uLong nFmt = 0); virtual ~SwDBField(); - virtual SwFieldType* ChgTyp( SwFieldType* ); + virtual SwFieldType* ChgTyp( SwFieldType* ) SAL_OVERRIDE; /// Current text. inline void SetExpansion(const OUString& rStr); - virtual sal_uInt16 GetSubType() const; - virtual void SetSubType(sal_uInt16 nType); + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE; - virtual OUString GetFieldName() const; + virtual OUString GetFieldName() const SAL_OVERRIDE; /// For calculations in expressions. void ChgValue( double d, bool bVal ); @@ -105,7 +105,7 @@ public: inline void SetInitialized() { bInitialized = true; } /// Get name. - virtual OUString GetPar1() const; + virtual OUString GetPar1() const SAL_OVERRIDE; /// access to the command string OUString GetFieldCode() const { return sFieldCode;} @@ -113,8 +113,8 @@ public: /// DBName inline const SwDBData& GetDBData() const { return ((SwDBFieldType*)GetTyp())->GetDBData(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; inline void SwDBField::SetExpansion(const OUString& rStr) @@ -146,12 +146,12 @@ public: SwDBData GetDBData(SwDoc* pDoc); void SetDBData(const SwDBData& rDBData); - virtual OUString GetFieldName() const; + virtual OUString GetFieldName() const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); - virtual sal_uInt16 GetSubType() const; - virtual void SetSubType(sal_uInt16 nType); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -163,7 +163,7 @@ class SW_DLLPUBLIC SwDBNextSetFieldType : public SwFieldType public: SwDBNextSetFieldType(); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -179,18 +179,18 @@ public: SwDBNextSetField( SwDBNextSetFieldType*, const OUString& rCond, const OUString& rDummy, const SwDBData& rDBData); - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; void Evaluate(SwDoc*); inline void SetCondValid(bool bCond); inline bool IsCondValid() const; // Condition - virtual OUString GetPar1() const; - virtual void SetPar1(const OUString& rStr); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual OUString GetPar1() const SAL_OVERRIDE; + virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; inline bool SwDBNextSetField::IsCondValid() const @@ -208,7 +208,7 @@ class SwDBNumSetFieldType : public SwFieldType public: SwDBNumSetFieldType(); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -225,24 +225,24 @@ class SwDBNumSetField : public SwDBNameInfField public: SwDBNumSetField(SwDBNumSetFieldType*, const OUString& rCond, const OUString& rDBNum, const SwDBData& rDBData); - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; inline bool IsCondValid() const; inline void SetCondValid(bool bCond); void Evaluate(SwDoc*); // Condition - virtual OUString GetPar1() const; - virtual void SetPar1(const OUString& rStr); + virtual OUString GetPar1() const SAL_OVERRIDE; + virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; // Number of data record. - virtual OUString GetPar2() const; - virtual void SetPar2(const OUString& rStr); + virtual OUString GetPar2() const SAL_OVERRIDE; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; // Number of data record is in nFormat!! - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; inline bool SwDBNumSetField::IsCondValid() const @@ -262,7 +262,7 @@ public: SwDBNameFieldType(SwDoc*); OUString Expand(sal_uLong) const; - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -274,10 +274,10 @@ class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField public: SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0); - virtual OUString Expand() const; - virtual SwField* Copy() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -289,7 +289,7 @@ class SW_DLLPUBLIC SwDBSetNumberFieldType : public SwFieldType public: SwDBSetNumberFieldType(); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -303,14 +303,14 @@ class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField public: SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0); - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; void Evaluate(SwDoc*); inline long GetSetNumber() const; inline void SetSetNumber(long nNum); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; inline long SwDBSetNumberField::GetSetNumber() const diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index f78267c4e218..30ffeb1a168c 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -196,7 +196,7 @@ private: SwFlyDrawObj* mpMasterObj; protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -205,22 +205,22 @@ public: SwFlyDrawContact( SwFlyFrmFmt* pToRegisterIn, SdrModel* pMod ); virtual ~SwFlyDrawContact(); - virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const; - virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ); + virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE; + virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) SAL_OVERRIDE; - virtual const SdrObject* GetMaster() const; - virtual SdrObject* GetMaster(); - virtual void SetMaster( SdrObject* _pNewMaster ); + virtual const SdrObject* GetMaster() const SAL_OVERRIDE; + virtual SdrObject* GetMaster() SAL_OVERRIDE; + virtual void SetMaster( SdrObject* _pNewMaster ) SAL_OVERRIDE; /** override methods to control Writer fly frames, which are linked, and to assure that all objects anchored at/inside the Writer fly frame are also made visible/invisible. */ - virtual void MoveObjToVisibleLayer( SdrObject* _pDrawObj ); - virtual void MoveObjToInvisibleLayer( SdrObject* _pDrawObj ); + virtual void MoveObjToVisibleLayer( SdrObject* _pDrawObj ) SAL_OVERRIDE; + virtual void MoveObjToInvisibleLayer( SdrObject* _pDrawObj ) SAL_OVERRIDE; /** get data collection of anchored objects handled by with contact */ - virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const; + virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const SAL_OVERRIDE; }; /** new class for re-direct methods calls at a 'virtual' @@ -244,7 +244,7 @@ class SwDrawVirtObj : public SdrVirtObj /** AW: Need own sdr::contact::ViewContact since AnchorPos from parent is not used but something own (top left of new SnapRect minus top left of original SnapRect) */ - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -254,9 +254,9 @@ class SwDrawVirtObj : public SdrVirtObj virtual ~SwDrawVirtObj(); /// access to offset - virtual const Point GetOffset() const; + virtual const Point GetOffset() const SAL_OVERRIDE; - virtual SwDrawVirtObj* Clone() const; + virtual SwDrawVirtObj* Clone() const SAL_OVERRIDE; SwDrawVirtObj& operator= (const SwDrawVirtObj& rObj); /// connection to writer layout @@ -274,48 +274,48 @@ class SwDrawVirtObj : public SdrVirtObj / to drawing layer. */ bool IsConnected() const; - virtual void NbcSetAnchorPos(const Point& rPnt); + virtual void NbcSetAnchorPos(const Point& rPnt) SAL_OVERRIDE; /// All overloaded methods which need to use the offset - virtual void RecalcBoundRect(); - virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const; - virtual ::basegfx::B2DPolyPolygon TakeContour() const; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; + virtual void RecalcBoundRect() SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon TakeContour() const SAL_OVERRIDE; + virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE; virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const; - virtual void NbcMove(const Size& rSiz); - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); - virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); - virtual void Move(const Size& rSiz); - virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true); - virtual void Rotate(const Point& rRef, long nWink, double sn, double cs); - virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear); - virtual void RecalcSnapRect(); - virtual const Rectangle& GetSnapRect() const; - virtual void SetSnapRect(const Rectangle& rRect); - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual const Rectangle& GetLogicRect() const; - virtual void SetLogicRect(const Rectangle& rRect); - virtual void NbcSetLogicRect(const Rectangle& rRect); - virtual Point GetSnapPoint(sal_uInt32 i) const; - virtual Point GetPoint(sal_uInt32 i) const; - virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i); - - virtual bool HasTextEdit() const; - - virtual SdrLayerID GetLayer() const; - virtual void NbcSetLayer(SdrLayerID nLayer); - virtual void SetLayer(SdrLayerID nLayer); + virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; + virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE; + virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE; + virtual void Move(const Size& rSiz) SAL_OVERRIDE; + virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) SAL_OVERRIDE; + virtual void Rotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE; + virtual void Mirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; + virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear) 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 Point GetSnapPoint(sal_uInt32 i) const SAL_OVERRIDE; + virtual Point GetPoint(sal_uInt32 i) const SAL_OVERRIDE; + virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) SAL_OVERRIDE; + + virtual bool HasTextEdit() const SAL_OVERRIDE; + + virtual SdrLayerID GetLayer() const SAL_OVERRIDE; + virtual void NbcSetLayer(SdrLayerID nLayer) SAL_OVERRIDE; + virtual void SetLayer(SdrLayerID nLayer) SAL_OVERRIDE; /// FullDrag support - virtual bool supportsFullDrag() const; - virtual SdrObject* getFullDragClone() const; + virtual bool supportsFullDrag() const SAL_OVERRIDE; + virtual SdrObject* getFullDragClone() const SAL_OVERRIDE; - virtual void SetBoundRectDirty(); - virtual const Rectangle& GetCurrentBoundRect() const; - virtual const Rectangle& GetLastBoundRect() const; + virtual void SetBoundRectDirty() SAL_OVERRIDE; + virtual const Rectangle& GetCurrentBoundRect() const SAL_OVERRIDE; + virtual const Rectangle& GetLastBoundRect() const SAL_OVERRIDE; }; bool CheckControlLayer( const SdrObject *pObj ); @@ -393,7 +393,7 @@ class SwDrawContact : public SwContact protected: /// virtuelle Methoden von SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -401,12 +401,12 @@ class SwDrawContact : public SwContact SwDrawContact( SwFrmFmt *pToRegisterIn, SdrObject *pObj ); virtual ~SwDrawContact(); - virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const; - virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ); + virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE; + virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) SAL_OVERRIDE; - virtual const SdrObject* GetMaster() const; - virtual SdrObject* GetMaster(); - virtual void SetMaster( SdrObject* _pNewMaster ); + virtual const SdrObject* GetMaster() const SAL_OVERRIDE; + virtual SdrObject* GetMaster() SAL_OVERRIDE; + virtual void SetMaster( SdrObject* _pNewMaster ) SAL_OVERRIDE; const SwFrm* GetAnchorFrm( const SdrObject* _pDrawObj = 0L ) const; SwFrm* GetAnchorFrm( SdrObject* _pDrawObj = 0L ); @@ -451,7 +451,7 @@ class SwDrawContact : public SwContact SdrObject* GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm ); /// Virtual methods of SdrObjUserCall. - virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect); + virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect) SAL_OVERRIDE; /** Used by Changed() and by UndoDraw. Notifies paragraphs that have to get out of the way. */ @@ -468,7 +468,7 @@ class SwDrawContact : public SwContact */ static void GetTextObjectsFromFmt( std::list<SdrTextObj*>&, SwDoc* ); - virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const; + virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const SAL_OVERRIDE; }; #endif diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index bb2343e23fc9..797a2c4bec38 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -52,11 +52,11 @@ public: void SetExpansion( const OUString& rStr ) { aExpansion = rStr; bCRLFFlag = sal_False; } - virtual SwFieldType* Copy() const; - virtual OUString GetName() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; + virtual OUString GetName() const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; OUString GetCmd() const; void SetCmd( const OUString& aStr ); @@ -90,8 +90,8 @@ public: class SwDDEField : public SwField { private: - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; public: SwDDEField(SwDDEFieldType*); @@ -99,11 +99,11 @@ public: /** Get parameter via types. Name cannot be changed. */ - virtual OUString GetPar1() const; + virtual OUString GetPar1() const SAL_OVERRIDE; // Command - virtual OUString GetPar2() const; - virtual void SetPar2(const OUString& rStr); + virtual OUString GetPar2() const SAL_OVERRIDE; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; }; #endif // INCLUDED_SW_INC_DDEFLD_HXX diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx index 3b1c31ab22e9..19c6f7aeb89e 100644 --- a/sw/inc/dlelstnr.hxx +++ b/sw/inc/dlelstnr.hxx @@ -66,17 +66,17 @@ public: virtual ~SwLinguServiceEventListener(); /// XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XDictionaryListEventListener virtual void SAL_CALL processDictionaryListEvent( const ::com::sun::star::linguistic2::DictionaryListEvent& rDicListEvent) throw( ::com::sun::star::uno::RuntimeException ); /// XLinguServiceEventListener - virtual void SAL_CALL processLinguServiceEvent( const ::com::sun::star::linguistic2::LinguServiceEvent& rLngSvcEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL processLinguServiceEvent( const ::com::sun::star::linguistic2::LinguServiceEvent& rLngSvcEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 59119052e7fb..d43856fe6ae7 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -713,123 +713,123 @@ public: SwNodes const& GetNodes() const { return *m_pNodes; } // IInterface - virtual sal_Int32 acquire(); - virtual sal_Int32 release(); - virtual sal_Int32 getReferenceCount() const; + virtual sal_Int32 acquire() SAL_OVERRIDE; + virtual sal_Int32 release() SAL_OVERRIDE; + virtual sal_Int32 getReferenceCount() const SAL_OVERRIDE; // IDocumentSettingAccess - virtual bool get(/*[in]*/ DocumentSettingId id) const; - virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value); - virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const; - virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ); - virtual rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable(); - virtual const rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const; - virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const; - virtual void setLinkUpdateMode( /*[in]*/ sal_uInt16 nMode ); - virtual SwFldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const; - virtual void setFieldUpdateFlags( /*[in]*/ SwFldUpdateFlags eMode ); - virtual SwCharCompressType getCharacterCompressionType() const; - virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType ); + 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 SwFldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const SAL_OVERRIDE; + virtual void setFieldUpdateFlags( /*[in]*/ SwFldUpdateFlags eMode ) SAL_OVERRIDE; + virtual SwCharCompressType getCharacterCompressionType() const SAL_OVERRIDE; + virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType ) SAL_OVERRIDE; virtual sal_uInt32 getRsid() const; virtual void setRsid( sal_uInt32 nVal ); virtual sal_uInt32 getRsidRoot() const; virtual void setRsidRoot( sal_uInt32 nVal ); // IDocumentDeviceAccess - virtual SfxPrinter* getPrinter(/*[in]*/ bool bCreate ) const; - virtual void setPrinter(/*[in]*/ SfxPrinter* pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged ); - virtual VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const; - virtual void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool bCallVirDevDataChanged ); - virtual OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const; - virtual void setReferenceDeviceType(/*[in]*/ bool bNewVirtual,/*[in]*/ bool bNewHiRes ); - virtual const JobSetup* getJobsetup() const; - virtual void setJobsetup(/*[in]*/ const JobSetup& rJobSetup ); - virtual const SwPrintData & getPrintData() const; - virtual void setPrintData(/*[in]*/ const SwPrintData& rPrtData); + virtual SfxPrinter* getPrinter(/*[in]*/ bool bCreate ) const SAL_OVERRIDE; + virtual void setPrinter(/*[in]*/ SfxPrinter* pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged ) SAL_OVERRIDE; + virtual VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const SAL_OVERRIDE; + virtual void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool bCallVirDevDataChanged ) SAL_OVERRIDE; + virtual OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const SAL_OVERRIDE; + virtual void setReferenceDeviceType(/*[in]*/ bool bNewVirtual,/*[in]*/ bool bNewHiRes ) SAL_OVERRIDE; + virtual const JobSetup* getJobsetup() const SAL_OVERRIDE; + virtual void setJobsetup(/*[in]*/ const JobSetup& rJobSetup ) SAL_OVERRIDE; + virtual const SwPrintData & getPrintData() const SAL_OVERRIDE; + virtual void setPrintData(/*[in]*/ const SwPrintData& rPrtData) SAL_OVERRIDE; // IDocumentMarkAccess IDocumentMarkAccess* getIDocumentMarkAccess(); const IDocumentMarkAccess* getIDocumentMarkAccess() const; // IDocumentRedlineAccess - virtual RedlineMode_t GetRedlineMode() const; - virtual void SetRedlineMode_intern(/*[in]*/RedlineMode_t eMode); - virtual void SetRedlineMode(/*[in]*/RedlineMode_t eMode); - virtual bool IsRedlineOn() const; - virtual bool IsIgnoreRedline() const; - virtual bool IsInRedlines(const SwNode& rNode) const; - virtual const SwRedlineTbl& GetRedlineTbl() const; - virtual const SwExtraRedlineTbl& GetExtraRedlineTbl() const; - virtual SwExtraRedlineTbl& GetExtraRedlineTbl(); - virtual bool HasExtraRedlineTbl() const; - virtual bool AppendRedline(/*[in]*/SwRangeRedline* pPtr, /*[in]*/bool bCallDelete); - virtual bool AppendTableRowRedline(/*[in]*/SwTableRowRedline* pPtr, /*[in]*/bool bCallDelete); - virtual bool AppendTableCellRedline(/*[in]*/SwTableCellRedline* pPtr, /*[in]*/bool bCallDelete); - virtual bool SplitRedline(const SwPaM& rPam); - virtual bool DeleteRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bSaveInUndo, /*[in]*/sal_uInt16 nDelType); - virtual bool DeleteRedline(/*[in]*/const SwStartNode& rSection, /*[in]*/bool bSaveInUndo, /*[in]*/sal_uInt16 nDelType); - virtual sal_uInt16 GetRedlinePos(/*[in]*/const SwNode& rNode, /*[in]*/sal_uInt16 nType) const; - virtual void CompressRedlines(); - virtual const SwRangeRedline* GetRedline(/*[in]*/const SwPosition& rPos, /*[in]*/sal_uInt16* pFndPos) const; - virtual bool IsRedlineMove() const; - virtual void SetRedlineMove(/*[in]*/bool bFlag); - virtual bool AcceptRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete); - virtual bool AcceptRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete); - virtual bool RejectRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete); - virtual bool RejectRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete); - virtual const SwRangeRedline* SelNextRedline(/*[in]*/SwPaM& rPam) const; - virtual const SwRangeRedline* SelPrevRedline(/*[in]*/SwPaM& rPam) const; - virtual void UpdateRedlineAttr(); - virtual sal_uInt16 GetRedlineAuthor(); - virtual sal_uInt16 InsertRedlineAuthor(const OUString& rAuthor); - virtual bool SetRedlineComment(/*[in]*/const SwPaM& rPam, /*[in]*/const OUString& rComment); - virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const; - virtual void SetRedlinePassword(/*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword); + virtual RedlineMode_t GetRedlineMode() const SAL_OVERRIDE; + virtual void SetRedlineMode_intern(/*[in]*/RedlineMode_t eMode) SAL_OVERRIDE; + virtual void SetRedlineMode(/*[in]*/RedlineMode_t eMode) SAL_OVERRIDE; + virtual bool IsRedlineOn() const SAL_OVERRIDE; + virtual bool IsIgnoreRedline() const SAL_OVERRIDE; + virtual bool IsInRedlines(const SwNode& rNode) const SAL_OVERRIDE; + virtual const SwRedlineTbl& GetRedlineTbl() const SAL_OVERRIDE; + virtual const SwExtraRedlineTbl& GetExtraRedlineTbl() const SAL_OVERRIDE; + virtual SwExtraRedlineTbl& GetExtraRedlineTbl() SAL_OVERRIDE; + virtual bool HasExtraRedlineTbl() const SAL_OVERRIDE; + virtual bool AppendRedline(/*[in]*/SwRangeRedline* pPtr, /*[in]*/bool bCallDelete) SAL_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 SplitRedline(const SwPaM& rPam) SAL_OVERRIDE; + virtual bool DeleteRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bSaveInUndo, /*[in]*/sal_uInt16 nDelType) SAL_OVERRIDE; + virtual bool DeleteRedline(/*[in]*/const SwStartNode& rSection, /*[in]*/bool bSaveInUndo, /*[in]*/sal_uInt16 nDelType) SAL_OVERRIDE; + virtual sal_uInt16 GetRedlinePos(/*[in]*/const SwNode& rNode, /*[in]*/sal_uInt16 nType) const SAL_OVERRIDE; + virtual void CompressRedlines() SAL_OVERRIDE; + virtual const SwRangeRedline* GetRedline(/*[in]*/const SwPosition& rPos, /*[in]*/sal_uInt16* pFndPos) const SAL_OVERRIDE; + virtual bool IsRedlineMove() const SAL_OVERRIDE; + virtual void SetRedlineMove(/*[in]*/bool bFlag) SAL_OVERRIDE; + virtual bool AcceptRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual bool AcceptRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual bool RejectRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual bool RejectRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual const SwRangeRedline* SelNextRedline(/*[in]*/SwPaM& rPam) const SAL_OVERRIDE; + virtual const SwRangeRedline* SelPrevRedline(/*[in]*/SwPaM& rPam) const SAL_OVERRIDE; + virtual void UpdateRedlineAttr() SAL_OVERRIDE; + virtual sal_uInt16 GetRedlineAuthor() SAL_OVERRIDE; + virtual sal_uInt16 InsertRedlineAuthor(const OUString& rAuthor) SAL_OVERRIDE; + virtual bool SetRedlineComment(/*[in]*/const SwPaM& rPam, /*[in]*/const OUString& rComment) SAL_OVERRIDE; + virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const SAL_OVERRIDE; + virtual void SetRedlinePassword(/*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword) SAL_OVERRIDE; // IDocumentUndoRedo IDocumentUndoRedo & GetIDocumentUndoRedo(); IDocumentUndoRedo const& GetIDocumentUndoRedo() const; // IDocumentLinksAdministration - virtual bool IsVisibleLinks() const; - virtual void SetVisibleLinks(bool bFlag); - virtual sfx2::LinkManager& GetLinkManager(); - virtual const sfx2::LinkManager& GetLinkManager() const; - virtual void UpdateLinks(bool bUI); - virtual bool GetData(const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any& rValue) const; - virtual bool SetData(const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any& rValue); - virtual ::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem); - virtual bool EmbedAllLinks(); - virtual void SetLinksUpdated(const bool bNewLinksUpdated); - virtual bool LinksUpdated() const; + virtual bool IsVisibleLinks() const SAL_OVERRIDE; + virtual void SetVisibleLinks(bool bFlag) SAL_OVERRIDE; + virtual sfx2::LinkManager& GetLinkManager() SAL_OVERRIDE; + virtual const sfx2::LinkManager& GetLinkManager() const SAL_OVERRIDE; + virtual void UpdateLinks(bool bUI) SAL_OVERRIDE; + virtual bool GetData(const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any& rValue) const SAL_OVERRIDE; + virtual bool SetData(const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any& rValue) SAL_OVERRIDE; + virtual ::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem) SAL_OVERRIDE; + virtual bool EmbedAllLinks() SAL_OVERRIDE; + virtual void SetLinksUpdated(const bool bNewLinksUpdated) SAL_OVERRIDE; + virtual bool LinksUpdated() const SAL_OVERRIDE; // IDocumentFieldsAccess - virtual const SwFldTypes *GetFldTypes() const; - virtual SwFieldType *InsertFldType(const SwFieldType &); - virtual SwFieldType *GetSysFldType( const sal_uInt16 eWhich ) const; - virtual SwFieldType* GetFldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const; - virtual void RemoveFldType(sal_uInt16 nFld); - virtual void UpdateFlds( SfxPoolItem* pNewHt, bool bCloseDB); - virtual void InsDeletedFldType(SwFieldType &); - virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich); - virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds); - virtual void UpdateRefFlds(SfxPoolItem* pHt); - virtual void UpdateTblFlds(SfxPoolItem* pHt); - virtual void UpdateExpFlds(SwTxtFld* pFld, bool bUpdateRefFlds); - virtual void UpdateUsrFlds(); - virtual void UpdatePageFlds(SfxPoolItem*); - virtual void LockExpFlds(); - virtual void UnlockExpFlds(); - virtual bool IsExpFldsLocked() const; - virtual SwDocUpdtFld& GetUpdtFlds() const; - virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen); - virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime); - virtual void FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt); - virtual void FldsToCalc(SwCalc& rCalc, const _SetGetExpFld& rToThisFld); - virtual void FldsToExpand(SwHash**& ppTbl, sal_uInt16& rTblSize, const _SetGetExpFld& rToThisFld); - virtual bool IsNewFldLst() const; - virtual void SetNewFldLst( bool bFlag); - virtual void InsDelFldInFldLst(bool bIns, const SwTxtFld& rFld); + virtual const SwFldTypes *GetFldTypes() const SAL_OVERRIDE; + virtual SwFieldType *InsertFldType(const SwFieldType &) SAL_OVERRIDE; + virtual SwFieldType *GetSysFldType( const sal_uInt16 eWhich ) const SAL_OVERRIDE; + virtual SwFieldType* GetFldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const SAL_OVERRIDE; + virtual void RemoveFldType(sal_uInt16 nFld) SAL_OVERRIDE; + virtual void UpdateFlds( SfxPoolItem* pNewHt, bool bCloseDB) SAL_OVERRIDE; + virtual void InsDeletedFldType(SwFieldType &) SAL_OVERRIDE; + virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich) SAL_OVERRIDE; + virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds) SAL_OVERRIDE; + virtual void UpdateRefFlds(SfxPoolItem* pHt) SAL_OVERRIDE; + virtual void UpdateTblFlds(SfxPoolItem* pHt) SAL_OVERRIDE; + virtual void UpdateExpFlds(SwTxtFld* pFld, bool bUpdateRefFlds) SAL_OVERRIDE; + virtual void UpdateUsrFlds() SAL_OVERRIDE; + virtual void UpdatePageFlds(SfxPoolItem*) SAL_OVERRIDE; + virtual void LockExpFlds() SAL_OVERRIDE; + virtual void UnlockExpFlds() SAL_OVERRIDE; + virtual bool IsExpFldsLocked() const SAL_OVERRIDE; + virtual SwDocUpdtFld& GetUpdtFlds() 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 FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) SAL_OVERRIDE; + virtual void FldsToCalc(SwCalc& rCalc, const _SetGetExpFld& rToThisFld) SAL_OVERRIDE; + virtual void FldsToExpand(SwHash**& ppTbl, sal_uInt16& rTblSize, const _SetGetExpFld& rToThisFld) SAL_OVERRIDE; + virtual bool IsNewFldLst() const SAL_OVERRIDE; + virtual void SetNewFldLst( bool bFlag) SAL_OVERRIDE; + virtual void InsDelFldInFldLst(bool bIns, const SwTxtFld& rFld) SAL_OVERRIDE; /** Returns the field at a certain position. @param rPos position to search at @@ -845,165 +845,165 @@ public: bool containsUpdatableFields(); // IDocumentContentOperations - virtual bool CopyRange(SwPaM&, SwPosition&, const bool bCopyAll) const; - virtual void DeleteSection(SwNode* pNode); - virtual bool DeleteRange(SwPaM&); - virtual bool DelFullPara(SwPaM&); + virtual bool CopyRange(SwPaM&, SwPosition&, const bool bCopyAll) const SAL_OVERRIDE; + virtual void DeleteSection(SwNode* pNode) SAL_OVERRIDE; + virtual bool DeleteRange(SwPaM&) SAL_OVERRIDE; + virtual bool DelFullPara(SwPaM&) SAL_OVERRIDE; // Add optional parameter <bForceJoinNext>, default value <false> // Needed for hiding of deletion redlines virtual bool DeleteAndJoin( SwPaM&, - const bool bForceJoinNext = false ); - virtual bool MoveRange(SwPaM&, SwPosition&, SwMoveFlags); - virtual bool MoveNodeRange(SwNodeRange&, SwNodeIndex&, SwMoveFlags); - virtual bool MoveAndJoin(SwPaM&, SwPosition&, SwMoveFlags); - virtual bool Overwrite(const SwPaM &rRg, const OUString& rStr); + const bool bForceJoinNext = false ) SAL_OVERRIDE; + virtual bool MoveRange(SwPaM&, SwPosition&, SwMoveFlags) SAL_OVERRIDE; + virtual bool MoveNodeRange(SwNodeRange&, SwNodeIndex&, SwMoveFlags) SAL_OVERRIDE; + virtual bool MoveAndJoin(SwPaM&, SwPosition&, SwMoveFlags) SAL_OVERRIDE; + virtual bool Overwrite(const SwPaM &rRg, const OUString& rStr) SAL_OVERRIDE; virtual bool InsertString(const SwPaM &rRg, const OUString&, - const enum InsertFlags nInsertMode = INS_EMPTYEXPAND ); + const enum InsertFlags nInsertMode = INS_EMPTYEXPAND ) SAL_OVERRIDE; virtual bool UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal = 0 ); virtual bool UpdateRsid( const SwPaM &rRg, sal_Int32 nLen ); virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, - const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*); + const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*) SAL_OVERRIDE; virtual SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet, - const SfxItemSet* pGrfAttrSet, SwFrmFmt*); + const SfxItemSet* pGrfAttrSet, SwFrmFmt*) SAL_OVERRIDE; virtual SwDrawFrmFmt* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, - const SfxItemSet& rFlyAttrSet ); + const SfxItemSet& rFlyAttrSet ) SAL_OVERRIDE; virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet, - const SfxItemSet* pGrfAttrSet, SwFrmFmt*); + const SfxItemSet* pGrfAttrSet, SwFrmFmt*) SAL_OVERRIDE; // Add a para for the char attribute exp... virtual bool InsertPoolItem( const SwPaM &rRg, const SfxPoolItem&, const SetAttrMode nFlags, - const bool bExpandCharToPara=false); + const bool bExpandCharToPara=false) SAL_OVERRIDE; virtual bool InsertItemSet (const SwPaM &rRg, const SfxItemSet&, - const SetAttrMode nFlags); - virtual void ReRead(SwPaM&, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj); - virtual void TransliterateText(const SwPaM& rPaM, utl::TransliterationWrapper&); + const SetAttrMode nFlags) SAL_OVERRIDE; + virtual void ReRead(SwPaM&, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj) SAL_OVERRIDE; + virtual void TransliterateText(const SwPaM& rPaM, utl::TransliterationWrapper&) SAL_OVERRIDE; virtual SwFlyFrmFmt* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet, - const SfxItemSet* pGrfAttrSet, SwFrmFmt*); - virtual bool SplitNode(const SwPosition &rPos, bool bChkTableStart); - virtual bool AppendTxtNode(SwPosition& rPos); + const SfxItemSet* pGrfAttrSet, SwFrmFmt*) SAL_OVERRIDE; + virtual bool SplitNode(const SwPosition &rPos, bool bChkTableStart) SAL_OVERRIDE; + virtual bool AppendTxtNode(SwPosition& rPos) SAL_OVERRIDE; virtual void SetModified(SwPaM &rPaM); virtual bool ReplaceRange(SwPaM& rPam, const OUString& rNewStr, - const bool bRegExReplace); - virtual void RemoveLeadingWhiteSpace(const SwPosition & rPos ); + const bool bRegExReplace) SAL_OVERRIDE; + virtual void RemoveLeadingWhiteSpace(const SwPosition & rPos ) SAL_OVERRIDE; // IDocumentStylePoolAccess - virtual SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ); - virtual SwFmt* GetFmtFromPool( sal_uInt16 nId ); - virtual SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId ); - virtual SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId ); - virtual SwPageDesc* GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage = true ); - virtual SwNumRule* GetNumRuleFromPool( sal_uInt16 nId ); - virtual bool IsPoolTxtCollUsed( sal_uInt16 nId ) const; - virtual bool IsPoolFmtUsed( sal_uInt16 nId ) const; - virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const; + virtual SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) SAL_OVERRIDE; + virtual SwFmt* GetFmtFromPool( sal_uInt16 nId ) SAL_OVERRIDE; + virtual SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId ) SAL_OVERRIDE; + virtual SwCharFmt* GetCharFmtFromPool( 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 IsPoolTxtCollUsed( sal_uInt16 nId ) const SAL_OVERRIDE; + virtual bool IsPoolFmtUsed( sal_uInt16 nId ) const SAL_OVERRIDE; + virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const SAL_OVERRIDE; // IDocumentLineNumberAccess - virtual const SwLineNumberInfo& GetLineNumberInfo() const; - virtual void SetLineNumberInfo(const SwLineNumberInfo& rInfo); + virtual const SwLineNumberInfo& GetLineNumberInfo() const SAL_OVERRIDE; + virtual void SetLineNumberInfo(const SwLineNumberInfo& rInfo) SAL_OVERRIDE; // IDocumentStatistics - virtual void DocInfoChgd(); - virtual const SwDocStat &GetDocStat() const; - virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false, bool bFields = true); - virtual void SetDocStat(const SwDocStat& rStat); - virtual void UpdateDocStat(bool bCompleteAsync = false, bool bFields = true); + virtual void DocInfoChgd() SAL_OVERRIDE; + virtual const SwDocStat &GetDocStat() const SAL_OVERRIDE; + virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false, bool bFields = true) SAL_OVERRIDE; + virtual void SetDocStat(const SwDocStat& rStat) SAL_OVERRIDE; + virtual void UpdateDocStat(bool bCompleteAsync = false, bool bFields = true) SAL_OVERRIDE; // IDocumentState - virtual void SetModified(); - virtual void ResetModified(); - virtual bool IsModified() const; - virtual bool IsLoaded() const; - virtual bool IsUpdateExpFld() const; - virtual bool IsNewDoc() const; - virtual bool IsPageNums() const; - virtual void SetPageNums(bool b); - virtual void SetNewDoc(bool b); - virtual void SetUpdateExpFldStat(bool b); - virtual void SetLoaded(bool b); + virtual void SetModified() SAL_OVERRIDE; + virtual void ResetModified() SAL_OVERRIDE; + virtual bool IsModified() const SAL_OVERRIDE; + virtual bool IsLoaded() const SAL_OVERRIDE; + virtual bool IsUpdateExpFld() const SAL_OVERRIDE; + virtual bool IsNewDoc() const SAL_OVERRIDE; + virtual bool IsPageNums() const SAL_OVERRIDE; + virtual void SetPageNums(bool b) SAL_OVERRIDE; + virtual void SetNewDoc(bool b) SAL_OVERRIDE; + virtual void SetUpdateExpFldStat(bool b) SAL_OVERRIDE; + virtual void SetLoaded(bool b) SAL_OVERRIDE; // IDocumentDrawModelAccess - virtual const SdrModel* GetDrawModel() const; - virtual SdrModel* GetDrawModel(); - virtual SdrLayerID GetHeavenId() const; - virtual SdrLayerID GetHellId() const; - virtual SdrLayerID GetControlsId() const; - virtual SdrLayerID GetInvisibleHeavenId() const; - virtual SdrLayerID GetInvisibleHellId() const; - virtual SdrLayerID GetInvisibleControlsId() const; - virtual void NotifyInvisibleLayers( SdrPageView& _rSdrPageView ); - virtual bool IsVisibleLayerId( const SdrLayerID& _nLayerId ) const; - virtual SdrLayerID GetVisibleLayerIdByInvisibleOne( const SdrLayerID& _nInvisibleLayerId ); - virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId ); - virtual SdrModel* _MakeDrawModel(); - virtual SdrModel* GetOrCreateDrawModel(); + virtual const SdrModel* GetDrawModel() const SAL_OVERRIDE; + virtual SdrModel* GetDrawModel() 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 void NotifyInvisibleLayers( SdrPageView& _rSdrPageView ) SAL_OVERRIDE; + virtual bool IsVisibleLayerId( const SdrLayerID& _nLayerId ) const SAL_OVERRIDE; + virtual SdrLayerID GetVisibleLayerIdByInvisibleOne( const SdrLayerID& _nInvisibleLayerId ) SAL_OVERRIDE; + virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId ) SAL_OVERRIDE; + virtual SdrModel* _MakeDrawModel() SAL_OVERRIDE; + virtual SdrModel* GetOrCreateDrawModel() SAL_OVERRIDE; // IDocumentLayoutAccess - virtual void SetCurrentViewShell( SwViewShell* pNew ); - virtual SwLayouter* GetLayouter(); - virtual const SwLayouter* GetLayouter() const; - virtual void SetLayouter( SwLayouter* pNew ); - virtual SwFrmFmt* MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet ); - virtual void DelLayoutFmt( SwFrmFmt *pFmt ); - virtual SwFrmFmt* CopyLayoutFmt( const SwFrmFmt& rSrc, const SwFmtAnchor& rNewAnchor, bool bSetTxtFlyAtt, bool bMakeFrms ); - virtual const SwViewShell *GetCurrentViewShell() const; - virtual SwViewShell *GetCurrentViewShell(); //< It must be able to communicate to a SwViewShell.This is going to be removerd later. - virtual const SwRootFrm *GetCurrentLayout() const; - virtual SwRootFrm *GetCurrentLayout(); - virtual bool HasLayout() const; + virtual void SetCurrentViewShell( SwViewShell* pNew ) SAL_OVERRIDE; + virtual SwLayouter* GetLayouter() SAL_OVERRIDE; + virtual const SwLayouter* GetLayouter() const SAL_OVERRIDE; + virtual void SetLayouter( SwLayouter* pNew ) SAL_OVERRIDE; + virtual SwFrmFmt* MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet ) SAL_OVERRIDE; + virtual void DelLayoutFmt( SwFrmFmt *pFmt ) SAL_OVERRIDE; + virtual SwFrmFmt* CopyLayoutFmt( const SwFrmFmt& rSrc, const SwFmtAnchor& rNewAnchor, bool bSetTxtFlyAtt, bool bMakeFrms ) SAL_OVERRIDE; + 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 removerd later. + virtual const SwRootFrm *GetCurrentLayout() const SAL_OVERRIDE; + virtual SwRootFrm *GetCurrentLayout() SAL_OVERRIDE; + virtual bool HasLayout() const SAL_OVERRIDE; void ClearSwLayouterEntries(); // IDocumentTimerAccess - virtual void StartIdling(); - virtual void StopIdling(); - virtual void BlockIdling(); - virtual void UnblockIdling(); - virtual void StartBackgroundJobs(); + virtual void StartIdling() SAL_OVERRIDE; + virtual void StopIdling() SAL_OVERRIDE; + virtual void BlockIdling() SAL_OVERRIDE; + virtual void UnblockIdling() SAL_OVERRIDE; + virtual void StartBackgroundJobs() SAL_OVERRIDE; // IDocumentChartDataProviderAccess - virtual SwChartDataProvider * GetChartDataProvider( bool bCreate = false ) const; - virtual void CreateChartInternalDataProviders( const SwTable *pTable ); - virtual SwChartLockController_Helper & GetChartControllerHelper(); + virtual SwChartDataProvider * GetChartDataProvider( bool bCreate = false ) const SAL_OVERRIDE; + virtual void CreateChartInternalDataProviders( const SwTable *pTable ) SAL_OVERRIDE; + virtual SwChartLockController_Helper & GetChartControllerHelper() SAL_OVERRIDE; // IDocumentListItems - virtual void addListItem( const SwNodeNum& rNodeNum ); - virtual void removeListItem( const SwNodeNum& rNodeNum ); + virtual void addListItem( const SwNodeNum& rNodeNum ) SAL_OVERRIDE; + virtual void removeListItem( const SwNodeNum& rNodeNum ) SAL_OVERRIDE; virtual OUString getListItemText( const SwNodeNum& rNodeNum, const bool bWithNumber = true, - const bool bWithSpacesForLevel = false ) const; - virtual void getListItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const; - virtual void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const; + const bool bWithSpacesForLevel = false ) const SAL_OVERRIDE; + virtual void getListItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const SAL_OVERRIDE; + virtual void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const SAL_OVERRIDE; // IDocumentOutlineNodes - virtual sal_Int32 getOutlineNodesCount() const; - virtual int getOutlineLevel( const sal_Int32 nIdx ) const; + virtual sal_Int32 getOutlineNodesCount() const SAL_OVERRIDE; + virtual int getOutlineLevel( const sal_Int32 nIdx ) const SAL_OVERRIDE; virtual OUString getOutlineText( const sal_Int32 nIdx, const bool bWithNumber, const bool bWithSpacesForLevel, - const bool bWithFtn ) const; - virtual SwTxtNode* getOutlineNode( const sal_Int32 nIdx ) const; - virtual void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const; + const bool bWithFtn ) const SAL_OVERRIDE; + virtual SwTxtNode* getOutlineNode( const sal_Int32 nIdx ) const SAL_OVERRIDE; + virtual void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const SAL_OVERRIDE; // IDocumentListsAccess virtual SwList* createList( const OUString& rListId, - const OUString& rDefaultListStyleName ); - virtual void deleteList( const OUString& rListId ); - virtual SwList* getListByName( const OUString& rListId ) const; - virtual SwList* createListForListStyle( const OUString& rListStyleName ); - virtual SwList* getListForListStyle( const OUString& rListStyleName ) const; - virtual void deleteListForListStyle( const OUString& rListStyleName ); + const OUString& rDefaultListStyleName ) SAL_OVERRIDE; + virtual void deleteList( const OUString& rListId ) SAL_OVERRIDE; + virtual SwList* getListByName( const OUString& rListId ) const SAL_OVERRIDE; + virtual SwList* createListForListStyle( const OUString& rListStyleName ) SAL_OVERRIDE; + virtual SwList* getListForListStyle( const OUString& rListStyleName ) const SAL_OVERRIDE; + virtual void deleteListForListStyle( const OUString& rListStyleName ) SAL_OVERRIDE; virtual void trackChangeOfListStyleName( const OUString& rListStyleName, - const OUString& rNewListStyleName ); + const OUString& rNewListStyleName ) SAL_OVERRIDE; // IDocumentExternalData virtual void setExternalData(::sw::tExternalDataType eType, - ::sw::tExternalDataPointer pPayload); - virtual ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType); + ::sw::tExternalDataPointer pPayload) SAL_OVERRIDE; + virtual ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType) SAL_OVERRIDE; virtual void setDocReadOnly( sal_Bool b) { mbReadOnly = b; } virtual sal_Bool getDocReadOnly() const { return mbReadOnly; } diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 4c717e735d58..93f18154b40b 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -63,8 +63,8 @@ public: class SwGrfFmtColls : public std::vector<SwGrfFmtColl*>, public SwFmtsBase { public: - virtual size_t GetFmtCount() const { return size(); } - virtual SwFmt* GetFmt(size_t idx) const { return (SwFmt*)operator[](idx); } + virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); } + virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); } sal_uInt16 GetPos(const SwGrfFmtColl* pFmt) const; /// free's any remaining child objects virtual ~SwGrfFmtColls() {} @@ -77,8 +77,8 @@ class SAL_DLLPUBLIC_TEMPLATE SwFrmFmts_Base : public std::vector<SwFrmFmt*> {}; class SW_DLLPUBLIC SwFrmFmts : public SwFrmFmts_Base, public SwFmtsBase { public: - virtual size_t GetFmtCount() const { return size(); } - virtual SwFmt* GetFmt(size_t idx) const { return (SwFmt*)operator[](idx); } + virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); } + virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); } sal_uInt16 GetPos(const SwFrmFmt* pFmt) const; bool Contains(const SwFrmFmt* pFmt) const; /// free's any remaining child objects @@ -88,8 +88,8 @@ public: class SwCharFmts : public std::vector<SwCharFmt*>, public SwFmtsBase { public: - virtual size_t GetFmtCount() const { return size(); } - virtual SwFmt* GetFmt(size_t idx) const { return (SwFmt*)operator[](idx); } + virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); } + virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); } sal_uInt16 GetPos(const SwCharFmt* pFmt) const; bool Contains(const SwCharFmt* pFmt) const; void dumpAsXml(xmlTextWriterPtr w); @@ -100,8 +100,8 @@ public: class SwTxtFmtColls : public std::vector<SwTxtFmtColl*>, public SwFmtsBase { public: - virtual size_t GetFmtCount() const { return size(); } - virtual SwFmt* GetFmt(size_t idx) const { return (SwFmt*)operator[](idx); } + virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); } + virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); } sal_uInt16 GetPos(const SwTxtFmtColl* pFmt) const; void dumpAsXml(xmlTextWriterPtr w); virtual ~SwTxtFmtColls() {} @@ -111,8 +111,8 @@ public: class SW_DLLPUBLIC SwSectionFmts : public std::vector<SwSectionFmt*>, public SwFmtsBase { public: - virtual size_t GetFmtCount() const { return size(); } - virtual SwFmt* GetFmt(size_t idx) const { return (SwFmt*)operator[](idx); } + virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); } + virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); } sal_uInt16 GetPos(const SwSectionFmt* pFmt) const; bool Contains(const SwSectionFmt* pFmt) const; /// free's any remaining child objects diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 72257e277a2f..4662938eab93 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -79,16 +79,16 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener SAL_DLLPRIVATE void RemoveLink(); /// Catch hint for DocInfo. - SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; /// FileIO - SAL_DLLPRIVATE virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); - SAL_DLLPRIVATE virtual bool Load( SfxMedium& rMedium ); - SAL_DLLPRIVATE virtual bool LoadFrom( SfxMedium& rMedium ); - SAL_DLLPRIVATE virtual bool ConvertFrom( SfxMedium &rMedium ); - SAL_DLLPRIVATE virtual bool ConvertTo( SfxMedium &rMedium ); - SAL_DLLPRIVATE virtual bool SaveAs( SfxMedium& rMedium ); - SAL_DLLPRIVATE virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); + SAL_DLLPRIVATE virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool Load( SfxMedium& rMedium ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool LoadFrom( SfxMedium& rMedium ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool ConvertFrom( SfxMedium &rMedium ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool ConvertTo( SfxMedium &rMedium ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool SaveAs( SfxMedium& rMedium ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE; SAL_DLLPRIVATE virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE; @@ -98,9 +98,9 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener /// Make DocInfo known to the Doc. SAL_DLLPRIVATE virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( - Window *pParent, const SfxItemSet &); + Window *pParent, const SfxItemSet &) SAL_OVERRIDE; /// OLE-stuff - SAL_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16); + SAL_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16) SAL_OVERRIDE; /// Methods for StyleSheets @@ -141,7 +141,7 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener protected: /// override to update text fields - virtual void DoFlushDocInfo(); + virtual void DoFlushDocInfo() SAL_OVERRIDE; public: using SotObject::GetInterface; @@ -165,15 +165,15 @@ public: DECL_LINK( Ole2ModifiedHdl, void * ); /// OLE-stuff. - virtual void SetVisArea( const Rectangle &rRect ); - virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const; - virtual Printer *GetDocumentPrinter(); - virtual OutputDevice* GetDocumentRefDev(); - virtual void OnDocumentPrinterChanged( Printer * pNewPrinter ); - virtual sal_uLong GetMiscStatus() const; + virtual void SetVisArea( const Rectangle &rRect ) SAL_OVERRIDE; + virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const SAL_OVERRIDE; + virtual Printer *GetDocumentPrinter() SAL_OVERRIDE; + virtual OutputDevice* GetDocumentRefDev() SAL_OVERRIDE; + virtual void OnDocumentPrinterChanged( Printer * pNewPrinter ) SAL_OVERRIDE; + virtual sal_uLong GetMiscStatus() const SAL_OVERRIDE; - virtual void PrepareReload(); - virtual void SetModified( bool = true ); + virtual void PrepareReload() SAL_OVERRIDE; + virtual void SetModified( bool = true ) SAL_OVERRIDE; /// Dispatcher void Execute(SfxRequest &); @@ -195,10 +195,10 @@ public: void UpdateChildWindows(); /// global IO. - virtual bool Save(); + virtual bool Save() SAL_OVERRIDE; /// For Style PI. - virtual SfxStyleSheetBasePool* GetStyleSheetPool(); + virtual SfxStyleSheetBasePool* GetStyleSheetPool() SAL_OVERRIDE; /// Set View for actions via Shell. void SetView(SwView* pVw); @@ -219,11 +219,11 @@ public: SwCrsrShell* pCrsrSh = 0, SwPaM* pPaM = 0); virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType, - ::com::sun::star::uno::Any & rValue ); + ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; virtual bool DdeSetData( const OUString& rItem, const OUString& rMimeType, - const ::com::sun::star::uno::Any & rValue ); - virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ); - virtual void ReconnectDdeLink(SfxObjectShell& rServer); + const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; + virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ) SAL_OVERRIDE; + virtual void ReconnectDdeLink(SfxObjectShell& rServer) SAL_OVERRIDE; virtual void FillClass( SvGlobalName * pClassName, sal_uInt32 * pClipFormat, @@ -231,9 +231,9 @@ public: OUString * pLongUserName, OUString * pUserName, sal_Int32 nFileFormat, - bool bTemplate = false ) const; + bool bTemplate = false ) const SAL_OVERRIDE; - virtual void LoadStyles( SfxObjectShell& rSource ); + virtual void LoadStyles( SfxObjectShell& rSource ) SAL_OVERRIDE; void _LoadStyles( SfxObjectShell& rSource, sal_Bool bPreserveCurrentDocument ); @@ -253,7 +253,7 @@ public: void LoadingFinished(); /// Cancel transfer (called from SFX). - virtual void CancelTransfers(); + virtual void CancelTransfers() SAL_OVERRIDE; /// Re-read Doc from Html-source. void ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcView ); @@ -267,15 +267,15 @@ public: void InvalidateModel(); void ReactivateModel(); - virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames(); + virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames() SAL_OVERRIDE; /// #i20883# Digital Signatures and Encryption - virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates ); + virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates ) SAL_OVERRIDE; /** #i42634# Overwrites SfxObjectShell::UpdateLinks This new function is necessary to trigger update of links in docs read by the binary filter: */ - virtual void UpdateLinks(); + virtual void UpdateLinks() SAL_OVERRIDE; virtual void setDocAccTitle( const OUString& rTitle ); virtual const OUString getDocAccTitle() const; @@ -287,15 +287,15 @@ public: SAL_DLLPRIVATE sal_Bool IsTemplate() { return bIsATemplate; } SAL_DLLPRIVATE void SetIsTemplate( bool bValue ) { bIsATemplate = bValue; } - virtual const ::sfx2::IXmlIdRegistry* GetXmlIdRegistry() const; + virtual const ::sfx2::IXmlIdRegistry* GetXmlIdRegistry() const SAL_OVERRIDE; /** passwword protection for Writer (derived from SfxObjectShell) see also: FN_REDLINE_ON, FN_REDLINE_ON */ - virtual bool IsChangeRecording() const; - virtual bool HasChangeRecordProtection() const; - virtual void SetChangeRecording( bool bActivate ); - virtual bool SetProtectionPassword( const OUString &rPassword ); - virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ); + virtual bool IsChangeRecording() const SAL_OVERRIDE; + virtual bool HasChangeRecordProtection() const SAL_OVERRIDE; + virtual void SetChangeRecording( bool bActivate ) SAL_OVERRIDE; + virtual bool SetProtectionPassword( const OUString &rPassword ) SAL_OVERRIDE; + virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) SAL_OVERRIDE; }; /** Find the right DocShell and create a new one: diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 2e2654ba5dd4..e90ff280de31 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -98,8 +98,8 @@ public: sal_Bool IsPhysical() const { return bPhysical; } void SetPhysical(sal_Bool bPhys); - virtual void SetHidden( sal_Bool bHidden ); - virtual bool IsHidden( ) const; + virtual void SetHidden( sal_Bool bHidden ) SAL_OVERRIDE; + virtual bool IsHidden( ) const SAL_OVERRIDE; void SetGrabBagItem(const com::sun::star::uno::Any& rVal); void GetGrabBagItem(com::sun::star::uno::Any& rVal) const; @@ -110,15 +110,15 @@ public: void SetItemSet( const SfxItemSet& rSet, const bool bResetIndentAttrsAtParagraphStyle = false ); - virtual SfxItemSet& GetItemSet(); + virtual SfxItemSet& GetItemSet() SAL_OVERRIDE; /** new method for paragraph styles to merge indent attributes of applied list style into the given item set, if the list style indent attributes are applicable. */ void MergeIndentAttrsOfListStyle( SfxItemSet& rSet ); - virtual const OUString& GetParent() const; - virtual const OUString& GetFollow() const; + virtual const OUString& GetParent() const SAL_OVERRIDE; + virtual const OUString& GetFollow() const SAL_OVERRIDE; - virtual sal_uLong GetHelpId( OUString& rFile ); - virtual void SetHelpId( const OUString& r, sal_uLong nId ); + virtual sal_uLong GetHelpId( OUString& rFile ) SAL_OVERRIDE; + virtual void SetHelpId( const OUString& r, sal_uLong nId ) SAL_OVERRIDE; /** Preset the members without physical access. Used by StyleSheetPool. */ @@ -127,15 +127,15 @@ public: void PresetParent(const OUString& rName){ aParent = rName; } void PresetFollow(const OUString& rName){ aFollow = rName; } - virtual bool SetName( const OUString& rStr); - virtual bool SetParent( const OUString& rStr); - virtual bool SetFollow( const OUString& rStr); + virtual bool SetName( const OUString& rStr) SAL_OVERRIDE; + virtual bool SetParent( const OUString& rStr) SAL_OVERRIDE; + virtual bool SetFollow( const OUString& rStr) SAL_OVERRIDE; - virtual bool HasFollowSupport() const; - virtual bool HasParentSupport() const; - virtual bool HasClearParentSupport() const; - virtual OUString GetDescription(); - virtual OUString GetDescription(SfxMapUnit eUnit); + virtual bool HasFollowSupport() const SAL_OVERRIDE; + virtual bool HasParentSupport() const SAL_OVERRIDE; + virtual bool HasClearParentSupport() const SAL_OVERRIDE; + virtual OUString GetDescription() SAL_OVERRIDE; + virtual OUString GetDescription(SfxMapUnit eUnit) SAL_OVERRIDE; SwCharFmt* GetCharFmt(); SwTxtFmtColl* GetCollection(); @@ -144,7 +144,7 @@ public: const SwNumRule* GetNumRule(); void SetNumRule(const SwNumRule& rRule); - virtual bool IsUsed() const; + virtual bool IsUsed() const SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -171,13 +171,13 @@ public: SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL ); virtual ~SwStyleSheetIterator(); - virtual sal_uInt16 Count(); - virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx); - virtual SfxStyleSheetBase* First(); - virtual SfxStyleSheetBase* Next(); - virtual SfxStyleSheetBase* Find(const OUString& rStr); + virtual sal_uInt16 Count() SAL_OVERRIDE; + virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx) SAL_OVERRIDE; + virtual SfxStyleSheetBase* First() SAL_OVERRIDE; + virtual SfxStyleSheetBase* Next() SAL_OVERRIDE; + virtual SfxStyleSheetBase* Find(const OUString& rStr) SAL_OVERRIDE; - virtual void Notify( SfxBroadcaster&, const SfxHint& ); + virtual void Notify( SfxBroadcaster&, const SfxHint& ) SAL_OVERRIDE; void InvalidateIterator(); }; @@ -188,8 +188,8 @@ class SwDocStyleSheetPool : public SfxStyleSheetBasePool SwDoc& rDoc; sal_Bool bOrganizer : 1; ///< Organizer - virtual SfxStyleSheetBase* Create( const OUString&, SfxStyleFamily, sal_uInt16 nMask); - virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& ); + virtual SfxStyleSheetBase* Create( const OUString&, SfxStyleFamily, sal_uInt16 nMask) SAL_OVERRIDE; + virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& ) SAL_OVERRIDE; using SfxStyleSheetBasePool::Find; @@ -197,29 +197,29 @@ public: SwDocStyleSheetPool( SwDoc&, sal_Bool bOrganizer = sal_False ); virtual void Replace( SfxStyleSheetBase& rSource, - SfxStyleSheetBase& rTarget ); + SfxStyleSheetBase& rTarget ) SAL_OVERRIDE; virtual SfxStyleSheetBase& Make(const OUString&, SfxStyleFamily, sal_uInt16 nMask) SAL_OVERRIDE; virtual SfxStyleSheetBase* Find( const OUString&, SfxStyleFamily eFam, - sal_uInt16 n=SFXSTYLEBIT_ALL ); + sal_uInt16 n=SFXSTYLEBIT_ALL ) SAL_OVERRIDE; virtual bool SetParent( SfxStyleFamily eFam, const OUString &rStyle, - const OUString &rParent ); + const OUString &rParent ) SAL_OVERRIDE; - virtual void Remove( SfxStyleSheetBase* pStyle); + virtual void Remove( SfxStyleSheetBase* pStyle) SAL_OVERRIDE; void SetOrganizerMode( sal_Bool bMode ) { bOrganizer = bMode; } sal_Bool IsOrganizerMode() const { return bOrganizer; } - virtual SfxStyleSheetIteratorPtr CreateIterator( SfxStyleFamily, sal_uInt16 nMask ); + virtual SfxStyleSheetIteratorPtr CreateIterator( SfxStyleFamily, sal_uInt16 nMask ) SAL_OVERRIDE; SwDoc& GetDoc() const { return rDoc; } void dispose(); - virtual void SAL_CALL acquire( ) throw (); - virtual void SAL_CALL release( ) throw (); + virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw () SAL_OVERRIDE; void InvalidateIterator(); diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index c1c1c7cc977a..27a0c0461626 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -148,7 +148,7 @@ public: sal_uInt16 const nMaxPage, const OUString& ) const; void ChangeExpansion( SwDoc* pDoc, sal_Bool bVirtPageNum, const sal_Int16* pNumFmt = 0 ); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -173,15 +173,15 @@ public: void ChangeExpansion(sal_uInt16 const nPageNumber, sal_uInt16 const nMaxPage); - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; - virtual OUString GetPar2() const; - virtual void SetPar2(const OUString& rStr); + virtual OUString GetPar2() const SAL_OVERRIDE; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; - virtual sal_uInt16 GetSubType() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; OUString GetUserString() const { return sUserStr; } void SetUserString( const OUString& rS ) { sUserStr = rS; } @@ -197,7 +197,7 @@ public: SwAuthorFieldType(); OUString Expand(sal_uLong) const; - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -211,14 +211,14 @@ class SwAuthorField : public SwField public: SwAuthorField(SwAuthorFieldType*, sal_uInt32 nFmt = 0); - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; inline void SetExpansion(const OUString& rStr) { aContent = rStr; } inline OUString GetContent() const { return aContent; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -232,7 +232,7 @@ public: SwFileNameFieldType(SwDoc*); OUString Expand(sal_uLong) const; - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -246,14 +246,14 @@ class SW_DLLPUBLIC SwFileNameField : public SwField public: SwFileNameField(SwFileNameFieldType*, sal_uInt32 nFmt = 0); - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; inline void SetExpansion(const OUString& rStr) { aContent = rStr; } inline OUString GetContent() const { return aContent; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -267,7 +267,7 @@ public: SwTemplNameFieldType(SwDoc*); OUString Expand(sal_uLong) const; - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -279,10 +279,10 @@ class SW_DLLPUBLIC SwTemplNameField : public SwField public: SwTemplNameField(SwTemplNameFieldType*, sal_uInt32 nFmt = 0); - virtual OUString Expand() const; - virtual SwField* Copy() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -297,7 +297,7 @@ class SwDocStatFieldType : public SwFieldType public: SwDocStatFieldType(SwDoc*); OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const; - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; inline void SetNumFormat( sal_Int16 eFmt ) { nNumberingType = eFmt; } }; @@ -316,13 +316,13 @@ public: void ChangeExpansion( const SwFrm* pFrm ); - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; - virtual sal_uInt16 GetSubType() const; - virtual void SetSubType(sal_uInt16 nSub); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -335,7 +335,7 @@ class SwHiddenTxtFieldType : public SwFieldType public: SwHiddenTxtFieldType(sal_Bool bSetHidden = sal_True); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; void SetHiddenFlag( sal_Bool bSetHidden = sal_True ); inline sal_Bool GetHiddenFlag() const { return bHidden; } @@ -358,8 +358,8 @@ class SwHiddenTxtField : public SwField sal_Bool bIsHidden : 1; ///< Is it not visible? sal_Bool bValid : 1; ///< Is DB-field evaluated? - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; public: SwHiddenTxtField( SwHiddenTxtFieldType*, @@ -375,7 +375,7 @@ public: const OUString& rFalse, sal_uInt16 nSubType = TYP_HIDDENTXTFLD); - virtual OUString GetFieldName() const; + virtual OUString GetFieldName() const SAL_OVERRIDE; void Evaluate(SwDoc*); @@ -384,17 +384,17 @@ public: OUString GetDBName(const OUString& rName, SwDoc *pDoc); /// Condition - virtual void SetPar1(const OUString& rStr); - virtual OUString GetPar1() const; + virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; + virtual OUString GetPar1() const SAL_OVERRIDE; /// True/False - String - virtual void SetPar2(const OUString& rStr); - virtual OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; + virtual OUString GetPar2() const SAL_OVERRIDE; - virtual sal_uInt16 GetSubType() const; + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -406,7 +406,7 @@ class SwHiddenParaFieldType : public SwFieldType public: SwHiddenParaFieldType(); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -421,17 +421,17 @@ public: /// Direct input, delete old value. SwHiddenParaField(SwHiddenParaFieldType*, const OUString& rCond); - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; void SetHidden(sal_Bool bHidden) { bIsHidden = bHidden; } sal_Bool IsHidden() const { return bIsHidden; } /// Query, set condition. - virtual OUString GetPar1() const; - virtual void SetPar1(const OUString& rStr); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual OUString GetPar1() const SAL_OVERRIDE; + virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -445,7 +445,7 @@ class SwMacroFieldType : public SwFieldType public: SwMacroFieldType(SwDoc*); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -458,8 +458,8 @@ class SW_DLLPUBLIC SwMacroField : public SwField OUString aText; sal_Bool bIsScriptURL; - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; public: /// Direct input, delete old value. @@ -471,17 +471,17 @@ public: OUString GetMacroName() const; SvxMacro GetSvxMacro() const; - virtual OUString GetFieldName() const; + virtual OUString GetFieldName() const SAL_OVERRIDE; /// Library and FileName - virtual OUString GetPar1() const; - virtual void SetPar1(const OUString& rStr); + virtual OUString GetPar1() const SAL_OVERRIDE; + virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; /// Macrotext - virtual OUString GetPar2() const; - virtual void SetPar2(const OUString& rStr); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual OUString GetPar2() const SAL_OVERRIDE; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; static void CreateMacroString( OUString& rMacro, const OUString& rMacroName, @@ -501,7 +501,7 @@ private: public: SwPostItFieldType(SwDoc* pDoc); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; SwDoc* GetDoc() const { @@ -532,20 +532,20 @@ public: const DateTime& rDate); ~SwPostItField(); - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; inline const DateTime GetDateTime() const { return aDateTime; } inline const Date GetDate() const { return aDateTime.GetDate(); } inline const Time GetTime() const { return aDateTime.GetTime(); } /// Author - virtual OUString GetPar1() const; - virtual void SetPar1(const OUString& rStr); + virtual OUString GetPar1() const SAL_OVERRIDE; + virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; /// Text - virtual OUString GetPar2() const; - virtual void SetPar2(const OUString& rStr); + virtual OUString GetPar2() const SAL_OVERRIDE; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; OUString GetTxt() const { return sTxt; } OUString GetInitials() const; void SetName(const OUString& rStr); @@ -556,9 +556,9 @@ public: sal_Int32 GetNumberOfParagraphs() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); - virtual OUString GetDescription() const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; + virtual OUString GetDescription() const SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -571,7 +571,7 @@ public: SwDocInfoFieldType(SwDoc* pDc); OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFormat, sal_uInt16 nLang, const OUString& rName) const; - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; class SW_DLLPUBLIC SwDocInfoField : public SwValueField @@ -580,22 +580,22 @@ class SW_DLLPUBLIC SwDocInfoField : public SwValueField OUString aContent; OUString aName; - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; public: SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, sal_uInt32 nFmt=0); SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFmt=0); - virtual void SetSubType(sal_uInt16); - virtual sal_uInt16 GetSubType() const; - virtual void SetLanguage(sal_uInt16 nLng); - virtual OUString GetFieldName() const; + virtual void SetSubType(sal_uInt16) SAL_OVERRIDE; + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual void SetLanguage(sal_uInt16 nLng) SAL_OVERRIDE; + virtual OUString GetFieldName() const SAL_OVERRIDE; OUString GetName() const { return aName; } void SetName( const OUString& rName ) { aName = rName; } inline void SetExpansion(const OUString& rStr) { aContent = rStr; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -611,7 +611,7 @@ public: inline void SetData(const OUString& rStr) { aData = rStr; } OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFormat) const; - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; class SwExtUserField : public SwField @@ -622,16 +622,16 @@ class SwExtUserField : public SwField public: SwExtUserField(SwExtUserFieldType*, sal_uInt16 nSub, sal_uInt32 nFmt=0); - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; - virtual sal_uInt16 GetSubType() const; - virtual void SetSubType(sal_uInt16 nSub); + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE; inline void SetExpansion(const OUString& rStr) { aContent = rStr; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -643,11 +643,11 @@ class SwRefPageSetFieldType : public SwFieldType public: SwRefPageSetFieldType(); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; protected: /// Overlay, because there is nothing to update! - virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -663,18 +663,18 @@ public: SwRefPageSetField( SwRefPageSetFieldType*, short nOff = 0, sal_Bool bOn = sal_True ); - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; - virtual OUString GetPar2() const; - virtual void SetPar2(const OUString& rStr); + virtual OUString GetPar2() const SAL_OVERRIDE; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; sal_Bool IsOn() const { return bOn; } short GetOffset() const { return nOffset; } void SetOffset( short nOff ) { nOffset = nOff; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -689,10 +689,10 @@ class SwRefPageGetFieldType : public SwFieldType void UpdateField( SwTxtFld* pTxtFld, _SetGetExpFlds& rSetList ); protected: /// overwritten to update all RefPageGet fields - virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) SAL_OVERRIDE; public: SwRefPageGetFieldType( SwDoc* pDoc ); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; sal_uInt16 MakeSetList( _SetGetExpFlds& rTmpLst ); SwDoc* GetDoc() const { return pDoc; } }; @@ -707,14 +707,14 @@ class SwRefPageGetField : public SwField public: SwRefPageGetField( SwRefPageGetFieldType*, sal_uInt32 nFmt ); - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; void SetText( const OUString& rTxt ) { sTxt = rTxt; } void ChangeExpansion( const SwFrm* pFrm, const SwTxtFld* pFld ); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -728,7 +728,7 @@ class SwJumpEditFieldType : public SwFieldType public: SwJumpEditFieldType( SwDoc* pDoc ); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; SwCharFmt* GetCharFmt(); }; @@ -740,21 +740,21 @@ public: SwJumpEditField( SwJumpEditFieldType*, sal_uInt32 nFormat, const OUString& sText, const OUString& sHelp ); - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; /// Placeholder-Text - virtual OUString GetPar1() const; - virtual void SetPar1(const OUString& rStr); + virtual OUString GetPar1() const SAL_OVERRIDE; + virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; /// Hint-Text - virtual OUString GetPar2() const; - virtual void SetPar2(const OUString& rStr); + virtual OUString GetPar2() const SAL_OVERRIDE; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; SwCharFmt* GetCharFmt() const { return ((SwJumpEditFieldType*)GetTyp())->GetCharFmt(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -767,7 +767,7 @@ class SwScriptFieldType : public SwFieldType public: SwScriptFieldType( SwDoc* pDoc ); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -786,22 +786,22 @@ public: SwScriptField( SwScriptFieldType*, const OUString& rType, const OUString& rCode, sal_Bool bURL=sal_False ); - virtual OUString GetDescription() const; + virtual OUString GetDescription() const SAL_OVERRIDE; - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; /// Type - virtual OUString GetPar1() const; - virtual void SetPar1(const OUString& rStr); + virtual OUString GetPar1() const SAL_OVERRIDE; + virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; /// Text - virtual OUString GetPar2() const; - virtual void SetPar2(const OUString& rStr); + virtual OUString GetPar2() const SAL_OVERRIDE; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; sal_Bool IsCodeURL() const { return bCodeURL; } void SetCodeURL( sal_Bool bURL ) { bCodeURL = bURL; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -813,7 +813,7 @@ class SwCombinedCharFieldType : public SwFieldType public: SwCombinedCharFieldType(); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -829,15 +829,15 @@ class SW_DLLPUBLIC SwCombinedCharField : public SwField public: SwCombinedCharField( SwCombinedCharFieldType*, const OUString& rChars ); - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; /// Characters - virtual OUString GetPar1() const; - virtual void SetPar1(const OUString& rStr); + virtual OUString GetPar1() const SAL_OVERRIDE; + virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_INC_DOCUFLD_HXX diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx index e9f414858467..b9774007b01e 100644 --- a/sw/inc/dpage.hxx +++ b/sw/inc/dpage.hxx @@ -38,14 +38,14 @@ public: // #i3694# // This GetOffset() method is not needed anymore, it even leads to errors. // virtual Point GetOffset() const; - virtual SdrObject* ReplaceObject( SdrObject* pNewObj, sal_uLong nObjNum ); + virtual SdrObject* ReplaceObject( SdrObject* pNewObj, sal_uLong nObjNum ) SAL_OVERRIDE; virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV, - const Rectangle *pRect) const; + const Rectangle *pRect) const SAL_OVERRIDE; sal_Bool RequestHelp( Window* pWindow, SdrView* pView, const HelpEvent& rEvt ); - 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; }; #endif // INCLUDED_SW_INC_DPAGE_HXX diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx index e5eaad641c0b..6d255dfe25c3 100644 --- a/sw/inc/drawdoc.hxx +++ b/sw/inc/drawdoc.hxx @@ -34,17 +34,17 @@ public: const SwDoc& GetDoc() const { return *pDoc; } SwDoc& GetDoc() { return *pDoc; } - virtual SdrPage* AllocPage(bool bMasterPage); + virtual SdrPage* AllocPage(bool bMasterPage) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::embed::XStorage> GetDocumentStorage() const; + ::com::sun::star::embed::XStorage> GetDocumentStorage() const SAL_OVERRIDE; /// For saving of rectangles as control-replacement for versions < 5.0. - virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const; + virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const SAL_OVERRIDE; protected: /// overload of <SdrModel::createUnoModel()> is needed to provide corresponding uno model. - 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; }; #endif diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index c03d5bf2444a..cf7b02a87c04 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -583,7 +583,7 @@ public: sal_Bool HasOtherCnt() const; /// Apply ViewOptions with Start-/EndAction. - virtual void ApplyViewOptions( const SwViewOption &rOpt ); + virtual void ApplyViewOptions( const SwViewOption &rOpt ) SAL_OVERRIDE; /** Query text within selection. @returns FALSE, if selected range is too large to be copied diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 8aaf12e04abc..f688d9024e03 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -74,12 +74,12 @@ class SwGetExpFieldType : public SwValueFieldType { public: SwGetExpFieldType(SwDoc* pDoc); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; /** Overlay, because get-field cannot be changed and therefore does not need to be updated. Update at changing of set-values! */ protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; }; class SW_DLLPUBLIC SwGetExpField : public SwFormulaField @@ -90,15 +90,15 @@ class SW_DLLPUBLIC SwGetExpField : public SwFormulaField bool bLateInitialization; // #i82544# - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; public: SwGetExpField( SwGetExpFieldType*, const OUString& rFormel, sal_uInt16 nSubType = nsSwGetSetExpType::GSE_EXPR, sal_uLong nFmt = 0); - virtual void SetValue( const double& rVal ); - virtual void SetLanguage(sal_uInt16 nLng); + virtual void SetValue( const double& rVal ) SAL_OVERRIDE; + virtual void SetLanguage(sal_uInt16 nLng) SAL_OVERRIDE; inline OUString GetExpStr() const; inline void ChgExpStr(const OUString& rExpand); @@ -113,16 +113,16 @@ public: Only called by formatting!! */ void ChangeExpansion( const SwFrm&, const SwTxtFld& ); - virtual OUString GetFieldName() const; + virtual OUString GetFieldName() const SAL_OVERRIDE; /// Change formula. - virtual OUString GetPar2() const; - virtual void SetPar2(const OUString& rStr); + virtual OUString GetPar2() const SAL_OVERRIDE; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; - virtual sal_uInt16 GetSubType() const; - virtual void SetSubType(sal_uInt16 nType); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; static sal_Int32 GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc, sal_Int32 nHint = 0); // #i82544# @@ -155,13 +155,13 @@ class SW_DLLPUBLIC SwSetExpFieldType : public SwValueFieldType sal_Bool bDeleted; protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; public: SwSetExpFieldType( SwDoc* pDoc, const OUString& rName, sal_uInt16 nType = nsSwGetSetExpType::GSE_EXPR ); - virtual SwFieldType* Copy() const; - virtual OUString GetName() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; + virtual OUString GetName() const SAL_OVERRIDE; inline void SetType(sal_uInt16 nTyp); inline sal_uInt16 GetType() const; @@ -192,8 +192,8 @@ public: const SwNode* GetOutlineChgNd() const { return pOutlChgNd; } void SetOutlineChgNd( const SwNode* p ) { pOutlChgNd = p; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; inline void SwSetExpFieldType::SetType( sal_uInt16 nTyp ) @@ -217,13 +217,13 @@ class SW_DLLPUBLIC SwSetExpField : public SwFormulaField sal_uInt16 nSeqNo; sal_uInt16 nSubType; - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; public: SwSetExpField(SwSetExpFieldType*, const OUString& rFormel, sal_uLong nFmt = 0); - virtual void SetValue( const double& rVal ); + virtual void SetValue( const double& rVal ) SAL_OVERRIDE; inline OUString GetExpStr() const; @@ -235,10 +235,10 @@ public: inline void SetInputFlag(sal_Bool bInp); inline sal_Bool GetInputFlag() const; - virtual OUString GetFieldName() const; + virtual OUString GetFieldName() const SAL_OVERRIDE; - virtual sal_uInt16 GetSubType() const; - virtual void SetSubType(sal_uInt16 nType); + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE; inline sal_Bool IsSequenceFld() const; @@ -247,13 +247,13 @@ public: inline sal_uInt16 GetSeqNumber() const { return nSeqNo; } /// Query name only. - virtual OUString GetPar1() const; + virtual OUString GetPar1() const SAL_OVERRIDE; /// Query formula. - virtual OUString GetPar2() const; - virtual void SetPar2(const OUString& rStr); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual OUString GetPar2() const SAL_OVERRIDE; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; inline OUString SwSetExpField::GetExpStr() const @@ -283,7 +283,7 @@ class SwInputFieldType : public SwFieldType public: SwInputFieldType( SwDoc* pDoc ); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; SwDoc* GetDoc() const { return pDoc; } }; @@ -299,8 +299,8 @@ class SW_DLLPUBLIC SwInputField : public SwField SwFmtFld* mpFmtFld; // attribute to which the <SwInputField> belongs to - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; // Accessing Input Field's content const OUString& getContent() const; @@ -328,15 +328,15 @@ public: bool isFormField() const; - virtual OUString GetFieldName() const; + virtual OUString GetFieldName() const SAL_OVERRIDE; /// Content - virtual OUString GetPar1() const; - virtual void SetPar1(const OUString& rStr); + virtual OUString GetPar1() const SAL_OVERRIDE; + virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; /// aPromptText - virtual OUString GetPar2() const; - virtual void SetPar2(const OUString& rStr); + virtual OUString GetPar2() const SAL_OVERRIDE; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; virtual OUString GetHelp() const; virtual void SetHelp(const OUString & rStr); @@ -344,10 +344,10 @@ public: virtual OUString GetToolTip() const; virtual void SetToolTip(const OUString & rStr); - virtual sal_uInt16 GetSubType() const; - virtual void SetSubType(sal_uInt16 nSub); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -383,7 +383,7 @@ class SwTblFieldType : public SwValueFieldType { public: SwTblFieldType(SwDoc* pDocPtr); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; class SwTblField : public SwValueField, public SwTableFormula @@ -391,11 +391,11 @@ class SwTblField : public SwValueField, public SwTableFormula OUString sExpand; sal_uInt16 nSubType; - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; /// Search TextNode containing the field. - virtual const SwNode* GetNodeOfFormula() const; + virtual const SwNode* GetNodeOfFormula() const SAL_OVERRIDE; OUString GetCommand(); @@ -403,22 +403,22 @@ public: SwTblField( SwTblFieldType*, const OUString& rFormel, sal_uInt16 nSubType = 0, sal_uLong nFmt = 0); - virtual void SetValue( const double& rVal ); - virtual sal_uInt16 GetSubType() const; - virtual void SetSubType(sal_uInt16 nType); + virtual void SetValue( const double& rVal ) SAL_OVERRIDE; + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE; OUString GetExpStr() const { return sExpand; } void ChgExpStr(const OUString& rStr) { sExpand = rStr; } void CalcField( SwTblCalcPara& rCalcPara ); - virtual OUString GetFieldName() const; + virtual OUString GetFieldName() const SAL_OVERRIDE; /// The formula. - virtual OUString GetPar2() const; - virtual void SetPar2(const OUString& rStr); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual OUString GetPar2() const SAL_OVERRIDE; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_INC_EXPFLD_HXX diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index c296565b3a90..357aafe67fd5 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -44,7 +44,7 @@ public: /// @@@ public copy ctor, but no copy assignment? SwFmtCharFmt( const SwFmtCharFmt& rAttr ); protected: - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; private: /// @@@ public copy ctor, but no copy assignment? @@ -54,18 +54,18 @@ public: TYPEINFO_OVERRIDE(); /// "pure virtual methods" of SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual bool GetInfo( SfxPoolItem& rInfo ) const; + virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE; void SetCharFmt( SwFmt* pFmt ) { pFmt->Add(this); } SwCharFmt* GetCharFmt() const { return (SwCharFmt*)GetRegisteredIn(); } diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 3723f31092d2..0108500d3568 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -319,7 +319,7 @@ public: void SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffset = 1 ); /// Show current selection (frame / draw object as required). - virtual void MakeSelVisible(); + virtual void MakeSelVisible() SAL_OVERRIDE; /** @return FrmFmt of object that may be under Point. Object does not become selected! */ diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 90cd505cc2e3..ddf1c3274b87 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -409,8 +409,8 @@ protected: public: virtual ~SwValueField(); - virtual SwFieldType* ChgTyp( SwFieldType* ); - virtual void SetLanguage(sal_uInt16 nLng); + virtual SwFieldType* ChgTyp( SwFieldType* ) SAL_OVERRIDE; + virtual void SetLanguage(sal_uInt16 nLng) SAL_OVERRIDE; inline SwDoc* GetDoc() const { return ((SwValueFieldType*)GetTyp())->GetDoc(); } @@ -432,7 +432,7 @@ protected: SwFormulaField( const SwFormulaField& rFld ); public: - virtual OUString GetFormula() const; + virtual OUString GetFormula() const SAL_OVERRIDE; void SetFormula(const OUString& rStr); void SetExpandedFormula(const OUString& rStr); diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index 8b854ff89435..fa07bd5c5c52 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -85,7 +85,7 @@ class SwDateTimeFieldType : public SwValueFieldType public: SwDateTimeFieldType(SwDoc* pDoc); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; }; class SW_DLLPUBLIC SwDateTimeField : public SwValueField @@ -93,20 +93,20 @@ class SW_DLLPUBLIC SwDateTimeField : public SwValueField sal_uInt16 nSubType; long nOffset; // Offset in minutes. - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; public: SwDateTimeField(SwDateTimeFieldType* pType, sal_uInt16 nSubType = DATEFLD, sal_uLong nFmt = 0, sal_uInt16 nLng = 0); - virtual sal_uInt16 GetSubType() const; - virtual void SetSubType(sal_uInt16 nSub); + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE; - virtual double GetValue() const; + virtual double GetValue() const SAL_OVERRIDE; - virtual void SetPar2(const OUString& rStr); - virtual OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; + virtual OUString GetPar2() const SAL_OVERRIDE; inline sal_Bool IsDate() const { return (nSubType & DATEFLD) != 0; } @@ -119,8 +119,8 @@ public: void SetDateTime(const DateTime& rDT); static double GetDateTime(SwDoc* pDoc, const DateTime& rDT); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_INC_FLDDAT_HXX diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx index 8ba7905909f4..55751e61dc67 100644 --- a/sw/inc/flddropdown.hxx +++ b/sw/inc/flddropdown.hxx @@ -46,7 +46,7 @@ public: @return a copy of this type */ - virtual SwFieldType * Copy () const; + virtual SwFieldType * Copy () const SAL_OVERRIDE; }; /** @@ -90,14 +90,14 @@ class SW_DLLPUBLIC SwDropDownField : public SwField @return the expanded value of the field */ - virtual OUString Expand() const; + virtual OUString Expand() const SAL_OVERRIDE; /** Creates a copy of this field. @return the copy of this field */ - virtual SwField * Copy() const; + virtual SwField * Copy() const SAL_OVERRIDE; public: /** @@ -126,14 +126,14 @@ public: @return the selected value */ - virtual OUString GetPar1() const; + virtual OUString GetPar1() const SAL_OVERRIDE; /** Returns the name of the field. @return the name of the field */ - virtual OUString GetPar2() const; + virtual OUString GetPar2() const SAL_OVERRIDE; /** Sets the selected value. @@ -142,14 +142,14 @@ public: selected. Otherwise no item will be selected, i.e. the resulting selection will be empty. */ - virtual void SetPar1(const OUString & rStr); + virtual void SetPar1(const OUString & rStr) SAL_OVERRIDE; /** Sets the name of the field. @param rStr the new name of the field */ - virtual void SetPar2(const OUString & rStr); + virtual void SetPar2(const OUString & rStr) SAL_OVERRIDE; /** Sets the items of the dropdown box. @@ -248,7 +248,7 @@ public: - FIELD_PROP_PAR3 Get the help text of the field. - FIELD_PROP_PAR4 Get the tool tip of the field. */ - virtual bool QueryValue(com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId) const; + virtual bool QueryValue(com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId) const SAL_OVERRIDE; /** API: Sets a property value on the dropdown field. @@ -260,7 +260,7 @@ public: - FIELD_PROP_PAR3 Set the help text of the field. - FIELD_PROP_PAR4 Set the tool tip of the field. */ - virtual bool PutValue(const com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId); + virtual bool PutValue(const com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId) SAL_OVERRIDE; }; #endif diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index 74b3395406bb..f410ca22c912 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -51,16 +51,16 @@ public: SwFmtAnchor &operator=( const SwFmtAnchor& ); /// "pure virtual methods" of SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; RndStdIds GetAnchorId() const { return nAnchorId; } sal_uInt16 GetPageNum() const { return nPageNum; } diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index 1009ba155e18..eada4b6ac8c9 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -45,16 +45,16 @@ public: TYPEINFO_OVERRIDE(); /// "pure virtual methods" of SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; void SetStyleHandle( boost::shared_ptr<SfxItemSet> pHandle ) { mpHandle = pHandle; } const boost::shared_ptr<SfxItemSet> GetStyleHandle() const { return mpHandle; } diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx index c7ee3440f76b..5ded377618a6 100644 --- a/sw/inc/fmtclbl.hxx +++ b/sw/inc/fmtclbl.hxx @@ -31,7 +31,7 @@ public: : SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {} /// "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; }; inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(sal_Bool bInP) const diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 81f2f0e06207..4393f5cb8f78 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -100,16 +100,16 @@ public: SwFmtCol& operator=( const SwFmtCol& ); /// "pure virtual methods" of SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; const SwColumns &GetColumns() const { return aColumns; } SwColumns &GetColumns() { return aColumns; } diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index 690857eb5bef..4d69b242ec49 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -40,15 +40,15 @@ public: inline SwFmtChain &operator=( const SwFmtChain& ); /// "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; SwFlyFrmFmt* GetPrev() const { return (SwFlyFrmFmt*)aPrev.GetRegisteredIn(); } SwFlyFrmFmt* GetNext() const { return (SwFlyFrmFmt*)aNext.GetRegisteredIn(); } diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index 87d83bc51949..db00d0755bad 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -39,8 +39,8 @@ public: ~SwFmtCntnt(); /// "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; const SwNodeIndex *GetCntntIdx() const { return pStartNode; } void SetNewCntntIdx( const SwNodeIndex *pIdx ); diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index e5e000f45cdd..1b77f1542df2 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -86,7 +86,7 @@ protected: { pNextTxtFmtColl = this; } /// To get UL- / LR- / FontHeight-changes. - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: @@ -109,12 +109,12 @@ public: /** Override to recognize changes on the <SwNumRuleItem> and register/unregister the paragragh style at the corresponding <SwNumRule> instance. */ - virtual bool SetFmtAttr( const SfxPoolItem& rAttr ); - virtual bool SetFmtAttr( const SfxItemSet& rSet ); - virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); + virtual bool SetFmtAttr( const SfxPoolItem& rAttr ) SAL_OVERRIDE; + virtual bool SetFmtAttr( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE; /// Override <ResetAllFmtAttr()> to stay assigned to list level of outline style. - virtual sal_uInt16 ResetAllFmtAttr(); + virtual sal_uInt16 ResetAllFmtAttr() SAL_OVERRIDE; inline bool StayAssignedToListLevelOfOutlineStyle() const { diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index 28ee643974ca..93586fcd3ec0 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -33,12 +33,12 @@ public: sal_Bool bPrt = sal_False ) : SfxBoolItem( nId, bPrt ) {} /// "pure virtual methos" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(sal_Bool bInP) const diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx index 81f7e4d21896..d79566b35b2b 100644 --- a/sw/inc/fmtflcnt.hxx +++ b/sw/inc/fmtflcnt.hxx @@ -36,8 +36,8 @@ class SwFmtFlyCnt : public SfxPoolItem public: SwFmtFlyCnt( SwFrmFmt *pFrmFmt ); /// "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; inline SwFrmFmt *GetFrmFmt() const { return pFmt; } /// For Undo: delete the FlyFrmFormat "logically"; it is kept in Undo-object. diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 5c87e31c58a2..b1e89ecde91e 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -51,8 +51,8 @@ class SW_DLLPUBLIC SwFmtFld : public SfxPoolItem, public SwClient, public SfxBro SwFmtFld& operator=(const SwFmtFld& rFld); protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); - virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -66,10 +66,10 @@ public: virtual ~SwFmtFld(); /// "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual bool GetInfo( SfxPoolItem& rInfo ) const; + virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE; const SwField* GetField() const { diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index 2ab47e9e221a..776518d71da6 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -35,12 +35,12 @@ public: TYPEINFO_OVERRIDE(); /// "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; inline const SwFmtFollowTextFlow &SwAttrSet::GetFollowTextFlow(sal_Bool bInP) const diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx index 10de916409a9..b2ca7788a6b1 100644 --- a/sw/inc/fmtfordr.hxx +++ b/sw/inc/fmtfordr.hxx @@ -40,8 +40,8 @@ public: inline SwFmtFillOrder &operator=( const SwFmtFillOrder &rCpy ); /// "Pure virtual methods" of SfxPoolItem. - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_uInt16 GetValueCount() const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); } }; diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index e5920260216e..e10e9c0e3892 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -65,15 +65,15 @@ public: SwFmtFrmSize& operator=( const SwFmtFrmSize& rCpy ); /// "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; SwFrmSize GetHeightSizeType() const { return m_eFrmHeightType; } void SetHeightSizeType( SwFrmSize eSize ) { m_eFrmHeightType = eSize; } diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx index c4716fc95cf1..3d65769620b7 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -45,8 +45,8 @@ public: virtual ~SwFmtFtn(); /// "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; OUString GetNumStr() const { return m_aNumber; } sal_uInt16 GetNumber() const { return m_nNumber; } diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index 6d86c2ef9044..1292aa58b82c 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -52,18 +52,18 @@ protected: {} public: - virtual sal_uInt16 GetValueCount() const; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; inline sal_Bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); } @@ -91,7 +91,7 @@ public: : SwFmtFtnEndAtTxtEnd( RES_FTN_AT_TXTEND, ePos ) {} - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; }; class SW_DLLPUBLIC SwFmtEndAtTxtEnd : public SwFmtFtnEndAtTxtEnd @@ -103,7 +103,7 @@ public: SetNumType( SVX_NUM_ROMAN_LOWER ); } - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; }; inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(sal_Bool bInP) const diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index ec9b932fdf4d..b7f887d1dbbd 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -45,13 +45,13 @@ public: TYPEINFO_OVERRIDE(); /// "pure virtual methods" of SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; const SwFrmFmt *GetHeaderFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } SwFrmFmt *GetHeaderFmt() { return (SwFrmFmt*)GetRegisteredIn(); } @@ -78,13 +78,13 @@ public: TYPEINFO_OVERRIDE(); /// "pure virtual methods" of SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; const SwFrmFmt *GetFooterFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } SwFrmFmt *GetFooterFmt() { return (SwFrmFmt*)GetRegisteredIn(); } diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index dbdd0850c173..d8664f051795 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -51,18 +51,18 @@ public: TYPEINFO_OVERRIDE(); /// "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; const SwTxtINetFmt* GetTxtINetFmt() const { diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index 9d64c83de253..c6a4198561a2 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -38,15 +38,15 @@ public: TYPEINFO_OVERRIDE(); /// "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; sal_uLong GetStartValue() const { return nStartValue; } sal_Bool IsCount() const { return bCountLines != 0; } diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx index 416f1d315b87..0ba80aad46b4 100644 --- a/sw/inc/fmtlsplt.hxx +++ b/sw/inc/fmtlsplt.hxx @@ -32,12 +32,12 @@ public: SwFmtLayoutSplit( sal_Bool bSplit = sal_True ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {} /// "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(sal_Bool bInP) const diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index 806be2c608d0..9adeedfa748c 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -107,8 +107,8 @@ public: virtual ~SwFmtMeta(); /// SfxPoolItem - virtual bool operator==( const SfxPoolItem & ) const; - virtual SfxPoolItem * Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem & ) const SAL_OVERRIDE; + virtual SfxPoolItem * Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; /// notify clients registered at m_pMeta that this meta is being (re-)moved void NotifyChangeTxtNode(SwTxtNode *const pTxtNode); @@ -151,19 +151,19 @@ protected: { m_wXMeta = xMeta; } /// SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; public: explicit Meta(SwFmtMeta * const i_pFmt = 0); virtual ~Meta(); /// sfx2::Metadatable - virtual ::sfx2::IXmlIdRegistry& GetRegistry(); - virtual bool IsInClipboard() const; - virtual bool IsInUndo() const; - virtual bool IsInContent() const; + virtual ::sfx2::IXmlIdRegistry& GetRegistry() SAL_OVERRIDE; + virtual bool IsInClipboard() const SAL_OVERRIDE; + virtual bool IsInUndo() const SAL_OVERRIDE; + virtual bool IsInContent() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > MakeUnoObject(); + ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE; }; class MetaField diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index c4b2dd63d97e..a967823700a7 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -42,18 +42,18 @@ public: inline SwFmtVertOrient &operator=( const SwFmtVertOrient &rCpy ); /// "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - SvStream& Store(SvStream &rStream, sal_uInt16 itemVersion) const; - SfxPoolItem* Create(SvStream &rStream, sal_uInt16 itemVersion) const; + SvStream& Store(SvStream &rStream, sal_uInt16 itemVersion) const SAL_OVERRIDE; + SfxPoolItem* Create(SvStream &rStream, sal_uInt16 itemVersion) const SAL_OVERRIDE; sal_Int16 GetVertOrient() const { return eOrient; } sal_Int16 GetRelationOrient() const { return eRelation; } @@ -77,15 +77,15 @@ public: inline SwFmtHoriOrient &operator=( const SwFmtHoriOrient &rCpy ); /// "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; sal_Int16 GetHoriOrient() const { return eOrient; } sal_Int16 GetRelationOrient() const { return eRelation; } diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index be74b34f9006..3aa854538ff8 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -46,8 +46,8 @@ class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient SwModify* pDefinedIn; /**< Points to the object in which the attribute was set (CntntNode/Format). */ protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); - virtual void SwClientNotify( const SwModify&, const SfxHint& rHint ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; + virtual void SwClientNotify( const SwModify&, const SfxHint& rHint ) SAL_OVERRIDE; public: SwFmtPageDesc( const SwPageDesc *pDesc = 0 ); @@ -58,15 +58,15 @@ public: TYPEINFO_OVERRIDE(); /// "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; SwPageDesc *GetPageDesc() { return (SwPageDesc*)GetRegisteredIn(); } const SwPageDesc *GetPageDesc() const { return (SwPageDesc*)GetRegisteredIn(); } diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx index f7c41095d078..650585734de8 100644 --- a/sw/inc/fmtrfmrk.hxx +++ b/sw/inc/fmtrfmrk.hxx @@ -41,8 +41,8 @@ public: ~SwFmtRefMark( ); /// "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; const SwTxtRefMark *GetTxtRefMark() const { return pTxtAttr; } SwTxtRefMark *GetTxtRefMark() { return pTxtAttr; } diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx index bd0f9cb55fd6..b14edc0a2689 100644 --- a/sw/inc/fmtrowsplt.hxx +++ b/sw/inc/fmtrowsplt.hxx @@ -32,12 +32,12 @@ public: SwFmtRowSplit( sal_Bool bSplit = sal_True ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {} // "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; inline const SwFmtRowSplit &SwAttrSet::GetRowSplit(sal_Bool bInP) const diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index e0577c7f89e4..2835d4a5d2ab 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -42,19 +42,19 @@ public: SwFmtRuby& operator=( const SwFmtRuby& rAttr ); // "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; const SwTxtRuby* GetTxtRuby() const { return pTxtAttr; } SwTxtRuby* GetTxtRuby() { return pTxtAttr; } diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index 80eea3a4694e..5f974b3ddc56 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -39,16 +39,16 @@ public: inline SwFmtSurround &operator=( const SwFmtSurround &rCpy ); // "Pure virtual Methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual sal_uInt16 GetValueCount() const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; SwSurround GetSurround()const { return SwSurround( GetValue() ); } sal_Bool IsAnchorOnly() const { return bAnchorOnly; } diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index 4cb250cec47e..c50589267234 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -49,15 +49,15 @@ public: virtual ~SwFmtURL(); /// "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; void SetTargetFrameName( const OUString& rStr ) { sTargetFrameName = rStr; } void SetURL(const OUString &rURL, bool bServerMap); diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index 9a46e85287bc..565d2b168b47 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -44,11 +44,11 @@ public: const SwFmtWrapInfluenceOnObjPos& _rSource ); /// pure virtual methods of class <SfxPoolItem> - virtual bool operator==( const SfxPoolItem& _rAttr ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& _rAttr ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; /// direct accessors to data void SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition ); diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 4829caf678ac..038a0834e9d0 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -62,7 +62,7 @@ protected: SwFmt( SwAttrPool& rPool, const OUString &rFmtNm, const sal_uInt16* pWhichRanges, SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich ); SwFmt( const SwFmt& rFmt ); - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); ///< Already in base class Client. @@ -74,7 +74,7 @@ public: sal_uInt16 Which() const { return nWhichId; } /// Query format information. - virtual bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; /// Copy attributes even among documents. void CopyAttrs( const SwFmt&, sal_Bool bReplace=sal_True ); diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index a2d2771cc44c..e4fa0cc4d778 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -58,7 +58,7 @@ protected: pDrvdFrm, nFmtWhich ) {} - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); ///< Already in base class Client. @@ -164,7 +164,7 @@ public: ~SwFlyFrmFmt(); /// Creates the views. - virtual void MakeFrms(); + virtual void MakeFrms() SAL_OVERRIDE; SwFlyFrm* GetFrm( const Point* pDocPos = 0, const sal_Bool bCalcFrm = sal_False ) const; @@ -172,9 +172,9 @@ public: SwAnchoredObject* GetAnchoredObj( const Point* pDocPos = 0, const sal_Bool bCalcFrm = sal_False ) const; - virtual Graphic MakeGraphic( ImageMap* pMap = NULL ); + virtual Graphic MakeGraphic( ImageMap* pMap = NULL ) SAL_OVERRIDE; - virtual bool GetInfo( SfxPoolItem& rInfo ) const; + virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE; OUString GetObjTitle() const; void SetObjTitle( const OUString& rTitle, bool bBroadcast = false ); @@ -192,7 +192,7 @@ public: @return true, if background color is transparent, but not "no fill" or a existing background graphic is transparent. */ - virtual bool IsBackgroundTransparent() const; + virtual bool IsBackgroundTransparent() const SAL_OVERRIDE; /** SwFlyFrmFmt::IsBackgroundBrushInherited @@ -262,19 +262,19 @@ public: /** DrawObjects are removed from the arrays at the layout. The DrawObjects are marked as deleted. */ - virtual void DelFrms(); + virtual void DelFrms() SAL_OVERRIDE; /** Register DrawObjects in the arrays at layout. Reset delete marks. */ - virtual void MakeFrms(); + virtual void MakeFrms() SAL_OVERRIDE; - virtual Graphic MakeGraphic( ImageMap* pMap = NULL ); + virtual Graphic MakeGraphic( ImageMap* pMap = NULL ) SAL_OVERRIDE; - virtual SwFrmFmt::tLayoutDir GetLayoutDir() const; - virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir ); + virtual SwFrmFmt::tLayoutDir GetLayoutDir() const SAL_OVERRIDE; + virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir ) SAL_OVERRIDE; - virtual sal_Int16 GetPositionLayoutDir() const; - virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ); + virtual sal_Int16 GetPositionLayoutDir() const SAL_OVERRIDE; + virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ) SAL_OVERRIDE; inline bool IsPosAttrSet() const { return mbPosAttrSet; } inline void PosAttrSet() { mbPosAttrSet = true; } @@ -284,7 +284,7 @@ public: mbPosAttrSet = false; } - virtual OUString GetDescription() const; + virtual OUString GetDescription() const SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrmFmt); }; diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx index 3abf70ff12d0..2ff9034d8c3f 100644 --- a/sw/inc/ftninfo.hxx +++ b/sw/inc/ftninfo.hxx @@ -37,7 +37,7 @@ class SW_DLLPUBLIC SwEndNoteInfo : public SwClient OUString sSuffix; protected: bool m_bEndNote; - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE; public: SvxNumberType aFmt; diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx index b76f891e0737..fa08d449d5b3 100644 --- a/sw/inc/globdoc.hxx +++ b/sw/inc/globdoc.hxx @@ -38,7 +38,7 @@ public: OUString * pLongUserName, OUString * pUserName, sal_Int32 nFileFormat, - bool bTemplate = false ) const; + bool bTemplate = false ) const SAL_OVERRIDE; }; #endif diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 0223baac2bf6..de916b330c3b 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -56,21 +56,21 @@ public: {} // pure virtual methods of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; // pure virtual methods of SfxEnumItem - virtual sal_uInt16 GetValueCount() const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; inline SwMirrorGrf& operator=( const SwMirrorGrf& rMirrorGrf ) { @@ -96,7 +96,7 @@ public: sal_Int32 nTop, sal_Int32 nBottom ); // "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; }; class SwRotationGrf : public SfxUInt16Item @@ -111,17 +111,17 @@ public: {} // pure virtual methods from SfxInt16Item - 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; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; void SetUnrotatedSize( const Size& rSz ) { aUnrotatedSize = rSz; } const Size& GetUnrotatedSize() const { return aUnrotatedSize; } @@ -135,12 +135,12 @@ public: {} // pure virtual methods from SfxInt16Item - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; class SW_DLLPUBLIC SwContrastGrf : public SfxInt16Item @@ -151,12 +151,12 @@ public: {} // pure virtual methods from SfxInt16Item - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; class SwChannelGrf : public SfxInt16Item @@ -172,7 +172,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; class SwChannelRGrf : public SwChannelGrf @@ -181,7 +181,7 @@ public: SwChannelRGrf( sal_Int16 nVal = 0 ) : SwChannelGrf( nVal, RES_GRFATR_CHANNELR ) {} - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; }; class SwChannelGGrf : public SwChannelGrf { @@ -189,7 +189,7 @@ public: SwChannelGGrf( sal_Int16 nVal = 0 ) : SwChannelGrf( nVal, RES_GRFATR_CHANNELG ) {} - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; }; class SwChannelBGrf : public SwChannelGrf { @@ -197,7 +197,7 @@ public: SwChannelBGrf( sal_Int16 nVal = 0 ) : SwChannelGrf( nVal, RES_GRFATR_CHANNELB ) {} - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; }; class SW_DLLPUBLIC SwGammaGrf : public SfxPoolItem @@ -219,18 +219,18 @@ public: } // pure virtual methods from SfxEnumItem - 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; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; const double& GetValue() const { return nValue; } void SetValue( const double& rVal ) { nValue = rVal; } @@ -244,12 +244,12 @@ public: {} // pure virtual methods from SfxInt16Item - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; class SwTransparencyGrf : public SfxByteItem @@ -260,16 +260,16 @@ public: {} // pure virtual methods from SfxInt16Item - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; class SW_DLLPUBLIC SwDrawModeGrf : public SfxEnumItem @@ -280,20 +280,20 @@ public: {} // pure virtual methods of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; // pure virtual methods of SfxEnumItem - virtual sal_uInt16 GetValueCount() const; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; /****************************************************************************** diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx index 87e040015487..38747bc392ff 100644 --- a/sw/inc/hfspacingitem.hxx +++ b/sw/inc/hfspacingitem.hxx @@ -32,12 +32,12 @@ public: sal_Bool bPrt = sal_False ) : SfxBoolItem( nId, bPrt ) {} // "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(sal_Bool bInP) const diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index 3e4a6c790d69..df973d0c513b 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -75,18 +75,18 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion protected: virtual void GetNextPortion( OUString& rNextPortion, LanguageType& rLangOfPortion, - bool bAllowImplicitChangesForNotConvertibleText ); + bool bAllowImplicitChangesForNotConvertibleText ) SAL_OVERRIDE; virtual void HandleNewUnit( const sal_Int32 nUnitStart, - const sal_Int32 nUnitEnd ); + const sal_Int32 nUnitEnd ) SAL_OVERRIDE; virtual void ReplaceUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, const OUString& rOrigText, const OUString& rReplaceWith, const ::com::sun::star::uno::Sequence< sal_Int32 > &rOffsets, ReplacementAction eAction, - LanguageType *pNewUnitLanguage ); + LanguageType *pNewUnitLanguage ) SAL_OVERRIDE; - virtual bool HasRubySupport() const; + virtual bool HasRubySupport() const SAL_OVERRIDE; public: SwHHCWrapper( diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index 7242d27578d4..649f11b0728b 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -40,8 +40,8 @@ public: SwMsgPoolItem( sal_uInt16 nWhich ); // "Overhead" of SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; }; // SwPtrMsgPoolItem (old SwObjectDying!) diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx index 619bc1f85dd1..ce84f67df00c 100644 --- a/sw/inc/lineinfo.hxx +++ b/sw/inc/lineinfo.hxx @@ -50,7 +50,7 @@ class SW_DLLPUBLIC SwLineNumberInfo : public SwClient /**< purpose of derivation sal_Bool bRestartEachPage; /**< Restart counting at the first paragraph of each page (even on follows when paragraphs are splitted) */ protected: - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: SwLineNumberInfo(); diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 049bd7492f30..3c81e713905f 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -62,8 +62,8 @@ class SwRevisionConfig : public utl::ConfigItem SwRevisionConfig(); ~SwRevisionConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -82,8 +82,8 @@ class SwCompareConfig : public utl::ConfigItem SwCompareConfig(); ~SwCompareConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& ){ }; + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& ) SAL_OVERRIDE { }; void Load(); void SetModified() {ConfigItem::SetModified(); } }; @@ -108,8 +108,8 @@ class SwInsertConfig : public utl::ConfigItem SwInsertConfig(sal_Bool bWeb); ~SwInsertConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -133,8 +133,8 @@ class SwTableConfig : public utl::ConfigItem SwTableConfig(sal_Bool bWeb); ~SwTableConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -161,8 +161,8 @@ class SwMiscConfig : public utl::ConfigItem SwMiscConfig(); ~SwMiscConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} }; diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 850b23079770..d5e3ddd7a307 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -123,7 +123,7 @@ public: const Graphic& GetGrf() const { return maGrfObj.GetGraphic(); } const GraphicObject& GetGrfObj() const { return maGrfObj; } const GraphicObject* GetReplacementGrfObj() const; - virtual SwCntntNode *SplitCntntNode( const SwPosition & ); + virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE; /// isolated only way to set GraphicObject to allow more actions when doing so void SetGraphic(const Graphic& rGraphic, const OUString& rLink); @@ -137,7 +137,7 @@ public: /// when GraphicObject content changes void onGraphicChanged(); - virtual Size GetTwipSize() const; + virtual Size GetTwipSize() const SAL_OVERRIDE; void SetTwipSize( const Size& rSz ); bool IsTransparent() const; @@ -162,7 +162,7 @@ public: void SetScaleImageMap( bool b ) { bScaleImageMap = b; } /// in ndcopy.cxx - virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const; + virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE; /** Re-read in case graphic was not OK. The current one gets replaced by the new one. */ @@ -180,8 +180,8 @@ public: bool IsSelected() const; /// Communicate to graphic that node is in Undo-range. - virtual bool SavePersistentData(); - virtual bool RestorePersistentData(); + virtual bool SavePersistentData() SAL_OVERRIDE; + virtual bool RestorePersistentData() SAL_OVERRIDE; /// Query link-data. bool IsGrfLink() const { return refLink.Is(); } diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 937c4d46134f..37279c68af5d 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -39,7 +39,7 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode // Creates for all derivations an AttrSet with ranges for frame- and // graphics-attributes (only called by SwCntntNode). - virtual void NewAttrSet( SwAttrPool& ); + virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE; SwNoTxtNode( const SwNoTxtNode& ); // Not allowed. SwNoTxtNode &operator=( const SwNoTxtNode& ); // Not allowed. @@ -51,7 +51,7 @@ protected: public: ~SwNoTxtNode(); - virtual SwCntntFrm *MakeFrm( SwFrm* ); + virtual SwCntntFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE; inline SwGrfFmtColl *GetGrfColl() const { return (SwGrfFmtColl*)GetRegisteredIn(); } diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index 9b3f6c777872..f23a205d4473 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -100,19 +100,19 @@ public: SwOLEObj& GetOLEObj() { return aOLEObj; } ~SwOLENode(); - virtual SwCntntNode *SplitCntntNode( const SwPosition & ); + virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE; /// Is in ndcopy.cxx. - virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const; + virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE; - virtual Size GetTwipSize() const; + virtual Size GetTwipSize() const SAL_OVERRIDE; const Graphic* GetGraphic(); void GetNewReplacement(); - virtual bool SavePersistentData(); - virtual bool RestorePersistentData(); + virtual bool SavePersistentData() SAL_OVERRIDE; + virtual bool RestorePersistentData() SAL_OVERRIDE; sal_Bool IsInGlobalDocSection() const; sal_Bool IsOLEObjectDeleted() const; diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 897e6d7e9f2a..8746d106bf54 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -133,7 +133,7 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable SAL_DLLPRIVATE void MoveTxtAttr_To_AttrSet(); // Called by SplitNode. /// Create the specific AttrSet. - SAL_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& ); + SAL_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE; /// Optimization: Asking for information about hidden characters at SwScriptInfo /// updates these flags. @@ -202,8 +202,8 @@ public: protected: /// for hanging TxtFmtCollections somewhere else (Outline-Numbering!) - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); - virtual void SwClientNotify( const SwModify&, const SfxHint& ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE; public: using SwCntntNode::GetAttr; @@ -223,18 +223,18 @@ public: virtual ~SwTxtNode(); - virtual sal_Int32 Len() const; + virtual sal_Int32 Len() const SAL_OVERRIDE; /// Is in itratr. void GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMax, sal_uLong &rAbs, OutputDevice* pOut = 0 ) const; /// overriding to handle change of certain paragraph attributes - virtual sal_Bool SetAttr( const SfxPoolItem& ); - virtual sal_Bool SetAttr( const SfxItemSet& rSet ); - virtual sal_Bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); - virtual sal_Bool ResetAttr( const std::vector<sal_uInt16>& rWhichArr ); - virtual sal_uInt16 ResetAllAttr(); + virtual sal_Bool SetAttr( const SfxPoolItem& ) SAL_OVERRIDE; + virtual sal_Bool SetAttr( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual sal_Bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE; + virtual sal_Bool ResetAttr( const std::vector<sal_uInt16>& rWhichArr ) SAL_OVERRIDE; + virtual sal_uInt16 ResetAllAttr() SAL_OVERRIDE; /// insert text content /// @param rStr text to insert; in case it does not fit into the capacity @@ -339,10 +339,10 @@ public: const ::com::sun::star::uno::Sequence<sal_Int32>& rOffsets ); /// Virtual methods from CntntNode. - virtual SwCntntFrm *MakeFrm( SwFrm* ); - virtual SwCntntNode *SplitCntntNode( const SwPosition & ); - virtual SwCntntNode *JoinNext(); - virtual SwCntntNode *JoinPrev(); + virtual SwCntntFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE; + virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE; + virtual SwCntntNode *JoinNext() SAL_OVERRIDE; + virtual SwCntntNode *JoinPrev() SAL_OVERRIDE; SwCntntNode *AppendNode( const SwPosition & ); @@ -398,7 +398,7 @@ public: sal_uInt16 Convert( SwConversionArgs & ); inline SwTxtFmtColl *GetTxtColl() const; - virtual SwFmtColl *ChgFmtColl( SwFmtColl* ); + virtual SwFmtColl *ChgFmtColl( SwFmtColl* ) SAL_OVERRIDE; void _ChgTxtCollUpdateNum( const SwTxtFmtColl* pOld, const SwTxtFmtColl* pNew ); @@ -659,7 +659,7 @@ public: /// in ndcopy.cxx bool IsSymbol( const sal_Int32 nBegin ) const; // In itratr.cxx. - virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const; + virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE; /// Interactive hyphenation: we find TxtFrm and call its CalcHyph. bool Hyphenate( SwInterHyphInfo &rHyphInf ); @@ -731,7 +731,7 @@ public: SwIndex const & rPos, const sal_Int32 nChangeLen, const bool bNegative = false, - const bool bDelete = false ); + const bool bDelete = false ) SAL_OVERRIDE; /// change text to Upper/Lower/Hiragana/Katagana/... void TransliterateText( utl::TransliterationWrapper& rTrans, @@ -775,16 +775,16 @@ public: { m_wXParagraph = xParagraph; } /// sfx2::Metadatable - virtual ::sfx2::IXmlIdRegistry& GetRegistry(); - virtual bool IsInClipboard() const; - virtual bool IsInUndo() const; - virtual bool IsInContent() const; + virtual ::sfx2::IXmlIdRegistry& GetRegistry() SAL_OVERRIDE; + virtual bool IsInClipboard() const SAL_OVERRIDE; + virtual bool IsInUndo() const SAL_OVERRIDE; + virtual bool IsInContent() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > MakeUnoObject(); + ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE; bool IsCollapse() const; - virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ); + virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ) SAL_OVERRIDE; sal_uInt32 GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const; sal_uInt32 GetParRsid() const; diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 52d80a3e47de..4b3c88d18348 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -317,7 +317,7 @@ public: /// Call ChkCondcoll to all ContentNodes of section. void CheckSectionCondColl() const; - virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ); + virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ) SAL_OVERRIDE; private: /// Private constructor because copying is never allowed!! @@ -374,7 +374,7 @@ protected: SwAttrSet (handle): */ sal_uInt16 ClearItemsFromAttrSet( const std::vector<sal_uInt16>& rWhichIds ); - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); /// Already contained in base class Client. @@ -430,7 +430,7 @@ public: virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0; /// Get information from Client. - virtual bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; /// SS for PoolItems: hard attributation. diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 27827250acd4..5450977c62e3 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -53,13 +53,13 @@ class SW_DLLPUBLIC SwNumFmt : public SvxNumberFormat, public SwClient //For i120928,record the cp info of graphic within bullet sal_Unicode cGrfBulletCP; SAL_DLLPRIVATE void UpdateNumNodes( SwDoc* pDoc ); - SAL_DLLPRIVATE virtual void NotifyGraphicArrived(); + SAL_DLLPRIVATE virtual void NotifyGraphicArrived() SAL_OVERRIDE; using SvxNumberFormat::operator ==; using SvxNumberFormat::operator !=; protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE; public: SwNumFmt(); @@ -77,16 +77,16 @@ public: void SetCharFmt( SwCharFmt* ); virtual void SetCharFmtName(const OUString& rSet); - virtual OUString GetCharFmtName()const; + virtual OUString GetCharFmtName()const SAL_OVERRIDE; //For i120928,access the cp info of graphic within bullet void SetGrfBulletCP(sal_Unicode cP){cGrfBulletCP = cP;} sal_Unicode GetGrfBulletCP()const {return cGrfBulletCP;} - virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0); + virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0) SAL_OVERRIDE; - virtual void SetVertOrient(sal_Int16 eSet); - virtual sal_Int16 GetVertOrient() const; + virtual void SetVertOrient(sal_Int16 eSet) SAL_OVERRIDE; + virtual sal_Int16 GetVertOrient() const SAL_OVERRIDE; const SwFmtVertOrient* GetGraphicOrientation() const; sal_Bool IsEnumeration() const; // #i22362# diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index 1af8ad98b264..e6f2203f8f87 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -158,7 +158,7 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify SAL_DLLPRIVATE SwPageDesc(const OUString&, SwFrmFmt*, SwDoc *pDc ); protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ) SAL_OVERRIDE; public: OUString GetName() const { return aDescName; } @@ -233,7 +233,7 @@ public: void SetPoolHlpFileId( sal_uInt8 nId ) { aMaster.SetPoolHlpFileId( nId ); } /// Query information from Client. - virtual bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; const SwFrmFmt* GetPageFmtOfNode( const SwNode& rNd, sal_Bool bCheckForThisPgDc = sal_True ) const; diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 76dde6eae120..8bd41a07c8ec 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -59,20 +59,20 @@ private: SwFmtDrop & operator= (const SwFmtDrop &); protected: - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: /// "pure virtual methods" of SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + const IntlWrapper* pIntl = 0) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; inline sal_uInt8 GetLines() const { return nLines; } inline sal_uInt8 &GetLines() { return nLines; } @@ -90,7 +90,7 @@ public: inline SwCharFmt *GetCharFmt() { return (SwCharFmt*)GetRegisteredIn(); } void SetCharFmt( SwCharFmt *pNew ); /// Get information from Client. - virtual bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; /// Get and set Modify pointer. inline const SwModify* GetDefinedIn() const { return pDefinedIn; } @@ -109,12 +109,12 @@ public: inline SwRegisterItem& operator=( const SwRegisterItem& rRegister ); /// "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; inline SwRegisterItem::SwRegisterItem( const sal_Bool bRegister ) : @@ -146,16 +146,16 @@ public: { SetValue( rCpy.GetValue() ); return *this; } /// "pure virtual methods" of SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; }; class SwParaConnectBorderItem : public SfxBoolItem @@ -169,12 +169,12 @@ public: inline SwParaConnectBorderItem& operator=( const SwParaConnectBorderItem& rConnect ); /// "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; inline SwParaConnectBorderItem::SwParaConnectBorderItem( const sal_Bool bConnect ) : diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx index cfd3fb0472d9..837d447f7d34 100644 --- a/sw/inc/postithelper.hxx +++ b/sw/inc/postithelper.hxx @@ -136,13 +136,13 @@ public: { } - virtual SwPosition GetAnchorPosition() const; - virtual bool UseElement(); - virtual const SwFmtFld& GetFmtFld() const + virtual SwPosition GetAnchorPosition() const SAL_OVERRIDE; + virtual bool UseElement() SAL_OVERRIDE; + virtual const SwFmtFld& GetFmtFld() const SAL_OVERRIDE { return mrFmtFld; } - virtual const SfxBroadcaster* GetBroadCaster() const + virtual const SfxBroadcaster* GetBroadCaster() const SAL_OVERRIDE { return dynamic_cast<const SfxBroadcaster *> (&mrFmtFld); } @@ -150,7 +150,7 @@ public: SwEditWin& rEditWin, WinBits nBits, SwPostItMgr& aMgr, - SwPostItBits aBits ); + SwPostItBits aBits ) SAL_OVERRIDE; private: SwFmtFld& mrFmtFld; diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx index 22acab7d2c46..d7397b3575d7 100644 --- a/sw/inc/prtopt.hxx +++ b/sw/inc/prtopt.hxx @@ -31,9 +31,9 @@ public: SwPrintOptions(sal_Bool bWeb); virtual ~SwPrintOptions(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); - virtual void doSetModified( ) { bModified = sal_True; SetModified();} + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void doSetModified( ) SAL_OVERRIDE { bModified = sal_True; SetModified();} SwPrintOptions& operator=(const SwPrintData& rData) { diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 8c0aa430f501..6219b598a3ff 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -59,9 +59,9 @@ public: SwRedlineExtraData_FmtColl( const OUString& rColl, sal_uInt16 nPoolFmtId, const SfxItemSet* pSet = 0 ); virtual ~SwRedlineExtraData_FmtColl(); - virtual SwRedlineExtraData* CreateNew() const; - virtual void Reject( SwPaM& rPam ) const; - virtual bool operator == ( const SwRedlineExtraData& ) const; + virtual SwRedlineExtraData* CreateNew() const SAL_OVERRIDE; + virtual void Reject( SwPaM& rPam ) const SAL_OVERRIDE; + virtual bool operator == ( const SwRedlineExtraData& ) const SAL_OVERRIDE; void SetItemSet( const SfxItemSet& rSet ); }; @@ -75,9 +75,9 @@ class SwRedlineExtraData_Format : public SwRedlineExtraData public: SwRedlineExtraData_Format( const SfxItemSet& rSet ); virtual ~SwRedlineExtraData_Format(); - virtual SwRedlineExtraData* CreateNew() const; - virtual void Reject( SwPaM& rPam ) const; - virtual bool operator == ( const SwRedlineExtraData& ) const; + virtual SwRedlineExtraData* CreateNew() const SAL_OVERRIDE; + virtual void Reject( SwPaM& rPam ) const SAL_OVERRIDE; + virtual bool operator == ( const SwRedlineExtraData& ) const SAL_OVERRIDE; }; /* @@ -97,9 +97,9 @@ class SW_DLLPUBLIC SwRedlineExtraData_FormattingChanges : public SwRedlineExtraD public: SwRedlineExtraData_FormattingChanges( const SfxItemSet* pItemSet ); virtual ~SwRedlineExtraData_FormattingChanges(); - virtual SwRedlineExtraData* CreateNew() const; - virtual void Reject( SwPaM& rPam ) const; - virtual bool operator == ( const SwRedlineExtraData& ) const; + virtual SwRedlineExtraData* CreateNew() const SAL_OVERRIDE; + virtual void Reject( SwPaM& rPam ) const SAL_OVERRIDE; + virtual bool operator == ( const SwRedlineExtraData& ) const SAL_OVERRIDE; SfxItemSet* GetItemSet( ) const; }; diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index 0b4e3ceec585..c961bb6266f3 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -62,10 +62,10 @@ class SwGetRefFieldType : public SwFieldType SwDoc* pDoc; protected: /// Overlay in order to update all ref-fields. - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: SwGetRefFieldType(SwDoc* pDoc ); - virtual SwFieldType* Copy() const; + virtual SwFieldType* Copy() const SAL_OVERRIDE; SwDoc* GetDoc() const { return pDoc; } @@ -84,8 +84,8 @@ private: sal_uInt16 nSubType; sal_uInt16 nSeqNo; - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; // #i81002# OUString MakeRefNumStr( const SwTxtNode& rTxtNodeOfField, @@ -98,7 +98,7 @@ public: virtual ~SwGetRefField(); - virtual OUString GetFieldName() const; + virtual OUString GetFieldName() const SAL_OVERRIDE; OUString GetSetRefName() const { return sSetRefName; } @@ -114,8 +114,8 @@ public: void SetExpand( const OUString& rStr ) { sTxt = rStr; } /// Get/set sub type. - virtual sal_uInt16 GetSubType() const; - virtual void SetSubType( sal_uInt16 n ); + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual void SetSubType( sal_uInt16 n ) SAL_OVERRIDE; // --> #i81002# bool IsRefToHeadingCrossRefBookmark() const; @@ -129,16 +129,16 @@ public: void SetSeqNo( sal_uInt16 n ) { nSeqNo = n; } // Name of reference. - virtual OUString GetPar1() const; - virtual void SetPar1(const OUString& rStr); + virtual OUString GetPar1() const SAL_OVERRIDE; + virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; - virtual OUString GetPar2() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); + virtual OUString GetPar2() const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) SAL_OVERRIDE; void ConvertProgrammaticToUIName(); - virtual OUString GetDescription() const; + virtual OUString GetDescription() const SAL_OVERRIDE; }; #endif /// INCLUDED_SW_INC_REFFLD_HXX diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 2d958baeb0df..9b0e27e34240 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -160,7 +160,7 @@ private: bool const bHidden, bool const bCondition); protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); // rtti @@ -296,20 +296,20 @@ class SW_DLLPUBLIC SwSectionFmt protected: SwSectionFmt( SwSectionFmt* pDrvdFrm, SwDoc *pDoc ); - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); // Already contained in base class client. ~SwSectionFmt(); // Deletes all Frms in aDepend (Frms are recognized via PTR_CAST). - virtual void DelFrms(); + virtual void DelFrms() SAL_OVERRIDE; // Creates views. - virtual void MakeFrms(); + virtual void MakeFrms() SAL_OVERRIDE; // Get information from Format. - virtual bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; SwSection* GetSection() const; inline SwSectionFmt* GetParent() const; @@ -341,12 +341,12 @@ public: { m_wXTextSection = xTextSection; } // sfx2::Metadatable - virtual ::sfx2::IXmlIdRegistry& GetRegistry(); - virtual bool IsInClipboard() const; - virtual bool IsInUndo() const; - virtual bool IsInContent() const; + virtual ::sfx2::IXmlIdRegistry& GetRegistry() SAL_OVERRIDE; + virtual bool IsInClipboard() const SAL_OVERRIDE; + virtual bool IsInUndo() const SAL_OVERRIDE; + virtual bool IsInContent() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > MakeUnoObject(); + ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE; }; diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index e64e5ed0df3b..c28fb75f037a 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -273,7 +273,7 @@ private: class AsciiReader: public Reader { friend class SwReader; - virtual sal_uLong Read( SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &); + virtual sal_uLong Read( SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE; public: AsciiReader(): Reader() {} }; @@ -285,9 +285,9 @@ class SW_DLLPUBLIC StgReader : public Reader protected: sal_uLong OpenMainStream( SotStorageStreamRef& rRef, sal_uInt16& rBuffSize ); public: - virtual int GetReaderType(); + virtual int GetReaderType() SAL_OVERRIDE; OUString GetFltName() { return aFltName; } - virtual void SetFltName( const OUString& r ); + virtual void SetFltName( const OUString& r ) SAL_OVERRIDE; }; // The given stream has to be created dynamically and must @@ -477,7 +477,7 @@ protected: com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStg; // Create error at call. - virtual sal_uLong WriteStream(); + virtual sal_uLong WriteStream() SAL_OVERRIDE; virtual sal_uLong WriteStorage() = 0; virtual sal_uLong WriteMedium( SfxMedium& ) = 0; @@ -486,10 +486,10 @@ protected: public: StgWriter() : Writer() {} - virtual sal_Bool IsStgWriter() const; + virtual sal_Bool IsStgWriter() const SAL_OVERRIDE; - virtual sal_uLong Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString* = 0, SfxMedium* = 0 ); - virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* = 0 ); + virtual sal_uLong Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString* = 0, SfxMedium* = 0 ) SAL_OVERRIDE; + virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* = 0 ) SAL_OVERRIDE; SotStorage& GetStorage() const { return *pStg; } }; diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index c5f7c745e7cd..d5736be0859c 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -105,7 +105,7 @@ public: //from class SalFrame virtual void SetWindowState( const OString & rStr ) = 0; virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; - virtual void EndDialog(long ) = 0; + virtual void EndDialog(long ) SAL_OVERRIDE = 0; }; class AbstractInsFootNoteDlg : public VclAbstractDialog diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx index cf8d7d969cad..b22deecd8a97 100644 --- a/sw/inc/swacorr.hxx +++ b/sw/inc/swacorr.hxx @@ -32,12 +32,12 @@ protected: // Return replacement text (only for SWG-format, all others can be obtained from wordlist!). // rShort is stream-name - encrypted! virtual bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, - const OUString& rFileName, const OUString& rShort, OUString& rLong ); + const OUString& rFileName, const OUString& rShort, OUString& rLong ) SAL_OVERRIDE; // Text with attributes (only SWG-format!). // rShort is stream-name - encrypted! virtual bool PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, - const OUString& rFileName, const OUString& rShort, SfxObjectShell&, OUString& ); + const OUString& rFileName, const OUString& rShort, SfxObjectShell&, OUString& ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index cb67b5217bf2..782cb26acc4e 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -168,7 +168,7 @@ class SW_DLLPUBLIC SwAttrSet : public SfxItemSet SwAttrSet *pOldSet, *pNewSet; // Notification-Callback - virtual void Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew ); + virtual void Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew ) SAL_OVERRIDE; void PutChgd( const SfxPoolItem& rI ) { SfxItemSet::PutDirect( rI ); } public: @@ -176,7 +176,7 @@ public: SwAttrSet( SwAttrPool&, const sal_uInt16* nWhichPairTable ); SwAttrSet( const SwAttrSet& ); - virtual SfxItemSet* Clone(sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0) const; + virtual SfxItemSet* Clone(sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0) const SAL_OVERRIDE; bool Put_BC( const SfxPoolItem& rAttr, SwAttrSet* pOld, SwAttrSet* pNew ); bool Put_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew ); diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx index a55d151114a1..a47ae6a73535 100644 --- a/sw/inc/swbaslnk.hxx +++ b/sw/inc/swbaslnk.hxx @@ -57,9 +57,9 @@ public: virtual ~SwBaseLink(); 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; - virtual void Closed(); + virtual void Closed() SAL_OVERRIDE; virtual const SwNode* GetAnchor() const; diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx index b80b231c3ef5..72eeeb49b3f4 100644 --- a/sw/inc/swcli.hxx +++ b/sw/inc/swcli.hxx @@ -32,10 +32,10 @@ class SwOleClient : public SfxInPlaceClient sal_Bool bInDoVerb; sal_Bool bOldCheckForOLEInCaption; - virtual void ObjectAreaChanged(); - virtual void RequestNewObjectArea( Rectangle& ); - virtual void ViewChanged(); - virtual void MakeVisible(); + virtual void ObjectAreaChanged() SAL_OVERRIDE; + virtual void RequestNewObjectArea( Rectangle& ) SAL_OVERRIDE; + virtual void ViewChanged() SAL_OVERRIDE; + virtual void MakeVisible() SAL_OVERRIDE; public: SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& ); @@ -44,7 +44,7 @@ public: sal_Bool IsCheckForOLEInCaption() const { return bOldCheckForOLEInCaption; } - virtual void FormatChanged(); + virtual void FormatChanged() SAL_OVERRIDE; }; #endif diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index 0b71ec5caf16..b62004f25dbc 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -260,7 +260,7 @@ protected: sal_Bool bChg : 1; sal_Bool bParked : 1; // Table-cursor was parked. - virtual bool IsSelOvrCheck(int eFlags); + virtual bool IsSelOvrCheck(int eFlags) SAL_OVERRIDE; public: SwTableCursor( const SwPosition &rPos, SwPaM* pRing = 0 ); @@ -268,8 +268,8 @@ public: virtual ~SwTableCursor(); virtual sal_Bool LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, - sal_Bool bAllowVisual, sal_Bool bSkipHidden, sal_Bool bInsertCrsr ); - virtual bool GotoTable( const OUString& rName ); + sal_Bool bAllowVisual, sal_Bool bSkipHidden, sal_Bool bInsertCrsr ) SAL_OVERRIDE; + virtual bool GotoTable( const OUString& rName ) SAL_OVERRIDE; void InsertBox( const SwTableBox& rTblBox ); void DeleteBox(size_t nPos); diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx index 2e8b61ad842c..7b01d9aad4ad 100644 --- a/sw/inc/swddetbl.hxx +++ b/sw/inc/swddetbl.hxx @@ -41,8 +41,8 @@ public: SwDDEFieldType* GetDDEFldType(); inline const SwDDEFieldType* GetDDEFldType() const; protected: - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); - virtual void SwClientNotify( const SwModify&, const SfxHint& ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE; }; // ----------- Inlines ----------------------------- diff --git a/sw/inc/swfltopt.hxx b/sw/inc/swfltopt.hxx index 4a611d2218a0..afc0050e0f61 100644 --- a/sw/inc/swfltopt.hxx +++ b/sw/inc/swfltopt.hxx @@ -29,8 +29,8 @@ public: void GetValues( sal_uInt16 nCnt, const sal_Char** ppNames, sal_uInt32* pValues ); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; #endif diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index 08d57d718853..2a1bc0486d89 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -108,9 +108,9 @@ class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener, public utl::C sal_Bool bEmbeddedLoadSave : 1; // Catch hint for DocInfo. - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE; protected: // Envelopes, labels. @@ -212,9 +212,9 @@ public: SwFldUpdateFlags GetFldUpdateFlags( sal_Bool bWeb ) const; // Virtual methods for options 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; // Pool is created here and set at SfxShell. void InitAttrPool(); diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx index 8be8e92ea532..606dc10d2852 100644 --- a/sw/inc/swserv.hxx +++ b/sw/inc/swserv.hxx @@ -62,7 +62,7 @@ public: virtual bool GetData( ::com::sun::star::uno::Any & rData, const OUString & rMimeType, - bool bSynchron = false ); + bool bSynchron = false ) SAL_OVERRIDE; sal_Bool SetData( const OUString & rMimeType, const ::com::sun::star::uno::Any& rData ); diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 4968bd7b2f4c..e003e2ffbe38 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -124,7 +124,7 @@ protected: bool IsModifyLocked(){ return bModifyLocked;} - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE; public: enum SearchType @@ -302,7 +302,7 @@ public: SwSelBoxes& rBoxes, bool bToTop = true ) const; // Get information from client. - virtual bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; // Search in format for registered table. static SwTable * FindTable( SwFrmFmt const*const pFmt ); diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx index ec696082ab0c..914e8c6c7838 100644 --- a/sw/inc/swtblfmt.hxx +++ b/sw/inc/swtblfmt.hxx @@ -78,7 +78,7 @@ protected: {} // For recognition of changes (especially TableBoxAttribute). - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); // Already in base class Content. diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index dd25833392e7..6976500c543a 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -51,15 +51,15 @@ public: virtual ~SwTextGridItem(); // "pure virtual methods" of SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; SwTextGridItem& operator=( const SwTextGridItem& ); diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 43122d2cce04..a3108fb10daf 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -77,7 +77,7 @@ class SW_DLLPUBLIC SwTOXMark protected: // SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); // rtti @@ -90,8 +90,8 @@ public: SwTOXMark& operator=( const SwTOXMark& rCopy ); // "pure virtual methods" of SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; void InvalidateTOXMark(); @@ -475,7 +475,7 @@ public: SwTOXBase( const SwTOXBase& rCopy, SwDoc* pDoc = 0 ); virtual ~SwTOXBase(); - virtual bool GetInfo( SfxPoolItem& rInfo ) const; + virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE; // a kind of CopyCtor - check if the TOXBase is at TOXType of the doc. // If not, so create it an copy all other used things. The return is this diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx index 92e1cb0495b9..fe4fad242796 100644 --- a/sw/inc/txatbase.hxx +++ b/sw/inc/txatbase.hxx @@ -129,7 +129,7 @@ protected: public: SwTxtAttrEnd( SfxPoolItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); - virtual sal_Int32* GetEnd(); + virtual sal_Int32* GetEnd() SAL_OVERRIDE; }; // --------------- Inline Implementations ------------------------ diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx index 1f80016d9141..b727106b41f5 100644 --- a/sw/inc/txtatr.hxx +++ b/sw/inc/txtatr.hxx @@ -86,13 +86,13 @@ class SW_DLLPUBLIC SwTxtRuby : public SwTxtAttrNesting, public SwClient { SwTxtNode* m_pTxtNode; protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwTxtRuby( SwFmtRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); virtual ~SwTxtRuby(); TYPEINFO_OVERRIDE(); - virtual bool GetInfo( SfxPoolItem& rInfo ) const; + virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE; SAL_DLLPRIVATE void InitRuby(SwTxtNode & rNode); diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx index b973aaadd469..7ce306e1b5c3 100644 --- a/sw/inc/txtfld.hxx +++ b/sw/inc/txtfld.hxx @@ -81,11 +81,11 @@ public: virtual ~SwTxtInputFld(); - virtual sal_Int32* GetEnd(); + virtual sal_Int32* GetEnd() SAL_OVERRIDE; void LockNotifyContentChange(); void UnlockNotifyContentChange(); - virtual void NotifyContentChange( SwFmtFld& rFmtFld ); + virtual void NotifyContentChange( SwFmtFld& rFmtFld ) SAL_OVERRIDE; void UpdateTextNodeContent( const OUString& rNewContent ); diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx index 174cb1fba814..28fa9d73ef64 100644 --- a/sw/inc/txtinet.hxx +++ b/sw/inc/txtinet.hxx @@ -35,14 +35,14 @@ class SW_DLLPUBLIC SwTxtINetFmt : public SwTxtAttrNesting, public SwClient bool m_bVisitedValid : 1; // is m_bVisited valid? protected: -virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); +virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwTxtINetFmt( SwFmtINetFmt& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); virtual ~SwTxtINetFmt(); TYPEINFO_OVERRIDE(); - virtual bool GetInfo( SfxPoolItem& rInfo ) const; + virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE; SAL_DLLPRIVATE void InitINetFmt(SwTxtNode & rNode); diff --git a/sw/inc/txtrfmrk.hxx b/sw/inc/txtrfmrk.hxx index b4f560c8ba5b..78fac9723424 100644 --- a/sw/inc/txtrfmrk.hxx +++ b/sw/inc/txtrfmrk.hxx @@ -35,7 +35,7 @@ public: SwTxtRefMark( SwFmtRefMark& rAttr, sal_Int32 const nStart, sal_Int32 const*const pEnd = 0); - virtual sal_Int32* GetEnd(); // SwTxtAttr + virtual sal_Int32* GetEnd() SAL_OVERRIDE; // SwTxtAttr // get and set TxtNode pointer inline const SwTxtNode& GetTxtNode() const; diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx index 755905391582..e767bd759d28 100644 --- a/sw/inc/txttxmrk.hxx +++ b/sw/inc/txttxmrk.hxx @@ -37,7 +37,7 @@ public: sal_Int32 const nStart, sal_Int32 const*const pEnd = 0); virtual ~SwTxtTOXMark(); - virtual sal_Int32 *GetEnd(); // SwTxtAttr + virtual sal_Int32 *GetEnd() SAL_OVERRIDE; // SwTxtAttr void CopyTOXMark( SwDoc* pDestDoc ); diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 39e3fe074d3a..9c0ff35df8ab 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -72,7 +72,7 @@ protected: virtual SwRewriter GetRewriter() const; // return type is sal_uInt16 because this overrides SfxUndoAction::GetId() - virtual sal_uInt16 GetId() const { return static_cast<sal_uInt16>(m_nId); } + virtual sal_uInt16 GetId() const SAL_OVERRIDE { return static_cast<sal_uInt16>(m_nId); } // the 4 methods that derived classes have to override // base implementation does nothing @@ -84,12 +84,12 @@ public: // should not be public, but ran into trouble in untbl.cxx private: // SfxUndoAction - virtual void Undo(); - virtual void Redo(); - virtual void UndoWithContext(SfxUndoContext &); - virtual void RedoWithContext(SfxUndoContext &); - virtual void Repeat(SfxRepeatTarget &); - virtual bool CanRepeat(SfxRepeatTarget &) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void UndoWithContext(SfxUndoContext &) SAL_OVERRIDE; + virtual void RedoWithContext(SfxUndoContext &) SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget &) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget &) const SAL_OVERRIDE; public: SwUndo(SwUndoId const nId); @@ -104,7 +104,7 @@ public: @return textual comment for this undo object */ - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; // UndoObject remembers which mode was turned on. // In Undo/Redo/Repeat this remembered mode is switched on. @@ -236,9 +236,9 @@ protected: public: virtual ~SwUndoInserts(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; // Set destination range after reading. void SetInsertRange( const SwPaM&, bool bScanFlys = true, @@ -288,11 +288,11 @@ public: virtual ~SwUndoInsLayFmt(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; @@ -302,14 +302,14 @@ class SwUndoDelLayFmt : public SwUndoFlyBase public: SwUndoDelLayFmt( SwFrmFmt* pFormat ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void RedoForRollback(); void ChgShowSel( bool bNew ) { bShowSelFrm = bNew; } - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; }; diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 73b01130d2dd..917bbd7276e8 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -158,36 +158,36 @@ class SwChartDataProvider : protected: //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwChartDataProvider( const SwDoc* pDoc ); virtual ~SwChartDataProvider(); // XDataProvider - virtual ::sal_Bool SAL_CALL createDataSourcePossible( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL detectArguments( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL createDataSourcePossible( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) 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::PropertyValue > SAL_CALL detectArguments( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRangeXMLConversion virtual OUString SAL_CALL convertRangeToXML( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, - std::exception); - virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::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; // 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; SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } @@ -226,12 +226,12 @@ public: virtual ~SwChartDataSource(); // XDataSource - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; typedef cppu::WeakImplHelper10 @@ -278,7 +278,7 @@ class SwChartDataSequence : protected: //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwChartDataSequence( SwChartDataProvider &rProvider, @@ -289,62 +289,62 @@ public: 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 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDataSequence virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getSourceRangeRepresentation() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin eLabelOrigin ) throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextualDataSequence virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; // XNumericalDataSequence virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // 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; // XModifiable - virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setModified( ::sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setModified( ::sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::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; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // 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; SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } sal_Bool DeleteBox( const SwTableBox &rBox ); @@ -386,33 +386,33 @@ public: virtual ~SwChartLabeledDataSequence(); // XLabeledDataSequence - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getValues( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setValues( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getLabel( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLabel( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getValues( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValues( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getLabel( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLabel( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::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; }; #endif diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index 9fec2d44349b..f055acc10859 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -275,22 +275,22 @@ public: SwXTextTables(SwDoc* pDoc); //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 nIndex) 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 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static ::com::sun::star::text::XTextTable* GetObject( SwFrmFmt& rFmt ); }; @@ -314,25 +314,25 @@ public: SwXFrames(SwDoc* pDoc, FlyCntType eSet); //XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; FlyCntType GetType()const{return eType;} static SwXFrame* GetObject( SwFrmFmt& rFmt, FlyCntType eType ); @@ -347,9 +347,9 @@ public: SwXTextFrames(SwDoc* pDoc); //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -361,9 +361,9 @@ public: SwXTextGraphicObjects(SwDoc* pDoc); //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -375,9 +375,9 @@ public: SwXTextEmbeddedObjects(SwDoc* pDoc); //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -390,22 +390,22 @@ public: SwXTextSections(SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFmt& rFmt ); }; @@ -419,22 +419,22 @@ class SwXBookmarks : public SwCollectionBaseClass, SwXBookmarks(SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -451,12 +451,12 @@ public: SwXNumberingRulesCollection( SwDoc* pDoc ); //XIndexAccess - virtual sal_Int32 SAL_CALL SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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; }; typedef @@ -478,17 +478,17 @@ public: SwXFootnotes(sal_Bool bEnd, SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFmtFtn& rFmt ); }; @@ -502,22 +502,22 @@ public: SwXReferenceMarks(SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static SwXReferenceMark* GetObject( SwDoc* pDoc, const SwFmtRefMark* pMark ); }; diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx index d2830284ed0e..2ce45aaf442f 100644 --- a/sw/inc/unocrsr.hxx +++ b/sw/inc/unocrsr.hxx @@ -34,8 +34,8 @@ public: protected: virtual const SwCntntFrm* DoSetBidiLevelLeftRight( - sal_Bool & io_rbLeft, sal_Bool bVisualAllowed, sal_Bool bInsertCrsr); - virtual void DoSetBidiLevelUpDown(); + sal_Bool & io_rbLeft, sal_Bool bVisualAllowed, sal_Bool bInsertCrsr) SAL_OVERRIDE; + virtual void DoSetBidiLevelUpDown() SAL_OVERRIDE; public: @@ -44,19 +44,19 @@ public: virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | - nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); + nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )) SAL_OVERRIDE; - virtual bool IsReadOnlyAvailable() const; + virtual bool IsReadOnlyAvailable() const SAL_OVERRIDE; sal_Bool IsRemainInSection() const { return bRemainInSection; } void SetRemainInSection( sal_Bool bFlag ) { bRemainInSection = bFlag; } - virtual sal_Bool IsSkipOverProtectSections() const + virtual sal_Bool IsSkipOverProtectSections() const SAL_OVERRIDE { return bSkipOverProtectSections; } void SetSkipOverProtectSections( sal_Bool bFlag ) { bSkipOverProtectSections = bFlag; } - virtual sal_Bool IsSkipOverHiddenSections() const + virtual sal_Bool IsSkipOverHiddenSections() const SAL_OVERRIDE { return bSkipOverHiddenSections; } void SetSkipOverHiddenSections( sal_Bool bFlag ) { bSkipOverHiddenSections = bFlag; } @@ -85,9 +85,9 @@ public: virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | - nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); + nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )) SAL_OVERRIDE; - virtual SwUnoTableCrsr * Clone() const; + virtual SwUnoTableCrsr * Clone() const SAL_OVERRIDE; void MakeBoxSels(); diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 631f72ccc3e3..da3ddf32cf1a 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -46,7 +46,7 @@ protected: // Create a SdrObject according to a description. Can be used by derived classes to // support own ::com::sun::star::drawing::Shapes (e.g. controls). - virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ) throw (std::exception); + virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ) throw (std::exception) SAL_OVERRIDE; public: SwFmDrawPage( SdrPage* pPage ); @@ -63,7 +63,7 @@ public: // The following method is called when a SvxShape-object is to be created. // Derived classes may obtain at this point a derivation or an object // that is aggregating a SvxShape. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (std::exception) SAL_OVERRIDE; }; typedef cppu::WeakAggImplHelper4 @@ -84,33 +84,33 @@ public: ~SwXDrawPage(); //XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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; //XShapes - virtual void SAL_CALL add(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL remove(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL add(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL remove(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XShapeGrouper virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > SAL_CALL group(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > & xShapes) throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL ungroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > & aGroup) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ungroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > & aGroup) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; SwFmDrawPage* GetSvxPage(); // renamed and outlined to detect where it's called @@ -218,54 +218,54 @@ class SwXShape : public SwXShapeBaseClass, protected: virtual ~SwXShape(); //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwXShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xShape); TYPEINFO_OVERRIDE(); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTextContent - virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + 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; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) 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(void) 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 > & aListener) 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; SwShapeDescriptor_Impl* GetDescImpl() {return pImpl;} SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } @@ -284,21 +284,21 @@ protected: public: SwXGroupShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xShape); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw(); - virtual void SAL_CALL release( ) throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw() SAL_OVERRIDE; //XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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; }; #endif diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx index f28096b99153..6465c46b804e 100644 --- a/sw/inc/unofieldcoll.hxx +++ b/sw/inc/unofieldcoll.hxx @@ -47,30 +47,30 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& rName) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception); + getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -95,41 +95,41 @@ public: SwXTextFieldTypes(SwDoc* pDoc); // SwUnoCollection - virtual void Invalidate(); + virtual void Invalidate() SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRefreshable virtual void SAL_CALL refresh() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener>& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener>& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index cc63fd73959b..30f11c9ec80c 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -75,7 +75,7 @@ private: protected: com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxStyleData; com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxStyleFamily; - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; virtual ~SwXFrame(); public: @@ -88,37 +88,37 @@ public: 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 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; TYPEINFO_OVERRIDE(); //XNamed - virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XShape - virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XShapeDescriptor - virtual OUString SAL_CALL getShapeType(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getShapeType(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //Base implementation //XComponent @@ -129,9 +129,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); void attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -162,12 +162,12 @@ class SwXTextFrame : public SwXTextFrameBaseClass, public SwXFrame { protected: - virtual const SwStartNode *GetStartNode() const; + virtual const SwStartNode *GetStartNode() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > CreateCursor() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ~SwXTextFrame(); public: @@ -177,50 +177,50 @@ public: // FIXME: EVIL HACK: make available for SwXFrame::attachToRange void SetDoc(SwDoc *const pDoc) { SwXText::SetDoc(pDoc); }; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw(); - virtual void SAL_CALL release( ) throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw() SAL_OVERRIDE; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTextFrame - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - 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 > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XEnumerationAccess - frueher XParagraphEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) 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; //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); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + 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; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertySet - 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 ::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; void * SAL_CALL operator new( size_t ) throw(); void SAL_CALL operator delete( void * ) throw(); @@ -241,30 +241,30 @@ public: SwXTextGraphicObject( SwDoc *pDoc ); SwXTextGraphicObject(SwFrmFmt& rFmt); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw(); - virtual void SAL_CALL release( ) throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw() SAL_OVERRIDE; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //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 ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + 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; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) 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(void) 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 > & aListener) 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void * SAL_CALL operator new( size_t ) throw(); void SAL_CALL operator delete( void * ) throw(); }; @@ -287,37 +287,37 @@ public: SwXTextEmbeddedObject( SwDoc *pDoc ); SwXTextEmbeddedObject(SwFrmFmt& rFmt); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw(); - virtual void SAL_CALL release( ) throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw() SAL_OVERRIDE; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //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 ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + 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; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) 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(void) 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 > & aListener) 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; //XEmbeddedObjectSupplier2 - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL getEmbeddedObject(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > SAL_CALL getExtendedControlOverEmbeddedObject(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::sal_Int64 SAL_CALL getAspect() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAspect( ::sal_Int64 _aspect ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getReplacementGraphic() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL getEmbeddedObject(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > SAL_CALL getExtendedControlOverEmbeddedObject(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::sal_Int64 SAL_CALL getAspect() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAspect( ::sal_Int64 _aspect ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getReplacementGraphic() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void * SAL_CALL operator new( size_t ) throw(); void SAL_CALL operator delete( void * ) throw(); }; @@ -337,13 +337,13 @@ public: TYPEINFO_OVERRIDE(); // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; #endif diff --git a/sw/inc/unoidxcoll.hxx b/sw/inc/unoidxcoll.hxx index 7b545ca7e6c3..faae97c89886 100644 --- a/sw/inc/unoidxcoll.hxx +++ b/sw/inc/unoidxcoll.hxx @@ -36,38 +36,38 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess virtual sal_Int32 SAL_CALL getCount() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& rName) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception); + getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx index 6769a167a2a4..ede6304de43c 100644 --- a/sw/inc/unoparagraph.hxx +++ b/sw/inc/unoparagraph.hxx @@ -97,44 +97,44 @@ public: void attachToText(SwXText & rParent, SwTxtNode & rTxtNode); // MetadatableMixin - virtual ::sfx2::Metadatable* GetCoreObject(); + virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - GetModel(); + GetModel() SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -142,62 +142,62 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( @@ -208,28 +208,28 @@ public: throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTolerantMultiPropertySet virtual ::com::sun::star::uno::Sequence< @@ -240,65 +240,65 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XContentEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getString() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setString(const OUString& rString) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -326,21 +326,21 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx index 4f605be8f6b6..55dcdd0676c7 100644 --- a/sw/inc/unoredline.hxx +++ b/sw/inc/unoredline.hxx @@ -34,28 +34,28 @@ class SwXRedlineText : public ::com::sun::star::container::XEnumerationAccess { SwNodeIndex aNodeIndex; - virtual const SwStartNode *GetStartNode() const; + virtual const SwStartNode *GetStartNode() const SAL_OVERRIDE; public: SwXRedlineText(SwDoc* pDoc, SwNodeIndex aNodeIndex); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw(){OWeakObject::acquire();} - virtual void SAL_CALL release( ) throw(){OWeakObject::release();} + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE {OWeakObject::acquire();} + virtual void SAL_CALL release( ) throw() SAL_OVERRIDE {OWeakObject::release();} - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - 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 > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess (via XEnumerationAccess) - 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; }; typedef @@ -77,37 +77,37 @@ public: TYPEINFO_OVERRIDE(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw(){OWeakObject::acquire();} - virtual void SAL_CALL release( ) throw(){OWeakObject::release();} + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE {OWeakObject::acquire();} + virtual void SAL_CALL release( ) throw() SAL_OVERRIDE {OWeakObject::release();} - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - 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 > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) 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; const SwRangeRedline* GetRedline() const {return pRedline;} protected: //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; #endif diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx index 42e4cf94f4e1..8d096d5946cd 100644 --- a/sw/inc/unoredlines.hxx +++ b/sw/inc/unoredlines.hxx @@ -46,20 +46,20 @@ public: SwXRedlines(SwDoc* pDoc); //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 nIndex) 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 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XEnumerationAccess - was: XParagraphEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static ::com::sun::star::beans::XPropertySet* GetObject( SwRangeRedline& rRedline, SwDoc& rDoc ); }; @@ -76,16 +76,16 @@ public: SwXRedlineEnumeration(SwDoc& rDoc); //XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Any SAL_CALL nextElement(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL nextElement(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; #endif diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index 315cb77b7b8f..658bbc9d8632 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -52,18 +52,18 @@ public: SwXFootnoteProperties(SwDoc* pDoc); //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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void Invalidate() {pDoc = 0;} }; @@ -82,18 +82,18 @@ public: SwXEndnoteProperties(SwDoc* pDoc); //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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void Invalidate() {pDoc = 0;} }; @@ -112,18 +112,18 @@ public: SwXLineNumberingProperties(SwDoc* pDoc); //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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void Invalidate() {pDoc = 0;} }; @@ -150,7 +150,7 @@ protected: virtual ~SwXNumberingRules(); //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwXNumberingRules(SwDocShell& rDocSh); // chapter numbering @@ -159,36 +159,36 @@ public: static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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 nIndex) 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 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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; //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; //XNamed - virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> @@ -216,9 +216,9 @@ public: void Invalidate() {SwXNumberingRules::Invalidate();} //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -255,28 +255,28 @@ public: 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 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTextColumns - virtual sal_Int32 SAL_CALL getReferenceValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getColumnCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setColumnCount( sal_Int16 nColumns ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextColumn > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setColumns( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextColumn >& Columns ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getReferenceValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getColumnCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setColumnCount( sal_Int16 nColumns ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextColumn > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setColumns( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextColumn >& Columns ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; sal_Int32 GetSepLineWidth() const {return nSepLineWidth;} sal_Int32 GetSepLineColor() const {return nSepLineColor;} diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx index 03a724219cd5..0d8f7f05aa8b 100644 --- a/sw/inc/unosrch.hxx +++ b/sw/inc/unosrch.hxx @@ -71,37 +71,37 @@ public: 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 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XSearchDescriptor - virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XReplaceDescriptor - virtual OUString SAL_CALL getReplaceString(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setReplaceString(const OUString& aReplaceString) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getReplaceString(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setReplaceString(const OUString& aReplaceString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertyReplace - virtual sal_Bool SAL_CALL getValueSearch(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setValueSearch(sal_Bool ValueSearch_) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getSearchAttributes(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setSearchAttributes(const ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aSearchAttribs) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getReplaceAttributes(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setReplaceAttributes(const ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aSearchAttribs) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL getValueSearch(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setValueSearch(sal_Bool ValueSearch_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getSearchAttributes(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setSearchAttributes(const ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aSearchAttribs) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getReplaceAttributes(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setReplaceAttributes(const ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aSearchAttribs) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void FillSearchItemSet(SfxItemSet& rSet) const; void FillReplaceItemSet(SfxItemSet& rSet) const; diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index c5ad1a24540b..bde8eba77cd0 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -73,29 +73,29 @@ public: SwXStyleFamilies(SwDocShell& rDocShell); //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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; //XStyleLoader virtual void SAL_CALL loadStylesFromURL(const OUString& rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, - std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getStyleLoaderOptions(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getStyleLoaderOptions(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; class SwXStyleFamily : public cppu::WeakImplHelper4 @@ -117,39 +117,39 @@ public: ~SwXStyleFamily(); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNameContainer - virtual void SAL_CALL insertByName(const OUString& Name, const ::com::sun::star::uno::Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL replaceByName(const OUString& Name, const ::com::sun::star::uno::Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL insertByName(const OUString& Name, const ::com::sun::star::uno::Any& Element) 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 replaceByName(const OUString& Name, const ::com::sun::star::uno::Any& Element) 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 removeByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::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; //SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; class SwXStyle : public cppu::WeakImplHelper7 @@ -197,7 +197,7 @@ protected: std::exception); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwXStyle(SwDoc* pDoc, SfxStyleFamily eFam = SFX_STYLE_FAMILY_PARA, sal_Bool bConditional = sal_False); SwXStyle(SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam, @@ -211,52 +211,52 @@ public: 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 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XNamed - virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XStyle - virtual sal_Bool SAL_CALL isUserDefined(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL isInUse(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual OUString SAL_CALL getParentStyle(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isInUse(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getParentStyle(void) 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; //XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //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; //XMultiPropertyStates - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; OUString GetStyleName() const { return m_sStyleName;} SfxStyleFamily GetFamily() const {return eFamily;} @@ -284,13 +284,13 @@ public: SwXFrameStyle( SwDoc *pDoc ); ~SwXFrameStyle(); - virtual void SAL_CALL acquire( ) throw(){SwXStyle::acquire();} - virtual void SAL_CALL release( ) throw(){SwXStyle::release();} + virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE {SwXStyle::acquire();} + virtual void SAL_CALL release( ) throw() SAL_OVERRIDE {SwXStyle::release();} - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; friend class SwFrameStyleEventDescriptor; }; @@ -313,11 +313,11 @@ public: SwXPageStyle(SwDocShell* pDocSh); ~SwXPageStyle(); - 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 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 setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL 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; }; @@ -337,17 +337,17 @@ public: SwXAutoStyles(SwDocShell& rDocShell); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -359,21 +359,21 @@ class SwXAutoStyleFamily : public cppu::WeakImplHelper1< com::sun::star::style:: IStyleAccess::SwAutoStyleFamily eFamily; protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwXAutoStyleFamily(SwDocShell* pDocShell, IStyleAccess::SwAutoStyleFamily eFamily); virtual ~SwXAutoStyleFamily(); //XAutoStyleFamily - virtual ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyle > SAL_CALL insertStyle( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Values ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyle > SAL_CALL insertStyle( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Values ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class SwXAutoStylesEnumerator : public cppu::WeakImplHelper1< ::com::sun::star::container::XEnumeration >, @@ -385,10 +385,10 @@ public: virtual ~SwXAutoStylesEnumerator(); //XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - 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); + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL nextElement( ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; // an automatic style @@ -411,36 +411,36 @@ public: virtual ~SwXAutoStyle(); //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; //XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //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; //XMultiPropertyStates - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Special - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; #endif diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 86a5254bd65d..13e655fb4ec5 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -81,19 +81,19 @@ class SwXCell : public SwXCellBaseClass, static size_t const NOTFOUND = SAL_MAX_SIZE; protected: - virtual const SwStartNode *GetStartNode() const; + virtual const SwStartNode *GetStartNode() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > CreateCursor() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; bool IsValid() const; virtual ~SwXCell(); //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, size_t nPos = NOTFOUND); @@ -104,49 +104,49 @@ public: 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 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw(); - virtual void SAL_CALL release( ) throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw() SAL_OVERRIDE; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XCell - virtual OUString SAL_CALL getFormula( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFormula( const OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::table::CellContentType SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getError( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getFormula( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFormula( const OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::table::CellContentType SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getError( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - 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 > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) 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; //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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XEnumerationAccess - was: XParagraphEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) 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; SwTableBox* GetTblBox()const {return pBox;} static SwXCell* CreateXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, SwTable *pTbl = 0 ); @@ -169,7 +169,7 @@ class SwXTextTableRow : public cppu::WeakImplHelper2 protected: virtual ~SwXTextTableRow(); //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwXTextTableRow(SwFrmFmt* pFmt, SwTableLine* pLine); @@ -177,24 +177,24 @@ public: TYPEINFO_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 ::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); - 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); + 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; const SwTableLine* GetTblRow() const {return pLine;} static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine); @@ -224,53 +224,53 @@ public: //XTextTableCursor virtual OUString SAL_CALL getRangeName() throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual sal_Bool SAL_CALL gotoCellByName( const OUString& aCellName, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL goUp( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL goDown( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL gotoCellByName( const OUString& aCellName, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL goUp( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL goDown( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL mergeRange() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL splitRange( sal_Int16 Count, sal_Bool Horizontal ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + 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 ::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); + 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); - 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); + 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; // ITextCursorHelper - virtual const SwPaM* GetPaM() const; - virtual SwPaM* GetPaM(); - virtual const SwDoc* GetDoc() const; - virtual SwDoc* GetDoc(); + virtual const SwPaM* GetPaM() const SAL_OVERRIDE; + virtual SwPaM* GetPaM() SAL_OVERRIDE; + virtual const SwDoc* GetDoc() const SAL_OVERRIDE; + virtual SwDoc* GetDoc() SAL_OVERRIDE; const SwUnoCrsr* GetCrsr() const; SwUnoCrsr* GetCrsr(); @@ -327,96 +327,96 @@ public: SW_DLLPUBLIC 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 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; TYPEINFO_OVERRIDE(); //XTextTable - virtual void SAL_CALL initialize( sal_Int32 nRows, sal_Int32 nColumns ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableRows > SAL_CALL getRows( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableColumns > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByName( const OUString& aCellName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCellNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( sal_Int32 nRows, sal_Int32 nColumns ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableRows > SAL_CALL getRows( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableColumns > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByName( const OUString& aCellName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCellNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextTableCursor > SAL_CALL createCursorByCellName( const OUString& aCellName ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XTextContent - virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + 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; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) 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(void) 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 > & aListener) 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; //XCellRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XChartDataArray - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XChartData - virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual double SAL_CALL getNotANumber( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getNotANumber( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XSortable - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL sort(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XAutoFormattable virtual void SAL_CALL autoFormat(const OUString& aName) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, - std::exception); + 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 ::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); + 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); - 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); + 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; //XNamed - virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XCellRangeData - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL getDataArray( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aArray ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL getDataArray( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aArray ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -427,7 +427,7 @@ public: SwRangeDescriptor& rDesc); //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } }; @@ -465,66 +465,66 @@ public: 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 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XCellRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw(::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::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); + 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); - 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); + 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; //XChartData - virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual double SAL_CALL getNotANumber( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getNotANumber( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XChartDataArray - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XSortable - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL sort(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XCellRangeData - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL getDataArray( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aArray ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL getDataArray( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aArray ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } sal_uInt16 getRowCount(void); @@ -558,28 +558,28 @@ public: TYPEINFO_OVERRIDE(); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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; //XTableRows virtual void SAL_CALL insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; class SwXTableColumns : public cppu::WeakImplHelper2 @@ -599,28 +599,28 @@ public: TYPEINFO_OVERRIDE(); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::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; //XTableColumns virtual void SAL_CALL insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; #endif diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx index 629d3ccf01da..cfb25c21c610 100644 --- a/sw/inc/unotext.hxx +++ b/sw/inc/unotext.hxx @@ -95,25 +95,25 @@ 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); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -121,68 +121,68 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getString() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setString(const OUString& rString) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSimpleText virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XText virtual void SAL_CALL insertTextContent( @@ -192,12 +192,12 @@ public: ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XParagraphAppend virtual ::com::sun::star::uno::Reference< @@ -207,7 +207,7 @@ public: ::com::sun::star::beans::PropertyValue >& rCharacterAndParagraphProperties) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL finishParagraphInsert( @@ -218,7 +218,7 @@ public: ::com::sun::star::text::XTextRange >& xInsertPosition) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextPortionAppend virtual ::com::sun::star::uno::Reference< @@ -229,7 +229,7 @@ public: ::com::sun::star::beans::PropertyValue >& rCharacterAndParagraphProperties) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL @@ -242,7 +242,7 @@ public: ::com::sun::star::text::XTextRange >& rTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContentAppend virtual ::com::sun::star::uno::Reference< @@ -254,7 +254,7 @@ public: ::com::sun::star::beans::PropertyValue >& rCharacterAndParagraphProperties) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL insertTextContentWithProperties( @@ -265,7 +265,7 @@ public: rCharacterAndParagraphProperties, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xInsertPosition) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextConvert virtual ::com::sun::star::uno::Reference< @@ -278,7 +278,7 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xFrameProperties) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextTable > SAL_CALL convertToTable( @@ -301,13 +301,13 @@ public: ::com::sun::star::beans::PropertyValue > const& rTableProperties) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextCopy virtual void SAL_CALL copyText( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCopy >& xSource ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextRangeCompare sal_Int16 SAL_CALL compareRegionStarts( @@ -316,14 +316,14 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR2) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Int16 SAL_CALL compareRegionEnds( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR1, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR2) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRelativeTextContentInsert virtual void SAL_CALL insertTextContentBefore( @@ -332,26 +332,26 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent>& xSuccessor) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL insertTextContentAfter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent>& xNewContent, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent>& xPredecessor) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRelativeTextContentRemove virtual void SAL_CALL removeTextContentBefore( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent>& xSuccessor) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeTextContentAfter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent>& xPredecessor) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_SW_INC_UNOTEXT_HXX diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx index 8ab91063668a..9907fd7a510b 100644 --- a/sw/inc/unotextbodyhf.hxx +++ b/sw/inc/unotextbodyhf.hxx @@ -55,56 +55,56 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType) - throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw() { OWeakObject::release(); } + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // XAggregation virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& rType) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSimpleText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextPosition) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -125,11 +125,11 @@ private: protected: - virtual const SwStartNode *GetStartNode() const; + virtual const SwStartNode *GetStartNode() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > CreateCursor() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ~SwXHeadFootText(); @@ -144,51 +144,51 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType) - throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw() { OWeakObject::release(); } + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSimpleText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextPosition) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx index 408ef6582e3a..13a883b87604 100644 --- a/sw/inc/unotextcursor.hxx +++ b/sw/inc/unotextcursor.hxx @@ -106,10 +106,10 @@ public: const bool bForceExpandHints); // OTextCursorHelper - virtual const SwPaM* GetPaM() const; - virtual SwPaM* GetPaM(); - virtual const SwDoc* GetDoc() const; - virtual SwDoc* GetDoc(); + virtual const SwPaM* GetPaM() const SAL_OVERRIDE; + virtual SwPaM* GetPaM() SAL_OVERRIDE; + virtual const SwDoc* GetDoc() const SAL_OVERRIDE; + virtual SwDoc* GetDoc() SAL_OVERRIDE; DECLARE_XINTERFACE() @@ -118,23 +118,23 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -142,62 +142,62 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( @@ -206,73 +206,73 @@ public: throw ( css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + css::lang::WrappedTargetException, css::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 (css::uno::RuntimeException, std::exception); + throw (css::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< css::beans::XPropertiesChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception); + throw (css::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< css::beans::XPropertiesChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertyStates virtual void SAL_CALL setAllPropertiesToDefault() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XContentEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSortable virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL sort( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; // XDocumentInsertable virtual void SAL_CALL insertDocumentFromURL( @@ -281,85 +281,85 @@ public: ::com::sun::star::beans::PropertyValue >& rOptions) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getString() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setString(const OUString& rString) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextCursor virtual void SAL_CALL collapseToStart() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL collapseToEnd() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isCollapsed() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL goLeft(sal_Int16 nCount, sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL goRight(sal_Int16 nCount, sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL gotoStart(sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL gotoEnd(sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWordCursor virtual sal_Bool SAL_CALL isStartOfWord() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isEndOfWord() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL gotoNextWord(sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL gotoPreviousWord(sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL gotoEndOfWord(sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL gotoStartOfWord(sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSentenceCursor virtual sal_Bool SAL_CALL isStartOfSentence() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isEndOfSentence() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL gotoNextSentence(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL gotoPreviousSentence(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL gotoStartOfSentence(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL gotoEndOfSentence(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XParagraphCursor virtual sal_Bool SAL_CALL isStartOfParagraph() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isEndOfParagraph() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL gotoStartOfParagraph(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL gotoEndOfParagraph(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL gotoNextParagraph(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL gotoPreviousParagraph(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRedline virtual void SAL_CALL makeRedline( @@ -367,11 +367,11 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XMarkingAccess virtual void SAL_CALL invalidateMarkings(::sal_Int32 nType) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx index 8346c866c170..583524466530 100644 --- a/sw/inc/unotextrange.hxx +++ b/sw/inc/unotextrange.hxx @@ -131,23 +131,23 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -155,98 +155,98 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XContentEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getString() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setString(const OUString& rString) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRedline virtual void SAL_CALL makeRedline( @@ -254,7 +254,7 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -286,31 +286,31 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess virtual sal_Int32 SAL_CALL getCount() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index f9bc195dd0bc..4ceaef815bb6 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -242,191 +242,191 @@ public: SwXTextDocument(SwDocShell* pShell); void NotifyRefreshListeners(); - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw(); - virtual void SAL_CALL release( ) throw(); + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw() SAL_OVERRIDE; //XWeak - virtual css::uno::Reference< css::uno::XAdapter > SAL_CALL queryAdapter( ) throw(css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::uno::XAdapter > SAL_CALL queryAdapter( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTextDocument - virtual css::uno::Reference< css::text::XText > SAL_CALL getText(void) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL reformat(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::text::XText > SAL_CALL getText(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL reformat(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XModel - virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getURL( ) throw(css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs( ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL lockControllers( ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL unlockControllers( ) throw(css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasControllersLocked( ) throw(css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController( ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection( ) throw(css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getURL( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL lockControllers( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unlockControllers( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasControllersLocked( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XComponent - virtual void SAL_CALL dispose(void) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) 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(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) 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; //XCloseable - virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XLineNumberingProperties - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getLineNumberingProperties(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getLineNumberingProperties(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XChapterNumberingSupplier - virtual css::uno::Reference< css::container::XIndexReplace > SAL_CALL getChapterNumberingRules(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XIndexReplace > SAL_CALL getChapterNumberingRules(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNumberingRulesSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getNumberingRules() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getNumberingRules() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XFootnotesSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getFootnotes(void) throw( css::uno::RuntimeException, std::exception ); - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getFootnoteSettings(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getFootnotes(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getFootnoteSettings(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XEndnotesSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getEndnotes(void) throw( css::uno::RuntimeException, std::exception ); - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEndnoteSettings(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getEndnotes(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEndnoteSettings(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XReplaceable - virtual css::uno::Reference< css::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor(void) throw( css::uno::RuntimeException, std::exception ); - virtual sal_Int32 SAL_CALL replaceAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL replaceAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XSearchable - virtual css::uno::Reference< css::util::XSearchDescriptor > SAL_CALL createSearchDescriptor(void) throw( css::uno::RuntimeException, std::exception ); - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL findAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findFirst(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findNext(const css::uno::Reference< css::uno::XInterface > & xStartAt, const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::util::XSearchDescriptor > SAL_CALL createSearchDescriptor(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL findAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findFirst(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findNext(const css::uno::Reference< css::uno::XInterface > & xStartAt, const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPagePrintable - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPagePrintSettings(void) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setPagePrintSettings(const css::uno::Sequence< css::beans::PropertyValue >& aSettings) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL printPages(const css::uno::Sequence< css::beans::PropertyValue >& xOptions) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ); + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPagePrintSettings(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setPagePrintSettings(const css::uno::Sequence< css::beans::PropertyValue >& aSettings) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL printPages(const css::uno::Sequence< css::beans::PropertyValue >& xOptions) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XReferenceMarksSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getReferenceMarks(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getReferenceMarks(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XTextFieldsSupplier - virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getTextFields(void) throw( css::uno::RuntimeException, std::exception ); - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextFieldMasters(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getTextFields(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextFieldMasters(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XTextEmbeddedObjectsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getEmbeddedObjects(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getEmbeddedObjects(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XBookmarksSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getBookmarks(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getBookmarks(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XTextSectionsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextSections(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextSections(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XTextTablesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextTables(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextTables(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XTextGraphicObjectsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGraphicObjects(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGraphicObjects(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XTextFramesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextFrames(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextFrames(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XStyleFamiliesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XAutoStylesSupplier - virtual css::uno::Reference< css::style::XAutoStyles > SAL_CALL getAutoStyles( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::style::XAutoStyles > SAL_CALL getAutoStyles( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XMultiServiceFactory virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) - throw( css::uno::Exception, css::uno::RuntimeException, std::exception ); + throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments) - throw( css::uno::Exception, css::uno::RuntimeException, std::exception ); + throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(void) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::drawing::XDrawPageSupplier - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XDocumentIndexesSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getDocumentIndexes(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getDocumentIndexes(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::beans::XPropertySetInfo > 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); - 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< css::beans::XPropertyChangeListener >& 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< css::beans::XPropertyChangeListener >& 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< css::beans::XVetoableChangeListener >& 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< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + 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< css::beans::XPropertyChangeListener >& 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< css::beans::XPropertyChangeListener >& 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< css::beans::XVetoableChangeListener >& 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< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& rPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& rPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XLinkTargetSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XRedlinesSupplier - virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getRedlines( ) throw(css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getRedlines( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::util::XRefreshable - virtual void SAL_CALL refresh(void) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL refresh(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::util::XLinkUpdate, - virtual void SAL_CALL updateLinks( ) throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateLinks( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::view::XRenderable virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; // css::xforms::XFormsSupplier - virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getXForms( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getXForms( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::document::XDocumentLanguages virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getDocumentLanguages( ::sal_Int16 nScriptTypes, ::sal_Int16 nCount ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; // css::text::XFlatParagraphIteratorProvider: - virtual css::uno::Reference< css::text::XFlatParagraphIterator > SAL_CALL getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::text::XFlatParagraphIterator > SAL_CALL getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void Invalidate(); void Reactivate(SwDocShell* pNewDocShell); @@ -469,18 +469,18 @@ public: ~SwXLinkTargetSupplier(); //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ); - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void Invalidate() {pxDoc = 0;} }; @@ -508,30 +508,30 @@ public: ~SwXLinkNameAccessWrapper(); //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ); - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) 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; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > 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< css::beans::XPropertyChangeListener >& 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< css::beans::XPropertyChangeListener >& 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< css::beans::XVetoableChangeListener >& 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< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::beans::XPropertySetInfo > 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< css::beans::XPropertyChangeListener >& 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< css::beans::XPropertyChangeListener >& 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< css::beans::XVetoableChangeListener >& 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< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XLinkTargetSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks(void) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -549,18 +549,18 @@ public: ~SwXOutlineTarget(); //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > 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< css::beans::XPropertyChangeListener >& 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< css::beans::XPropertyChangeListener >& 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< css::beans::XVetoableChangeListener >& 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< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::beans::XPropertySetInfo > 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< css::beans::XPropertyChangeListener >& 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< css::beans::XPropertyChangeListener >& 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< css::beans::XVetoableChangeListener >& 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< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; class SwXDocumentPropertyHelper : public SvxUnoForbiddenCharsTable @@ -580,7 +580,7 @@ public: css::uno::Reference<css::uno::XInterface> GetDrawTable(short nWhich); void Invalidate(); - virtual void onChange(); + virtual void onChange() SAL_OVERRIDE; }; /* The class SwViewOptionAdjust_Impl is used to adjust the SwViewOption of diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index bc2a484fb51f..ef4c88d0dfbf 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -38,8 +38,8 @@ class SW_DLLPUBLIC SwUserFieldType : public SwValueFieldType public: SwUserFieldType( SwDoc* pDocPtr, const OUString& ); - virtual OUString GetName() const; - virtual SwFieldType* Copy() const; + virtual OUString GetName() const SAL_OVERRIDE; + virtual SwFieldType* Copy() const SAL_OVERRIDE; OUString Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng); @@ -59,11 +59,11 @@ public: bool IsDeleted() const { return bDeleted; } void SetDeleted( bool b ) { bDeleted = b; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) SAL_OVERRIDE; protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE; }; inline bool SwUserFieldType::IsValid() const @@ -91,28 +91,28 @@ class SW_DLLPUBLIC SwUserField : public SwValueField { sal_uInt16 nSubType; - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; public: SwUserField(SwUserFieldType*, sal_uInt16 nSub = 0, sal_uInt32 nFmt = 0); - virtual sal_uInt16 GetSubType() const; - virtual void SetSubType(sal_uInt16 nSub); + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE; - virtual double GetValue() const; - virtual void SetValue( const double& rVal ); + virtual double GetValue() const SAL_OVERRIDE; + virtual void SetValue( const double& rVal ) SAL_OVERRIDE; - virtual OUString GetFieldName() const; + virtual OUString GetFieldName() const SAL_OVERRIDE; // Name cannot be changed. - virtual OUString GetPar1() const; + virtual OUString GetPar1() const SAL_OVERRIDE; // Content. - virtual OUString GetPar2() const; - virtual void SetPar2(const OUString& rStr); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); + virtual OUString GetPar2() const SAL_OVERRIDE; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_INC_USRFLD_HXX diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 89a0ffcc6c93..6dc470370a7c 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -127,7 +127,7 @@ public: SwShellCrsr( SwShellCrsr& ); virtual ~SwShellCrsr(); - virtual void FillRects(); // For Table- und normal cursors. + virtual void FillRects() SAL_OVERRIDE; // For Table- und normal cursors. void Show(); // Update and display all selections. void Hide(); // Hide all selections. @@ -142,19 +142,19 @@ public: const Point& GetEndPos() const { return( SwPaM::End() == pPt ? aPtPt : aMkPt ); } Point& GetEndPos() { return( SwPaM::End() == pPt ? aPtPt : aMkPt ); } - virtual void SetMark(); + virtual void SetMark() SAL_OVERRIDE; - virtual SwCursor* Create( SwPaM* pRing = 0 ) const; + virtual SwCursor* Create( SwPaM* pRing = 0 ) const SAL_OVERRIDE; - virtual short MaxReplaceArived(); //returns RET_YES/RET_CANCEL/RET_NO - virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ); + virtual short MaxReplaceArived() SAL_OVERRIDE; //returns RET_YES/RET_CANCEL/RET_NO + virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ) SAL_OVERRIDE; bool UpDown( bool bUp, sal_uInt16 nCnt = 1 ); // true: Cursor can be set to this position. - virtual bool IsAtValidPos( bool bPoint = true ) const; + virtual bool IsAtValidPos( bool bPoint = true ) const SAL_OVERRIDE; - virtual bool IsReadOnlyAvailable() const; + virtual bool IsReadOnlyAvailable() const SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL( SwShellCrsr ) }; @@ -172,19 +172,19 @@ public: const SwPosition &rPtPos, const Point& rPtPt ); virtual ~SwShellTableCrsr(); - virtual void FillRects(); // For table and normal cursor. + virtual void FillRects() SAL_OVERRIDE; // For table and normal cursor. // Check if SPoint is within table SSelection. bool IsInside( const Point& rPt ) const; - virtual void SetMark(); - virtual SwCursor* Create( SwPaM* pRing = 0 ) const; + virtual void SetMark() SAL_OVERRIDE; + virtual SwCursor* Create( SwPaM* pRing = 0 ) const SAL_OVERRIDE; - virtual short MaxReplaceArived(); //returns RET_YES/RET_CANCEL/RET_NO - virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ); + virtual short MaxReplaceArived() SAL_OVERRIDE; //returns RET_YES/RET_CANCEL/RET_NO + virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ) SAL_OVERRIDE; // true: Cursor can be set to this position. - virtual bool IsAtValidPos( bool bPoint = true ) const; + virtual bool IsAtValidPos( bool bPoint = true ) const SAL_OVERRIDE; }; diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx index d9d170422f90..0027f546088a 100644 --- a/sw/inc/wdocsh.hxx +++ b/sw/inc/wdocsh.hxx @@ -44,7 +44,7 @@ public: OUString * pLongUserName, OUString * pUserName, sal_Int32 nFileFormat, - bool bTemplate = false ) const; + bool bTemplate = false ) const SAL_OVERRIDE; sal_uInt16 GetSourcePara()const {return nSourcePara;} void SetSourcePara(sal_uInt16 nSet) {nSourcePara = nSet;} diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx index 7caa99ff49fa..ca05576738c8 100644 --- a/sw/qa/core/filters-test.cxx +++ b/sw/qa/core/filters-test.cxx @@ -45,11 +45,11 @@ class SwFiltersTest public: virtual bool load( const OUString &rFilter, const OUString &rURL, const OUString &rUserData, unsigned int nFilterFlags, - unsigned int nClipboardID, unsigned int nFilterVersion); + unsigned int nClipboardID, unsigned int nFilterVersion) SAL_OVERRIDE; virtual bool save( const OUString &rFilter, const OUString &rURL, const OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion) SAL_OVERRIDE; - virtual void setUp(); + virtual void setUp() SAL_OVERRIDE; // Ensure CVEs remain unbroken void testCVEs(); diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index c5582a1f18cc..d21fb9e16e35 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -57,8 +57,8 @@ public: void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath); - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() SAL_OVERRIDE; + virtual void tearDown() SAL_OVERRIDE; //void testStarBasic(); void testVba(); diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index cd5c031ce5cd..046158cdca2a 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -62,8 +62,8 @@ using namespace ::com::sun::star; class SwDocTest : public test::BootstrapFixture { public: - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() SAL_OVERRIDE; + virtual void tearDown() SAL_OVERRIDE; void randomTest(); void testPageDescName(); diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index 043debb70784..77a1dc97996f 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -70,7 +70,7 @@ using namespace com::sun::star; void Import_Export_Import() {\ executeImportExportImportTest(filename);\ }\ - void verify();\ + void verify() SAL_OVERRIDE;\ }; \ CPPUNIT_TEST_SUITE_REGISTRATION(TestName); \ void TestName::verify() @@ -85,7 +85,7 @@ using namespace com::sun::star; void Import() { \ executeImportTest(filename);\ }\ - void verify();\ + void verify() SAL_OVERRIDE;\ }; \ CPPUNIT_TEST_SUITE_REGISTRATION(TestName); \ void TestName::verify() @@ -107,14 +107,14 @@ public: { } - virtual void setUp() + virtual void setUp() SAL_OVERRIDE { test::BootstrapFixture::setUp(); mxDesktop.set( com::sun::star::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())) ); } - virtual void tearDown() + virtual void tearDown() SAL_OVERRIDE { if (mxComponent.is()) mxComponent->dispose(); diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index e6aaa409cfcb..128443542bdd 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -24,7 +24,7 @@ public: /** * Blacklist handling */ - bool mustTestImportOf(const char* filename) const { + bool mustTestImportOf(const char* filename) const SAL_OVERRIDE { // Only test import of .odt document return OString(filename).endsWith(".odt"); } diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 557a3f58a195..de70fa3d9bed 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -61,7 +61,7 @@ protected: /** * Blacklist handling */ - bool mustTestImportOf(const char* filename) const { + bool mustTestImportOf(const char* filename) const SAL_OVERRIDE { const char* aBlacklist[] = { "math-escape.docx", "math-mso2k7.docx", diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx index c8f45e3937d3..417e92c5e544 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx @@ -34,7 +34,7 @@ protected: /** * Blacklist handling */ - bool mustTestImportOf(const char* filename) const { + bool mustTestImportOf(const char* filename) const SAL_OVERRIDE { // If the testcase is stored in some other format, it's pointless to test. return (OString(filename).endsWith(".docx")); } diff --git a/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx b/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx index b32042600447..6cdd6282073b 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx @@ -22,7 +22,7 @@ protected: /** * Blacklist handling */ - bool mustTestImportOf(const char* filename) const { + bool mustTestImportOf(const char* filename) const SAL_OVERRIDE { // If the testcase is stored in some other format, it's pointless to test. return (OString(filename).endsWith(".docx")); } diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index 9251a891dbbd..0aba10b3bf02 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -30,7 +30,7 @@ class Test : public SwModelTestBase public: Test() : SwModelTestBase("/sw/qa/extras/rtfexport/data/", "Rich Text Format") {} - bool mustTestImportOf(const char* filename) const { + bool mustTestImportOf(const char* filename) const SAL_OVERRIDE { // Don't test the first import of these, for some reason those tests fail const char* aBlacklist[] = { "math-eqarray.rtf", diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index 24b3c5a7cb03..2e3d200c31e4 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -22,7 +22,7 @@ class Test : public SwModelTestBase public: Test() : SwModelTestBase("/sw/qa/extras/ww8export/data/", "MS Word 97") {} - bool mustTestImportOf(const char* filename) const + bool mustTestImportOf(const char* filename) const SAL_OVERRIDE { // If the testcase is stored in some other format, it's pointless to test. return OString(filename).endsWith(".doc"); diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx index 321a2d8ec47f..1f7ae93aea8b 100644 --- a/sw/qa/tiledrendering/tiledrendering.cxx +++ b/sw/qa/tiledrendering/tiledrendering.cxx @@ -49,8 +49,8 @@ private: uno::Reference<frame::XComponentLoader> xLoader; uno::Reference<lang::XComponent> xComponent; public: - virtual void Init(); - virtual int Main(); + virtual void Init() SAL_OVERRIDE; + virtual int Main() SAL_OVERRIDE; void Open(OUString & aFileUrl); }; diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index b513c055508b..0920579e087d 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -47,45 +47,45 @@ class SwAccessibleCell : public SwAccessibleContext, protected: // Set states for getAccessibleStateSet. // This drived class additionally sets SELECTABLE(1) and SELECTED(+) - virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ); + virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; - virtual void _InvalidateCursorPos(); + virtual void _InvalidateCursorPos() SAL_OVERRIDE; virtual ~SwAccessibleCell(); public: SwAccessibleCell( SwAccessibleMap* pInitMap, const SwCellFrm *pCellFrm ); - virtual sal_Bool HasCursor(); // required by map to remember that object + virtual sal_Bool HasCursor() SAL_OVERRIDE; // required by map to remember that object // XAccessibleContext /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Returns a list of all supported services. In this case that is just // the AccessibleContext service. virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void Dispose( sal_Bool bRecursive = sal_False ); + virtual void Dispose( sal_Bool bRecursive = sal_False ) SAL_OVERRIDE; - virtual void InvalidatePosOrSize( const SwRect& rFrm ); + virtual void InvalidatePosOrSize( const SwRect& rFrm ) SAL_OVERRIDE; // XInterface @@ -95,68 +95,68 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire( ) throw () + virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE { SwAccessibleContext::acquire(); }; - virtual void SAL_CALL release( ) throw () + virtual void SAL_CALL release( ) throw () SAL_OVERRIDE { SwAccessibleContext::release(); }; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleValue //===== XAccessibleExtendedAttributes ================================================ ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; private: SwFrmFmt* GetTblBoxFormat() const; public: virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleSelection ============================================ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL clearAccessibleSelection( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 0165b438da57..0e3201ee6532 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -204,123 +204,123 @@ public: // Return the XAccessibleContext. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext (void) throw (com::sun::star::uno::RuntimeException, std::exception); + getAccessibleContext (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext // Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; // Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return this object's description. virtual OUString SAL_CALL getAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return the object's current name. virtual OUString SAL_CALL getAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) - throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // thread safe C++ interface diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index 07481af9b194..e1559e5b9ea7 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -55,51 +55,51 @@ public: // Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; // Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException, std::exception); + getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /** @@ -117,7 +117,7 @@ class SwAccessibleDocument : public SwAccessibleDocumentBase, protected: // Set states for getAccessibleStateSet. // This drived class additinaly sets MULTISELECTABLE(1) - virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ); + virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; virtual ~SwAccessibleDocument(); @@ -127,27 +127,27 @@ public: DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); //===== XEventListener==================================================== virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Event ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Returns a list of all supported services. In this case that is just // the AccessibleContext service. virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInterface @@ -157,65 +157,65 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire( ) throw () + virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE { SwAccessibleContext::acquire(); }; - virtual void SAL_CALL release( ) throw () + virtual void SAL_CALL release( ) throw () SAL_OVERRIDE { SwAccessibleContext::release(); }; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL clearAccessibleSelection( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // index has to be treated as global child index. virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; // thread safe C++ interface // The object is not visible an longer and should be destroyed - virtual void Dispose( sal_Bool bRecursive = sal_False ); + virtual void Dispose( sal_Bool bRecursive = sal_False ) SAL_OVERRIDE; // XAccessibleComponent sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleGetAccFlowTo ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx index 4d21c981dd94..7a23512d3c53 100644 --- a/sw/source/core/access/accembedded.hxx +++ b/sw/source/core/access/accembedded.hxx @@ -39,40 +39,40 @@ public: virtual com::sun::star::uno::Any SAL_CALL queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire (void) - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL release (void) - throw (); + throw () SAL_OVERRIDE; // XServiceInfo // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Returns a list of all supported services. In this case that is just // the AccessibleContext service. virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleExtendedAttributes virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; }; #endif diff --git a/sw/source/core/access/accfield.hxx b/sw/source/core/access/accfield.hxx index 2c11371ee659..fdc10f2189eb 100644 --- a/sw/source/core/access/accfield.hxx +++ b/sw/source/core/access/accfield.hxx @@ -65,103 +65,103 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire( ) throw () ; - virtual void SAL_CALL release( ) throw () ; + virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE ; + virtual void SAL_CALL release( ) throw () SAL_OVERRIDE ; public: //===== XAccessible ===================================================== /// Return the XAccessibleContext. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext (void) throw (com::sun::star::uno::RuntimeException, std::exception); + getAccessibleContext (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL getAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) - throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Rectangle SAL_CALL getBoundsImpl(sal_Bool bRelative) diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx index 5e22361eba9c..e6cd36b938d4 100644 --- a/sw/source/core/access/accfootnote.hxx +++ b/sw/source/core/access/accfootnote.hxx @@ -41,28 +41,28 @@ public: /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static sal_Bool IsEndnote( const SwFtnFrm *pFrm ); }; diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx index d73b3de0ac47..a43aed8c987a 100644 --- a/sw/source/core/access/accframebase.hxx +++ b/sw/source/core/access/accframebase.hxx @@ -36,29 +36,29 @@ protected: // Set states for getAccessibleStateSet. // This drived class additionally sets SELECTABLE(1), SELECTED(+), // FOCUSABLE(1) and FOCUSED(+) - virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ); + virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; SwFlyFrm* getFlyFrm() const; sal_Bool GetSelectedState( ); SwPaM* GetCrsr(); - virtual void _InvalidateCursorPos(); - virtual void _InvalidateFocus(); + virtual void _InvalidateCursorPos() SAL_OVERRIDE; + virtual void _InvalidateFocus() SAL_OVERRIDE; virtual ~SwAccessibleFrameBase(); - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwAccessibleFrameBase( SwAccessibleMap* pInitMap, sal_Int16 nInitRole, const SwFlyFrm *pFlyFrm ); - virtual sal_Bool HasCursor(); // required by map to remember that object + virtual sal_Bool HasCursor() SAL_OVERRIDE; // required by map to remember that object static sal_uInt8 GetNodeType( const SwFlyFrm *pFlyFrm ); // The object is not visible an longer and should be destroyed - virtual void Dispose( sal_Bool bRecursive = sal_False ); - virtual sal_Bool SetSelectedState( sal_Bool bSeleted ); + virtual void Dispose( sal_Bool bRecursive = sal_False ) SAL_OVERRIDE; + virtual sal_Bool SetSelectedState( sal_Bool bSeleted ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx index c042bf29cf1f..b986b250d222 100644 --- a/sw/source/core/access/accgraphic.hxx +++ b/sw/source/core/access/accgraphic.hxx @@ -36,23 +36,23 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx index 5395e68faae9..b0a53e6eea15 100644 --- a/sw/source/core/access/accheaderfooter.hxx +++ b/sw/source/core/access/accheaderfooter.hxx @@ -41,31 +41,31 @@ public: /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx index b5ea3952b207..c7e62e896734 100644 --- a/sw/source/core/access/acchyperlink.hxx +++ b/sw/source/core/access/acchyperlink.hxx @@ -49,35 +49,35 @@ class SwAccessibleHyperlink : public: // XAccessibleAction virtual sal_Int32 SAL_CALL getAccessibleActionCount() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleHyperlink virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getStartIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getEndIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isValid( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 423e9265ef7e..0cdde33b8405 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -115,10 +115,10 @@ protected: public: SwDrawModellListener_Impl( SdrModel *pDrawModel ); - virtual void SAL_CALL addEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; void Dispose(); }; diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx index ff7a02847ffb..d4c961a8c10c 100644 --- a/sw/source/core/access/accnotextframe.hxx +++ b/sw/source/core/access/accnotextframe.hxx @@ -49,7 +49,7 @@ protected: const SwNoTxtNode *GetNoTxtNode() const; - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwAccessibleNoTextFrame( SwAccessibleMap* pInitMap, @@ -61,12 +61,12 @@ public: // #i73249# - Return the object's current name. virtual OUString SAL_CALL getAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInterface methods need to be implemented to disambiguate // between those inherited through SwAcessibleContext and @@ -74,62 +74,62 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire( ) throw () + virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE { SwAccessibleContext::acquire(); }; - virtual void SAL_CALL release( ) throw () + virtual void SAL_CALL release( ) throw () SAL_OVERRIDE { SwAccessibleContext::release(); }; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleImage virtual OUString SAL_CALL getAccessibleImageDescription( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleImageHeight( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleImageWidth( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // The object is not visible an longer and should be destroyed - virtual void Dispose( sal_Bool bRecursive = sal_False ); - - virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);//Shen Zhen Jie changed sal_Unicode to sal_uInt32 - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void Dispose( sal_Bool bRecursive = sal_False ) SAL_OVERRIDE; + + virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;//Shen Zhen Jie changed sal_Unicode to sal_uInt32 + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleHypertext ============================================ virtual sal_Int32 SAL_CALL getHyperLinkCount() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleHyperlink > SAL_CALL getHyperLink( sal_Int32 nLinkIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; SwAccessibleMap *GetAccessibleMap(){ return GetMap();} @@ -137,7 +137,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx index b6387b63800e..7c641c4ed4a2 100644 --- a/sw/source/core/access/accnotexthyperlink.hxx +++ b/sw/source/core/access/accnotexthyperlink.hxx @@ -47,35 +47,35 @@ public: // XAccessibleAction virtual sal_Int32 SAL_CALL getAccessibleActionCount() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleHyperlink virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getStartIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getEndIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isValid( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx index 452bad4bd506..56cb0c7a9014 100644 --- a/sw/source/core/access/accpage.hxx +++ b/sw/source/core/access/accpage.hxx @@ -44,10 +44,10 @@ protected: // Set states for getAccessibleStateSet. // This drived class additionally sets // FOCUSABLE(1) and FOCUSED(+) - virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ); + virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; - virtual void _InvalidateCursorPos(); - virtual void _InvalidateFocus(); + virtual void _InvalidateCursorPos() SAL_OVERRIDE; + virtual void _InvalidateFocus() SAL_OVERRIDE; virtual ~SwAccessiblePage(); @@ -59,23 +59,23 @@ public: // XAccessibleContext methods that need to be overridden virtual OUString SAL_CALL getAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool HasCursor(); // required by map to remember that object + virtual sal_Bool HasCursor() SAL_OVERRIDE; // required by map to remember that object }; #endif diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index 0c7b3dc2f5d3..c9fb45e609b7 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -170,12 +170,12 @@ protected: // Set states for getAccessibleStateSet. // This drived class additinaly sets MULTILINE(1), MULTISELECTABLE(+), // FOCUSABLE(+) and FOCUSED(+) - virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ); + virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; - virtual void _InvalidateContent( sal_Bool bVisibleDataFired ); + virtual void _InvalidateContent( sal_Bool bVisibleDataFired ) SAL_OVERRIDE; - virtual void _InvalidateCursorPos(); - virtual void _InvalidateFocus(); + virtual void _InvalidateCursorPos() SAL_OVERRIDE; + virtual void _InvalidateFocus() SAL_OVERRIDE; virtual ~SwAccessibleParagraph(); @@ -235,7 +235,7 @@ protected: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew) SAL_OVERRIDE; public: @@ -244,57 +244,57 @@ public: inline operator ::com::sun::star::accessibility::XAccessibleText *(); - virtual sal_Bool HasCursor(); // required by map to remember that object + virtual sal_Bool HasCursor() SAL_OVERRIDE; // required by map to remember that object com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetCurrentTabStop( sal_Int32 nIndex ); - virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext // Return this object's description. virtual OUString SAL_CALL getAccessibleDescription (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return the parents locale or throw exception if this object has no // parent yet/anymore. virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) - throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent virtual void SAL_CALL grabFocus() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // #i71385# virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Returns a list of all supported services. In this case that is just // the AccessibleContext service. virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInterface @@ -304,140 +304,140 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire( ) throw () + virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE { SwAccessibleContext::acquire(); }; - virtual void SAL_CALL release( ) throw () + virtual void SAL_CALL release( ) throw () SAL_OVERRIDE { SwAccessibleContext::release(); }; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleText virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getSelectedText( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleEditableText - virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL clearAccessibleSelection( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // index has to be treated as global child index. virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleHypertext virtual sal_Int32 SAL_CALL getHyperLinkCount() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleHyperlink > SAL_CALL getHyperLink( sal_Int32 nLinkIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // #i71360# // XAccesibleTextMarkup virtual sal_Int32 SAL_CALL getTextMarkupCount( sal_Int32 nTextMarkupType ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextMarkup( sal_Int32 nTextMarkupIndex, sal_Int32 nTextMarkupType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::accessibility::TextSegment > SAL_CALL getTextMarkupAtIndex( sal_Int32 nCharIndex, sal_Int32 nTextMarkupType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleTextSelection virtual sal_Bool SAL_CALL scrollToPosition( const ::com::sun::star::awt::Point& aPoint, sal_Bool isLeftTop ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectedPortionCount( ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSeletedPositionStart( sal_Int32 nSelectedPortionIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL removeSelection( sal_Int32 selectionIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL addSelection( sal_Int32 selectionIndex, sal_Int32 startOffset, sal_Int32 endOffset) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; // XAccessibleExtendedAttributes virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; sal_Bool GetSelectionAtIndex(sal_Int32& nIndex, sal_Int32& nStart, sal_Int32& nEnd); sal_Int32 GetRealHeadingLevel(); // XAccessibleComponent @@ -447,24 +447,24 @@ public: // XAccessibleMultiLineText virtual sal_Int32 SAL_CALL getLineNumberAtIndex( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtLineNumber( sal_Int32 nLineNo ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getNumberOfLineWithCaret() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // #i63870# // XAccesibleTextAttributes - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; inline SwAccessibleParagraph::operator ::com::sun::star::accessibility::XAccessibleText *() diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx index c550ff1ac502..8ec578128279 100644 --- a/sw/source/core/access/accportions.hxx +++ b/sw/source/core/access/accportions.hxx @@ -97,13 +97,13 @@ public: virtual ~SwAccessiblePortionData(); // SwPortionHandler methods - virtual void Text(sal_uInt16 nLength, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0); - virtual void Special(sal_uInt16 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0); - virtual void LineBreak(KSHORT nWidth); - virtual void Skip(sal_uInt16 nLength); - virtual void Finish(); + virtual void Text(sal_uInt16 nLength, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0) SAL_OVERRIDE; + virtual void Special(sal_uInt16 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0) SAL_OVERRIDE; + virtual void LineBreak(KSHORT nWidth) SAL_OVERRIDE; + virtual void Skip(sal_uInt16 nLength) SAL_OVERRIDE; + virtual void Finish() SAL_OVERRIDE; - virtual void SetAttrFieldType( sal_uInt16 nAttrFldType ); + virtual void SetAttrFieldType( sal_uInt16 nAttrFldType ) SAL_OVERRIDE; sal_Bool FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos ); sal_Bool IsIndexInFootnode(sal_Int32 nIndex); sal_Bool IsInGrayPortion( sal_Int32 nPos ); diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx index b2f9d3171f62..dda722e50d5c 100644 --- a/sw/source/core/access/accpreview.hxx +++ b/sw/source/core/access/accpreview.hxx @@ -43,27 +43,27 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //====== XTypeProvider ==================================================== - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException, std::exception); - OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void _InvalidateFocus(); + OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _InvalidateFocus() SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 4a973a00d2bd..e092c50c7cfc 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -585,7 +585,7 @@ public: inline sal_Bool IsSelected() const { return bSelected; } - virtual void Unselect( sal_Int32, sal_Int32 ); + virtual void Unselect( sal_Int32, sal_Int32 ) SAL_OVERRIDE; }; inline SwAccSingleTableSelHander_Impl::SwAccSingleTableSelHander_Impl() : @@ -609,7 +609,7 @@ public: uno::Sequence < sal_Int32 > GetSelSequence(); - virtual void Unselect( sal_Int32 nRowOrCol, sal_Int32 nExt ); + virtual void Unselect( sal_Int32 nRowOrCol, sal_Int32 nExt ) SAL_OVERRIDE; virtual ~SwAccAllTableSelHander_Impl(); }; diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index f70e15c54ace..45db34cd2044 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -59,7 +59,7 @@ class SwAccessibleTable : protected: // Set states for getAccessibleStateSet. // This drived class additinaly sets MULTISELECTABLE(+) - virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ); + virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; virtual ~SwAccessibleTable(); @@ -83,7 +83,7 @@ protected: // Is table data evailable? sal_Bool HasTableData() const { return (mpTableData != 0); } - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwAccessibleTable( SwAccessibleMap* pInitMap, const SwTabFrm* pTableFrm ); @@ -96,176 +96,176 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire( ) throw () + virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE { SwAccessibleContext::acquire(); }; - virtual void SAL_CALL release( ) throw () + virtual void SAL_CALL release( ) throw () SAL_OVERRIDE { SwAccessibleContext::release(); }; //====== XTypeProvider ==================================================== - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleContext ============================================== /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleTable ================================================ virtual sal_Int32 SAL_CALL getAccessibleRowCount() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleTableSelection ============================================ virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== C++ interface ====================================================== // The object has been moved by the layout - virtual void InvalidatePosOrSize( const SwRect& rOldBox ); + virtual void InvalidatePosOrSize( const SwRect& rOldBox ) SAL_OVERRIDE; // The object is not visible an longer and should be destroyed - virtual void Dispose( sal_Bool bRecursive = sal_False ); + virtual void Dispose( sal_Bool bRecursive = sal_False ) SAL_OVERRIDE; virtual void DisposeChild( const sw::access::SwAccessibleChild& rFrmOrObj, - sal_Bool bRecursive ); + sal_Bool bRecursive ) SAL_OVERRIDE; virtual void InvalidateChildPosOrSize( const sw::access::SwAccessibleChild& rFrmOrObj, - const SwRect& rFrm ); + const SwRect& rFrm ) SAL_OVERRIDE; //===== XAccessibleSelection ============================================ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL clearAccessibleSelection( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // index has to be treated as global child index. virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; typedef std::vector<const SwAccessibleContext*> VEC_CELL; VEC_CELL m_vecCellAdd; VEC_CELL m_vecCellRemove; @@ -287,8 +287,8 @@ protected: virtual ~SwAccessibleTableColHeaders() {} - virtual SwAccessibleTableData_Impl* CreateNewTableData(); - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual SwAccessibleTableData_Impl* CreateNewTableData() SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwAccessibleTableColHeaders( SwAccessibleMap *pMap, const SwTabFrm *pTabFrm ); @@ -297,36 +297,36 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire( ) throw () + virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE { SwAccessibleContext::acquire(); }; - virtual void SAL_CALL release( ) throw () + virtual void SAL_CALL release( ) throw () SAL_OVERRIDE { SwAccessibleContext::release(); }; //===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; //===== XAccessibleTable ================================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== @@ -334,7 +334,7 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx index 580ccadc7e98..20e621fece53 100644 --- a/sw/source/core/access/acctextframe.hxx +++ b/sw/source/core/access/acctextframe.hxx @@ -40,56 +40,56 @@ private: protected: virtual ~SwAccessibleTextFrame(); - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwAccessibleTextFrame( SwAccessibleMap* pInitMap, const SwFlyFrm& rFlyFrm ); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () SAL_OVERRIDE; //===== XAccessibleSelection ============================================ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL clearAccessibleSelection( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //===== XAccessibleContext ============================================== // #i73249# - Return the object's current name. virtual OUString SAL_CALL getAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== @@ -97,23 +97,23 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //====== XTypeProvider ==================================================== - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleContext::getAccessibleRelationSet ==================== @@ -131,7 +131,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/crsr/BlockCursor.cxx b/sw/source/core/crsr/BlockCursor.cxx index 9c7f44359041..992d29b673c7 100644 --- a/sw/source/core/crsr/BlockCursor.cxx +++ b/sw/source/core/crsr/BlockCursor.cxx @@ -35,12 +35,12 @@ class SwBlockCursor : public IBlockCursor public: SwBlockCursor( const SwCrsrShell& rCrsrSh, const SwPosition &rPos ) : aCursor( rCrsrSh, rPos ), pStartPt(0), pEndPt(0) {} - virtual SwShellCrsr& getShellCrsr(); - virtual void setStartPoint( const Point &rPt ); - virtual void setEndPoint( const Point &rPt ); - virtual const Point* getStartPoint() const; - virtual const Point* getEndPoint() const; - virtual void clearPoints(); + virtual SwShellCrsr& getShellCrsr() SAL_OVERRIDE; + virtual void setStartPoint( const Point &rPt ) SAL_OVERRIDE; + virtual void setEndPoint( const Point &rPt ) SAL_OVERRIDE; + virtual const Point* getStartPoint() const SAL_OVERRIDE; + virtual const Point* getEndPoint() const SAL_OVERRIDE; + virtual void clearPoints() SAL_OVERRIDE; virtual ~SwBlockCursor(); }; diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index 963d929b2460..5ad51819ee66 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -1065,8 +1065,8 @@ struct SwFindParaAttr : public SwFindParas virtual ~SwFindParaAttr() { delete pSTxt; } - virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly ); - virtual bool IsReplaceMode() const; + virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly ) SAL_OVERRIDE; + virtual bool IsReplaceMode() const SAL_OVERRIDE; }; int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion, diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx index 17ba627e2813..5cd0cc2f8cae 100644 --- a/sw/source/core/crsr/findcoll.cxx +++ b/sw/source/core/crsr/findcoll.cxx @@ -36,8 +36,8 @@ struct SwFindParaFmtColl : public SwFindParas : pFmtColl( &rFmtColl ), pReplColl( pRpColl ), rCursor( rCrsr ) {} virtual ~SwFindParaFmtColl() {} - virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly ); - virtual bool IsReplaceMode() const; + virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly ) SAL_OVERRIDE; + virtual bool IsReplaceMode() const SAL_OVERRIDE; }; int SwFindParaFmtColl::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion, diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index 9b1a90793f04..b64b7749c2c1 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -549,8 +549,8 @@ struct SwFindParaText : public SwFindParas SwFindParaText( const SearchOptions& rOpt, sal_Bool bSearchNotes, int bRepl, SwCursor& rCrsr ) : rSearchOpt( rOpt ), rCursor( rCrsr ), aSTxt( rOpt ), bReplace( 0 != bRepl ), bSearchInNotes( bSearchNotes ) {} - virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly ); - virtual bool IsReplaceMode() const; + virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly ) SAL_OVERRIDE; + virtual bool IsReplaceMode() const SAL_OVERRIDE; virtual ~SwFindParaText(); }; diff --git a/sw/source/core/crsr/overlayrangesoutline.hxx b/sw/source/core/crsr/overlayrangesoutline.hxx index d5a6e1eddf83..0779da304af1 100644 --- a/sw/source/core/crsr/overlayrangesoutline.hxx +++ b/sw/source/core/crsr/overlayrangesoutline.hxx @@ -34,7 +34,7 @@ namespace sw std::vector< basegfx::B2DRange > maRanges; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlayRangesOutline( diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx index 3bbcdf1bc2de..68950f3ece85 100644 --- a/sw/source/core/doc/acmplwrd.cxx +++ b/sw/source/core/doc/acmplwrd.cxx @@ -58,7 +58,7 @@ public: static sal_uLong GetElementCount() {return nSwAutoCompleteClientCount;} #endif protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; typedef std::vector<SwAutoCompleteClient> SwAutoCompleteClientVector; diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index d36b16c0b616..55cf11d4ec1c 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -206,9 +206,9 @@ public: LineArrayComparator( const CompareData &rD1, const CompareData &rD2, int nStt1, int nEnd1, int nStt2, int nEnd2 ); - virtual bool Compare( int nIdx1, int nIdx2 ) const; - virtual int GetLen1() const { return nLen1; } - virtual int GetLen2() const { return nLen2; } + virtual bool Compare( int nIdx1, int nIdx2 ) const SAL_OVERRIDE; + virtual int GetLen1() const SAL_OVERRIDE { return nLen1; } + virtual int GetLen2() const SAL_OVERRIDE { return nLen2; } }; class WordArrayComparator : public ArrayComparator @@ -224,9 +224,9 @@ public: WordArrayComparator( const SwTxtNode *pNode1, const SwTxtNode *pNode2 ); ~WordArrayComparator(); - virtual bool Compare( int nIdx1, int nIdx2 ) const; - virtual int GetLen1() const { return nCnt1; } - virtual int GetLen2() const { return nCnt2; } + virtual bool Compare( int nIdx1, int nIdx2 ) const SAL_OVERRIDE; + virtual int GetLen1() const SAL_OVERRIDE { return nCnt1; } + virtual int GetLen2() const SAL_OVERRIDE { return nCnt2; } int GetCharSequence( const int *pWordLcs1, const int *pWordLcs2, int *pSubseq1, int *pSubseq2, int nLcsLen ); }; @@ -242,9 +242,9 @@ public: { } - virtual bool Compare( int nIdx1, int nIdx2 ) const; - virtual int GetLen1() const { return pTxtNd1->GetTxt().getLength(); } - virtual int GetLen2() const { return pTxtNd2->GetTxt().getLength(); } + virtual bool Compare( int nIdx1, int nIdx2 ) const SAL_OVERRIDE; + virtual int GetLen1() const SAL_OVERRIDE { return pTxtNd1->GetTxt().getLength(); } + virtual int GetLen2() const SAL_OVERRIDE { return pTxtNd2->GetTxt().getLength(); } }; /// Options set in Tools->Options->Writer->Comparison @@ -952,8 +952,8 @@ public: SwCompareLine( const SwNode& rNd ); virtual ~SwCompareLine(); - virtual sal_uLong GetHashValue() const; - virtual bool Compare( const CompareLine& rLine ) const; + virtual sal_uLong GetHashValue() const SAL_OVERRIDE; + virtual bool Compare( const CompareLine& rLine ) const SAL_OVERRIDE; static sal_uLong GetTxtNodeHashValue( const SwTxtNode& rNd, sal_uLong nVal ); static bool CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd ); @@ -979,14 +979,14 @@ class SwCompareData : public CompareData sal_uLong PrevIdx( const SwNode* pNd ); sal_uLong NextIdx( const SwNode* pNd ); - virtual void CheckRanges( CompareData& ); - virtual void ShowInsert( sal_uLong nStt, sal_uLong nEnd ); + virtual void CheckRanges( CompareData& ) SAL_OVERRIDE; + virtual void ShowInsert( sal_uLong nStt, sal_uLong nEnd ) SAL_OVERRIDE; virtual void ShowDelete( const CompareData& rData, sal_uLong nStt, - sal_uLong nEnd, sal_uLong nInsPos ); + sal_uLong nEnd, sal_uLong nInsPos ) SAL_OVERRIDE; virtual void CheckForChangesInLine( const CompareData& rData, sal_uLong& nStt, sal_uLong& nEnd, - sal_uLong& nThisStt, sal_uLong& nThisEnd ); + sal_uLong& nThisStt, sal_uLong& nThisEnd ) SAL_OVERRIDE; public: SwCompareData( SwDoc& rD ) : rDoc( rD ), pInsRing(0), pDelRing(0) {} diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 89163eb48c55..5fc09774342c 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1110,8 +1110,8 @@ namespace numfunc void InitFont(); /** catches notification about changed default bullet configuration data */ - virtual void Notify( const uno::Sequence<OUString>& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; // default bullet list configuration data OUString msFontname; @@ -1325,8 +1325,8 @@ namespace numfunc void LoadConfig(); /** catches notification about changed configuration data */ - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; // configuration data sal_Bool mbChangeIndentOnTabAtFirstPosOfFirstListItem; diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx index 0ad79d78649c..cbca9bdb4bd0 100644 --- a/sw/source/core/doc/swstylemanager.cxx +++ b/sw/source/core/doc/swstylemanager.cxx @@ -72,14 +72,14 @@ public: {} virtual ~SwStyleManager(); virtual StylePool::SfxItemSet_Pointer_t getAutomaticStyle( const SfxItemSet& rSet, - IStyleAccess::SwAutoStyleFamily eFamily ); + IStyleAccess::SwAutoStyleFamily eFamily ) SAL_OVERRIDE; virtual StylePool::SfxItemSet_Pointer_t getByName( const OUString& rName, - IStyleAccess::SwAutoStyleFamily eFamily ); + IStyleAccess::SwAutoStyleFamily eFamily ) SAL_OVERRIDE; virtual void getAllStyles( std::vector<StylePool::SfxItemSet_Pointer_t> &rStyles, - IStyleAccess::SwAutoStyleFamily eFamily ); + IStyleAccess::SwAutoStyleFamily eFamily ) SAL_OVERRIDE; virtual StylePool::SfxItemSet_Pointer_t cacheAutomaticStyle( const SfxItemSet& rSet, - SwAutoStyleFamily eFamily ); - virtual void clearCaches(); + SwAutoStyleFamily eFamily ) SAL_OVERRIDE; + virtual void clearCaches() SAL_OVERRIDE; }; IStyleAccess *createStyleManager( SfxItemSet* pIgnorableParagraphItems ) diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx index fe706ae8767a..cac64f2f357c 100644 --- a/sw/source/core/docnode/cancellablejob.hxx +++ b/sw/source/core/docnode/cancellablejob.hxx @@ -35,7 +35,7 @@ public: ~CancellableJob() {} // ::com::sun::star::util::XCancellable: - virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: CancellableJob( CancellableJob& ); // not defined diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index 451c5b104474..746059d4545b 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -56,7 +56,7 @@ class CancelJobsThread : public osl::Thread css::uno::Reference< css::util::XCancellable > getNextJob(); bool stopped() const; - virtual void SAL_CALL run(); + virtual void SAL_CALL run() SAL_OVERRIDE; mutable osl::Mutex maMutex; std::list< css::uno::Reference< css::util::XCancellable > > maJobs; @@ -161,8 +161,8 @@ class TerminateOfficeThread : public osl::Thread void StopOfficeTermination(); private: - virtual void SAL_CALL run(); - virtual void SAL_CALL onTerminated(); + virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() SAL_OVERRIDE; bool OfficeTerminationStopped(); void PerformOfficeTermination(); diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 1104a073c7f3..499fe8a4d353 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -71,13 +71,13 @@ public: rSectFmt( rFmt ) {} - 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; - virtual const SwNode* GetAnchor() const; + virtual const SwNode* GetAnchor() const SAL_OVERRIDE; virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0, - sal_Int32 nEnd = -1 ) const; + sal_Int32 nEnd = -1 ) const SAL_OVERRIDE; inline SwSectionNode* GetSectNode() { diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index a1714b03b419..a696fb4c8c5c 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1983,7 +1983,7 @@ namespace sdr * * This method will not handle included hierarchies and not check geometric visibility. */ - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: VOCOfDrawVirtObj(ObjectContact& rObjectContact, ViewContact& rViewContact) @@ -2002,7 +2002,7 @@ namespace sdr * Always needs to return something. Default is to create a standard ViewObjectContact * containing the given ObjectContact and *this. */ - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; public: /// basic constructor, used from SdrObject. diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index d02a4c79bfee..002dbe5d909c 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -82,7 +82,7 @@ namespace sdr * * @note ONLY based on model data */ - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: /// basic constructor, used from SdrObject. @@ -152,7 +152,7 @@ namespace drawinglayer protected: /// method which is to be used to implement the local decomposition of a 2D primitive - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: SwVirtFlyDrawObjPrimitive( @@ -164,12 +164,12 @@ namespace drawinglayer { } - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; // overloaded to allow callbacks to wrap_DoPaintObject - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; // data read access const SwVirtFlyDrawObj& getSwVirtFlyDrawObj() const { return mrSwVirtFlyDrawObj; } @@ -261,7 +261,7 @@ namespace sdr * * @note ONLY based on model data */ - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: /// basic constructor, used from SdrObject. diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index eeeb492ff799..c002b04e8b1e 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -62,7 +62,7 @@ class SwSdrHdl : public SdrHdl public: SwSdrHdl(const Point& rPnt, bool bTopRight ) : SdrHdl( rPnt, bTopRight ? HDL_ANCHOR_TR : HDL_ANCHOR ) {} - virtual bool IsFocusHdl() const; + virtual bool IsFocusHdl() const SAL_OVERRIDE; }; bool SwSdrHdl::IsFocusHdl() const diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index ff8956cc37e7..3aa9947058b9 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -44,13 +44,13 @@ public: rFldType( rType ) {} - 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; - virtual const SwNode* GetAnchor() const; + virtual const SwNode* GetAnchor() const SAL_OVERRIDE; virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0, - sal_Int32 nEnd = -1 ) const; + sal_Int32 nEnd = -1 ) const SAL_OVERRIDE; }; ::sfx2::SvBaseLink::UpdateResult SwIntrnlRefLink::DataChanged( const OUString& rMimeType, diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 6c0103f01d0e..5cc02c120053 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -1286,7 +1286,7 @@ namespace { } - virtual bool includeObject( const SdrObject& i_rObject ) const + virtual bool includeObject( const SdrObject& i_rObject ) const SAL_OVERRIDE { return m_pPV && m_pPV->GetView().IsObjMarkable( const_cast< SdrObject* >( &i_rObject ), m_pPV ); } diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index ed4afd7b6ad9..0d9dc6f0e1cd 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -36,66 +36,66 @@ namespace sw { public: MarkManager(/*[in/out]*/ SwDoc& rDoc); // IDocumentMarkAccess - virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rName, IDocumentMarkAccess::MarkType eMark); + virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rName, IDocumentMarkAccess::MarkType eMark) SAL_OVERRIDE; virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM, const OUString& rName, - const OUString& rType); + const OUString& rType) SAL_OVERRIDE; virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM, const OUString& rName, - const OUString& rType); + const OUString& rType) SAL_OVERRIDE; - virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, IDocumentMarkAccess::MarkType eMark); + virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, IDocumentMarkAccess::MarkType eMark) SAL_OVERRIDE; virtual sw::mark::IMark* makeAnnotationMark( const SwPaM& rPaM, - const ::rtl::OUString& rName ); + const ::rtl::OUString& rName ) SAL_OVERRIDE; - virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM); - virtual bool renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName); - virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset); - virtual void correctMarksRelative(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset); + virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM) SAL_OVERRIDE; + virtual bool renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName) SAL_OVERRIDE; + virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset) SAL_OVERRIDE; + virtual void correctMarksRelative(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset) SAL_OVERRIDE; - virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx); + virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx) SAL_OVERRIDE; // deleters virtual ::boost::shared_ptr<ILazyDeleter> - deleteMark(const const_iterator_t ppMark); - virtual void deleteMark(const ::sw::mark::IMark* const pMark); - virtual void clearAllMarks(); + deleteMark(const const_iterator_t ppMark) SAL_OVERRIDE; + virtual void deleteMark(const ::sw::mark::IMark* const pMark) SAL_OVERRIDE; + virtual void clearAllMarks() SAL_OVERRIDE; // marks - virtual const_iterator_t getAllMarksBegin() const; - virtual const_iterator_t getAllMarksEnd() const; - virtual sal_Int32 getAllMarksCount() const; - virtual const_iterator_t findMark(const OUString& rName) const; + virtual const_iterator_t getAllMarksBegin() const SAL_OVERRIDE; + virtual const_iterator_t getAllMarksEnd() const SAL_OVERRIDE; + virtual sal_Int32 getAllMarksCount() const SAL_OVERRIDE; + virtual const_iterator_t findMark(const OUString& rName) const SAL_OVERRIDE; virtual bool hasMark(const OUString& rName) const; // bookmarks - virtual const_iterator_t getBookmarksBegin() const; - virtual const_iterator_t getBookmarksEnd() const; - virtual sal_Int32 getBookmarksCount() const; - virtual const_iterator_t findBookmark(const OUString& rName) const; + virtual const_iterator_t getBookmarksBegin() const SAL_OVERRIDE; + virtual const_iterator_t getBookmarksEnd() const SAL_OVERRIDE; + virtual sal_Int32 getBookmarksCount() const SAL_OVERRIDE; + virtual const_iterator_t findBookmark(const OUString& rName) const SAL_OVERRIDE; // Fieldmarks - virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& rPos) const; - virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition& rPos) const; - virtual ::sw::mark::IFieldmark* getFieldmarkAfter(const SwPosition& rPos) const; + virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& rPos) const SAL_OVERRIDE; + virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition& rPos) const SAL_OVERRIDE; + virtual ::sw::mark::IFieldmark* getFieldmarkAfter(const SwPosition& rPos) const SAL_OVERRIDE; void dumpAsXml(xmlTextWriterPtr w); // Marks exclusive annotation marks - virtual const_iterator_t getCommonMarksBegin() const; - virtual const_iterator_t getCommonMarksEnd() const; - virtual sal_Int32 getCommonMarksCount() const; + virtual const_iterator_t getCommonMarksBegin() const SAL_OVERRIDE; + virtual const_iterator_t getCommonMarksEnd() const SAL_OVERRIDE; + virtual sal_Int32 getCommonMarksCount() const SAL_OVERRIDE; // Annotation Marks - virtual const_iterator_t getAnnotationMarksBegin() const; - virtual const_iterator_t getAnnotationMarksEnd() const; - virtual sal_Int32 getAnnotationMarksCount() const; - virtual const_iterator_t findAnnotationMark( const ::rtl::OUString& rName ) const; + virtual const_iterator_t getAnnotationMarksBegin() const SAL_OVERRIDE; + virtual const_iterator_t getAnnotationMarksEnd() const SAL_OVERRIDE; + virtual sal_Int32 getAnnotationMarksCount() const SAL_OVERRIDE; + virtual const_iterator_t findAnnotationMark( const ::rtl::OUString& rName ) const SAL_OVERRIDE; - virtual void assureSortedMarkContainers() const; + virtual void assureSortedMarkContainers() const SAL_OVERRIDE; private: // make names diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx index 25c5991857c4..17c566b6a430 100644 --- a/sw/source/core/inc/SwGrammarMarkUp.hxx +++ b/sw/source/core/inc/SwGrammarMarkUp.hxx @@ -42,8 +42,8 @@ public: SwGrammarMarkUp( const SwGrammarMarkUp* ); virtual ~SwGrammarMarkUp(); - virtual SwWrongList* Clone(); - virtual void CopyFrom( const SwWrongList& rCopy ); + virtual SwWrongList* Clone() SAL_OVERRIDE; + virtual void CopyFrom( const SwWrongList& rCopy ) SAL_OVERRIDE; /* SwWrongList::Move() + handling of maSentence */ void MoveGrammar( sal_Int32 nPos, sal_Int32 nDiff ); diff --git a/sw/source/core/inc/SwUndoFmt.hxx b/sw/source/core/inc/SwUndoFmt.hxx index 808b6b30da75..a76ed647e6e3 100644 --- a/sw/source/core/inc/SwUndoFmt.hxx +++ b/sw/source/core/inc/SwUndoFmt.hxx @@ -45,10 +45,10 @@ public: SwDoc * pDoc); virtual ~SwUndoFmtCreate(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; virtual SwFmt * Create(SwFmt * pDerivedFrom) = 0; virtual void Delete() = 0; @@ -69,10 +69,10 @@ public: SwUndoFmtDelete(SwUndoId nUndoId, SwFmt * pOld, SwDoc * pDoc); ~SwUndoFmtDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; virtual SwFmt * Create(SwFmt * pDerivedFrom) = 0; virtual void Delete(SwFmt * pFmt) = 0; @@ -91,10 +91,10 @@ public: SwDoc * pDoc); ~SwUndoRenameFmt(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - SwRewriter GetRewriter() const; + SwRewriter GetRewriter() const SAL_OVERRIDE; virtual SwFmt * Find(const OUString & rName) const = 0; }; @@ -105,9 +105,9 @@ public: SwUndoTxtFmtCollCreate(SwTxtFmtColl * pNew, SwTxtFmtColl * pDerivedFrom, SwDoc * pDoc); - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE; + virtual void Delete() SAL_OVERRIDE; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoTxtFmtCollDelete : public SwUndoFmtDelete @@ -115,9 +115,9 @@ class SwUndoTxtFmtCollDelete : public SwUndoFmtDelete public: SwUndoTxtFmtCollDelete(SwTxtFmtColl * pOld, SwDoc * pDoc); - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(SwFmt * pFmt); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE; + virtual void Delete(SwFmt * pFmt) SAL_OVERRIDE; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoRenameFmtColl : public SwUndoRenameFmt @@ -127,7 +127,7 @@ public: const OUString & sNewName, SwDoc * pDoc); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoCharFmtCreate : public SwUndoFmtCreate @@ -136,9 +136,9 @@ public: SwUndoCharFmtCreate(SwCharFmt * pNew, SwCharFmt * pDerivedFrom, SwDoc * pDoc); - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE; + virtual void Delete() SAL_OVERRIDE; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoCharFmtDelete : public SwUndoFmtDelete @@ -146,9 +146,9 @@ class SwUndoCharFmtDelete : public SwUndoFmtDelete public: SwUndoCharFmtDelete(SwCharFmt * pOld, SwDoc * pDoc); - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(SwFmt * pFmt); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE; + virtual void Delete(SwFmt * pFmt) SAL_OVERRIDE; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoRenameCharFmt : public SwUndoRenameFmt @@ -158,7 +158,7 @@ public: const OUString & sNewName, SwDoc * pDoc); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoFrmFmtCreate : public SwUndoFmtCreate @@ -169,9 +169,9 @@ public: SwUndoFrmFmtCreate(SwFrmFmt * pNew, SwFrmFmt * pDerivedFrom, SwDoc * pDoc); - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE; + virtual void Delete() SAL_OVERRIDE; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoFrmFmtDelete : public SwUndoFmtDelete @@ -179,9 +179,9 @@ class SwUndoFrmFmtDelete : public SwUndoFmtDelete public: SwUndoFrmFmtDelete(SwFrmFmt * pOld, SwDoc * pDoc); - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(SwFmt * pFmt); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Create(SwFmt * pDerivedFrom) SAL_OVERRIDE; + virtual void Delete(SwFmt * pFmt) SAL_OVERRIDE; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoRenameFrmFmt : public SwUndoRenameFmt @@ -191,7 +191,7 @@ public: const OUString & sNewName, SwDoc * pDoc); - virtual SwFmt * Find(const OUString & rName) const; + virtual SwFmt * Find(const OUString & rName) const SAL_OVERRIDE; }; class SwUndoNumruleCreate : public SwUndo @@ -204,10 +204,10 @@ class SwUndoNumruleCreate : public SwUndo public: SwUndoNumruleCreate(const SwNumRule * pNew, SwDoc * pDoc); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - SwRewriter GetRewriter() const; + SwRewriter GetRewriter() const SAL_OVERRIDE; }; class SwUndoNumruleDelete : public SwUndo @@ -218,10 +218,10 @@ class SwUndoNumruleDelete : public SwUndo public: SwUndoNumruleDelete(const SwNumRule & aRule, SwDoc * pDoc); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - SwRewriter GetRewriter() const; + SwRewriter GetRewriter() const SAL_OVERRIDE; }; class SwUndoNumruleRename : public SwUndo @@ -233,10 +233,10 @@ class SwUndoNumruleRename : public SwUndo SwUndoNumruleRename(const OUString & aOldName, const OUString & aNewName, SwDoc * pDoc); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - SwRewriter GetRewriter() const; + SwRewriter GetRewriter() const SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_SWUNDOFMT_HXX diff --git a/sw/source/core/inc/SwUndoPageDesc.hxx b/sw/source/core/inc/SwUndoPageDesc.hxx index 6efaf6d32b56..a8c7c13668a6 100644 --- a/sw/source/core/inc/SwUndoPageDesc.hxx +++ b/sw/source/core/inc/SwUndoPageDesc.hxx @@ -40,10 +40,10 @@ public: SwDoc * pDoc); virtual ~SwUndoPageDesc(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; }; class SwUndoPageDescCreate : public SwUndo @@ -58,11 +58,11 @@ public: SwUndoPageDescCreate(const SwPageDesc * pNew, SwDoc * pDoc); virtual ~SwUndoPageDescCreate(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; }; class SwUndoPageDescDelete : public SwUndo @@ -76,11 +76,11 @@ public: SwUndoPageDescDelete(const SwPageDesc & aOld, SwDoc * pDoc); virtual ~SwUndoPageDescDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; }; #endif // _SW_UNDO_PAGE_DESC_CHANGE_HXX diff --git a/sw/source/core/inc/SwUndoTOXChange.hxx b/sw/source/core/inc/SwUndoTOXChange.hxx index 08cc3e15c852..ed6aeca07608 100644 --- a/sw/source/core/inc/SwUndoTOXChange.hxx +++ b/sw/source/core/inc/SwUndoTOXChange.hxx @@ -34,9 +34,9 @@ public: SwUndoTOXChange(SwTOXBase * pTOX, const SwTOXBase & rNew); virtual ~SwUndoTOXChange(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_SWUNDOTOXCHANGE_HXX diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx index c3901088273b..ff62ced64fd8 100644 --- a/sw/source/core/inc/SwXMLBlockExport.hxx +++ b/sw/source/core/inc/SwXMLBlockExport.hxx @@ -37,10 +37,10 @@ public: com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); virtual ~SwXMLBlockListExport ( void ) {} - sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass); - void _ExportAutoStyles() {} - void _ExportMasterStyles () {} - void _ExportContent() {} + sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE; + void _ExportAutoStyles() SAL_OVERRIDE {} + void _ExportMasterStyles () SAL_OVERRIDE {} + void _ExportContent() SAL_OVERRIDE {} }; class SwXMLTextBlockExport : public SvXMLExport @@ -56,11 +56,11 @@ public: com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); virtual ~SwXMLTextBlockExport ( void ) {} - sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) {return 0;} + sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) SAL_OVERRIDE {return 0;} sal_uInt32 exportDoc(const OUString & rText); - void _ExportAutoStyles() {} - void _ExportMasterStyles () {} - void _ExportContent() {} + void _ExportAutoStyles() SAL_OVERRIDE {} + void _ExportMasterStyles () SAL_OVERRIDE {} + void _ExportContent() SAL_OVERRIDE {} }; #endif diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index 81801c413ea3..726db195a613 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -34,7 +34,7 @@ protected: virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; public: SwXMLBlockListImport( @@ -60,7 +60,7 @@ protected: virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; public: sal_Bool bTextOnly; @@ -76,7 +76,7 @@ public: virtual ~SwXMLTextBlockImport ( void ) throw(); virtual void SAL_CALL endDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/inc/SwXMLBlockListContext.hxx b/sw/source/core/inc/SwXMLBlockListContext.hxx index 52605b31dda1..6577c81c80b1 100644 --- a/sw/source/core/inc/SwXMLBlockListContext.hxx +++ b/sw/source/core/inc/SwXMLBlockListContext.hxx @@ -40,7 +40,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; }; @@ -69,7 +69,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; ~SwXMLTextBlockDocumentContext ( void ); }; @@ -87,7 +87,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; ~SwXMLTextBlockBodyContext ( void ); }; @@ -105,7 +105,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; ~SwXMLTextBlockTextContext ( void ); }; @@ -120,7 +120,7 @@ public: const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - virtual void Characters( const OUString& rChars ); + virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; ~SwXMLTextBlockParContext ( void ); }; diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index 5afd8f1b4d08..df3c20ffa9fa 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -54,41 +54,41 @@ public: SwXMLTextBlocks( const OUString& rFile ); SwXMLTextBlocks( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString& rFile ); void AddName( const OUString&, const OUString&, const OUString&, sal_Bool bOnlyTxt = sal_False ); - virtual void AddName( const OUString&, const OUString&, sal_Bool bOnlyTxt = sal_False ); + virtual void AddName( const OUString&, const OUString&, sal_Bool bOnlyTxt = sal_False ) SAL_OVERRIDE; OUString GeneratePackageName ( const OUString& rShort ); virtual ~SwXMLTextBlocks(); //virtual sal_Bool IsOld() const; - virtual sal_uLong Delete( sal_uInt16 ); - virtual sal_uLong Rename( sal_uInt16, const OUString&, const OUString& ); - virtual sal_uLong CopyBlock( SwImpBlocks& rImp, OUString& rShort, const OUString& rLong); - virtual void ClearDoc(); - virtual sal_uLong GetDoc( sal_uInt16 ); - virtual sal_uLong BeginPutDoc( const OUString&, const OUString& ); - virtual sal_uLong PutDoc(); - virtual sal_uLong GetText( sal_uInt16, OUString& ); - virtual sal_uLong PutText( const OUString&, const OUString&, const OUString& ); - virtual sal_uLong MakeBlockList(); - - virtual short GetFileType ( void ) const; - virtual sal_uLong OpenFile( sal_Bool bReadOnly = sal_True ); - virtual void CloseFile(); + virtual sal_uLong Delete( sal_uInt16 ) SAL_OVERRIDE; + virtual sal_uLong Rename( sal_uInt16, const OUString&, const OUString& ) SAL_OVERRIDE; + virtual sal_uLong CopyBlock( SwImpBlocks& rImp, OUString& rShort, const OUString& rLong) SAL_OVERRIDE; + virtual void ClearDoc() SAL_OVERRIDE; + virtual sal_uLong GetDoc( sal_uInt16 ) SAL_OVERRIDE; + virtual sal_uLong BeginPutDoc( const OUString&, const OUString& ) SAL_OVERRIDE; + virtual sal_uLong PutDoc() SAL_OVERRIDE; + virtual sal_uLong GetText( sal_uInt16, OUString& ) SAL_OVERRIDE; + virtual sal_uLong PutText( const OUString&, const OUString&, const OUString& ) SAL_OVERRIDE; + virtual sal_uLong MakeBlockList() SAL_OVERRIDE; + + virtual short GetFileType ( void ) const SAL_OVERRIDE; + virtual sal_uLong OpenFile( sal_Bool bReadOnly = sal_True ) SAL_OVERRIDE; + virtual void CloseFile() SAL_OVERRIDE; static sal_Bool IsFileUCBStorage( const OUString & rFileName); // Methods for the new Autocorrecter sal_uLong GetText( const OUString& rShort, OUString& ); - virtual sal_Bool IsOnlyTextBlock( const OUString& rShort ) const; + virtual sal_Bool IsOnlyTextBlock( const OUString& rShort ) const SAL_OVERRIDE; virtual sal_Bool IsOnlyTextBlock( sal_uInt16 nIdx ) const; virtual void SetIsTextOnly( const OUString& rShort, sal_Bool bNewValue ); virtual void SetIsTextOnly( sal_uInt16 nIdx, sal_Bool bNewValue ); virtual sal_uLong GetMacroTable( sal_uInt16, SvxMacroTableDtor& rMacroTbl, - sal_Bool bFileAlreadyOpen = sal_False ); + sal_Bool bFileAlreadyOpen = sal_False ) SAL_OVERRIDE; virtual sal_uLong SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTable, - sal_Bool bFileAlreadyOpen = sal_False ); - virtual sal_Bool PutMuchEntries( sal_Bool bOn ); + sal_Bool bFileAlreadyOpen = sal_False ) SAL_OVERRIDE; + virtual sal_Bool PutMuchEntries( sal_Bool bOn ) SAL_OVERRIDE; public: SwDoc* GetDoc() const { return pDoc; } diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx index 4aeb9161e0f6..c70565a7cd19 100644 --- a/sw/source/core/inc/SwXTextDefaults.hxx +++ b/sw/source/core/inc/SwXTextDefaults.hxx @@ -43,34 +43,34 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx index e2336e9860d2..f55513fe75f1 100644 --- a/sw/source/core/inc/UndoAttribute.hxx +++ b/sw/source/core/inc/UndoAttribute.hxx @@ -52,9 +52,9 @@ public: virtual ~SwUndoAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SaveRedlineData( const SwPaM& rPam, sal_Bool bInsCntnt ); @@ -75,9 +75,9 @@ public: virtual ~SwUndoResetAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SetAttrs( const std::set<sal_uInt16> &rAttrs ); @@ -121,11 +121,11 @@ public: virtual ~SwUndoFmtAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; void PutAttr( const SfxPoolItem& rItem ); SwFmt* GetFmt( SwDoc& rDoc ); // checks if it is still in the Doc! @@ -139,8 +139,8 @@ class SwUndoFmtResetAttr : public SwUndo const sal_uInt16 nWhichId ); ~SwUndoFmtResetAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; private: // format at which a certain attribute is reset. @@ -161,9 +161,9 @@ class SwUndoDontExpandFmt : public SwUndo public: SwUndoDontExpandFmt( const SwPosition& rPos ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; // helper class to receive changed attribute sets @@ -177,7 +177,7 @@ class SwUndoFmtAttrHelper : public SwClient public: SwUndoFmtAttrHelper( SwFmt& rFmt, bool bSaveDrawPt = true ); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; SwUndoFmtAttr* GetUndo() const { return m_pUndo.get(); } // release the undo object (so it is not deleted here), and return it @@ -196,9 +196,9 @@ public: virtual ~SwUndoMoveLeftMargin(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; SwHistory& GetHistory() { return *m_pHistory; } @@ -217,8 +217,8 @@ public: virtual ~SwUndoDefaultAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; class SwUndoChangeFootNote : public SwUndo, private SwUndRng @@ -235,9 +235,9 @@ public: sal_uInt16 nNum, bool bIsEndNote ); virtual ~SwUndoChangeFootNote(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; SwHistory& GetHistory() { return *m_pHistory; } }; @@ -253,8 +253,8 @@ public: virtual ~SwUndoFootNoteInfo(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; class SwUndoEndNoteInfo : public SwUndo @@ -268,8 +268,8 @@ public: virtual ~SwUndoEndNoteInfo(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOATTRIBUTE_HXX diff --git a/sw/source/core/inc/UndoBookmark.hxx b/sw/source/core/inc/UndoBookmark.hxx index e910ecba3e8c..0d2234f64825 100644 --- a/sw/source/core/inc/UndoBookmark.hxx +++ b/sw/source/core/inc/UndoBookmark.hxx @@ -55,7 +55,7 @@ public: @return the rewriter for this undo object */ - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; }; class SwUndoInsBookmark : public SwUndoBookmark @@ -63,8 +63,8 @@ class SwUndoInsBookmark : public SwUndoBookmark public: SwUndoInsBookmark( const ::sw::mark::IMark& ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOBOOKMARK_HXX diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx index 5f85dda679b0..64b2b95fd222 100644 --- a/sw/source/core/inc/UndoCore.hxx +++ b/sw/source/core/inc/UndoCore.hxx @@ -127,9 +127,9 @@ public: const bool bResetListAttrs ); virtual ~SwUndoFmtColl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; /** Returns the rewriter for this undo object. @@ -144,7 +144,7 @@ public: @return the rewriter for this undo object */ - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; SwHistory* GetHistory() { return pHistory; } @@ -162,17 +162,17 @@ class SwUndoSetFlyFmt : public SwUndo, public SwClient bool bAnchorChgd; void PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem ); - void Modify( const SfxPoolItem*, const SfxPoolItem* ); + void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; void GetAnchor( SwFmtAnchor& rAnhor, sal_uLong nNode, sal_Int32 nCntnt ); public: SwUndoSetFlyFmt( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFrmFmt ); virtual ~SwUndoSetFlyFmt(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; void DeRegisterFromFormat( SwFmt& ); }; @@ -183,9 +183,9 @@ class SwUndoOutlineLeftRight : public SwUndo, private SwUndRng public: SwUndoOutlineLeftRight( const SwPaM& rPam, short nOffset ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; const int nUndoStringLength = 20; diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx index 7a13c427d5e9..719bd53f0cb2 100644 --- a/sw/source/core/inc/UndoDelete.hxx +++ b/sw/source/core/inc/UndoDelete.hxx @@ -70,9 +70,9 @@ public: sal_Bool bCalledByTblCpy = sal_False ); virtual ~SwUndoDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; /** Returns rewriter for this undo object. @@ -84,7 +84,7 @@ public: @return rewriter for this undo object */ - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; sal_Bool CanGrouping( SwDoc*, const SwPaM& ); diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx index b9d9c3ae063e..632fd5ec682b 100644 --- a/sw/source/core/inc/UndoDraw.hxx +++ b/sw/source/core/inc/UndoDraw.hxx @@ -42,10 +42,10 @@ public: virtual ~SwSdrUndo(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; class SwUndoDrawGroup : public SwUndo @@ -59,8 +59,8 @@ public: virtual ~SwUndoDrawGroup(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void AddObj( sal_uInt16 nPos, SwDrawFrmFmt*, SdrObject* ); void SetGroupFmt( SwDrawFrmFmt* ); @@ -88,8 +88,8 @@ public: virtual ~SwUndoDrawUnGroup(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void AddObj( sal_uInt16 nPos, SwDrawFrmFmt* ); }; @@ -104,8 +104,8 @@ public: virtual ~SwUndoDrawUnGroupConnectToLayout(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt, SdrObject* pDrawObject ); @@ -123,8 +123,8 @@ public: virtual ~SwUndoDrawDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void AddObj( sal_uInt16 nPos, SwDrawFrmFmt*, const SdrMark& ); }; diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx index 7ce1169531e7..2c4c797bfc35 100644 --- a/sw/source/core/inc/UndoInsert.hxx +++ b/sw/source/core/inc/UndoInsert.hxx @@ -61,9 +61,9 @@ public: SwUndoInsert( const SwNodeIndex& rNode ); virtual ~SwUndoInsert(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; /** Returns rewriter for this undo object. @@ -76,7 +76,7 @@ public: @return rewriter for this undo object */ - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; void SetWithRsid() { m_bWithRsid = true; } @@ -96,8 +96,8 @@ public: virtual ~SwUndoReplace(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; /** Returns the rewriter of this undo object. @@ -118,7 +118,7 @@ public: @return the rewriter of this undo object */ - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; void SetEnd( const SwPaM& rPam ); @@ -143,8 +143,8 @@ public: virtual ~SwUndoReRead(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; class SwUndoInsertLabel : public SwUndo @@ -185,9 +185,9 @@ public: const sal_Bool bCpyBrd ); virtual ~SwUndoInsertLabel(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; /** Returns the rewriter of this undo object. @@ -201,7 +201,7 @@ public: @return the rewriter of this undo object */ - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; void SetNodePos( sal_uLong nNd ) { if( LTYPE_OBJECT != eType ) NODE.nNode = nNd; } diff --git a/sw/source/core/inc/UndoManager.hxx b/sw/source/core/inc/UndoManager.hxx index 4514b2895668..65d3b03422c1 100644 --- a/sw/source/core/inc/UndoManager.hxx +++ b/sw/source/core/inc/UndoManager.hxx @@ -41,42 +41,42 @@ public: IDocumentState & rState); /** IDocumentUndoRedo */ - virtual void DoUndo(bool const bDoUndo); - virtual bool DoesUndo() const; - virtual void DoGroupUndo(bool const bDoUndo); - virtual bool DoesGroupUndo() const; - virtual void DoDrawUndo(bool const bDoUndo); - virtual bool DoesDrawUndo() const; - virtual void SetUndoNoModifiedPosition(); - virtual void LockUndoNoModifiedPosition(); - virtual void UnLockUndoNoModifiedPosition(); - virtual void SetUndoNoResetModified(); - virtual bool IsUndoNoResetModified() const; + virtual void DoUndo(bool const bDoUndo) SAL_OVERRIDE; + virtual bool DoesUndo() const SAL_OVERRIDE; + virtual void DoGroupUndo(bool const bDoUndo) SAL_OVERRIDE; + virtual bool DoesGroupUndo() const SAL_OVERRIDE; + virtual void DoDrawUndo(bool const bDoUndo) SAL_OVERRIDE; + virtual bool DoesDrawUndo() const SAL_OVERRIDE; + virtual void SetUndoNoModifiedPosition() SAL_OVERRIDE; + virtual void LockUndoNoModifiedPosition() SAL_OVERRIDE; + virtual void UnLockUndoNoModifiedPosition() SAL_OVERRIDE; + virtual void SetUndoNoResetModified() SAL_OVERRIDE; + virtual bool IsUndoNoResetModified() const SAL_OVERRIDE; virtual SwUndoId StartUndo(SwUndoId const eUndoId, - SwRewriter const*const pRewriter); + SwRewriter const*const pRewriter) SAL_OVERRIDE; virtual SwUndoId EndUndo(SwUndoId const eUndoId, - SwRewriter const*const pRewriter); - virtual void DelAllUndoObj(); + SwRewriter const*const pRewriter) SAL_OVERRIDE; + virtual void DelAllUndoObj() SAL_OVERRIDE; virtual bool GetLastUndoInfo(OUString *const o_pStr, - SwUndoId *const o_pId) const; - virtual SwUndoComments_t GetUndoComments() const; + SwUndoId *const o_pId) const SAL_OVERRIDE; + virtual SwUndoComments_t GetUndoComments() const SAL_OVERRIDE; virtual bool GetFirstRedoInfo(OUString *const o_pStr, - SwUndoId *const o_pId = 0) const; - virtual SwUndoComments_t GetRedoComments() const; + SwUndoId *const o_pId = 0) const SAL_OVERRIDE; + virtual SwUndoComments_t GetRedoComments() const SAL_OVERRIDE; virtual bool Repeat(::sw::RepeatContext & rContext, - sal_uInt16 const nRepeatCnt); - virtual SwUndoId GetRepeatInfo(OUString *const o_pStr) const; - virtual void AppendUndo(SwUndo *const pUndo); - virtual void ClearRedo(); - virtual bool IsUndoNodes(SwNodes const& rNodes) const; + sal_uInt16 const nRepeatCnt) SAL_OVERRIDE; + virtual SwUndoId GetRepeatInfo(OUString *const o_pStr) const SAL_OVERRIDE; + virtual void AppendUndo(SwUndo *const pUndo) SAL_OVERRIDE; + virtual void ClearRedo() SAL_OVERRIDE; + virtual bool IsUndoNodes(SwNodes const& rNodes) const SAL_OVERRIDE; // ::svl::IUndoManager virtual void AddUndoAction(SfxUndoAction *pAction, - bool bTryMerg = false); - virtual bool Undo(); - virtual bool Redo(); - virtual void EnableUndo(bool bEnable); + bool bTryMerg = false) SAL_OVERRIDE; + virtual bool Undo() SAL_OVERRIDE; + virtual bool Redo() SAL_OVERRIDE; + virtual void EnableUndo(bool bEnable) SAL_OVERRIDE; SwUndo * RemoveLastUndo(); SwUndo * GetLastUndo(); diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx index bf92ea626613..53614c4f9fe2 100644 --- a/sw/source/core/inc/UndoNumbering.hxx +++ b/sw/source/core/inc/UndoNumbering.hxx @@ -45,11 +45,11 @@ public: virtual ~SwUndoInsNum(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; SwHistory* GetHistory(); // will be created if necessary void SetSttNum( sal_uLong nNdIdx ) { nSttSet = nNdIdx; } @@ -75,9 +75,9 @@ public: virtual ~SwUndoDelNum(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void AddNode( const SwTxtNode& rNd, sal_Bool bResetLRSpace ); SwHistory* GetHistory() { return pHistory; } @@ -91,9 +91,9 @@ class SwUndoMoveNum : public SwUndo, private SwUndRng public: SwUndoMoveNum( const SwPaM& rPam, long nOffset, bool bIsOutlMv = false ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SetStartNode( sal_uLong nValue ) { nNewStt = nValue; } }; @@ -105,9 +105,9 @@ class SwUndoNumUpDown : public SwUndo, private SwUndRng public: SwUndoNumUpDown( const SwPaM& rPam, short nOffset ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; class SwUndoNumOrNoNum : public SwUndo @@ -119,9 +119,9 @@ public: SwUndoNumOrNoNum( const SwNodeIndex& rIdx, sal_Bool mbOldNum, sal_Bool mbNewNum ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; class SwUndoNumRuleStart : public SwUndo @@ -135,9 +135,9 @@ public: SwUndoNumRuleStart( const SwPosition& rPos, sal_Bool bDelete ); SwUndoNumRuleStart( const SwPosition& rPos, sal_uInt16 nStt ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDONUMBERING_HXX diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx index 91f9c1aa0bc3..639ee22d72f6 100644 --- a/sw/source/core/inc/UndoOverwrite.hxx +++ b/sw/source/core/inc/UndoOverwrite.hxx @@ -45,9 +45,9 @@ public: virtual ~SwUndoOverwrite(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; /** Returns the rewriter of this undo object. @@ -60,7 +60,7 @@ public: @return the rewriter of this undo object */ - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; sal_Bool CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns ); }; @@ -79,9 +79,9 @@ public: virtual ~SwUndoTransliterate(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void AddChanges( SwTxtNode& rTNd, sal_Int32 nStart, sal_Int32 nLen, ::com::sun::star::uno::Sequence <sal_Int32>& rOffsets ); diff --git a/sw/source/core/inc/UndoRedline.hxx b/sw/source/core/inc/UndoRedline.hxx index 0a943276d98f..1b5ed47b923e 100644 --- a/sw/source/core/inc/UndoRedline.hxx +++ b/sw/source/core/inc/UndoRedline.hxx @@ -43,8 +43,8 @@ public: virtual ~SwUndoRedline(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; SwUndoId GetUserId() const { return mnUserId; } sal_uInt16 GetRedlSaveCount() const; @@ -56,8 +56,8 @@ class SwUndoRedlineDelete : public SwUndoRedline sal_Bool bIsDelim : 1; sal_Bool bIsBackspace : 1; - virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam); - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam); + virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; public: SwUndoRedlineDelete( const SwPaM& rRange, SwUndoId nUserId = UNDO_EMPTY ); @@ -75,15 +75,15 @@ class SwUndoRedlineSort : public SwUndoRedline sal_uLong nSaveEndNode, nOffset; sal_Int32 nSaveEndCntnt; - virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam); - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam); + virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; public: SwUndoRedlineSort( const SwPaM& rRange, const SwSortOptions& rOpt ); virtual ~SwUndoRedlineSort(); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SetSaveRange( const SwPaM& rRange ); void SetOffset( const SwNodeIndex& rIdx ); @@ -92,23 +92,23 @@ public: class SwUndoAcceptRedline : public SwUndoRedline { private: - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam); + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; public: SwUndoAcceptRedline( const SwPaM& rRange ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; class SwUndoRejectRedline : public SwUndoRedline { private: - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam); + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; public: SwUndoRejectRedline( const SwPaM& rRange ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; class SwUndoCompDoc : public SwUndo, public SwUndRng @@ -124,8 +124,8 @@ public: virtual ~SwUndoCompDoc(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOREDLINE_HXX diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx index ea681525192f..478161cb78f8 100644 --- a/sw/source/core/inc/UndoSection.hxx +++ b/sw/source/core/inc/UndoSection.hxx @@ -52,9 +52,9 @@ public: virtual ~SwUndoInsSection(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SetSectNdPos(sal_uLong const nPos) { m_nSectionNodePos = nPos; } void SaveSplitNode(SwTxtNode *const pTxtNd, bool const bAtStart); diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx index 5deb7ea8a5a1..b750741bb710 100644 --- a/sw/source/core/inc/UndoSort.hxx +++ b/sw/source/core/inc/UndoSort.hxx @@ -73,9 +73,9 @@ public: virtual ~SwUndoSort(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void Insert( const OUString& rOrgPos, const OUString& rNewPos ); void Insert( sal_uLong nOrgPos, sal_uLong nNewPos ); diff --git a/sw/source/core/inc/UndoSplitMove.hxx b/sw/source/core/inc/UndoSplitMove.hxx index 6d0027951cba..918ab0c293d2 100644 --- a/sw/source/core/inc/UndoSplitMove.hxx +++ b/sw/source/core/inc/UndoSplitMove.hxx @@ -37,9 +37,9 @@ public: virtual ~SwUndoSplitNode(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SetTblFlag() { bTblFlag = sal_True; } }; @@ -66,8 +66,8 @@ public: SwUndoMove( const SwPaM&, const SwPosition& ); SwUndoMove( SwDoc* pDoc, const SwNodeRange&, const SwNodeIndex& ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; /// set the destination range after the move void SetDestRange( const SwPaM&, const SwPosition&, sal_Bool, sal_Bool ); diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx index 4d7d89bcecf9..5eff20981281 100644 --- a/sw/source/core/inc/UndoTable.hxx +++ b/sw/source/core/inc/UndoTable.hxx @@ -65,11 +65,11 @@ public: virtual ~SwUndoInsTbl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; }; class SwUndoTxtToTbl : public SwUndo, public SwUndRng @@ -90,9 +90,9 @@ public: virtual ~SwUndoTxtToTbl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; SwHistory& GetHistory(); // will be created if necessary void AddFillBox( const SwTableBox& rBox ); @@ -116,9 +116,9 @@ public: virtual ~SwUndoTblToTxt(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SetRange( const SwNodeRange& ); void AddBoxPos( SwDoc& rDoc, sal_uLong nNdIdx, sal_uLong nEndIdx, @@ -136,8 +136,8 @@ public: virtual ~SwUndoAttrTbl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; class SwUndoTblNumFmt; @@ -157,8 +157,8 @@ public: virtual ~SwUndoTblAutoFmt(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void SaveBoxCntnt( const SwTableBox& rBox ); }; @@ -195,8 +195,8 @@ public: virtual ~SwUndoTblNdsChg(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void SaveNewBoxes( const SwTableNode& rTblNd, const SwTableSortBoxes& rOld ); void SaveNewBoxes( const SwTableNode& rTblNd, const SwTableSortBoxes& rOld, @@ -229,8 +229,8 @@ public: virtual ~SwUndoTblMerge(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void MoveBoxCntnt( SwDoc* pDoc, SwNodeRange& rRg, SwNodeIndex& rPos ); @@ -262,8 +262,8 @@ public: virtual ~SwUndoTblNumFmt(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void SetNumFmt( sal_uLong nNewNumFmtIdx, const double& rNewNumber ) { nFmtIdx = nNewNumFmtIdx; fNum = rNewNumber; } @@ -287,8 +287,8 @@ public: virtual ~SwUndoTblCpyTbl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void AddBoxBefore( const SwTableBox& rBox, bool bDelCntnt ); void AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx, @@ -308,8 +308,8 @@ public: virtual ~SwUndoCpyTbl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; void SetTableSttIdx( sal_uLong nIdx ) { nTblNode = nIdx; } }; @@ -329,9 +329,9 @@ public: virtual ~SwUndoSplitTbl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SetTblNodeOffset( sal_uLong nIdx ) { nOffset = nIdx - nTblNode; } SwHistory* GetHistory() { return pHistory; } @@ -353,9 +353,9 @@ public: virtual ~SwUndoMergeTbl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; void SaveFormula( SwHistory& rHistory ); }; @@ -369,9 +369,9 @@ class SwUndoTblHeadline : public SwUndo public: SwUndoTblHeadline( const SwTable&, sal_uInt16 nOldHdl, sal_uInt16 nNewHdl ); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOTABLE_HXX diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index ed678567c145..f3cd2f09d63e 100644 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -57,15 +57,15 @@ public: SwAutoCorrDoc( SwEditShell& rEditShell, SwPaM& rPam, sal_Unicode cIns = 0 ); ~SwAutoCorrDoc(); - virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ); - virtual bool Insert( sal_Int32 nPos, const OUString& rTxt ); - virtual bool Replace( sal_Int32 nPos, const OUString& rTxt ); - virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt ); + virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ) SAL_OVERRIDE; + virtual bool Insert( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE; + virtual bool Replace( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE; + virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt ) SAL_OVERRIDE; virtual bool SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId, - SfxPoolItem& ); + SfxPoolItem& ) SAL_OVERRIDE; - virtual bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ); + virtual bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ) SAL_OVERRIDE; // return text of a previous paragraph // If it does not exist or if there is nothing before, return blank. @@ -76,15 +76,15 @@ public: virtual bool ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos, SvxAutoCorrect& rACorrect, - OUString* pPara ); + OUString* pPara ) SAL_OVERRIDE; // Will be called after swapping characters by the functions // - FnCptlSttWrd and // - FnCptlSttSntnc. // Afterwards the words can be added into exception list if needed. virtual void SaveCpltSttWord( sal_uLong nFlag, sal_Int32 nPos, - const OUString& rExceptWord, sal_Unicode cChar ); - virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara ) const; + const OUString& rExceptWord, sal_Unicode cChar ) SAL_OVERRIDE; + virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara ) const SAL_OVERRIDE; }; class SwAutoCorrExceptWord diff --git a/sw/source/core/inc/annotationmark.hxx b/sw/source/core/inc/annotationmark.hxx index 49adf05a7855..903c0516ea5e 100755..100644 --- a/sw/source/core/inc/annotationmark.hxx +++ b/sw/source/core/inc/annotationmark.hxx @@ -36,7 +36,7 @@ namespace sw { namespace mark virtual ~AnnotationMark(); - virtual void InitDoc(SwDoc* const io_Doc); + virtual void InitDoc(SwDoc* const io_Doc) SAL_OVERRIDE; const SwFmtFld* GetAnnotationFmtFld() const; }; diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx index 70bbcbd985f0..882a0283c6ad 100644 --- a/sw/source/core/inc/ascharanchoredobjectposition.hxx +++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx @@ -125,7 +125,7 @@ namespace objectpositioning <mnLineAlignment> are calculated. calculated position is set at the given object. */ - virtual void CalcPosition(); + virtual void CalcPosition() SAL_OVERRIDE; // calculated anchored position for object position type AS_CHAR Point GetAnchorPos() const; diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx index 769fe1ea4eb2..da73d4f1dce1 100644 --- a/sw/source/core/inc/bodyfrm.hxx +++ b/sw/source/core/inc/bodyfrm.hxx @@ -27,12 +27,12 @@ class SwBorderAttrs; class SwBodyFrm: public SwLayoutFrm { protected: - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; public: SwBodyFrm( SwFrmFmt*, SwFrm* ); - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL(SwBodyFrm) }; diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index 9df8878743cc..3184a10ada16 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -48,16 +48,16 @@ namespace sw { { public: //getters - virtual SwPosition& GetMarkPos() const + virtual SwPosition& GetMarkPos() const SAL_OVERRIDE { return *m_pPos1; } - virtual const OUString& GetName() const + virtual const OUString& GetName() const SAL_OVERRIDE { return m_aName; } - virtual SwPosition& GetOtherMarkPos() const + virtual SwPosition& GetOtherMarkPos() const SAL_OVERRIDE { OSL_PRECOND(IsExpanded(), "<SwPosition::GetOtherMarkPos(..)> - I have no other Pos set." ); return *m_pPos2; } - virtual SwPosition& GetMarkStart() const + virtual SwPosition& GetMarkStart() const SAL_OVERRIDE { if( !IsExpanded() ) return GetMarkPos( ); if ( GetMarkPos( ) < GetOtherMarkPos( ) ) @@ -65,7 +65,7 @@ namespace sw { else return GetOtherMarkPos( ); } - virtual SwPosition& GetMarkEnd() const + virtual SwPosition& GetMarkEnd() const SAL_OVERRIDE { if( !IsExpanded() ) return GetMarkPos(); if ( GetMarkPos( ) >= GetOtherMarkPos( ) ) @@ -74,8 +74,8 @@ namespace sw { return GetOtherMarkPos( ); } - virtual bool IsCoveringPosition(const SwPosition& rPos) const; - virtual bool IsExpanded() const + virtual bool IsCoveringPosition(const SwPosition& rPos) const SAL_OVERRIDE; + virtual bool IsExpanded() const SAL_OVERRIDE { return static_cast< bool >(m_pPos2); } virtual void SetName(const OUString& rName) @@ -85,7 +85,7 @@ namespace sw { virtual void ClearOtherMarkPos() { m_pPos2.reset(); } - virtual OUString ToString( ) const; + virtual OUString ToString( ) const SAL_OVERRIDE; virtual void Swap() { @@ -108,7 +108,7 @@ namespace sw { protected: // SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; MarkBase(const SwPaM& rPaM, const OUString& rName); ::boost::scoped_ptr<SwPosition> m_pPos1; @@ -167,24 +167,24 @@ namespace sw { const KeyCode& rCode, const OUString& rName, const OUString& rShortName); - virtual void InitDoc(SwDoc* const io_Doc); + virtual void InitDoc(SwDoc* const io_Doc) SAL_OVERRIDE; - virtual const OUString& GetShortName() const + virtual const OUString& GetShortName() const SAL_OVERRIDE { return m_sShortName; } - virtual const KeyCode& GetKeyCode() const + virtual const KeyCode& GetKeyCode() const SAL_OVERRIDE { return m_aCode; } - virtual void SetShortName(const OUString& rShortName) + virtual void SetShortName(const OUString& rShortName) SAL_OVERRIDE { m_sShortName = rShortName; } - virtual void SetKeyCode(const KeyCode& rCode) + virtual void SetKeyCode(const KeyCode& rCode) SAL_OVERRIDE { m_aCode = rCode; } // ::sfx2::Metadatable - virtual ::sfx2::IXmlIdRegistry& GetRegistry(); - virtual bool IsInClipboard() const; - virtual bool IsInUndo() const; - virtual bool IsInContent() const; + virtual ::sfx2::IXmlIdRegistry& GetRegistry() SAL_OVERRIDE; + virtual bool IsInClipboard() const SAL_OVERRIDE; + virtual bool IsInUndo() const SAL_OVERRIDE; + virtual bool IsInContent() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > MakeUnoObject(); + ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE; private: KeyCode m_aCode; @@ -198,20 +198,20 @@ namespace sw { public: Fieldmark(const SwPaM& rPaM); - virtual OUString GetFieldname() const + virtual OUString GetFieldname() const SAL_OVERRIDE { return m_aFieldname; } - virtual OUString GetFieldHelptext() const + virtual OUString GetFieldHelptext() const SAL_OVERRIDE { return m_aFieldHelptext; } - virtual IFieldmark::parameter_map_t* GetParameters() + virtual IFieldmark::parameter_map_t* GetParameters() SAL_OVERRIDE { return &m_vParams; } - virtual const IFieldmark::parameter_map_t* GetParameters() const + virtual const IFieldmark::parameter_map_t* GetParameters() const SAL_OVERRIDE { return &m_vParams; } - virtual void SetFieldname(const OUString& aFieldname) + virtual void SetFieldname(const OUString& aFieldname) SAL_OVERRIDE { m_aFieldname = aFieldname; } - virtual void SetFieldHelptext(const OUString& aFieldHelptext) + virtual void SetFieldHelptext(const OUString& aFieldHelptext) SAL_OVERRIDE { m_aFieldHelptext = aFieldHelptext; } virtual void ReleaseDoc(SwDoc* const) = 0; @@ -219,8 +219,8 @@ namespace sw { void SetMarkStartPos( const SwPosition& rNewStartPos ); void SetMarkEndPos( const SwPosition& rNewEndPos ); - virtual void Invalidate(); - virtual OUString ToString() const; + virtual void Invalidate() SAL_OVERRIDE; + virtual OUString ToString() const SAL_OVERRIDE; private: OUString m_aFieldname; @@ -233,8 +233,8 @@ namespace sw { { public: TextFieldmark(const SwPaM& rPaM); - virtual void InitDoc(SwDoc* const io_pDoc); - virtual void ReleaseDoc(SwDoc* const pDoc); + virtual void InitDoc(SwDoc* const io_pDoc) SAL_OVERRIDE; + virtual void ReleaseDoc(SwDoc* const pDoc) SAL_OVERRIDE; }; class CheckboxFieldmark @@ -243,10 +243,10 @@ namespace sw { { public: CheckboxFieldmark(const SwPaM& rPaM); - virtual void InitDoc(SwDoc* const io_pDoc); - virtual void ReleaseDoc(SwDoc* const pDoc); - bool IsChecked() const; - void SetChecked(bool checked); + virtual void InitDoc(SwDoc* const io_pDoc) SAL_OVERRIDE; + virtual void ReleaseDoc(SwDoc* const pDoc) SAL_OVERRIDE; + bool IsChecked() const SAL_OVERRIDE; + void SetChecked(bool checked) SAL_OVERRIDE; virtual OUString toString( ) const; }; diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx index b362fc74e371..7b551940eccf 100644 --- a/sw/source/core/inc/cellfrm.hxx +++ b/sw/source/core/inc/cellfrm.hxx @@ -33,20 +33,20 @@ class SwCellFrm: public SwLayoutFrm const SwTableBox* pTabBox; protected: - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: SwCellFrm( const SwTableBox &, SwFrm*, bool bInsertContent = true ); ~SwCellFrm(); - virtual bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0, bool bTestBackground = false ) const; + virtual bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; virtual void Paint( SwRect const&, - SwPrintData const*const pPrintData = NULL ) const; - virtual void CheckDirection( bool bVert ); + SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; + virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; // #i103961# - virtual void Cut(); + virtual void Cut() SAL_OVERRIDE; const SwTableBox *GetTabBox() const { return pTabBox; } diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx index a045636ed738..e36c89196c19 100644 --- a/sw/source/core/inc/cntfrm.hxx +++ b/sw/source/core/inc/cntfrm.hxx @@ -45,21 +45,21 @@ class SwCntntFrm: public SwFrm, public SwFlowFrm sal_Bool bTstMove, const bool bObjsInNewUpper ); - virtual void MakeAll(); + virtual void MakeAll() SAL_OVERRIDE; void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 ); - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool& ); + virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool& ) SAL_OVERRIDE; const SwCntntFrm* ImplGetNextCntntFrm( bool bFwd ) const; protected: sal_Bool MakePrtArea( const SwBorderAttrs & ); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); - virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; SwCntntFrm( SwCntntNode * const, SwFrm* ); @@ -67,8 +67,8 @@ public: virtual ~SwCntntFrm(); TYPEINFO_OVERRIDE(); // already in base class - virtual void Cut(); - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); + virtual void Cut() SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; inline const SwCntntNode *GetNode() const; inline SwCntntNode *GetNode(); diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx index 93ee8b163668..774a8e57b1ca 100644 --- a/sw/source/core/inc/colfrm.hxx +++ b/sw/source/core/inc/colfrm.hxx @@ -29,8 +29,8 @@ public: SwColumnFrm( SwFrmFmt*, SwFrm* ); ~SwColumnFrm(); - virtual void PaintBreak() const; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; + virtual void PaintBreak() const SAL_OVERRIDE; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL(SwColumnFrm) }; diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx index 79212d38b06c..b43775de0f78 100644 --- a/sw/source/core/inc/crossrefbookmark.hxx +++ b/sw/source/core/inc/crossrefbookmark.hxx @@ -37,22 +37,22 @@ namespace sw { const OUString& rPrefix); // getters - virtual SwPosition& GetOtherMarkPos() const; - virtual SwPosition& GetMarkStart() const + virtual SwPosition& GetOtherMarkPos() const SAL_OVERRIDE; + virtual SwPosition& GetMarkStart() const SAL_OVERRIDE { return *m_pPos1; } - virtual SwPosition& GetMarkEnd() const + virtual SwPosition& GetMarkEnd() const SAL_OVERRIDE { return *m_pPos1; } - virtual bool IsExpanded() const + virtual bool IsExpanded() const SAL_OVERRIDE { return false; } - virtual void SetMarkPos(const SwPosition& rNewPos); - virtual void SetOtherMarkPos(const SwPosition&) + virtual void SetMarkPos(const SwPosition& rNewPos) SAL_OVERRIDE; + virtual void SetOtherMarkPos(const SwPosition&) SAL_OVERRIDE { OSL_PRECOND(false, "<CrossRefBookmark::SetOtherMarkPos(..)>" " - misusage of CrossRefBookmark: other bookmark position isn't allowed to be set." ); } - virtual void ClearOtherMarkPos() + virtual void ClearOtherMarkPos() SAL_OVERRIDE { OSL_PRECOND(false, "<SwCrossRefBookmark::ClearOtherMarkPos(..)>" diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index 451c9a936878..7532f9f9a5a6 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -36,12 +36,12 @@ const sal_uInt16 SwFlyDrawObjIdentifier = 0x0001; class SwFlyDrawObj : public SdrObject { private: - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; protected: // #i95264# SwFlyDrawObj needs an own VC since createViewIndependentPrimitive2DSequence() // is called when RecalcBoundRect() is used - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -50,8 +50,8 @@ public: ~SwFlyDrawObj(); // for instantiation of this class while loading (via factory) - virtual sal_uInt32 GetObjInventor() const; - virtual sal_uInt16 GetObjIdentifier() const; + virtual sal_uInt32 GetObjInventor() const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; }; // virtual objects for Flys @@ -66,7 +66,7 @@ protected: // AW: Need own sdr::contact::ViewContact since AnchorPos from parent is // not used but something own (top left of new SnapRect minus top left // of original SnapRect) - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; public: // for paints triggered form ExecutePrimitive @@ -82,26 +82,26 @@ public: ~SwVirtFlyDrawObj(); // overloaded method of base class SdrVirtObj - virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const; + virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const SAL_OVERRIDE; // we treat the size calculation completely on ourself here - virtual const Rectangle& GetCurrentBoundRect() const; - virtual const Rectangle& GetLastBoundRect() const; - virtual void RecalcBoundRect(); - virtual void RecalcSnapRect(); - virtual const Rectangle& GetSnapRect() const; - virtual void SetSnapRect(const Rectangle& rRect); - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual const Rectangle& GetLogicRect() const; - virtual void SetLogicRect(const Rectangle& rRect); - virtual void NbcSetLogicRect(const Rectangle& rRect); - virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const; - virtual void NbcMove (const Size& rSiz); + virtual const Rectangle& GetCurrentBoundRect() const SAL_OVERRIDE; + virtual const Rectangle& GetLastBoundRect() const SAL_OVERRIDE; + virtual void RecalcBoundRect() SAL_OVERRIDE; + virtual void RecalcSnapRect() SAL_OVERRIDE; + virtual const Rectangle& GetSnapRect() const SAL_OVERRIDE; + virtual void SetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual const Rectangle& GetLogicRect() const SAL_OVERRIDE; + virtual void SetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; + virtual void NbcMove (const Size& rSiz) SAL_OVERRIDE; virtual void NbcResize(const Point& rRef, const Fraction& xFact, - const Fraction& yFact); - virtual void Move (const Size& rSiz); + const Fraction& yFact) SAL_OVERRIDE; + virtual void Move (const Size& rSiz) SAL_OVERRIDE; virtual void Resize(const Point& rRef, const Fraction& xFact, - const Fraction& yFact, bool bUnsetRelative = true); + const Fraction& yFact, bool bUnsetRelative = true) SAL_OVERRIDE; const SwFrmFmt *GetFmt() const; SwFrmFmt *GetFmt(); @@ -113,13 +113,13 @@ public: void SetRect() const; // if an URL is attached to a graphic than this is a macro object - virtual bool HasMacro() const; - virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const; - virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; + virtual bool HasMacro() const SAL_OVERRIDE; + virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE; + virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE; // FullDrag support - virtual bool supportsFullDrag() const; - virtual SdrObject* getFullDragClone() const; + virtual bool supportsFullDrag() const SAL_OVERRIDE; + virtual SdrObject* getFullDragClone() const SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index 64e34fb5609a..f648389115f8 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -94,7 +94,7 @@ struct SwSortTxtElement : public SwSortElement SwSortTxtElement( const SwNodeIndex& rPos ); virtual ~SwSortTxtElement(); - virtual OUString GetKey( sal_uInt16 nKey ) const; + virtual OUString GetKey( sal_uInt16 nKey ) const SAL_OVERRIDE; }; // sort table @@ -105,8 +105,8 @@ struct SwSortBoxElement : public SwSortElement SwSortBoxElement( sal_uInt16 nRC ); virtual ~SwSortBoxElement(); - virtual OUString GetKey( sal_uInt16 nKey ) const; - virtual double GetValue( sal_uInt16 nKey ) const; + virtual OUString GetKey( sal_uInt16 nKey ) const SAL_OVERRIDE; + virtual double GetValue( sal_uInt16 nKey ) const SAL_OVERRIDE; }; // two-dimensional array of FndBoxes diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx index 311103b2d5bb..e15967b51f63 100644 --- a/sw/source/core/inc/dumpfilter.hxx +++ b/sw/source/core/inc/dumpfilter.hxx @@ -39,25 +39,25 @@ namespace sw { // XFilter virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL cancel( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XExporter virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx index 1d1617ad071f..a0f31ba1b9fe 100644 --- a/sw/source/core/inc/dview.hxx +++ b/sw/source/core/inc/dview.hxx @@ -69,32 +69,32 @@ class SwDrawView : public FmFormView protected: // add custom handles (used by other apps, e.g. AnchorPos) - virtual void AddCustomHdl(); + virtual void AddCustomHdl() SAL_OVERRIDE; // overloaded to allow extra handling when picking SwVirtFlyDrawObj's using FmFormView::CheckSingleSdrObjectHit; - virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uLong nOptions, const SetOfByte* pMVisLay) const; + virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uLong nOptions, const SetOfByte* pMVisLay) const SAL_OVERRIDE; // support enhanced text edit for draw objects - virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const; + virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const SAL_OVERRIDE; public: SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice* pOutDev=NULL ); // from base class - virtual SdrObject* GetMaxToTopObj(SdrObject* pObj) const; - virtual SdrObject* GetMaxToBtmObj(SdrObject* pObj) const; - virtual void MarkListHasChanged(); + virtual SdrObject* GetMaxToTopObj(SdrObject* pObj) const SAL_OVERRIDE; + virtual SdrObject* GetMaxToBtmObj(SdrObject* pObj) const SAL_OVERRIDE; + virtual void MarkListHasChanged() SAL_OVERRIDE; // #i7672# // Overload to resue edit background color in active text edit view (OutlinerView) - virtual void ModelHasChanged(); + virtual void ModelHasChanged() SAL_OVERRIDE; virtual void ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, - sal_uLong nNewPos ); - virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const; - virtual void MakeVisible( const Rectangle&, Window &rWin ); - virtual void CheckPossibilities(); + sal_uLong nNewPos ) SAL_OVERRIDE; + virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const SAL_OVERRIDE; + virtual void MakeVisible( const Rectangle&, Window &rWin ) SAL_OVERRIDE; + virtual void CheckPossibilities() SAL_OVERRIDE; const SwViewImp &Imp() const { return rImp; } SwViewImp &Imp() { return rImp; } @@ -102,7 +102,7 @@ public: // anchor and Xor for dragging void ShowDragAnchor(); - virtual void DeleteMarked(); + virtual void DeleteMarked() SAL_OVERRIDE; inline void ValidateMarkList() { FlushComeBackTimer(); } diff --git a/sw/source/core/inc/finalthreadmanager.hxx b/sw/source/core/inc/finalthreadmanager.hxx index 6d2b589aa7a6..def023c8b2db 100644 --- a/sw/source/core/inc/finalthreadmanager.hxx +++ b/sw/source/core/inc/finalthreadmanager.hxx @@ -53,24 +53,24 @@ public: explicit FinalThreadManager(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context); // ::com::sun::star::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XJobManager: - virtual void SAL_CALL registerJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL releaseJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL cancelAllJobs() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL registerJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL releaseJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancelAllJobs() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XTerminateListener2 - virtual void SAL_CALL cancelTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL cancelTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XTerminateListener (inherited via com::sun::star::frame::XTerminateListener2) - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun:star::lang::XEventListener (inherited via com::sun::star::frame::XTerminateListener) - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: FinalThreadManager(FinalThreadManager &); // not defined diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index 3ba5bf4b503f..74dc31913c93 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -121,7 +121,7 @@ protected: Point m_aContentPos; // content area's position relatively to Frm bool m_bValidContentPos; - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; void MakePrtArea( const SwBorderAttrs &rAttrs ); void MakeContentPos( const SwBorderAttrs &rAttrs ); @@ -141,15 +141,15 @@ protected: #i28701# */ - virtual void RegisterAtCorrectPage(); + virtual void RegisterAtCorrectPage() SAL_OVERRIDE; - virtual bool _SetObjTop( const SwTwips _nTop ); - virtual bool _SetObjLeft( const SwTwips _nLeft ); + virtual bool _SetObjTop( const SwTwips _nTop ) SAL_OVERRIDE; + virtual bool _SetObjLeft( const SwTwips _nLeft ) SAL_OVERRIDE; - virtual const SwRect GetObjBoundRect() const; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual const SwRect GetObjBoundRect() const SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; - virtual const IDocumentDrawModelAccess* getIDocumentDrawModelAccess( ); + virtual const IDocumentDrawModelAccess* getIDocumentDrawModelAccess( ) SAL_OVERRIDE; SwTwips CalcContentHeight(const SwBorderAttrs *pAttrs, const SwTwips nMinHeight, const SwTwips nUL); @@ -159,17 +159,17 @@ public: virtual ~SwFlyFrm(); // get client information - virtual bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; virtual void Paint( SwRect const&, - SwPrintData const*const pPrintData = NULL ) const; - virtual Size ChgSize( const Size& aNewSize ); + SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; + virtual Size ChgSize( const Size& aNewSize ) SAL_OVERRIDE; virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; - virtual void CheckDirection( bool bVert ); - virtual void Cut(); + virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; + virtual void Cut() SAL_OVERRIDE; #ifdef DBG_UTIL - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; #endif SwTwips _Shrink( SwTwips, sal_Bool bTst ); @@ -260,13 +260,13 @@ public: void InsertColumns(); // #i26791# - pure virtual methods of base class <SwAnchoredObject> - virtual void MakeObjPos(); - virtual void InvalidateObjPos(); + virtual void MakeObjPos() SAL_OVERRIDE; + virtual void InvalidateObjPos() SAL_OVERRIDE; - virtual SwFrmFmt& GetFrmFmt(); - virtual const SwFrmFmt& GetFrmFmt() const; + virtual SwFrmFmt& GetFrmFmt() SAL_OVERRIDE; + virtual const SwFrmFmt& GetFrmFmt() const SAL_OVERRIDE; - virtual const SwRect GetObjRect() const; + virtual const SwRect GetObjRect() const SAL_OVERRIDE; /** method to determine if a format on the Writer fly frame is possible @@ -275,18 +275,18 @@ public: <SwAnchoredObject::IsFormatPossible()> by: format isn't possible, if Writer fly frame is locked resp. col-locked. */ - virtual bool IsFormatPossible() const; + virtual bool IsFormatPossible() const SAL_OVERRIDE; static void GetAnchoredObjects( std::list<SwAnchoredObject*>&, const SwFmt& rFmt ); // overwriting "SwFrmFmt *SwLayoutFrm::GetFmt" to provide the correct derived return type. // (This is in order to skip on the otherwise necessary casting of the result to // 'SwFlyFrmFmt *' after calls to this function. The casting is now done in this function.) - virtual const SwFlyFrmFmt *GetFmt() const; - virtual SwFlyFrmFmt *GetFmt(); + virtual const SwFlyFrmFmt *GetFmt() const SAL_OVERRIDE; + virtual SwFlyFrmFmt *GetFmt() SAL_OVERRIDE; - virtual void dumpAsXml( xmlTextWriterPtr writer ) { SwLayoutFrm::dumpAsXml( writer ); }; + virtual void dumpAsXml( xmlTextWriterPtr writer ) SAL_OVERRIDE { SwLayoutFrm::dumpAsXml( writer ); }; - virtual void Calc() const; + virtual void Calc() const SAL_OVERRIDE; const Point& ContentPos() const { return m_aContentPos; } Point& ContentPos() { return m_aContentPos; } diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx index 28e007a148d8..b2388f3dcbd7 100644 --- a/sw/source/core/inc/flyfrms.hxx +++ b/sw/source/core/inc/flyfrms.hxx @@ -59,7 +59,7 @@ protected: // method <NotifyBackground> friend class SwFlyNotify; virtual void NotifyBackground( SwPageFrm *pPage, - const SwRect& rRect, PrepareHint eHint); + const SwRect& rRect, PrepareHint eHint) SAL_OVERRIDE; SwFlyFreeFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor ); public: @@ -68,7 +68,7 @@ public: virtual ~SwFlyFreeFrm(); - virtual void MakeAll(); + virtual void MakeAll() SAL_OVERRIDE; // #i37068# - accessors for member <mbNoMoveOnCheckClip> inline void SetNoMoveOnCheckClip( const bool _bNewNoMoveOnCheckClip ) @@ -115,7 +115,7 @@ public: format isn't possible, if Writer fly frame isn't registered at a page frame and its anchor frame isn't inside another Writer fly frame. */ - virtual bool IsFormatPossible() const; + virtual bool IsFormatPossible() const SAL_OVERRIDE; }; // Flys that are bound to LayoutFrms and not to Cntnt @@ -128,25 +128,25 @@ public: SwFlyLayFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor ); SwFlyLayFrm( SwFlyLayFrm& ); protected: - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; }; // Flys that are bound to Cntnt but not in Cntnt class SwFlyAtCntFrm : public SwFlyFreeFrm { protected: - virtual void MakeAll(); + virtual void MakeAll() SAL_OVERRIDE; // #i28701# - virtual bool _InvalidationAllowed( const InvalidationType _nInvalid ) const; + virtual bool _InvalidationAllowed( const InvalidationType _nInvalid ) const SAL_OVERRIDE; /** method to assure that anchored object is registered at the correct page frame #i28701# */ - virtual void RegisterAtCorrectPage(); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void RegisterAtCorrectPage() SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: // #i28701# @@ -157,7 +157,7 @@ public: void SetAbsPos( const Point &rNew ); // #i26791# - virtual void MakeObjPos(); + virtual void MakeObjPos() SAL_OVERRIDE; /** method to determine, if a format on the Writer fly frame is possible @@ -166,7 +166,7 @@ public: <SwFlyFreeFrm::IsFormatPossible()> by: format isn't possible, if method <MakeAll()> is already in progress. */ - virtual bool IsFormatPossible() const; + virtual bool IsFormatPossible() const SAL_OVERRIDE; }; // Flys that are bound to a character in Cntnt @@ -179,9 +179,9 @@ class SwFlyInCntFrm : public SwFlyFrm protected: virtual void NotifyBackground( SwPageFrm *pPage, - const SwRect& rRect, PrepareHint eHint); - virtual void MakeAll(); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + const SwRect& rRect, PrepareHint eHint) SAL_OVERRIDE; + virtual void MakeAll() SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: // #i28701# @@ -190,7 +190,7 @@ public: SwFlyInCntFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor ); virtual ~SwFlyInCntFrm(); - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; void SetRefPoint( const Point& rPoint, const Point &rRelAttr, const Point &rRelPos ); @@ -216,11 +216,11 @@ public: void AddRefOfst( long nOfst ) { aRef.Y() += nOfst; } // #i26791# - virtual void MakeObjPos(); + virtual void MakeObjPos() SAL_OVERRIDE; // invalidate anchor frame on invalidation of the position, because the // position is calculated during the format of the anchor frame - virtual void _ActionOnInvalidation( const InvalidationType _nInvalid ); + virtual void _ActionOnInvalidation( const InvalidationType _nInvalid ) SAL_OVERRIDE; }; inline void SwFlyInCntFrm::InvalidateLayout() const diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index c2e2155a8af3..42cbf2600b44 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -124,7 +124,7 @@ class SwFntAccess : public SwCacheAccess { SwViewShell *pShell; protected: - virtual SwCacheObj *NewObj( ); + virtual SwCacheObj *NewObj( ) SAL_OVERRIDE; public: SwFntAccess( const void * &rMagic, sal_uInt16 &rIndex, const void *pOwner, diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 514f64e2698e..51ace29eb259 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -428,7 +428,7 @@ protected: // draw shadow and borders void PaintShadow( const SwRect&, SwRect&, const SwBorderAttrs& ) const; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; virtual const IDocumentDrawModelAccess* getIDocumentDrawModelAccess( ); diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index a56db5fa4284..12e9eb963bf3 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -374,7 +374,7 @@ class SwBorderAttrAccess : public SwCacheAccess const SwFrm *pConstructor; //opt: for passing on to SwBorderAttrs protected: - virtual SwCacheObj *NewObj(); + virtual SwCacheObj *NewObj() SAL_OVERRIDE; public: SwBorderAttrAccess( SwCache &rCache, const SwFrm *pOwner ); diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx index 862b86357214..59fdb07eac22 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -38,12 +38,12 @@ public: const SwFtnFrm* FindFootNote() const; - virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); + virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; virtual void PaintBorder( const SwRect &, const SwPageFrm *pPage, - const SwBorderAttrs & ) const; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; + const SwBorderAttrs & ) const SAL_OVERRIDE; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; void PaintLine( const SwRect &, const SwPageFrm * ) const; }; @@ -64,17 +64,17 @@ class SwFtnFrm: public SwLayoutFrm bool mbUnlockPosOfLowerObjs : 1; #ifdef DBG_UTIL protected: - virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); + virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; #endif public: SwFtnFrm( SwFrmFmt*, SwFrm*, SwCntntFrm*, SwTxtFtn* ); - virtual void Cut(); - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); + virtual void Cut() SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; sal_Bool operator<( const SwTxtFtn* pTxtFtn ) const; diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx index ba6b3625aba6..776c772998b5 100644 --- a/sw/source/core/inc/hffrm.hxx +++ b/sw/source/core/inc/hffrm.hxx @@ -32,12 +32,12 @@ protected: public: SwHeadFootFrm(SwFrmFmt * pFrm, SwFrm*, sal_uInt16 aType); - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; virtual SwTwips GrowFrm( SwTwips, - sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); + sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; virtual SwTwips ShrinkFrm( SwTwips, - sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; + sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; }; /// Header in the document layout, inside a page. diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx index a840d03619f6..a5f1e5147253 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -50,14 +50,14 @@ class SwLayoutFrm: public SwFrm protected: void Destroy(); // for ~SwRootFrm - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); - virtual void MakeAll(); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void MakeAll() SAL_OVERRIDE; SwFrm *pLower; std::vector<SwAnchoredObject*> aVertPosOrientFrmsFor; - virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); + virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; long CalcRel( const SwFmtFrmSize &rSz, sal_Bool bWidth ) const; @@ -81,13 +81,13 @@ public: void PaintColLines( const SwRect &, const SwFmtCol &, const SwPageFrm * ) const; - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; - virtual void Cut(); - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); + virtual void Cut() SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; //sucht den dichtesten Cntnt zum SPoint, wird bei Seiten, Flys und Cells //benutzt wenn GetCrsrOfst versagt hat. @@ -101,7 +101,7 @@ public: virtual ~SwLayoutFrm(); virtual void Paint( SwRect const&, - SwPrintData const*const pPrintData = NULL ) const; + SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; const SwFrm *Lower() const { return pLower; } SwFrm *Lower() { return pLower; } const SwCntntFrm *ContainsCntnt() const; diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx index b0a2ed13b9b0..b78a3f7b48d2 100644 --- a/sw/source/core/inc/notxtfrm.hxx +++ b/sw/source/core/inc/notxtfrm.hxx @@ -36,22 +36,22 @@ class SwNoTxtFrm: public SwCntntFrm void InitCtor(); - void Format ( const SwBorderAttrs *pAttrs = 0 ); + void Format ( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; void PaintCntnt ( OutputDevice*, const SwRect&, const SwRect& ) const; void PaintPicture( OutputDevice*, const SwRect& ) const; protected: - virtual void MakeAll(); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void MakeAll() SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: SwNoTxtFrm( SwNoTxtNode * const, SwFrm* ); ~SwNoTxtFrm(); virtual void Paint( SwRect const&, - SwPrintData const*const pPrintData = NULL ) const; + SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; virtual bool GetCharRect( SwRect &, const SwPosition&, - SwCrsrMoveState* = 0) const; + SwCrsrMoveState* = 0) const SAL_OVERRIDE; virtual bool GetCrsrOfst(SwPosition* pPos, Point& aPoint, - SwCrsrMoveState* = 0, bool bTestBackground = false) const; + SwCrsrMoveState* = 0, bool bTestBackground = false) const SAL_OVERRIDE; const Size &GetGrfSize() const { return GetSize(); } void GetGrfArea( SwRect &rRect, SwRect * = 0, bool bMirror = true ) const; diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx index 4c7acb5aaa64..4096f3c9b02a 100644 --- a/sw/source/core/inc/observablethread.hxx +++ b/sw/source/core/inc/observablethread.hxx @@ -47,8 +47,8 @@ class ObservableThread : public osl::Thread, const oslInterlockedCount nThreadID ); // IReference - virtual oslInterlockedCount SAL_CALL acquire(); - virtual oslInterlockedCount SAL_CALL release(); + virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; + virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; protected: @@ -61,7 +61,7 @@ class ObservableThread : public osl::Thread, Otherwise, it's not guaranteed, that its ref-count is increased during the execution of the thread. */ - virtual void SAL_CALL run(); + virtual void SAL_CALL run() SAL_OVERRIDE; virtual void threadFunction() = 0; @@ -73,7 +73,7 @@ class ObservableThread : public osl::Thread, the end of its execution and that the observer is notified, that the thread has finished its work. */ - virtual void SAL_CALL onTerminated(); + virtual void SAL_CALL onTerminated() SAL_OVERRIDE; virtual void threadFinished(); diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index f022c5b1c6b6..a7526f6ea418 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -102,8 +102,8 @@ class SwPageFrm: public SwFtnBossFrm bool bRightSidebar ); protected: - virtual void MakeAll(); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void MakeAll() SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: DECL_FIXEDMEMPOOL_NEWDEL(SwPageFrm) @@ -161,20 +161,20 @@ public: void PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt ); virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; // erfrage vom Client Informationen - virtual bool GetInfo( SfxPoolItem& ) const; + virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; - virtual void Cut(); - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); - virtual void CheckDirection( bool bVert ); + virtual void Cut() SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; void CheckGrid( sal_Bool bInvalidate ); void PaintGrid( OutputDevice* pOut, SwRect &rRect ) const; sal_Bool HasGrid() const { return bHasGrid; } void PaintDecorators( ) const; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; - virtual void PaintBreak() const; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; + virtual void PaintBreak() const SAL_OVERRIDE; //Zeilennummern usw malen void RefreshExtraData( const SwRect & ) const; @@ -311,7 +311,7 @@ public: */ sw::sidebarwindows::SidebarPosition SidebarPosition() const; - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; inline sal_Int8 ShadowPxWidth() const { diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx index d37fd5509623..6fe273e35516 100644 --- a/sw/source/core/inc/retrieveinputstream.hxx +++ b/sw/source/core/inc/retrieveinputstream.hxx @@ -40,7 +40,7 @@ class SwAsyncRetrieveInputStreamThread : public ObservableThread protected: - virtual void threadFunction(); + virtual void threadFunction() SAL_OVERRIDE; private: diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index aebed31ff82d..0c36352df003 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -98,8 +98,8 @@ class SwHistorySetFmt : public SwHistoryHint public: SwHistorySetFmt( const SfxPoolItem* pFmtHt, sal_uLong nNode ); virtual ~SwHistorySetFmt(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - virtual OUString GetDescription() const; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual OUString GetDescription() const SAL_OVERRIDE; }; @@ -110,7 +110,7 @@ class SwHistoryResetFmt : public SwHistoryHint public: SwHistoryResetFmt( const SfxPoolItem* pFmtHt, sal_uLong nNodeIdx ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; @@ -128,7 +128,7 @@ class SwHistorySetTxt : public SwHistoryHint public: SwHistorySetTxt( SwTxtAttr* pTxtHt, sal_uLong nNode ); virtual ~SwHistorySetTxt(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; @@ -148,9 +148,9 @@ class SwHistorySetTxtFld : public SwHistoryHint public: SwHistorySetTxtFld( SwTxtFld* pTxtFld, sal_uLong nNode ); virtual ~SwHistorySetTxtFld(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; - virtual OUString GetDescription() const; + virtual OUString GetDescription() const SAL_OVERRIDE; }; @@ -163,7 +163,7 @@ class SwHistorySetRefMark : public SwHistoryHint public: SwHistorySetRefMark( SwTxtRefMark* pTxtHt, sal_uLong nNode ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; @@ -178,7 +178,7 @@ class SwHistorySetTOXMark : public SwHistoryHint public: SwHistorySetTOXMark( SwTxtTOXMark* pTxtHt, sal_uLong nNode ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; bool IsEqual( const SwTOXMark& rCmp ) const; }; @@ -193,7 +193,7 @@ class SwHistoryResetTxt : public SwHistoryHint public: SwHistoryResetTxt( sal_uInt16 nWhich, sal_Int32 nStt, sal_Int32 nEnd, sal_uLong nNode ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; sal_uInt16 GetWhich() const { return m_nAttr; } sal_uLong GetNode() const { return m_nNodeIndex; } @@ -215,9 +215,9 @@ public: SwHistorySetFootnote( SwTxtFtn* pTxtFtn, sal_uLong nNode ); SwHistorySetFootnote( const SwTxtFtn& ); virtual ~SwHistorySetFootnote(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; - virtual OUString GetDescription() const; + virtual OUString GetDescription() const SAL_OVERRIDE; }; @@ -229,7 +229,7 @@ class SwHistoryChangeFmtColl : public SwHistoryHint public: SwHistoryChangeFmtColl( SwFmtColl* pColl, sal_uLong nNode, sal_uInt8 nNodeWhich ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; @@ -242,7 +242,7 @@ class SwHistoryTxtFlyCnt : public SwHistoryHint public: SwHistoryTxtFlyCnt( SwFrmFmt* const pFlyFmt ); virtual ~SwHistoryTxtFlyCnt(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; SwUndoDelLayFmt* GetUDelLFmt() { return m_pUndo.get(); } }; @@ -252,7 +252,7 @@ class SwHistoryBookmark : public SwHistoryHint public: SwHistoryBookmark(const ::sw::mark::IMark& rBkmk, bool bSavePos, bool bSaveOtherPos); - virtual void SetInDoc(SwDoc * pDoc, bool); + virtual void SetInDoc(SwDoc * pDoc, bool) SAL_OVERRIDE; bool IsEqualBookmark(const ::sw::mark::IMark& rBkmk); const OUString& GetName() const; @@ -281,7 +281,7 @@ class SwHistorySetAttrSet : public SwHistoryHint public: SwHistorySetAttrSet( const SfxItemSet& rSet, sal_uLong nNode, const std::set<sal_uInt16> &rSetArr ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; @@ -296,7 +296,7 @@ public: SwHistoryResetAttrSet( const SfxItemSet& rSet, sal_uLong nNode, sal_Int32 nStt, sal_Int32 nEnd); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; const std::vector<sal_uInt16>& GetArr() const { return m_Array; } sal_uLong GetNode() const { return m_nNodeIndex; } @@ -312,7 +312,7 @@ class SwHistoryChangeFlyAnchor : public SwHistoryHint public: SwHistoryChangeFlyAnchor( SwFrmFmt& rFmt ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; class SwHistoryChangeFlyChain : public SwHistoryHint @@ -323,7 +323,7 @@ class SwHistoryChangeFlyChain : public SwHistoryHint public: SwHistoryChangeFlyChain( SwFlyFrmFmt& rFmt, const SwFmtChain& rAttr ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; class SwHistoryChangeCharFmt : public SwHistoryHint @@ -333,7 +333,7 @@ class SwHistoryChangeCharFmt : public SwHistoryHint public: SwHistoryChangeCharFmt( const SfxItemSet& rSet, const OUString & sFmt); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; }; @@ -412,7 +412,7 @@ private: void _MakeSetWhichIds(); protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE; public: SwRegHistory( SwHistory* pHst ); diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 227be352bdb3..fa955a0a62ae 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -143,7 +143,7 @@ class SwRootFrm: public SwLayoutFrm protected: - virtual void MakeAll(); + virtual void MakeAll() SAL_OVERRIDE; public: @@ -186,22 +186,22 @@ public: void SetDrawPage( SdrPage* pNew ){ pDrawPage = pNew; } virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; virtual void Paint( SwRect const&, - SwPrintData const*const pPrintData = NULL ) const; - virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); + SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; + virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; #ifdef DBG_UTIL - virtual void Cut(); - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); + virtual void Cut() SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; #endif - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; Point GetNextPrevCntntPos( const Point &rPoint, sal_Bool bNext ) const; - virtual Size ChgSize( const Size& aNewSize ); + virtual Size ChgSize( const Size& aNewSize ) SAL_OVERRIDE; void SetIdleFlags() { diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx index 083fda734a94..ac9a66adbad6 100644 --- a/sw/source/core/inc/rowfrm.hxx +++ b/sw/source/core/inc/rowfrm.hxx @@ -29,10 +29,10 @@ class SwBorderAttrs; /// SwRowFrm is one table row in the document layout. class SwRowFrm: public SwLayoutFrm { - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; //Aendern nur die Framesize, nicht die PrtArea-SSize - virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); - virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); + virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; + virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; const SwTableLine *pTabLine; SwRowFrm* pFollowRow; @@ -46,14 +46,14 @@ class SwRowFrm: public SwLayoutFrm bool mbIsRowSpanLine; protected: - virtual void MakeAll(); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void MakeAll() SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: SwRowFrm( const SwTableLine &, SwFrm*, bool bInsertContent = true ); ~SwRowFrm(); - virtual void Cut(); + virtual void Cut() SAL_OVERRIDE; //Zum Anmelden der Flys nachdem eine Zeile erzeugt _und_ eingefuegt wurde. //Muss vom Erzeuger gerufen werden, denn erst nach dem Konstruieren wird diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index 930d1bc83840..26e04ee1151e 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -54,11 +54,11 @@ class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm const SwSectionFmt* _GetEndSectFmt() const; bool IsEndnoteAtMyEnd() const; protected: - virtual void MakeAll(); - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ); - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); - virtual void SwClientNotify( const SwModify&, const SfxHint& ); + virtual void MakeAll() SAL_OVERRIDE; + virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) SAL_OVERRIDE; + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE; public: SwSectionFrm( SwSection &, SwFrm* ); //Inhalt wird nicht erzeugt! @@ -66,12 +66,12 @@ public: virtual ~SwSectionFrm(); void Init(); - virtual void CheckDirection( bool bVert ); + virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; - virtual void Cut(); - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); + virtual void Cut() SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; inline const SwSectionFrm *GetFollow() const; inline SwSectionFrm *GetFollow(); @@ -127,7 +127,7 @@ public: bool IsBalancedSection() const; - virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer); + virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) SAL_OVERRIDE; bool IsFtnAtEnd() const { return bFtnAtEnd; } bool IsEndnAtEnd() const { return bEndnAtEnd; } diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx index 07ef171962b6..58297497fc15 100644 --- a/sw/source/core/inc/swfntcch.hxx +++ b/sw/source/core/inc/swfntcch.hxx @@ -80,7 +80,7 @@ class SwFontAccess : public SwCacheAccess { SwViewShell *pShell; protected: - virtual SwCacheObj *NewObj( ); + virtual SwCacheObj *NewObj( ) SAL_OVERRIDE; public: SwFontAccess( const void *pOwner, SwViewShell *pSh ); diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index 02a454cb9943..510bd735125e 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -98,14 +98,14 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 ); - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ); + virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) SAL_OVERRIDE; protected: - virtual void MakeAll(); - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void MakeAll() SAL_OVERRIDE; + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; // only changes the Framesize, not the PrtArea size - virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); + virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE; public: SwTabFrm( SwTable &, SwFrm* ); // calling Regist Flys always after creation _and_pasting! @@ -121,16 +121,16 @@ public: inline SwTabFrm *GetFollow(); SwTabFrm* FindMaster( bool bFirstMaster = false ) const; - virtual bool GetInfo( SfxPoolItem &rHnt ) const; + virtual bool GetInfo( SfxPoolItem &rHnt ) const SAL_OVERRIDE; virtual void Paint( SwRect const&, - SwPrintData const*const pPrintData = NULL ) const; - virtual void CheckDirection( bool bVert ); + SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; + virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; - virtual void Cut(); - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); + virtual void Cut() SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; virtual void Prepare( const PrepareHint ePrep = PREP_CLEAR, - const void *pVoid = 0, bool bNotify = true ); + const void *pVoid = 0, bool bNotify = true ) SAL_OVERRIDE; SwCntntFrm *FindLastCntnt(); inline const SwCntntFrm *FindLastCntnt() const; @@ -215,7 +215,7 @@ public: sal_uInt16 GetBottomLineSize() const; - virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer); + virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL(SwTabFrm) }; diff --git a/sw/source/core/inc/textapi.hxx b/sw/source/core/inc/textapi.hxx index c4158c9dadc5..412df33720f7 100644 --- a/sw/source/core/inc/textapi.hxx +++ b/sw/source/core/inc/textapi.hxx @@ -35,9 +35,9 @@ class SwTextAPIEditSource : public SvxEditSource { SwTextAPIEditSource_Impl* pImpl; - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); + virtual SvxEditSource* Clone() const SAL_OVERRIDE; + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual void UpdateData() SAL_OVERRIDE; explicit SwTextAPIEditSource( const SwTextAPIEditSource& rSource ); public: diff --git a/sw/source/core/inc/threadlistener.hxx b/sw/source/core/inc/threadlistener.hxx index dbfadb0be538..4f5a181652f3 100644 --- a/sw/source/core/inc/threadlistener.hxx +++ b/sw/source/core/inc/threadlistener.hxx @@ -43,7 +43,7 @@ class ThreadListener : public IFinishedThreadListener void ListenToThread( const oslInterlockedCount nThreadID, ObservableThread& rThread ); - virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ); + virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) SAL_OVERRIDE; private: diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx index 7d44dd70b54e..920bc889dd41 100644 --- a/sw/source/core/inc/threadmanager.hxx +++ b/sw/source/core/inc/threadmanager.hxx @@ -51,8 +51,8 @@ class ThreadManager : public IThreadListenerOwner ~ThreadManager(); // --> IThreadListenerOwner - virtual boost::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef(); - virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ); + virtual boost::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef() SAL_OVERRIDE; + virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) SAL_OVERRIDE; /** initialization diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx index 4673b52a8dcb..7b72f992f46a 100644 --- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx +++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx @@ -43,11 +43,11 @@ namespace objectpositioning const SwRect* mpToCharRect; SwTwips mnToCharTopOfLine; - virtual bool IsAnchoredToChar() const; - virtual const SwFrm* ToCharOrientFrm() const; - virtual const SwRect* ToCharRect() const; + virtual bool IsAnchoredToChar() const SAL_OVERRIDE; + virtual const SwFrm* ToCharOrientFrm() const SAL_OVERRIDE; + virtual const SwRect* ToCharRect() const SAL_OVERRIDE; // #i22341# - virtual SwTwips ToCharTopOfLine() const; + virtual SwTwips ToCharTopOfLine() const SAL_OVERRIDE; // method to cast <SwAnchoredObjectPosition::GetAnchorFrm()> to // the needed type @@ -77,7 +77,7 @@ namespace objectpositioning /** calculate position of object */ - virtual void CalcPosition(); + virtual void CalcPosition() SAL_OVERRIDE; /** frame, at which the vertical position is oriented at */ diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx index cab45c43763e..31ddfe88bb3d 100644 --- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx +++ b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx @@ -41,7 +41,7 @@ namespace objectpositioning /** calculate position for object */ - virtual void CalcPosition(); + virtual void CalcPosition() SAL_OVERRIDE; /** calculated relative position for object */ diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index 557e7da4ee33..31f396c2db42 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -186,13 +186,13 @@ struct SwTOXIndex : public SwTOXSortTabBase const ::com::sun::star::lang::Locale& rLocale ); virtual ~SwTOXIndex() {} - virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const; - virtual sal_uInt16 GetLevel() const; - virtual bool operator==( const SwTOXSortTabBase& ); - virtual bool operator<( const SwTOXSortTabBase& ); + virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE; + virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; + virtual bool operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE; + virtual bool operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE; private: - virtual TextAndReading GetText_Impl() const; + virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; sal_uInt8 nKeyLevel; }; @@ -204,12 +204,12 @@ struct SwTOXCustom : public SwTOXSortTabBase const ::com::sun::star::lang::Locale& rLocale ); virtual ~SwTOXCustom() {} - virtual sal_uInt16 GetLevel() const; - virtual bool operator==( const SwTOXSortTabBase& ); - virtual bool operator<( const SwTOXSortTabBase& ); + virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; + virtual bool operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE; + virtual bool operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE; private: - virtual TextAndReading GetText_Impl() const; + virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; TextAndReading m_aKey; sal_uInt16 nLev; @@ -225,10 +225,10 @@ struct SwTOXContent : public SwTOXSortTabBase const SwTOXInternational& rIntl ); virtual ~SwTOXContent() {} - virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const; - virtual sal_uInt16 GetLevel() const; + virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE; + virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; private: - virtual TextAndReading GetText_Impl() const; + virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; }; @@ -240,12 +240,12 @@ struct SwTOXPara : public SwTOXSortTabBase void SetStartIndex(sal_Int32 nSet) { nStartIndex = nSet; } void SetEndIndex(sal_Int32 nSet) { nEndIndex = nSet; } - virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const; - virtual sal_uInt16 GetLevel() const; + virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE; + virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; - virtual OUString GetURL() const; + virtual OUString GetURL() const SAL_OVERRIDE; private: - virtual TextAndReading GetText_Impl() const; + virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; SwTOXElement eType; sal_uInt16 m_nLevel; @@ -261,11 +261,11 @@ struct SwTOXTable : public SwTOXSortTabBase void SetLevel(sal_uInt16 nSet){nLevel = nSet;} - virtual sal_uInt16 GetLevel() const; + virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; - virtual OUString GetURL() const; + virtual OUString GetURL() const SAL_OVERRIDE; private: - virtual TextAndReading GetText_Impl() const; + virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; sal_uInt16 nLevel; }; @@ -274,8 +274,8 @@ struct SwTOXAuthority : public SwTOXSortTabBase { private: SwFmtFld& m_rField; - virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const; - virtual TextAndReading GetText_Impl() const; + virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE; + virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; public: SwTOXAuthority( const SwCntntNode& rNd, SwFmtFld& rField, const SwTOXInternational& rIntl ); @@ -283,9 +283,9 @@ public: SwFmtFld& GetFldFmt() {return m_rField;} - virtual bool operator==( const SwTOXSortTabBase& ); - virtual bool operator<( const SwTOXSortTabBase& ); - virtual sal_uInt16 GetLevel() const; + virtual bool operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE; + virtual bool operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE; + virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_TXMSRT_HXX diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 5b99ffd8bdbc..a35a81aff0fd 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -208,11 +208,11 @@ class SwTxtFrm: public SwCntntFrm sal_Int32 &nChgStart, sal_Int32 &nChgEnd, sal_Int32 &nInvStart, sal_Int32 &nInvEnd); protected: - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; public: - com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetTabStopInfo( SwTwips CurrentPos ); + com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetTabStopInfo( SwTwips CurrentPos ) SAL_OVERRIDE; //public, weil der eine oder andere die Methode rufen darf um das //Prepare zu sparen - mit Vorsicht zu geniessen! void Init(); @@ -229,7 +229,7 @@ public: // Additional information can be obtained by passing an SwCrsrMoveState object. // Returns false if rPos > number of character is string virtual bool GetCharRect( SwRect& rRect, const SwPosition& rPos, - SwCrsrMoveState* pCMS = 0 ) const; + SwCrsrMoveState* pCMS = 0 ) const SAL_OVERRIDE; // Eine etwas abgespeckte GetCharRect-Version fuer autopositionierte Rahmen bool GetAutoPos( SwRect &, const SwPosition& ) const; @@ -255,7 +255,7 @@ public: bool GetTopOfLine( SwTwips& _onTopOfLine, const SwPosition& _rPos ) const; - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; //Liefert in nOffset den Offset des Characters innerhalb des //gesetzten Textbuffers zurueck, welcher der durch aPoint @@ -263,7 +263,7 @@ public: //naechsten ist. Wenn der SPoint ausserhalb der SSize liegt, //liefert die Funktion false, true sonst. virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; // GetKeyCrsrOfst sorgt dafuer, dass der Frame nicht gewechselt wird // (z.B. Wechsel in den zeichengebundenen Frame). @@ -273,18 +273,18 @@ public: void PaintExtraData( const SwRect & rRect ) const; //Seitennummer usw. SwRect Paint(); virtual void Paint( SwRect const&, - SwPrintData const*const pPrintData = NULL ) const; - virtual bool GetInfo( SfxPoolItem & ) const; + SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; + virtual bool GetInfo( SfxPoolItem & ) const SAL_OVERRIDE; //Layoutorientiertes Cursortravelling: Linker, rechter Rand, //vorhergehende/naechste Zeile, gleiche horizontale Position. - virtual bool LeftMargin(SwPaM *) const; - virtual bool RightMargin(SwPaM *, bool bAPI = false) const; + virtual bool LeftMargin(SwPaM *) const SAL_OVERRIDE; + virtual bool RightMargin(SwPaM *, bool bAPI = false) const SAL_OVERRIDE; virtual bool UnitUp(SwPaM *, const SwTwips nOffset = 0, - bool bSetInReadOnly = false ) const; + bool bSetInReadOnly = false ) const SAL_OVERRIDE; virtual bool UnitDown(SwPaM *, const SwTwips nOffset = 0, - bool bSetInReadOnly = false ) const; + bool bSetInReadOnly = false ) const SAL_OVERRIDE; bool _UnitUp(SwPaM *, const SwTwips nOffset = 0, bool bSetInReadOnly = false ) const; bool _UnitDown(SwPaM *, const SwTwips nOffset = 0, @@ -324,12 +324,12 @@ public: // Wer den void* falsch casted ist selbst Schuld! // Auf jedenfall muss der void* auf 0 geprueft werden. virtual void Prepare( const PrepareHint ePrep = PREP_CLEAR, - const void *pVoid = 0, bool bNotify = true ); + const void *pVoid = 0, bool bNotify = true ) SAL_OVERRIDE; // nMaxHeight is the required height // bSplit indicates, that the paragraph has to be split // bTst indicates, that we are currently doing a test formatting - virtual bool WouldFit( SwTwips &nMaxHeight, bool &bSplit, bool bTst ); + virtual bool WouldFit( SwTwips &nMaxHeight, bool &bSplit, bool bTst ) SAL_OVERRIDE; // Hier das WouldFit-Aequivalent fuer mal kurz probeweise // umgehaengte TextFrames, auch hier liefert @@ -418,8 +418,8 @@ public: inline SwTwips GetLeftMargin() const; inline SwTwips GetRightMargin() const; - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); - virtual void CheckDirection( bool bVert ); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; // Liefert die Summe der Zeilenhoehen in pLine zurueck. sal_uInt16 GetParHeight() const; @@ -581,7 +581,7 @@ public: static void repaintTextFrames( const SwTxtNode& rNode ); - virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer); + virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) SAL_OVERRIDE; }; /************************************************************************* diff --git a/sw/source/core/inc/undoflystrattr.hxx b/sw/source/core/inc/undoflystrattr.hxx index 5d1ea5395fac..93611f173f35 100644 --- a/sw/source/core/inc/undoflystrattr.hxx +++ b/sw/source/core/inc/undoflystrattr.hxx @@ -33,10 +33,10 @@ class SwUndoFlyStrAttr : public SwUndo const OUString& sNewStr ); virtual ~SwUndoFlyStrAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual SwRewriter GetRewriter() const; + virtual SwRewriter GetRewriter() const SAL_OVERRIDE; private: SwFlyFrmFmt& mrFlyFrmFmt; diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx index 639f6b6d7c67..51e5c7d3cb56 100644 --- a/sw/source/core/inc/unobookmark.hxx +++ b/sw/source/core/inc/unobookmark.hxx @@ -92,44 +92,44 @@ public: ::com::sun::star::lang::XUnoTunnel> & xUT); // MetadatableMixin - virtual ::sfx2::Metadatable* GetCoreObject(); + virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > GetModel(); + ::com::sun::star::frame::XModel > GetModel() SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -137,56 +137,56 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -201,20 +201,20 @@ class SwXFieldmarkParameters } // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; private: ::sw::mark::IFieldmark::parameter_map_t* getCoreParameters() throw (::com::sun::star::uno::RuntimeException); }; @@ -242,13 +242,13 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual OUString SAL_CALL getFieldType(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setFieldType(const OUString& description ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getParameters( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -256,13 +256,13 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class SwXODFCheckboxField : public SwXFieldmark diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx index 569710eb06ac..2ef2a690eccb 100644 --- a/sw/source/core/inc/unoevent.hxx +++ b/sw/source/core/inc/unoevent.hxx @@ -37,7 +37,7 @@ class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: virtual ~SwHyperlinkEventDescriptor(); public: @@ -71,12 +71,12 @@ public: ~SwFrameEventDescriptor(); virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: - virtual void setMacroItem(const SvxMacroItem& rItem); - virtual const SvxMacroItem& getMacroItem(); - virtual sal_uInt16 getMacroItemWhich() const; + virtual void setMacroItem(const SvxMacroItem& rItem) SAL_OVERRIDE; + virtual const SvxMacroItem& getMacroItem() SAL_OVERRIDE; + virtual sal_uInt16 getMacroItemWhich() const SAL_OVERRIDE; }; class SwFrameStyleEventDescriptor : public SvEventDescriptor @@ -91,12 +91,12 @@ public: ~SwFrameStyleEventDescriptor(); virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: - virtual void setMacroItem(const SvxMacroItem& rItem); - virtual const SvxMacroItem& getMacroItem(); - virtual sal_uInt16 getMacroItemWhich() const; + virtual void setMacroItem(const SvxMacroItem& rItem) SAL_OVERRIDE; + virtual const SvxMacroItem& getMacroItem() SAL_OVERRIDE; + virtual sal_uInt16 getMacroItemWhich() const SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx index 0065c2529ce4..e029d49ab18b 100644 --- a/sw/source/core/inc/unofield.hxx +++ b/sw/source/core/inc/unofield.hxx @@ -77,35 +77,35 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -113,40 +113,40 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -185,35 +185,35 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -221,68 +221,68 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUpdatable virtual void SAL_CALL update() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextField virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDependentTextField virtual void SAL_CALL attachTextFieldMaster( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xFieldMaster) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> SAL_CALL getTextFieldMaster() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -306,21 +306,21 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx index 4eae5ee007cd..09a6e7bc598f 100644 --- a/sw/source/core/inc/unoflatpara.hxx +++ b/sw/source/core/inc/unoflatpara.hxx @@ -57,32 +57,32 @@ public: SwXFlatParagraph( SwTxtNode& rTxtNode, const OUString& aExpandText, const ModelToViewHelper& rConversionMap ); virtual ~SwXFlatParagraph(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw(); - virtual void SAL_CALL release( ) throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // text::XTextMarkup: - virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, - const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception); + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & xRange, - const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception); + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // text::XFlatParagraph: - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setChecked(::sal_Int32 nType, ::sal_Bool bVal) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isChecked(::sal_Int32 nType) throw (css::uno::RuntimeException, std::exception); - virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); - virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); - virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); - virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); - virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setChecked(::sal_Int32 nType, ::sal_Bool bVal) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isChecked(::sal_Int32 nType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; const SwTxtNode* getTxtNode() const; @@ -90,7 +90,7 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething(const css::uno::Sequence< sal_Int8 >& rId) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: SwXFlatParagraph( const SwXFlatParagraph & ); // not defined @@ -115,15 +115,15 @@ public: virtual ~SwXFlatParagraphIterator(); // text::XFlatParagraphIterator: - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getFirstPara() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getNextPara() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getLastPara() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaBefore(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaAfter(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getFirstPara() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getNextPara() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getLastPara() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaBefore(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaAfter(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; protected: // SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; private: SwXFlatParagraphIterator( const SwXFlatParagraphIterator & ); // not defined diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx index 537ca3a4317a..bc8d40bb6ffe 100644 --- a/sw/source/core/inc/unofootnote.hxx +++ b/sw/source/core/inc/unofootnote.hxx @@ -57,12 +57,12 @@ private: protected: - virtual const SwStartNode *GetStartNode() const; + virtual const SwStartNode *GetStartNode() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > CreateCursor() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ~SwXFootnote(); @@ -81,52 +81,52 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType) - throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw() { OWeakObject::release(); } + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -134,80 +134,80 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFootnote virtual OUString SAL_CALL getLabel() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setLabel(const OUString& rLabel) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSimpleText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextPosition) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx index 0be41286f40a..a1b5d1d0d5ae 100644 --- a/sw/source/core/inc/unoidx.hxx +++ b/sw/source/core/inc/unoidx.hxx @@ -76,44 +76,44 @@ public: CreateXDocumentIndex(SwDoc & rDoc, SwTOXBaseSection const& rSection); // MetadatableMixin - virtual ::sfx2::Metadatable* GetCoreObject(); + virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - GetModel(); + GetModel() SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -121,74 +121,74 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRefreshable virtual void SAL_CALL refresh() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener>& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener>& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDocumentIndex virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL update() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -228,35 +228,35 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -264,56 +264,56 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDocumentIndexMark virtual OUString SAL_CALL getMarkEntry() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setMarkEntry(const OUString& rIndexEntry) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index 2d343de927bc..0eee4e645c86 100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -112,108 +112,108 @@ public: ::com::sun::star::uno::RuntimeException); // MetadatableMixin - virtual ::sfx2::Metadatable * GetCoreObject(); + virtual ::sfx2::Metadatable * GetCoreObject() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - GetModel(); + GetModel() SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setParent( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> const& xParent) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::NoSupportException, std::exception); + ::com::sun::star::lang::NoSupportException, std::exception) SAL_OVERRIDE; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > - SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception); + SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getString() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setString(const OUString& rString) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSimpleText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextPosition) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XText virtual void SAL_CALL insertTextContent( @@ -223,12 +223,12 @@ public: ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -266,31 +266,31 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -298,54 +298,54 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextField virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx index 953ee5589e96..a8d223393f3d 100644 --- a/sw/source/core/inc/unoparaframeenum.hxx +++ b/sw/source/core/inc/unoparaframeenum.hxx @@ -89,21 +89,21 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index fcaf6434dfe7..6011d0912f07 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -152,7 +152,7 @@ protected: virtual ~SwXTextPortion(); //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; public: SwXTextPortion(const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const& rParent, SwTextPortionType eType ); @@ -166,38 +166,38 @@ public: sal_Bool bIsEnd ); //XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XTolerantMultiPropertySet - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTextContent virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -210,16 +210,16 @@ public: //XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XContentEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void SetRefMark( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > xMark) @@ -284,27 +284,27 @@ public: //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; class SwXRedlinePortion : public SwXTextPortion @@ -333,14 +333,14 @@ public: SwRangeRedline const& rRedline, sal_Bool const bIsStart) throw(); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception); + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx index 8f5360e3bf78..75db5eee9fbc 100644 --- a/sw/source/core/inc/unorefmark.hxx +++ b/sw/source/core/inc/unorefmark.hxx @@ -68,35 +68,35 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -104,56 +104,56 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx index 017db44dd49d..651151ef76d1 100644 --- a/sw/source/core/inc/unosection.hxx +++ b/sw/source/core/inc/unosection.hxx @@ -73,44 +73,44 @@ public: const bool bIndexHeader = false); // MetadatableMixin - virtual ::sfx2::Metadatable* GetCoreObject(); + virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - GetModel(); + GetModel() SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -118,62 +118,62 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( @@ -184,55 +184,55 @@ public: throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTextSection virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection > SAL_CALL getParentSection() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection > > SAL_CALL getChildSections() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx index 96980afef814..597cfefe0ad4 100644 --- a/sw/source/core/inc/unotextmarkup.hxx +++ b/sw/source/core/inc/unotextmarkup.hxx @@ -55,16 +55,16 @@ public: virtual ~SwXTextMarkup(); // ::com::sun::star::text::XTextMarkup: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception); + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & xRange, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception); + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::text::XMultiTextMarkup: - virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: SwXTextMarkup( const SwXTextMarkup & ); // not defined @@ -72,7 +72,7 @@ private: protected: //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; SwTxtNode* mpTxtNode; const ModelToViewHelper maConversionMap; @@ -88,12 +88,12 @@ public: SwXStringKeyMap(); // ::com::sun::star::container::XStringKeyMap: - virtual ::com::sun::star::uno::Any SAL_CALL getValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException, std::exception); - virtual ::sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL insertValue(const OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, std::exception); - virtual ::sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertValue(const OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; private: SwXStringKeyMap(SwXStringKeyMap &); // not defined diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx index b9ed68134c2e..e43fe77bd487 100644 --- a/sw/source/core/inc/visiturl.hxx +++ b/sw/source/core/inc/visiturl.hxx @@ -31,7 +31,7 @@ public: SwURLStateChanged( const SwDoc* pD ); virtual ~SwURLStateChanged(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index b756e5af5f61..6546a000b2b1 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -181,7 +181,7 @@ public: SwSizeEnterLeave( const SwFrm* pF, sal_uLong nFunct, sal_uLong nAct, void* pPar ) : SwImplEnterLeave( pF, nFunct, nAct, pPar ), nFrmHeight( pF->Frm().Height() ) {} virtual ~SwSizeEnterLeave() {} - virtual void Leave(); // resize message + virtual void Leave() SAL_OVERRIDE; // resize message }; class SwUpperEnterLeave : public SwImplEnterLeave @@ -191,8 +191,8 @@ public: SwUpperEnterLeave( const SwFrm* pF, sal_uLong nFunct, sal_uLong nAct, void* pPar ) : SwImplEnterLeave( pF, nFunct, nAct, pPar ), nFrmId( 0 ) {} virtual ~SwUpperEnterLeave() {} - virtual void Enter(); // message - virtual void Leave(); // message of FrmId from upper + virtual void Enter() SAL_OVERRIDE; // message + virtual void Leave() SAL_OVERRIDE; // message of FrmId from upper }; class SwFrmChangesLeave : public SwImplEnterLeave @@ -202,8 +202,8 @@ public: SwFrmChangesLeave( const SwFrm* pF, sal_uLong nFunct, sal_uLong nAct, void* pPar ) : SwImplEnterLeave( pF, nFunct, nAct, pPar ), aFrm( pF->Frm() ) {} virtual ~SwFrmChangesLeave() {} - virtual void Enter(); // no message - virtual void Leave(); // message when resizing the Frm area + virtual void Enter() SAL_OVERRIDE; // no message + virtual void Leave() SAL_OVERRIDE; // message when resizing the Frm area }; void SwProtocol::Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct, void* pParam ) diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index a8850aa0f807..fdfb7853e4ce 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -3169,7 +3169,7 @@ class SwFrmHolder : private SfxListener { SwFrm* pFrm; bool bSet; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; public: SwFrmHolder() : pFrm(0), bSet(false) {} void SetFrm( SwFrm* pHold ); diff --git a/sw/source/core/layout/objectformatterlayfrm.hxx b/sw/source/core/layout/objectformatterlayfrm.hxx index f7c40c836813..99ba0e13292a 100644 --- a/sw/source/core/layout/objectformatterlayfrm.hxx +++ b/sw/source/core/layout/objectformatterlayfrm.hxx @@ -48,7 +48,7 @@ class SwObjectFormatterLayFrm : public SwObjectFormatter protected: - virtual SwFrm& GetAnchorFrm(); + virtual SwFrm& GetAnchorFrm() SAL_OVERRIDE; public: virtual ~SwObjectFormatterLayFrm(); @@ -56,8 +56,8 @@ class SwObjectFormatterLayFrm : public SwObjectFormatter // #i40147# - add parameter <_bCheckForMovedFwd>. // Not relevant for objects anchored at layout frame. virtual bool DoFormatObj( SwAnchoredObject& _rAnchoredObj, - const bool _bCheckForMovedFwd = false ); - virtual bool DoFormatObjs(); + const bool _bCheckForMovedFwd = false ) SAL_OVERRIDE; + virtual bool DoFormatObjs() SAL_OVERRIDE; static SwObjectFormatterLayFrm* CreateObjFormatter( SwLayoutFrm& _rAnchorLayFrm, diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx b/sw/source/core/layout/objectformattertxtfrm.hxx index 74eff931c680..b29fcadb4b95 100644 --- a/sw/source/core/layout/objectformattertxtfrm.hxx +++ b/sw/source/core/layout/objectformattertxtfrm.hxx @@ -116,15 +116,15 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter protected: - virtual SwFrm& GetAnchorFrm(); + virtual SwFrm& GetAnchorFrm() SAL_OVERRIDE; public: virtual ~SwObjectFormatterTxtFrm(); // #i40147# - add parameter <_bCheckForMovedFwd>. virtual bool DoFormatObj( SwAnchoredObject& _rAnchoredObj, - const bool _bCheckForMovedFwd = false ); - virtual bool DoFormatObjs(); + const bool _bCheckForMovedFwd = false ) SAL_OVERRIDE; + virtual bool DoFormatObjs() SAL_OVERRIDE; /** method to create an instance of <SwObjectFormatterTxtFrm> is necessary. diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 107a0e0e3ffd..3b72a714f938 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3004,7 +3004,7 @@ namespace virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, - const sdr::contact::DisplayInfo& rDisplayInfo) + const sdr::contact::DisplayInfo& rDisplayInfo) SAL_OVERRIDE { sal_Bool bPaint( sal_True ); diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index ddbb2627c1fd..636b6f8eb08c 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -72,8 +72,8 @@ public: SwOLELRUCache(); virtual void Notify( const uno::Sequence< - OUString>& aPropertyNames ); - virtual void Commit(); + OUString>& aPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; void Load(); void InsertObj( SwOLEObj& rObj ); @@ -98,9 +98,9 @@ class SwOLEListener_Impl : public ::cppu::WeakImplHelper1< embed::XStateChangeLi public: SwOLEListener_Impl( SwOLEObj* pObj ); void Release(); - virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException, std::exception); - virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; }; SwOLEListener_Impl::SwOLEListener_Impl( SwOLEObj* pObj ) @@ -158,9 +158,9 @@ public: SwEmbedObjectLink(SwOLENode* pNode); virtual ~SwEmbedObjectLink(); - 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 GetRealObject() != NULL; } }; diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 63ea8f5a5135..1ba49c8e1466 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -855,7 +855,7 @@ class SwMetaPortion : public SwTxtPortion { public: inline SwMetaPortion() { SetWhichPor( POR_META ); } - virtual void Paint( const SwTxtPaintInfo &rInf ) const; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; // OUTPUT_OPERATOR }; diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx index 120e2910d406..4568fa2349fc 100644 --- a/sw/source/core/text/pordrop.hxx +++ b/sw/source/core/text/pordrop.hxx @@ -90,11 +90,11 @@ public: const KSHORT nDistance ); virtual ~SwDropPortion(); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; void PaintDrop( const SwTxtPaintInfo &rInf ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const; - virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE; + virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const SAL_OVERRIDE; inline MSHORT GetLines() const { return nLines; } inline KSHORT GetDistance() const { return nDistance; } @@ -111,7 +111,7 @@ public: static void DeleteDropCapCache(); - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; #endif diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx index 39422ec97f9b..23afa3675782 100644 --- a/sw/source/core/text/porexp.hxx +++ b/sw/source/core/text/porexp.hxx @@ -30,16 +30,16 @@ class SwExpandPortion : public SwTxtPortion { public: inline SwExpandPortion() { SetWhichPor( POR_EXP ); } - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const; - virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const; - virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const; - virtual void Paint( const SwTxtPaintInfo &rInf ) const; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const SAL_OVERRIDE; + virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE; + virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const; + virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -58,18 +58,18 @@ public: bool IsMulti() const { return bMulti; } void SetMulti( bool bNew ) { bMulti = bNew; } - virtual SwLinePortion *Compress(); - virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const; - virtual void FormatEOL( SwTxtFormatInfo &rInf ); - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; + virtual SwLinePortion *Compress() SAL_OVERRIDE; + virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE; + virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; MSHORT MayUnderflow( const SwTxtFormatInfo &rInf, sal_Int32 nIdx, bool bUnderflow ) const; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const; + virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -81,12 +81,12 @@ class SwPostItsPortion : public SwExpandPortion bool bScript; public: SwPostItsPortion( bool bScrpt ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const; - virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; + virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE; bool IsScript() const { return bScript; } - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; #endif diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx index f6c13a54c88f..3107a1973364 100644 --- a/sw/source/core/text/porfld.hxx +++ b/sw/source/core/text/porfld.hxx @@ -69,14 +69,14 @@ public: inline const SwFont *GetFont() const { return pFnt; } inline OUString GetExp() const { return aExpand; } - virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; + virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; // Empty fields are also allowed - virtual SwLinePortion *Compress(); + virtual SwLinePortion *Compress() SAL_OVERRIDE; - virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const; + virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; inline bool IsFollow() const { return bFollow; } inline void SetFollow( bool bNew ) { bFollow = bNew; } @@ -103,12 +103,12 @@ public: virtual SwFldPortion *Clone( const OUString &rExpand ) const; // Extra GetTxtSize because of pFnt - virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const; + virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const; + virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -122,12 +122,12 @@ public: inline SwHiddenPortion( const OUString &rExpand, SwFont *pFntL = 0 ) : SwFldPortion( rExpand, pFntL ) { SetLen(1); SetWhichPor( POR_HIDDEN ); } - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE; // Field cloner for SplitGlue - virtual SwFldPortion *Clone( const OUString &rExpand ) const; - OUTPUT_OPERATOR + virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE; + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -148,15 +148,15 @@ public: const bool bCenter, const KSHORT nMinDst, const bool bLabelAlignmentPosAndSpaceModeActive ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; // Field cloner for SplitGlue - virtual SwFldPortion *Clone( const OUString &rExpand ) const; - virtual void FormatEOL( SwTxtFormatInfo &rInf ); + virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE; + virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -173,7 +173,7 @@ public: const bool bCenter, const KSHORT nMinDst, const bool bLabelAlignmentPosAndSpaceModeActive ); - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -198,8 +198,8 @@ public: const KSHORT nMinDst, const bool bLabelAlignmentPosAndSpaceModeActive ); ~SwGrfNumPortion(); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; void SetBase( long nLnAscent, long nLnDescent, long nFlyAscent, long nFlyDescent ); @@ -218,7 +218,7 @@ public: inline SwTwips GetId() const { return nId; } inline sal_Int16 GetOrient() const { return eOrient; } - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -241,10 +241,10 @@ class SwCombinedPortion : public SwFldPortion sal_uInt8 nProportion; // relative font height public: SwCombinedPortion( const OUString &rExpand ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const; - OUTPUT_OPERATOR + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; + OUTPUT_OPERATOR_OVERRIDE }; #endif diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx index 61967b0ae641..48532fa651f4 100644 --- a/sw/source/core/text/porfly.hxx +++ b/sw/source/core/text/porfly.hxx @@ -40,9 +40,9 @@ public: : SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( POR_FLY ); } inline KSHORT GetBlankWidth( ) const { return nBlankWidth; } inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; } - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); - OUTPUT_OPERATOR + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -57,7 +57,7 @@ class SwFlyCntPortion : public SwLinePortion bool bDraw : 1; // DrawContact? bool bMax : 1; // Line adjustment and height == line height sal_uInt8 nAlign : 3; // Line adjustment? No, above, middle, bottom - virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const; + virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const SAL_OVERRIDE; public: // OD 29.07.2003 #110978# - use new datatype for parameter <nFlags> @@ -89,9 +89,9 @@ public: objectpositioning::AsCharFlags nFlags ); sal_Int32 GetFlyCrsrOfst( const KSHORT nOfst, const Point &rPoint, SwPosition *pPos, SwCrsrMoveState* pCMS ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - OUTPUT_OPERATOR + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + OUTPUT_OPERATOR_OVERRIDE }; #endif diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx index 6d2bb5175945..161d3e1730f0 100644 --- a/sw/source/core/text/porftn.hxx +++ b/sw/source/core/text/porftn.hxx @@ -40,16 +40,16 @@ public: KSHORT nOrig = KSHRT_MAX ); KSHORT& Orig() { return nOrigHeight; } - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const; - virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE; + virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; // #i98418# void SetPreferredScriptType( sal_uInt8 nPreferredScriptType ); const SwTxtFtn* GetTxtFtn() const { return pFtn; }; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -63,7 +63,7 @@ public: : SwNumberPortion( rExpand, pFntL, true, false, 0, false ) { SetWhichPor( POR_FTNNUM ); } - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -75,21 +75,21 @@ class SwQuoVadisPortion : public SwFldPortion OUString aErgo; public: SwQuoVadisPortion( const OUString &rExp, const OUString& rStr ); - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE; void SetNumber( const OUString& rStr ) { aErgo = rStr; } const OUString GetQuoTxt() const { return aExpand; } const OUString &GetContTxt() const { return aErgo; } // Field cloner for SplitGlue - virtual SwFldPortion *Clone( const OUString &rExpand ) const; + virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const; + virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -100,12 +100,12 @@ class SwErgoSumPortion : public SwFldPortion { public: SwErgoSumPortion( const OUString &rExp, const OUString& rStr ); - virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); + virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; // Field cloner for SplitGlue - virtual SwFldPortion *Clone( const OUString &rExpand ) const; - OUTPUT_OPERATOR + virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE; + OUTPUT_OPERATOR_OVERRIDE }; #endif diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx index 4da5ae294618..7c5edccbec6b 100644 --- a/sw/source/core/text/porglue.hxx +++ b/sw/source/core/text/porglue.hxx @@ -44,12 +44,12 @@ public: inline void MoveAllGlue( SwGluePortion *pTarget ); inline void MoveHalfGlue( SwGluePortion *pTarget ); inline void AdjFixWidth(); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const; - virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const; - virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const SAL_OVERRIDE; + virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE; + virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -64,7 +64,7 @@ public: SwFixPortion( const KSHORT nFixWidth, const KSHORT nFixPos ); inline void Fix( const KSHORT nNewFix ) { nFix = nNewFix; } inline KSHORT Fix() const { return nFix; } - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -76,7 +76,7 @@ class SwMarginPortion : public SwGluePortion public: SwMarginPortion( const KSHORT nFixWidth ); void AdjustRight( const SwLineLayout* pCurr ); - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx index 55e541ff9036..400fd3cbbf18 100644 --- a/sw/source/core/text/porhyph.hxx +++ b/sw/source/core/text/porhyph.hxx @@ -32,13 +32,13 @@ public: { SetWhichPor( POR_HYPH ); } - virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); + virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const; + virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -55,12 +55,12 @@ public: SetWhichPor( POR_HYPHSTR ); } - virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const; + virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const; + virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -75,20 +75,20 @@ class SwSoftHyphPortion : public SwHyphPortion public: SwSoftHyphPortion(); - virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const; - virtual SwLinePortion *Compress(); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual void FormatEOL( SwTxtFormatInfo &rInf ); + virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE; + virtual SwLinePortion *Compress() SAL_OVERRIDE; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; inline void SetExpand( const bool bNew ) { bExpand = bNew; } bool IsExpand() const { return bExpand; } - virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const; + virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const; + virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -99,8 +99,8 @@ class SwSoftHyphStrPortion : public SwHyphStrPortion { public: SwSoftHyphStrPortion( const OUString &rStr ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - OUTPUT_OPERATOR + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + OUTPUT_OPERATOR_OVERRIDE }; #endif diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx index 92c80d4c6d1c..ef1c3ed4445e 100644 --- a/sw/source/core/text/porlay.hxx +++ b/sw/source/core/text/porlay.hxx @@ -103,8 +103,8 @@ private: public: // From SwLinePortion - virtual SwLinePortion *Insert( SwLinePortion *pPortion ); - virtual SwLinePortion *Append( SwLinePortion *pPortion ); + virtual SwLinePortion *Insert( SwLinePortion *pPortion ) SAL_OVERRIDE; + virtual SwLinePortion *Append( SwLinePortion *pPortion ) SAL_OVERRIDE; inline SwLinePortion *GetFirstPortion() const; // Flags @@ -165,7 +165,7 @@ public: { return _GetHangingMargin(); } // For special treatment for empty lines - virtual bool Format( SwTxtFormatInfo &rInf ); + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; // Stuff for justified alignment inline bool IsSpaceAdd() { return pLLSpaceAdd != NULL; } @@ -229,7 +229,7 @@ public: const SwLinePortion* _pDontConsiderPortion = NULL, const bool _bNoFlyCntPorAndLinePor = false ) const; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE DECL_FIXEDMEMPOOL_NEWDEL(SwLineLayout) }; @@ -341,7 +341,7 @@ public: void dumpAsXml( xmlTextWriter* writer, SwTxtFrm* pTxtFrm ); #endif - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE DECL_FIXEDMEMPOOL_NEWDEL(SwParaPortion) }; diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx index 616fa2d5144c..16561993e4d0 100644 --- a/sw/source/core/text/porlin.hxx +++ b/sw/source/core/text/porlin.hxx @@ -33,8 +33,10 @@ class SwPortionHandler; // The portions output operators are virtual methods of the portion. #ifdef DBG_UTIL #define OUTPUT_OPERATOR virtual SvStream & operator<<( SvStream & aOs ) const; +#define OUTPUT_OPERATOR_OVERRIDE virtual SvStream & operator<<( SvStream & aOs ) const SAL_OVERRIDE; #else #define OUTPUT_OPERATOR +#define OUTPUT_OPERATOR_OVERRIDE #endif // Portion groups diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx index ed0d28ddce15..8f11e91cc320 100644 --- a/sw/source/core/text/pormulti.hxx +++ b/sw/source/core/text/pormulti.hxx @@ -139,8 +139,8 @@ public: inline bool OnTop() const { return bTop; } void ActualizeTabulator(); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const; // Summarize the internal lines to calculate the (external) size @@ -154,9 +154,9 @@ public: { return ( HasRotation() ? ( IsRevers() ? 2700 : 900 ) : 0 ); } // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const; + virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; class SwDoubleLinePortion : public SwMultiPortion @@ -190,8 +190,8 @@ public: inline sal_Int32 GetBlank1() const { return nBlank1; } inline sal_Int32 GetBlank2() const { return nBlank2; } - virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const; - virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const; + virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; + virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const SAL_OVERRIDE; }; class SwRubyPortion : public SwMultiPortion @@ -234,9 +234,9 @@ public: // Get number of blanks for justified alignment sal_Int32 GetSpaceCnt( const SwTxtSizeInfo &rInf ) const; // Calculates extra spacing based on number of blanks - virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const; + virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; // Manipulate the spacing array at pCurr - virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const; + virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const SAL_OVERRIDE; }; // For cursor travelling in multiportions diff --git a/sw/source/core/text/porref.hxx b/sw/source/core/text/porref.hxx index 553faee334b3..ccf7f7152760 100644 --- a/sw/source/core/text/porref.hxx +++ b/sw/source/core/text/porref.hxx @@ -29,8 +29,8 @@ class SwRefPortion : public SwTxtPortion { public: inline SwRefPortion(){ SetWhichPor( POR_REF ); } - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - OUTPUT_OPERATOR + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -43,15 +43,15 @@ class SwIsoRefPortion : public SwRefPortion public: SwIsoRefPortion(); - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual SwLinePortion *Compress(); - virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual SwLinePortion *Compress() SAL_OVERRIDE; + virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const; + virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; #endif diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx index 17615690839f..82553082f6a3 100644 --- a/sw/source/core/text/porrst.hxx +++ b/sw/source/core/text/porrst.hxx @@ -34,8 +34,8 @@ class SwTmpEndPortion : public SwLinePortion { public: SwTmpEndPortion( const SwLinePortion &rPortion ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - OUTPUT_OPERATOR + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -47,16 +47,16 @@ class SwBreakPortion : public SwLinePortion public: SwBreakPortion( const SwLinePortion &rPortion ); // Returns 0 if we have no usable data - virtual SwLinePortion *Compress(); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const; - virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const; + virtual SwLinePortion *Compress() SAL_OVERRIDE; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; + virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const SAL_OVERRIDE; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const; + virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -83,10 +83,10 @@ public: // of rPortion. It is only used for kerning portions for grid mode SwKernPortion( const SwLinePortion &rPortion ); - virtual void FormatEOL( SwTxtFormatInfo &rInf ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; + virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -100,11 +100,11 @@ class SwArrowPortion : public SwLinePortion public: SwArrowPortion( const SwLinePortion &rPortion ); SwArrowPortion( const SwTxtPaintInfo &rInf ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual SwLinePortion *Compress(); + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual SwLinePortion *Compress() SAL_OVERRIDE; inline bool IsLeft() const { return bLeft; } inline const Point& GetPos() const { return aPos; } - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -136,8 +136,8 @@ public: inline SwHiddenTextPortion( sal_Int32 nLen ) { SetWhichPor( POR_HIDDEN_TXT ); SetLen( nLen ); } - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; }; /************************************************************************* @@ -160,9 +160,9 @@ public: SetWhichPor( POR_CONTROLCHAR ); SetLen( 1 ); } - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual KSHORT GetViewWidth( const SwTxtSizeInfo& rInf ) const; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual KSHORT GetViewWidth( const SwTxtSizeInfo& rInf ) const SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx index a8cf38b05950..525bfbe07651 100644 --- a/sw/source/core/text/portab.hxx +++ b/sw/source/core/text/portab.hxx @@ -35,18 +35,18 @@ class SwTabPortion : public SwFixPortion bool PreFormat( SwTxtFormatInfo &rInf ); public: SwTabPortion( const KSHORT nTabPos, const sal_Unicode cFill = '\0', const bool bAutoTab = true ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual void FormatEOL( SwTxtFormatInfo &rInf ); + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; bool PostFormat( SwTxtFormatInfo &rInf ); inline bool IsFilled() const { return 0 != cFill; } inline KSHORT GetTabPos() const { return nTabPos; } inline bool IsAutoTabStop() const { return bAutoTabStop; } // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const; + virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -59,7 +59,7 @@ public: inline SwTabLeftPortion( const KSHORT nTabPosVal, const sal_Unicode cFillChar='\0', bool bAutoTab = true ) : SwTabPortion( nTabPosVal, cFillChar, bAutoTab ) { SetWhichPor( POR_TABLEFT ); } - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -72,7 +72,7 @@ public: inline SwTabRightPortion( const KSHORT nTabPosVal, const sal_Unicode cFillChar='\0' ) : SwTabPortion( nTabPosVal, cFillChar ) { SetWhichPor( POR_TABRIGHT ); } - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -85,7 +85,7 @@ public: inline SwTabCenterPortion( const KSHORT nTabPosVal, const sal_Unicode cFillChar='\0' ) : SwTabPortion( nTabPosVal, cFillChar ) { SetWhichPor( POR_TABCENTER ); } - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -122,7 +122,7 @@ public: return mnWidthOfPortionsUpTpDecimalPosition; } - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -136,7 +136,7 @@ public: const sal_Unicode cFillChar = '\0' ) : SwTabDecimalPortion( nTabPosVal, cTab, cFillChar ) { SetLen( 0 ); } - virtual void Paint( const SwTxtPaintInfo &rInf ) const; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx index dc4db1a7068b..9d86686a5a07 100644 --- a/sw/source/core/text/portox.hxx +++ b/sw/source/core/text/portox.hxx @@ -30,8 +30,8 @@ class SwToxPortion : public SwTxtPortion { public: inline SwToxPortion(){ SetWhichPor( POR_TOX ); } - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - OUTPUT_OPERATOR + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + OUTPUT_OPERATOR_OVERRIDE }; /************************************************************************* @@ -44,15 +44,15 @@ class SwIsoToxPortion : public SwToxPortion public: SwIsoToxPortion(); - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual SwLinePortion *Compress(); - virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual SwLinePortion *Compress() SAL_OVERRIDE; + virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const; + virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE }; #endif diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx index 1ec658a9c9c2..2a9b275c3bcc 100644 --- a/sw/source/core/text/portxt.hxx +++ b/sw/source/core/text/portxt.hxx @@ -39,13 +39,13 @@ class SwTxtPortion : public SwLinePortion public: inline SwTxtPortion(){ SetWhichPor( POR_TXT ); } SwTxtPortion( const SwLinePortion &rPortion ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual void FormatEOL( SwTxtFormatInfo &rInf ); - virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const; - virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const; - virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const; - virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const SAL_OVERRIDE; + virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE; + virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE; + virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; // Counts the spaces for justified paragraph sal_Int32 GetSpaceCnt( const SwTxtSizeInfo &rInf, sal_Int32& rCnt ) const; @@ -53,9 +53,9 @@ public: bool CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess ); // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const; + virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE DECL_FIXEDMEMPOOL_NEWDEL(SwTxtPortion) }; @@ -64,11 +64,11 @@ class SwTxtInputFldPortion : public SwTxtPortion public: SwTxtInputFldPortion(); - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const; - virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const; - virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE; + virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE; + virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE; private: bool mbContainsInputFieldStart; @@ -87,14 +87,14 @@ public: SwHolePortion( const SwTxtPortion &rPor ); inline KSHORT GetBlankWidth( ) const { return nBlankWidth; } inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; } - virtual SwLinePortion *Compress(); - virtual bool Format( SwTxtFormatInfo &rInf ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const; + virtual SwLinePortion *Compress() SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const; + virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; - OUTPUT_OPERATOR + OUTPUT_OPERATOR_OVERRIDE DECL_FIXEDMEMPOOL_NEWDEL(SwHolePortion) }; @@ -103,8 +103,8 @@ class SwFieldMarkPortion : public SwTxtPortion public: inline SwFieldMarkPortion() : SwTxtPortion() { } - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; }; class SwFieldFormPortion : public SwTxtPortion @@ -112,8 +112,8 @@ class SwFieldFormPortion : public SwTxtPortion public: inline SwFieldFormPortion() : SwTxtPortion() { } - virtual void Paint( const SwTxtPaintInfo &rInf ) const; - virtual bool Format( SwTxtFormatInfo &rInf ); + virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx index 021f5e040ac0..aca6c89025d6 100644 --- a/sw/source/core/text/txtcache.hxx +++ b/sw/source/core/text/txtcache.hxx @@ -46,7 +46,7 @@ class SwTxtLineAccess : public SwCacheAccess { protected: - virtual SwCacheObj *NewObj(); + virtual SwCacheObj *NewObj() SAL_OVERRIDE; public: SwTxtLineAccess( const SwTxtFrm *pOwner ); @@ -55,7 +55,7 @@ public: inline SwTxtLine &GetTxtLine(); - virtual bool IsAvailable() const; + virtual bool IsAvailable() const SAL_OVERRIDE; }; inline SwTxtLine &SwTxtLineAccess::GetTxtLine() diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index 7400d8de6ab7..54c066bf98f6 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -118,7 +118,7 @@ class XmlPortionDumper:public SwPortionHandler virtual void Text( sal_uInt16 nLength, sal_uInt16 nType, sal_Int32 nHeight, - sal_Int32 nWidth) + sal_Int32 nWidth) SAL_OVERRIDE { ofs += nLength; xmlTextWriterStartElement( writer, BAD_CAST( "Text" ) ); @@ -150,7 +150,7 @@ class XmlPortionDumper:public SwPortionHandler const OUString & rText, sal_uInt16 nType, sal_Int32 nHeight, - sal_Int32 nWidth ) + sal_Int32 nWidth ) SAL_OVERRIDE { xmlTextWriterStartElement( writer, BAD_CAST( "Special" ) ); xmlTextWriterWriteFormatAttribute( writer, @@ -175,7 +175,7 @@ class XmlPortionDumper:public SwPortionHandler ofs += nLength; } - virtual void LineBreak( KSHORT nWidth ) + virtual void LineBreak( KSHORT nWidth ) SAL_OVERRIDE { xmlTextWriterStartElement( writer, BAD_CAST( "LineBreak" ) ); if (nWidth > 0) @@ -189,7 +189,7 @@ class XmlPortionDumper:public SwPortionHandler * @param nLength * number of 'model string' characters to be skipped */ - virtual void Skip( sal_uInt16 nLength ) + virtual void Skip( sal_uInt16 nLength ) SAL_OVERRIDE { xmlTextWriterStartElement( writer, BAD_CAST( "Skip" ) ); xmlTextWriterWriteFormatAttribute( writer, @@ -199,7 +199,7 @@ class XmlPortionDumper:public SwPortionHandler ofs += nLength; } - virtual void Finish( ) + virtual void Finish( ) SAL_OVERRIDE { xmlTextWriterStartElement( writer, BAD_CAST( "Finish" ) ); xmlTextWriterEndElement( writer ); diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx index 058f74a53216..4d18dd7e3489 100644 --- a/sw/source/core/txtnode/SwGrammarContact.cxx +++ b/sw/source/core/txtnode/SwGrammarContact.cxx @@ -52,12 +52,12 @@ public: ~SwGrammarContact() { aTimer.Stop(); delete mpProxyList; } // (pure) virtual functions of IGrammarContact - virtual void updateCursorPosition( const SwPosition& rNewPos ); - virtual SwGrammarMarkUp* getGrammarCheck( SwTxtNode& rTxtNode, bool bCreate ); - virtual void finishGrammarCheck( SwTxtNode& rTxtNode ); + virtual void updateCursorPosition( const SwPosition& rNewPos ) SAL_OVERRIDE; + virtual SwGrammarMarkUp* getGrammarCheck( SwTxtNode& rTxtNode, bool bCreate ) SAL_OVERRIDE; + virtual void finishGrammarCheck( SwTxtNode& rTxtNode ) SAL_OVERRIDE; protected: // virtual function of SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; SwGrammarContact::SwGrammarContact() : mpProxyList(0), mbFinished( false ) diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 8a9945babcb6..9da547bb1b9a 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -129,8 +129,8 @@ protected: public: SwDoGetCapitalSize( SwDrawTextInfo &rInfo ) : SwDoCapitals ( rInfo ) { } virtual ~SwDoGetCapitalSize() {} - virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ); - virtual void Do(); + virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE; + virtual void Do() SAL_OVERRIDE; const Size &GetSize() const { return aTxtSize; } }; @@ -190,8 +190,8 @@ public: , m_nBreak( -1 ) { } virtual ~SwDoGetCapitalBreak() {} - virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ); - virtual void Do(); + virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE; + virtual void Do() SAL_OVERRIDE; sal_Int32 getBreak() const { return m_nBreak; } }; @@ -273,8 +273,8 @@ public: SwDoCapitals( rInfo ), pUpperFnt(0), pLowerFnt(0) { } virtual ~SwDoDrawCapital() {} - virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ); - virtual void Do(); + virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE; + virtual void Do() SAL_OVERRIDE; void DrawSpace( Point &rPos ); }; @@ -369,8 +369,8 @@ public: SwDoCapitals( rInfo ), pUpperFnt(0), pLowerFnt(0), nCrsr( 0 ), nOfst( nOfs ) { } virtual ~SwDoCapitalCrsrOfst() {} - virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ); - virtual void Do(); + virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE; + virtual void Do() SAL_OVERRIDE; void DrawSpace( const Point &rPos ); inline sal_Int32 GetCrsr(){ return nCrsr; } @@ -446,7 +446,7 @@ class SwDoDrawStretchCapital : public SwDoDrawCapital const sal_uInt16 nCapWidth; const sal_uInt16 nOrgWidth; public: - virtual void Do(); + virtual void Do() SAL_OVERRIDE; SwDoDrawStretchCapital( SwDrawTextInfo &rInfo, const sal_uInt16 nCapitalWidth ) : SwDoDrawCapital( rInfo ), diff --git a/sw/source/core/uibase/dbui/dbmgr.cxx b/sw/source/core/uibase/dbui/dbmgr.cxx index 713d12eab1fb..21eb9e2c1e69 100644 --- a/sw/source/core/uibase/dbui/dbmgr.cxx +++ b/sw/source/core/uibase/dbui/dbmgr.cxx @@ -208,7 +208,7 @@ class SwConnectionDisposedListener_Impl : public cppu::WeakImplHelper1 { SwNewDBMgr& rDBMgr; - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception); + virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; public: SwConnectionDisposedListener_Impl(SwNewDBMgr& rMgr); ~SwConnectionDisposedListener_Impl(); diff --git a/sw/source/core/uibase/dbui/dbtree.cxx b/sw/source/core/uibase/dbui/dbtree.cxx index 9f240d9aa40a..9ba3200c760c 100644 --- a/sw/source/core/uibase/dbui/dbtree.cxx +++ b/sw/source/core/uibase/dbui/dbtree.cxx @@ -81,10 +81,10 @@ class SwDBTreeList_Impl : public cppu::WeakImplHelper1 < XContainerListener > pWrtSh(pShell) {} ~SwDBTreeList_Impl(); - virtual void SAL_CALL elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception); - virtual void SAL_CALL elementRemoved( const ContainerEvent& Event ) throw (RuntimeException, std::exception); - virtual void SAL_CALL elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception); - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception); + virtual void SAL_CALL elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementRemoved( const ContainerEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool HasContext(); SwWrtShell* GetWrtShell() { return pWrtSh;} diff --git a/sw/source/core/uibase/dbui/mailmergechildwindow.cxx b/sw/source/core/uibase/dbui/mailmergechildwindow.cxx index 67966f12abf5..bf16a14e828a 100644 --- a/sw/source/core/uibase/dbui/mailmergechildwindow.cxx +++ b/sw/source/core/uibase/dbui/mailmergechildwindow.cxx @@ -164,13 +164,13 @@ public: SwMailDispatcherListener_Impl(SwSendMailDialog& rParentDlg); ~SwMailDispatcherListener_Impl(); - virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher); - virtual void stopped(::rtl::Reference<MailDispatcher> xMailDispatcher); - virtual void idle(::rtl::Reference<MailDispatcher> xMailDispatcher); + virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE; + virtual void stopped(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE; + virtual void idle(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE; virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher, - uno::Reference< mail::XMailMessage> xMailMessage); + uno::Reference< mail::XMailMessage> xMailMessage) SAL_OVERRIDE; virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher, - uno::Reference< mail::XMailMessage> xMailMessage, const OUString& sErrorMessage); + uno::Reference< mail::XMailMessage> xMailMessage, const OUString& sErrorMessage) SAL_OVERRIDE; static void DeleteAttachments( uno::Reference< mail::XMailMessage >& xMessage ); }; diff --git a/sw/source/core/uibase/dbui/mmconfigitem.cxx b/sw/source/core/uibase/dbui/mmconfigitem.cxx index 324b8b6d0ce9..6143905efc5a 100644 --- a/sw/source/core/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/core/uibase/dbui/mmconfigitem.cxx @@ -155,8 +155,8 @@ public: SwMailMergeConfigItem_Impl(); ~SwMailMergeConfigItem_Impl(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; const Sequence< OUString> GetAddressBlocks(sal_Bool bConvertToConfig = sal_False) const; void SetAddressBlocks( diff --git a/sw/source/core/uibase/dochdl/swdtflvr.cxx b/sw/source/core/uibase/dochdl/swdtflvr.cxx index 9e148f46e5f8..4e53bfacc219 100644 --- a/sw/source/core/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/core/uibase/dochdl/swdtflvr.cxx @@ -163,8 +163,8 @@ public: SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh ); virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ); - virtual void Closed(); + const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; + virtual void Closed() SAL_OVERRIDE; sal_Bool WriteData( SvStream& rStrm ); diff --git a/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx index 5ea13c2cfe93..d3f1ee04bcf8 100644 --- a/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx +++ b/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx @@ -53,7 +53,7 @@ private: protected: virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition( - const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + const drawinglayer::geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: AnchorPrimitive( const basegfx::B2DPolygon& rTriangle, @@ -85,7 +85,7 @@ public: bool getShadow() const { return mbShadow; } bool getLineSolid() const { return mbLineSolid; } - virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; DeclPrimitive2DIDBlock() }; diff --git a/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx index 7c86e1abe013..c53ef7a04c9b 100644 --- a/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx +++ b/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx @@ -100,7 +100,7 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition void implResetGeometry(); // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; private: // object's geometry diff --git a/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx index c1334e8e077b..a5b38790ffbd 100644 --- a/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx +++ b/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx @@ -35,12 +35,12 @@ class AnnotationMenuButton : public MenuButton ~AnnotationMenuButton(); // overloaded <MenuButton> methods - virtual void Select(); + virtual void Select() SAL_OVERRIDE; // overloaded <Window> methods - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void KeyInput( const KeyEvent& rKeyEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; private: sw::sidebarwindows::SwSidebarWin& mrSidebarWin; diff --git a/sw/source/core/uibase/docvw/OverlayRanges.hxx b/sw/source/core/uibase/docvw/OverlayRanges.hxx index ccbe668211aa..8fd7cf46edb9 100755..100644 --- a/sw/source/core/uibase/docvw/OverlayRanges.hxx +++ b/sw/source/core/uibase/docvw/OverlayRanges.hxx @@ -40,7 +40,7 @@ namespace sw bool mbShowSolidBorder; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: static OverlayRanges* CreateOverlayRange( diff --git a/sw/source/core/uibase/docvw/PageBreakWin.cxx b/sw/source/core/uibase/docvw/PageBreakWin.cxx index 1380fdfcc469..b6a6c5ce2419 100644 --- a/sw/source/core/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/core/uibase/docvw/PageBreakWin.cxx @@ -61,7 +61,7 @@ namespace SwDashedLine( pParent, pColorFn ), m_pWin( pWin ) {}; - virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; }; void SwBreakDashedLine::MouseMove( const MouseEvent& rMEvt ) diff --git a/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx index efb1a5d68e27..2b9b4d2fa7f8 100644 --- a/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx +++ b/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx @@ -45,7 +45,7 @@ private: protected: virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition( - const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + const drawinglayer::geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: ShadowPrimitive( @@ -63,7 +63,7 @@ public: const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; } ShadowState getShadowState() const { return maShadowState; } - virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; DeclPrimitive2DIDBlock() }; diff --git a/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx index d692ec86a75b..d0e57d043584 100644 --- a/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx +++ b/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx @@ -37,7 +37,7 @@ class ShadowOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition { protected: // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; private: basegfx::B2DPoint maSecondPosition; diff --git a/sw/source/core/uibase/docvw/SidebarTxtControl.hxx b/sw/source/core/uibase/docvw/SidebarTxtControl.hxx index 37829b290a5a..f6f9fafc54ce 100644 --- a/sw/source/core/uibase/docvw/SidebarTxtControl.hxx +++ b/sw/source/core/uibase/docvw/SidebarTxtControl.hxx @@ -39,16 +39,16 @@ class SidebarTxtControl : public Control SwPostItMgr& mrPostItMgr; protected: - virtual void Paint( const Rectangle& rRect); - virtual void KeyInput( const KeyEvent& rKeyEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void LoseFocus(); - virtual void RequestHelp(const HelpEvent &rEvt); - virtual OUString GetSurroundingText() const; - virtual Selection GetSurroundingTextSelection() const; + virtual void Paint( const Rectangle& rRect) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void RequestHelp(const HelpEvent &rEvt) SAL_OVERRIDE; + virtual OUString GetSurroundingText() const SAL_OVERRIDE; + virtual Selection GetSurroundingTextSelection() const SAL_OVERRIDE; DECL_LINK( Select, Menu* ); @@ -59,13 +59,13 @@ class SidebarTxtControl : public Control SwPostItMgr& rPostItMgr ); ~SidebarTxtControl(); - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; OutlinerView* GetTextView() const; DECL_LINK( OnlineSpellCallback, SpellCallbackInfo*); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; } } // end of namespace sw::sidebarwindows diff --git a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx index 0ab0c43a33ae..5bbd2e8eef2e 100644 --- a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx @@ -43,15 +43,15 @@ class SidebarTextEditSource : public SvxEditSource, SidebarTextEditSource( SidebarTxtControl& rSidebarTxtControl ); virtual ~SidebarTextEditSource(); - virtual SvxEditSource* Clone() const; + virtual SvxEditSource* Clone() const SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE; - virtual void UpdateData(); + virtual void UpdateData() SAL_OVERRIDE; - virtual SfxBroadcaster& GetBroadcaster() const; + virtual SfxBroadcaster& GetBroadcaster() const SAL_OVERRIDE; DECL_LINK( NotifyHdl, EENotify* ); private: @@ -134,24 +134,24 @@ class SidebarTxtControlAccessibleContext : public VCLXAccessibleComponent virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); + virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; private: SidebarTxtControl& mrSidebarTxtControl; diff --git a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx index 051c5ecd7758..b8078c7e1c84 100644 --- a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx +++ b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx @@ -33,7 +33,7 @@ class SidebarTxtControlAccessible : public VCLXWindow virtual ~SidebarTxtControlAccessible(); virtual com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext > - CreateAccessibleContext(); + CreateAccessibleContext() SAL_OVERRIDE; private: SidebarTxtControl& mrSidebarTxtControl; diff --git a/sw/source/core/uibase/docvw/SidebarWinAcc.cxx b/sw/source/core/uibase/docvw/SidebarWinAcc.cxx index 99ba832a60db..c9201556017b 100644 --- a/sw/source/core/uibase/docvw/SidebarWinAcc.cxx +++ b/sw/source/core/uibase/docvw/SidebarWinAcc.cxx @@ -54,7 +54,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent } virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleParent() throw (css::uno::RuntimeException, std::exception) + getAccessibleParent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { osl::MutexGuard aGuard(maMutex); @@ -69,7 +69,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent return xAccParent; } - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { osl::MutexGuard aGuard(maMutex); diff --git a/sw/source/core/uibase/docvw/SidebarWinAcc.hxx b/sw/source/core/uibase/docvw/SidebarWinAcc.hxx index c86516d5ce99..739865e609db 100644 --- a/sw/source/core/uibase/docvw/SidebarWinAcc.hxx +++ b/sw/source/core/uibase/docvw/SidebarWinAcc.hxx @@ -39,7 +39,7 @@ class SidebarWinAccessible : public VCLXWindow virtual ~SidebarWinAccessible(); virtual com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext > - CreateAccessibleContext(); + CreateAccessibleContext() SAL_OVERRIDE; void ChangeSidebarItem( const SwSidebarItem& rSidebarItem ); diff --git a/sw/source/core/uibase/docvw/srcedtw.cxx b/sw/source/core/uibase/docvw/srcedtw.cxx index 65c6f25c02c5..968f3986b3cf 100644 --- a/sw/source/core/uibase/docvw/srcedtw.cxx +++ b/sw/source/core/uibase/docvw/srcedtw.cxx @@ -215,7 +215,7 @@ private: virtual ~ChangesListener() {} virtual void SAL_CALL disposing(css::lang::EventObject const &) - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { osl::MutexGuard g(editor_.mutex_); editor_.notifier_.clear(); @@ -223,7 +223,7 @@ private: virtual void SAL_CALL propertiesChange( css::uno::Sequence< css::beans::PropertyChangeEvent > const &) - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { SolarMutexGuard g; editor_.SetFont(); diff --git a/sw/source/core/uibase/inc/DashedLine.hxx b/sw/source/core/uibase/inc/DashedLine.hxx index 14ea2ef2507d..0944767a21e4 100644 --- a/sw/source/core/uibase/inc/DashedLine.hxx +++ b/sw/source/core/uibase/inc/DashedLine.hxx @@ -22,7 +22,7 @@ public: SwDashedLine( Window* pParent, Color& ( *pColorFn )() ); ~SwDashedLine( ); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/DropDownFieldDialog.hxx b/sw/source/core/uibase/inc/DropDownFieldDialog.hxx index 48ee686e8fe6..ad8a48b8109d 100644 --- a/sw/source/core/uibase/inc/DropDownFieldDialog.hxx +++ b/sw/source/core/uibase/inc/DropDownFieldDialog.hxx @@ -46,7 +46,7 @@ class DropDownFieldDialog : public SvxStandardDialog SwDropDownField* pDropField; DECL_LINK(ButtonHdl, PushButton*); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: DropDownFieldDialog( Window *pParent, SwWrtShell &rSh, SwField* pField, sal_Bool bNextButton = sal_False ); diff --git a/sw/source/core/uibase/inc/HeaderFooterWin.hxx b/sw/source/core/uibase/inc/HeaderFooterWin.hxx index 945d02de07e6..bf2a52c0bcf4 100644 --- a/sw/source/core/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/core/uibase/inc/HeaderFooterWin.hxx @@ -34,12 +34,12 @@ public: void SetOffset( Point aOffset, long nXLineStart, long nXLineEnd ); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Select( ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Select( ) SAL_OVERRIDE; - virtual void ShowAll( bool bShow ); - virtual bool Contains( const Point &rDocPt ) const; + virtual void ShowAll( bool bShow ) SAL_OVERRIDE; + virtual bool Contains( const Point &rDocPt ) const SAL_OVERRIDE; bool IsHeader() { return m_bIsHeader; }; bool IsEmptyHeaderFooter( ); @@ -47,7 +47,7 @@ public: void ExecuteCommand(sal_uInt16 nSlot); - void SetReadonly( bool bReadonly ); + void SetReadonly( bool bReadonly ) SAL_OVERRIDE; private: DECL_LINK( FadeHandler, void * ); diff --git a/sw/source/core/uibase/inc/PageBreakWin.hxx b/sw/source/core/uibase/inc/PageBreakWin.hxx index 9e9ed283b182..c0eb854a1b7e 100644 --- a/sw/source/core/uibase/inc/PageBreakWin.hxx +++ b/sw/source/core/uibase/inc/PageBreakWin.hxx @@ -36,19 +36,19 @@ public: SwPageBreakWin( SwEditWin* pEditWin, const SwPageFrm* pPageFrm ); ~SwPageBreakWin( ); - virtual void Paint( const Rectangle& rRect ); - virtual void Select( ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Activate( ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Select( ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Activate( ) SAL_OVERRIDE; void UpdatePosition( const Point* pEvtPt = NULL ); - virtual void ShowAll( bool bShow ); - virtual bool Contains( const Point &rDocPt ) const; + virtual void ShowAll( bool bShow ) SAL_OVERRIDE; + virtual bool Contains( const Point &rDocPt ) const SAL_OVERRIDE; const SwPageFrm* GetPageFrame( ); - void SetReadonly( bool bReadonly ); + void SetReadonly( bool bReadonly ) SAL_OVERRIDE; void Fade( bool bFadeIn ); diff --git a/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx b/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx index 922841304721..7bc8dcfea56c 100644 --- a/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx +++ b/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx @@ -38,15 +38,15 @@ class SwSpellDialogChildWindow void LockFocusNotification(bool bLock); protected: - virtual svx::SpellPortions GetNextWrongSentence(bool bRecheck); - virtual void ApplyChangedSentence(const svx::SpellPortions& rChanged, bool bRecheck); - virtual void AddAutoCorrection(const OUString& rOld, const OUString& rNew, LanguageType eLanguage); - virtual bool HasAutoCorrection(); - virtual bool HasGrammarChecking(); - virtual bool IsGrammarChecking(); - virtual void SetGrammarChecking(bool bOn); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual svx::SpellPortions GetNextWrongSentence(bool bRecheck) SAL_OVERRIDE; + virtual void ApplyChangedSentence(const svx::SpellPortions& rChanged, bool bRecheck) SAL_OVERRIDE; + virtual void AddAutoCorrection(const OUString& rOld, const OUString& rNew, LanguageType eLanguage) SAL_OVERRIDE; + virtual bool HasAutoCorrection() SAL_OVERRIDE; + virtual bool HasGrammarChecking() SAL_OVERRIDE; + virtual bool IsGrammarChecking() SAL_OVERRIDE; + virtual void SetGrammarChecking(bool bOn) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; public: SwSpellDialogChildWindow ( diff --git a/sw/source/core/uibase/inc/SwXFilterOptions.hxx b/sw/source/core/uibase/inc/SwXFilterOptions.hxx index 8e39c494f529..6a117372c5f1 100644 --- a/sw/source/core/uibase/inc/SwXFilterOptions.hxx +++ b/sw/source/core/uibase/inc/SwXFilterOptions.hxx @@ -55,39 +55,39 @@ public: // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > - SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception); + SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) 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); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XExecutableDialog virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XImporter virtual void SAL_CALL setTargetDocument( 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); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XExporter virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/uibase/inc/actctrl.hxx b/sw/source/core/uibase/inc/actctrl.hxx index 0111eb1de37d..d51ac3dec526 100644 --- a/sw/source/core/uibase/inc/actctrl.hxx +++ b/sw/source/core/uibase/inc/actctrl.hxx @@ -31,7 +31,7 @@ class SW_DLLPUBLIC NumEditAction: public NumericField protected: virtual void Action(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: NumEditAction( Window* pParent, const ResId& rResId ) : NumericField(pParent, rResId) {} @@ -47,8 +47,8 @@ class SW_DLLPUBLIC NoSpaceEdit : public Edit { OUString sForbiddenChars; protected: - virtual void KeyInput( const KeyEvent& ); - virtual void Modify(); + virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; public: NoSpaceEdit( Window* pParent ); @@ -81,7 +81,7 @@ public: ReturnActionEdit(Window* pParent, WinBits nStyle) : Edit(pParent, nStyle){} ~ReturnActionEdit(); - virtual void KeyInput( const KeyEvent& ); + virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; void SetReturnActionLink(const Link& rLink) { aReturnActionLink = rLink;} diff --git a/sw/source/core/uibase/inc/annotsh.hxx b/sw/source/core/uibase/inc/annotsh.hxx index 314188cc8c2f..02fe9f399ed4 100644 --- a/sw/source/core/uibase/inc/annotsh.hxx +++ b/sw/source/core/uibase/inc/annotsh.hxx @@ -66,7 +66,7 @@ public: void StateSearch(SfxItemSet &); virtual ::svl::IUndoManager* - GetUndoManager(); + GetUndoManager() SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/autoedit.hxx b/sw/source/core/uibase/inc/autoedit.hxx index 94d81b771527..606489f3a2af 100644 --- a/sw/source/core/uibase/inc/autoedit.hxx +++ b/sw/source/core/uibase/inc/autoedit.hxx @@ -27,7 +27,7 @@ public: AutoEdit( Window* pParent, ResId aResId ) : Edit( pParent, aResId ){} protected: - virtual void KeyInput( const KeyEvent& rEvent ); + virtual void KeyInput( const KeyEvent& rEvent ) SAL_OVERRIDE; }; // Implementation in autocorr.cxx diff --git a/sw/source/core/uibase/inc/barcfg.hxx b/sw/source/core/uibase/inc/barcfg.hxx index f0e05c11dde9..117fa3cff00a 100644 --- a/sw/source/core/uibase/inc/barcfg.hxx +++ b/sw/source/core/uibase/inc/barcfg.hxx @@ -30,8 +30,8 @@ public: SwToolbarConfigItem( bool bWeb ); ~SwToolbarConfigItem(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId ); }; diff --git a/sw/source/core/uibase/inc/bmpwin.hxx b/sw/source/core/uibase/inc/bmpwin.hxx index dcf59bb97efb..63c4082599e3 100644 --- a/sw/source/core/uibase/inc/bmpwin.hxx +++ b/sw/source/core/uibase/inc/bmpwin.hxx @@ -38,9 +38,9 @@ private: sal_Bool bGraphic : 1; bool bLeftAlign : 1; - virtual void Paint(const Rectangle& rRect); + virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; public: BmpWindow(Window* pPar, WinBits nStyle); diff --git a/sw/source/core/uibase/inc/bookctrl.hxx b/sw/source/core/uibase/inc/bookctrl.hxx index a8ce181fd7fc..7771fb326556 100644 --- a/sw/source/core/uibase/inc/bookctrl.hxx +++ b/sw/source/core/uibase/inc/bookctrl.hxx @@ -26,12 +26,12 @@ class SwBookmarkControl : public SfxStatusBarControl { - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sw/source/core/uibase/inc/bookmark.hxx b/sw/source/core/uibase/inc/bookmark.hxx index 2c896c17d3eb..ff1179c2d9bc 100644 --- a/sw/source/core/uibase/inc/bookmark.hxx +++ b/sw/source/core/uibase/inc/bookmark.hxx @@ -35,7 +35,7 @@ class BookmarkCombo : public SwComboBox sal_Int32 GetNextSelEntryPos(sal_Int32 nPos) const; sal_Int32 GetSelEntryPos(sal_Int32 nPos) const; - virtual bool PreNotify(NotifyEvent& rNEvt); + virtual bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE; public: BookmarkCombo(Window* pWin, WinBits nStyle); @@ -58,7 +58,7 @@ class SwInsertBookmarkDlg: public SvxStandardDialog DECL_LINK(ModifyHdl, BookmarkCombo *); DECL_LINK(DeleteHdl, void *); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: SwInsertBookmarkDlg(Window *pParent, SwWrtShell &rSh, SfxRequest& rReq); diff --git a/sw/source/core/uibase/inc/break.hxx b/sw/source/core/uibase/inc/break.hxx index 00933a759b4f..6dd6356e7343 100644 --- a/sw/source/core/uibase/inc/break.hxx +++ b/sw/source/core/uibase/inc/break.hxx @@ -59,7 +59,7 @@ class SwBreakDlg: public SvxStandardDialog void CheckEnable(); protected: - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: SwBreakDlg( Window *pParent, SwWrtShell &rSh ); diff --git a/sw/source/core/uibase/inc/cfgitems.hxx b/sw/source/core/uibase/inc/cfgitems.hxx index bcd36c4594e8..871252854288 100644 --- a/sw/source/core/uibase/inc/cfgitems.hxx +++ b/sw/source/core/uibase/inc/cfgitems.hxx @@ -68,8 +68,8 @@ public: SwDocDisplayItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); - 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; void operator=( const SwDocDisplayItem& ); void FillViewOptions( SwViewOption& rVOpt) const; }; @@ -104,8 +104,8 @@ public: SwElemItem(const SwElemItem& rElemItem); SwElemItem(const SwViewOption& rVOpt, sal_uInt16 nWhich); - 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; void operator=( const SwElemItem& ); void FillViewOptions( SwViewOption& rVOpt) const; @@ -127,9 +127,9 @@ public: SwAddPrinterItem( sal_uInt16 nWhich, const SwPrintData& rPrtData ); SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; const OUString &GetFax() const { return sFaxName; } void SetFax( const OUString& rFax) { sFaxName = rFax; } @@ -171,8 +171,8 @@ public: SwShadowCursorItem( const SwShadowCursorItem& rElemItem ); SwShadowCursorItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); - 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; void operator=( const SwShadowCursorItem& ); void FillViewOptions( SwViewOption& rVOpt) const; @@ -210,8 +210,8 @@ public: SfxPoolItem(_nWhich){}; SwTestItem( const SwTestItem& pTestItem); - 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 diff --git a/sw/source/core/uibase/inc/changedb.hxx b/sw/source/core/uibase/inc/changedb.hxx index 4e8e31acce58..a5d048821d66 100644 --- a/sw/source/core/uibase/inc/changedb.hxx +++ b/sw/source/core/uibase/inc/changedb.hxx @@ -52,7 +52,7 @@ class SwChangeDBDlg: public SvxStandardDialog DECL_LINK(ButtonHdl, void *); DECL_LINK(AddDBHdl, void *); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; void UpdateFlds(); void FillDBPopup(); SvTreeListEntry* Insert(const OUString& rDBName); diff --git a/sw/source/core/uibase/inc/chrdlg.hxx b/sw/source/core/uibase/inc/chrdlg.hxx index d233b37a9143..5b7a077e4d66 100644 --- a/sw/source/core/uibase/inc/chrdlg.hxx +++ b/sw/source/core/uibase/inc/chrdlg.hxx @@ -54,7 +54,7 @@ public: ~SwCharDlg(); - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; }; class SwCharURLPage : public SfxTabPage @@ -85,8 +85,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/colex.hxx b/sw/source/core/uibase/inc/colex.hxx index dc7d25b1ba73..4cb67723b036 100644 --- a/sw/source/core/uibase/inc/colex.hxx +++ b/sw/source/core/uibase/inc/colex.hxx @@ -49,7 +49,7 @@ class SW_DLLPUBLIC SwPageGridExample : public SwPageExample protected: virtual void DrawPage( const Point& rPoint, const bool bSecond, - const bool bEnabled ); + const bool bEnabled ) SAL_OVERRIDE; public: SwPageGridExample(Window* pPar) : SwPageExample(pPar), @@ -69,7 +69,7 @@ class SW_DLLPUBLIC SwColExample : public SwPageExample protected: virtual void DrawPage( const Point& rPoint, const bool bSecond, - const bool bEnabled ); + const bool bEnabled ) SAL_OVERRIDE; public: SwColExample(Window* pPar) @@ -94,14 +94,14 @@ private: SwFmtCol m_aCols; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: SwColumnOnlyExample(Window*); void SetColumns(const SwFmtCol& rCol); - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_INC_COLEX_HXX diff --git a/sw/source/core/uibase/inc/column.hxx b/sw/source/core/uibase/inc/column.hxx index ca7c55c2e692..9102eb102152 100644 --- a/sw/source/core/uibase/inc/column.hxx +++ b/sw/source/core/uibase/inc/column.hxx @@ -81,8 +81,8 @@ public: : ValueSet(pParent, WB_TABSTOP | WB_ITEMBORDER | WB_DOUBLEBORDER) { } - virtual void UserDraw( const UserDrawEvent& rUDEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; /*-------------------------------------------------------------------- @@ -162,8 +162,8 @@ class SwColumnPage : public SfxTabPage using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; SwColumnPage(Window *pParent, const SfxItemSet &rSet); @@ -177,8 +177,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet &rSet); - virtual void Reset(const SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; void SetFrmMode(sal_Bool bMod); void SetPageWidth(long nPageWidth); diff --git a/sw/source/core/uibase/inc/conarc.hxx b/sw/source/core/uibase/inc/conarc.hxx index 354a625468f2..62ec96a421ea 100644 --- a/sw/source/core/uibase/inc/conarc.hxx +++ b/sw/source/core/uibase/inc/conarc.hxx @@ -36,11 +36,11 @@ public: ConstArc(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(const sal_uInt16 nSlotId); // activate function - virtual void Deactivate(); + virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function + virtual void Deactivate() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_INC_CONARC_HXX diff --git a/sw/source/core/uibase/inc/concustomshape.hxx b/sw/source/core/uibase/inc/concustomshape.hxx index 96d6707b9a90..8e38ff85caa3 100644 --- a/sw/source/core/uibase/inc/concustomshape.hxx +++ b/sw/source/core/uibase/inc/concustomshape.hxx @@ -44,18 +44,18 @@ class ConstCustomShape : public SwDrawBase ConstCustomShape( SwWrtShell* pSh, SwEditWin* pWin, SwView* pView, SfxRequest& rReq ); // Mouse- & Key-Events - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(const sal_uInt16 nSlotId); // activate function + virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function OUString GetShapeType() const; static OUString GetShapeTypeFromRequest( SfxRequest& rReq ); - virtual void CreateDefaultObject(); + virtual void CreateDefaultObject() SAL_OVERRIDE; // #i33136# - virtual bool doConstructOrthogonal() const; + virtual bool doConstructOrthogonal() const SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_INC_CONCUSTOMSHAPE_HXX diff --git a/sw/source/core/uibase/inc/condedit.hxx b/sw/source/core/uibase/inc/condedit.hxx index 514a23e58c55..0a9d386c104f 100644 --- a/sw/source/core/uibase/inc/condedit.hxx +++ b/sw/source/core/uibase/inc/condedit.hxx @@ -27,8 +27,8 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper { bool bBrackets, bEnableDrop; - SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; public: ConditionEdit(Window* pParent, WinBits nStyle); diff --git a/sw/source/core/uibase/inc/conform.hxx b/sw/source/core/uibase/inc/conform.hxx index a1226a21f25e..5fb041d0fa94 100644 --- a/sw/source/core/uibase/inc/conform.hxx +++ b/sw/source/core/uibase/inc/conform.hxx @@ -27,10 +27,10 @@ public: ConstFormControl(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(const sal_uInt16 nSlotId); // activate function - virtual void CreateDefaultObject(); + virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function + virtual void CreateDefaultObject() SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/conpoly.hxx b/sw/source/core/uibase/inc/conpoly.hxx index d91c38e0dd6b..2df2d7eaeba0 100644 --- a/sw/source/core/uibase/inc/conpoly.hxx +++ b/sw/source/core/uibase/inc/conpoly.hxx @@ -35,11 +35,11 @@ public: ConstPolygon(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(const sal_uInt16 nSlotId); // activate function + virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function }; #endif // INCLUDED_SW_SOURCE_UI_INC_CONPOLY_HXX diff --git a/sw/source/core/uibase/inc/conrect.hxx b/sw/source/core/uibase/inc/conrect.hxx index 4791935d37ce..3539a63099e3 100644 --- a/sw/source/core/uibase/inc/conrect.hxx +++ b/sw/source/core/uibase/inc/conrect.hxx @@ -40,10 +40,10 @@ class ConstRectangle : public SwDrawBase ConstRectangle(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(const sal_uInt16 nSlotId); // activate function + virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function }; #endif // INCLUDED_SW_SOURCE_UI_INC_CONRECT_HXX diff --git a/sw/source/core/uibase/inc/content.hxx b/sw/source/core/uibase/inc/content.hxx index 2700bd261e83..b4a6c92f6988 100644 --- a/sw/source/core/uibase/inc/content.hxx +++ b/sw/source/core/uibase/inc/content.hxx @@ -36,7 +36,7 @@ class SwRangeRedline; class SwPopup : public PopupMenu { sal_uInt16 nCurId; - virtual void Select(){nCurId = GetCurItemId();} + virtual void Select() SAL_OVERRIDE {nCurId = GetCurItemId();} public: SwPopup() : @@ -96,7 +96,7 @@ public: : SwContent( pCnt, rName, nYPos ), sURL( rURL ), pINetAttr( pAttr ) {} - virtual sal_Bool IsProtect() const; + virtual sal_Bool IsProtect() const SAL_OVERRIDE; const OUString& GetURL() { return sURL; } const SwTxtINetFmt* GetINetAttr() { return pINetAttr; } }; @@ -128,7 +128,7 @@ public: const SwFmtFld* GetPostIt() { return pFld; } SwRangeRedline* GetRedline() { return pRedline; } - virtual sal_Bool IsProtect() const; + virtual sal_Bool IsProtect() const SAL_OVERRIDE; bool IsPostIt() {return mbPostIt; } }; diff --git a/sw/source/core/uibase/inc/conttree.hxx b/sw/source/core/uibase/inc/conttree.hxx index 11d39b9db697..ff808365a589 100644 --- a/sw/source/core/uibase/inc/conttree.hxx +++ b/sw/source/core/uibase/inc/conttree.hxx @@ -97,52 +97,52 @@ class SwContentTree : public SvTreeListBox using SvTreeListBox::EditEntry; protected: - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; SwNavigationPI* GetParentWindow(){return (SwNavigationPI*)Window::GetParent();} - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual void DragFinished( sal_Int8 ); - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; bool FillTransferData( TransferDataContainer& rTransfer, sal_Int8& rDragMode ); bool HasContentChanged(); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, - SvTreeListEntry* ); - virtual bool NotifyAcceptDrop( SvTreeListEntry* ); + SvTreeListEntry* ) SAL_OVERRIDE; + virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE; virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ); + ) SAL_OVERRIDE; virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; void EditEntry( SvTreeListEntry* pEntry, sal_uInt8 nMode ); void GotoContent(SwContent* pCnt); static void SetInDrag(bool bSet) {bIsInDrag = bSet;} - virtual PopupMenu* CreateContextMenu( void ); - virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ); + virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; public: SwContentTree(Window* pParent, const ResId& rResId); ~SwContentTree(); - OUString GetEntryAltText( SvTreeListEntry* pEntry ) const; - OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const; + OUString GetEntryAltText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; + OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; SdrObject* GetDrawingObjectsByContent(const SwContent *pCnt); bool ToggleToRoot(); @@ -189,12 +189,12 @@ public: DECL_LINK( ContentDoubleClickHdl, void * ); DECL_LINK( TimerUpdate, void * ); - virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ); - virtual void RequestingChildren( SvTreeListEntry* pParent ); - virtual void GetFocus(); - virtual void KeyInput(const KeyEvent& rKEvt); + virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE; + virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ); + virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) SAL_OVERRIDE; virtual sal_Int32 GetEntryRealChildrenNum( SvTreeListEntry* pEntry ) const; }; @@ -211,7 +211,7 @@ public: virtual void Paint( const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, - const SvTreeListEntry* pEntry); + const SvTreeListEntry* pEntry) SAL_OVERRIDE; }; namespace sfx2 { class DocumentInserter; } @@ -251,38 +251,38 @@ private: protected: - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ); + virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE; virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ); + ) SAL_OVERRIDE; virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ); + ) SAL_OVERRIDE; - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual void DragFinished( sal_Int8 ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 ) SAL_OVERRIDE; virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, - SvTreeListEntry* ); - virtual bool NotifyAcceptDrop( SvTreeListEntry* ); + SvTreeListEntry* ) SAL_OVERRIDE; + virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void KeyInput(const KeyEvent& rKEvt); - virtual void GetFocus(); - virtual void SelectHdl(); - virtual void DeselectHdl(); - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void SelectHdl() SAL_OVERRIDE; + virtual void DeselectHdl() SAL_OVERRIDE; + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE; void Clear(); @@ -302,8 +302,8 @@ protected: static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;} DECL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, SwGlobalTree*); - virtual PopupMenu* CreateContextMenu( void ); - virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ); + virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; public: SwGlobalTree(Window* pParent, const ResId& rResId); diff --git a/sw/source/core/uibase/inc/cption.hxx b/sw/source/core/uibase/inc/cption.hxx index 578efcdb8e1c..7eb9837e2dfd 100644 --- a/sw/source/core/uibase/inc/cption.hxx +++ b/sw/source/core/uibase/inc/cption.hxx @@ -55,7 +55,7 @@ public: : ComboBox( pParent, nStyle ) {} - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; class SwCaptionDialog : public SvxStandardDialog @@ -96,7 +96,7 @@ class SwCaptionDialog : public SvxStandardDialog DECL_LINK(OptionHdl, Button *); DECL_LINK(CaptionHdl, void *); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; void DrawSample(); void CheckButtonWidth(); diff --git a/sw/source/core/uibase/inc/dbconfig.hxx b/sw/source/core/uibase/inc/dbconfig.hxx index 042a719b7338..d569b26d1d20 100644 --- a/sw/source/core/uibase/inc/dbconfig.hxx +++ b/sw/source/core/uibase/inc/dbconfig.hxx @@ -38,8 +38,8 @@ public: void Load(); const SwDBData& GetAddressSource(); const SwDBData& GetBibliographySource(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/dbinsdlg.hxx b/sw/source/core/uibase/inc/dbinsdlg.hxx index 4d271dd41e2a..60ad6d86186c 100644 --- a/sw/source/core/uibase/inc/dbinsdlg.hxx +++ b/sw/source/core/uibase/inc/dbinsdlg.hxx @@ -144,8 +144,8 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem bool SplitTextToColArr( const OUString& rTxt, _DB_Columns& rColArr, sal_Bool bInsField ); using SfxModalDialog::Notify; - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; void Load(); // set the tables - properties diff --git a/sw/source/core/uibase/inc/dbtree.hxx b/sw/source/core/uibase/inc/dbtree.hxx index 7120cbf25e17..e94b1d22512c 100644 --- a/sw/source/core/uibase/inc/dbtree.hxx +++ b/sw/source/core/uibase/inc/dbtree.hxx @@ -44,17 +44,17 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox SAL_DLLPRIVATE DECL_LINK( DBCompare, SvSortData* ); SAL_DLLPRIVATE void InitTreeList(); - SAL_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent ); + SAL_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - SAL_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; using SvTreeListBox::Select; public: SwDBTreeList(Window* pParent, WinBits nStyle); virtual ~SwDBTreeList(); - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; OUString GetDBName( OUString& rTableName, OUString& rColumnName, sal_Bool* pbIsTable = 0); diff --git a/sw/source/core/uibase/inc/docfnote.hxx b/sw/source/core/uibase/inc/docfnote.hxx index c5289213d2b2..b9d2dac9318b 100644 --- a/sw/source/core/uibase/inc/docfnote.hxx +++ b/sw/source/core/uibase/inc/docfnote.hxx @@ -31,7 +31,7 @@ class SwFootNoteOptionDlg :public SfxTabDialog sal_uInt16 m_nFootNoteId; sal_uInt16 m_nEndNoteId; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; DECL_LINK( OkHdl, Button * ); diff --git a/sw/source/core/uibase/inc/docstdlg.hxx b/sw/source/core/uibase/inc/docstdlg.hxx index a7c427550942..98f4ab192c30 100644 --- a/sw/source/core/uibase/inc/docstdlg.hxx +++ b/sw/source/core/uibase/inc/docstdlg.hxx @@ -38,8 +38,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); protected: - virtual bool FillItemSet( SfxItemSet &rSet); - virtual void Reset (const SfxItemSet &rSet); + virtual bool FillItemSet( SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset (const SfxItemSet &rSet) SAL_OVERRIDE; DECL_LINK(UpdateHdl, void *); diff --git a/sw/source/core/uibase/inc/drpcps.hxx b/sw/source/core/uibase/inc/drpcps.hxx index 27714918c05e..3ddf9f5e2544 100644 --- a/sw/source/core/uibase/inc/drpcps.hxx +++ b/sw/source/core/uibase/inc/drpcps.hxx @@ -73,7 +73,7 @@ friend class SwDropCapsPict; SwDropCapsPage(Window *pParent, const SfxItemSet &rSet); ~SwDropCapsPage(); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; void FillSet( SfxItemSet &rSet ); DECL_LINK(ClickHdl, void *); @@ -89,8 +89,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet &rSet); - virtual void Reset (const SfxItemSet &rSet); + virtual bool FillItemSet( SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset (const SfxItemSet &rSet) SAL_OVERRIDE; void SetFormat(sal_Bool bSet){bFormat = bSet;} protected: diff --git a/sw/source/core/uibase/inc/drwtxtsh.hxx b/sw/source/core/uibase/inc/drwtxtsh.hxx index cd7b4befef17..1da91e4766fc 100644 --- a/sw/source/core/uibase/inc/drwtxtsh.hxx +++ b/sw/source/core/uibase/inc/drwtxtsh.hxx @@ -48,7 +48,7 @@ public: virtual ~SwDrawTextShell(); virtual ::svl::IUndoManager* - GetUndoManager(); + GetUndoManager() SAL_OVERRIDE; void StateDisableItems(SfxItemSet &); diff --git a/sw/source/core/uibase/inc/dselect.hxx b/sw/source/core/uibase/inc/dselect.hxx index d3905bc27e57..c087fa072bf8 100644 --- a/sw/source/core/uibase/inc/dselect.hxx +++ b/sw/source/core/uibase/inc/dselect.hxx @@ -33,9 +33,9 @@ class DrawSelection : public SwDrawBase DrawSelection(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // mouse- & key events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual void Activate(const sal_uInt16 nSlotId); // activate function + virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function }; #endif // INCLUDED_SW_SOURCE_UI_INC_DSELECT_HXX diff --git a/sw/source/core/uibase/inc/edtwin.hxx b/sw/source/core/uibase/inc/edtwin.hxx index 7b6c807a6223..152f4278e744 100644 --- a/sw/source/core/uibase/inc/edtwin.hxx +++ b/sw/source/core/uibase/inc/edtwin.hxx @@ -185,28 +185,28 @@ friend void PageNumNotify( SwViewShell* pVwSh, protected: - virtual void DataChanged( const DataChangedEvent& ); - virtual void PrePaint(); - virtual void Paint( const Rectangle& rRect ); - virtual void KeyInput(const KeyEvent &rKEvt); + virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; + virtual void PrePaint() SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent &rKEvt) SAL_OVERRIDE; - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; - virtual void MouseMove(const MouseEvent& rMEvt); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void MouseButtonUp(const MouseEvent& rMEvt); - virtual void RequestHelp(const HelpEvent& rEvt); + virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void RequestHelp(const HelpEvent& rEvt) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; // Drag & Drop Interface - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; - virtual OUString GetSurroundingText() const; - virtual Selection GetSurroundingTextSelection() const; + virtual OUString GetSurroundingText() const SAL_OVERRIDE; + virtual Selection GetSurroundingTextSelection() const SAL_OVERRIDE; void ShowAutoTextCorrectQuickHelp( const OUString& rWord, SvxAutoCorrCfg* pACfg, SvxAutoCorrect* pACorr, bool bFromIME = false ); @@ -269,7 +269,7 @@ public: const SwView &GetView() const { return m_rView; } SwView &GetView() { return m_rView; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; static inline long GetDDStartPosX() { return m_nDDStartPosX; } static inline long GetDDStartPosY() { return m_nDDStartPosY; } diff --git a/sw/source/core/uibase/inc/envimg.hxx b/sw/source/core/uibase/inc/envimg.hxx index fa3a0e393e79..054d602e1dce 100644 --- a/sw/source/core/uibase/inc/envimg.hxx +++ b/sw/source/core/uibase/inc/envimg.hxx @@ -63,11 +63,11 @@ public: SwEnvItem& operator =(const SwEnvItem& rItem); - virtual bool operator ==(const SfxPoolItem& rItem) const; + virtual bool operator ==(const SfxPoolItem& rItem) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; // class SwEnvCfgItem ------------------------------------------------------- @@ -82,8 +82,8 @@ public: SwEnvItem& GetItem() {return aEnvItem;} - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/envlop.hxx b/sw/source/core/uibase/inc/envlop.hxx index 69ca85d65349..c1557ccd87a9 100644 --- a/sw/source/core/uibase/inc/envlop.hxx +++ b/sw/source/core/uibase/inc/envlop.hxx @@ -43,15 +43,15 @@ class Printer; // class SwEnvPreview --------------------------------------------------------- class SwEnvPreview : public Window { - void Paint(const Rectangle&); + void Paint(const Rectangle&) SAL_OVERRIDE; public: SwEnvPreview(Window * pParent, WinBits nStyle); protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual Size GetOptimalSize() const; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; // class SwEnvDlg ----------------------------------------------------------- @@ -69,8 +69,8 @@ friend class SwEnvPreview; SfxItemSet *pSenderSet; sal_uInt16 m_nEnvPrintId; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); - virtual short Ok(); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual short Ok() SAL_OVERRIDE; public: SwEnvDlg(Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert); @@ -110,11 +110,11 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/fldedt.hxx b/sw/source/core/uibase/inc/fldedt.hxx index 89312e6421ee..17733c5446d1 100644 --- a/sw/source/core/uibase/inc/fldedt.hxx +++ b/sw/source/core/uibase/inc/fldedt.hxx @@ -44,7 +44,7 @@ public: DECL_LINK(OKHdl, void *); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; void EnableInsert(sal_Bool bEnable); void InsertHdl(); diff --git a/sw/source/core/uibase/inc/fldtdlg.hxx b/sw/source/core/uibase/inc/fldtdlg.hxx index 4835a4afb054..1dabf5c2e83c 100644 --- a/sw/source/core/uibase/inc/fldtdlg.hxx +++ b/sw/source/core/uibase/inc/fldtdlg.hxx @@ -38,10 +38,10 @@ class SwFldDlg: public SfxTabDialog sal_uInt16 m_nFuncId; sal_uInt16 m_nDbId; - virtual bool Close(); - virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); - virtual void Activate(); - virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); + virtual bool Close() SAL_OVERRIDE; + virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void Activate() SAL_OVERRIDE; + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; void ReInitTabPage( sal_uInt16 nPageId, sal_Bool bOnlyActivate = sal_False ); diff --git a/sw/source/core/uibase/inc/fldwrap.hxx b/sw/source/core/uibase/inc/fldwrap.hxx index 4a92fcf9c66d..6c43c326e21c 100644 --- a/sw/source/core/uibase/inc/fldwrap.hxx +++ b/sw/source/core/uibase/inc/fldwrap.hxx @@ -31,7 +31,7 @@ public: SFX_DECL_CHILDWINDOW_WITHID(SwFldDlgWrapper); - virtual sal_Bool ReInitDlg(SwDocShell *pDocSh); + virtual sal_Bool ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE; void ShowReferencePage(); }; @@ -48,7 +48,7 @@ public: SFX_DECL_CHILDWINDOW(SwFldDataOnlyDlgWrapper); - virtual sal_Bool ReInitDlg(SwDocShell *pDocSh); + virtual sal_Bool ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/fontcfg.hxx b/sw/source/core/uibase/inc/fontcfg.hxx index 49f536e8f48e..52da0a04af05 100644 --- a/sw/source/core/uibase/inc/fontcfg.hxx +++ b/sw/source/core/uibase/inc/fontcfg.hxx @@ -75,8 +75,8 @@ public: SwStdFontConfig(); ~SwStdFontConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; const OUString& GetFontStandard(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];} const OUString& GetFontOutline(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_OUTLINE + FONT_PER_GROUP * nFontGroup];} diff --git a/sw/source/core/uibase/inc/formedt.hxx b/sw/source/core/uibase/inc/formedt.hxx index eb0cdb05f323..ac3962abec5c 100644 --- a/sw/source/core/uibase/inc/formedt.hxx +++ b/sw/source/core/uibase/inc/formedt.hxx @@ -50,7 +50,7 @@ class SwIdxFormDlg : public SvxStandardDialog DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( AssignHdl, Button * ); void UpdatePattern(); - void Apply(); + void Apply() SAL_OVERRIDE; ListBox aEntryLB; OKButton aOKBtn; diff --git a/sw/source/core/uibase/inc/frmdlg.hxx b/sw/source/core/uibase/inc/frmdlg.hxx index 09ae2b06eef5..7b0959e7727d 100644 --- a/sw/source/core/uibase/inc/frmdlg.hxx +++ b/sw/source/core/uibase/inc/frmdlg.hxx @@ -47,7 +47,7 @@ class SwFrmDlg : public SfxTabDialog sal_uInt16 m_nMacroId; sal_uInt16 m_nBorderId; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: SwFrmDlg( SfxViewFrame *pFrame, Window *pParent, diff --git a/sw/source/core/uibase/inc/frmpage.hxx b/sw/source/core/uibase/inc/frmpage.hxx index 204d6bbb48e5..1b1b1e160a81 100644 --- a/sw/source/core/uibase/inc/frmpage.hxx +++ b/sw/source/core/uibase/inc/frmpage.hxx @@ -130,8 +130,8 @@ class SwFrmPage: public SfxTabPage bool m_bIsMathOLE; bool m_bIsMathBaselineAlignment; - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; DECL_LINK(RangeModifyHdl, void *); DECL_LINK(AnchorTypeHdl, void *); @@ -190,8 +190,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet &rSet); - virtual void Reset(const SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; void SetNewFrame(sal_Bool bNewFrame) { bNew = bNewFrame; } void SetFormatUsed(sal_Bool bFmt); @@ -225,7 +225,7 @@ class SwGrfExtPage: public SfxTabPage DECL_LINK(MirrorHdl, void *); DECL_LINK(BrowseHdl, void *); - virtual void ActivatePage(const SfxItemSet& rSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; SwGrfExtPage(Window *pParent, const SfxItemSet &rSet); ~SwGrfExtPage(); @@ -236,9 +236,9 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual bool FillItemSet(SfxItemSet &rSet); - virtual void Reset(const SfxItemSet &rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; }; class SwFrmURLPage : public SfxTabPage @@ -265,8 +265,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual bool FillItemSet(SfxItemSet &rSet); - virtual void Reset(const SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; }; class SwFrmAddPage : public SfxTabPage @@ -313,8 +313,8 @@ public: static SfxTabPage* Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet &rSet); - virtual void Reset(const SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; void SetFormatUsed(sal_Bool bFmt); void SetFrmType(const OString &rType) { sDlgType = rType; } diff --git a/sw/source/core/uibase/inc/glosbib.hxx b/sw/source/core/uibase/inc/glosbib.hxx index 7620f419784a..d16b026ae307 100644 --- a/sw/source/core/uibase/inc/glosbib.hxx +++ b/sw/source/core/uibase/inc/glosbib.hxx @@ -47,7 +47,7 @@ public: { } - virtual void KeyInput( const KeyEvent& rKEvent ); + virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; }; struct GlosBibUserData @@ -70,7 +70,7 @@ public: { } - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; }; class SwGlossaryGroupDlg : public SvxStandardDialog @@ -95,7 +95,7 @@ class SwGlossaryGroupDlg : public SvxStandardDialog sal_Bool IsDeleteAllowed(const OUString &rGroup); protected: - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; DECL_LINK( SelectHdl, SvTabListBox* ); DECL_LINK(NewHdl, void *); DECL_LINK( DeleteHdl, Button* ); diff --git a/sw/source/core/uibase/inc/gloslst.hxx b/sw/source/core/uibase/inc/gloslst.hxx index fb47656da3f2..9c45736a6c51 100644 --- a/sw/source/core/uibase/inc/gloslst.hxx +++ b/sw/source/core/uibase/inc/gloslst.hxx @@ -72,7 +72,7 @@ public: void Update(); - virtual void Timeout(); + virtual void Timeout() SAL_OVERRIDE; void ClearGroups(); }; diff --git a/sw/source/core/uibase/inc/glossary.hxx b/sw/source/core/uibase/inc/glossary.hxx index 2e343a329bab..177c70576138 100644 --- a/sw/source/core/uibase/inc/glossary.hxx +++ b/sw/source/core/uibase/inc/glossary.hxx @@ -58,18 +58,18 @@ class SwGlTreeListBox : public SvTreeListBox SvTreeListEntry* pDragEntry; virtual DragDropMode NotifyStartDrag( TransferDataContainer& rContainer, - SvTreeListEntry* ); - virtual bool NotifyAcceptDrop( SvTreeListEntry* ); + SvTreeListEntry* ) SAL_OVERRIDE; + virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE; virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ); + ) SAL_OVERRIDE; virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, - sal_uLong& rNewChildPos); + sal_uLong& rNewChildPos) SAL_OVERRIDE; sal_Bool NotifyCopyingOrMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, @@ -77,8 +77,8 @@ class SwGlTreeListBox : public SvTreeListBox public: SwGlTreeListBox(Window* pParent, WinBits nBits); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual Size GetOptimalSize() const; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void Clear(); }; @@ -135,7 +135,7 @@ class SwGlossaryDlg : public SvxStandardDialog DECL_LINK( CheckBoxHdl, CheckBox * ); DECL_LINK( PreviewLoadedHdl, void * ); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; void Init(); SvTreeListEntry* DoesBlockExist(const OUString& sBlock, const OUString& rShort); void ShowAutoText(const OUString& rGroup, const OUString& rShortName); diff --git a/sw/source/core/uibase/inc/glshell.hxx b/sw/source/core/uibase/inc/glshell.hxx index a23e80096d47..eac10f079af9 100644 --- a/sw/source/core/uibase/inc/glshell.hxx +++ b/sw/source/core/uibase/inc/glshell.hxx @@ -29,7 +29,7 @@ class SwGlosDocShell : public SwDocShell using SotObject::GetInterface; protected: - virtual bool Save(); + virtual bool Save() SAL_OVERRIDE; public: @@ -59,7 +59,7 @@ class SwWebGlosDocShell : public SwWebDocShell using SotObject::GetInterface; protected: - virtual bool Save(); + virtual bool Save() SAL_OVERRIDE; public: diff --git a/sw/source/core/uibase/inc/hyp.hxx b/sw/source/core/uibase/inc/hyp.hxx index 02edf350fe63..b642f62910a5 100644 --- a/sw/source/core/uibase/inc/hyp.hxx +++ b/sw/source/core/uibase/inc/hyp.hxx @@ -39,11 +39,11 @@ private: sal_Bool bInfoBox : 1; // display info-box when ending protected: - virtual void SpellStart( SvxSpellArea eSpell ); - virtual bool SpellContinue(); - virtual void SpellEnd( ); - virtual bool SpellMore(); - virtual void InsertHyphen( const sal_uInt16 nPos ); // insert hyphen + virtual void SpellStart( SvxSpellArea eSpell ) SAL_OVERRIDE; + virtual bool SpellContinue() SAL_OVERRIDE; + virtual void SpellEnd( ) SAL_OVERRIDE; + virtual bool SpellMore() SAL_OVERRIDE; + virtual void InsertHyphen( const sal_uInt16 nPos ) SAL_OVERRIDE; // insert hyphen public: SwHyphWrapper( SwView* pVw, diff --git a/sw/source/core/uibase/inc/inpdlg.hxx b/sw/source/core/uibase/inc/inpdlg.hxx index d96c59f484ad..0b7458fbff03 100644 --- a/sw/source/core/uibase/inc/inpdlg.hxx +++ b/sw/source/core/uibase/inc/inpdlg.hxx @@ -37,8 +37,8 @@ class SwWrtShell; class SwFldInputDlg: public SvxStandardDialog { - virtual void Apply(); - virtual void StateChanged( StateChangedType ); + virtual void Apply() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType ) SAL_OVERRIDE; SwWrtShell& rSh; SwInputField* pInpFld; diff --git a/sw/source/core/uibase/inc/inputwin.hxx b/sw/source/core/uibase/inc/inputwin.hxx index 2278f51c23d4..f419c6741318 100644 --- a/sw/source/core/uibase/inc/inputwin.hxx +++ b/sw/source/core/uibase/inc/inputwin.hxx @@ -40,7 +40,7 @@ public: const OUString& aTblName ); protected: - virtual void KeyInput( const KeyEvent& ); + virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; }; class SwInputWindow : public ToolBox @@ -72,8 +72,8 @@ friend class InputEdit; using Window::IsActive; protected: - virtual void Resize(); - virtual void Click(); + virtual void Resize() SAL_OVERRIDE; + virtual void Click() SAL_OVERRIDE; DECL_LINK( MenuHdl, Menu * ); DECL_LINK( DropdownClickHdl, void* ); void ApplyFormula(); @@ -83,7 +83,7 @@ public: SwInputWindow( Window* pParent, SfxBindings* pBindings ); virtual ~SwInputWindow(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SelectHdl( ToolBox*); diff --git a/sw/source/core/uibase/inc/insfnote.hxx b/sw/source/core/uibase/inc/insfnote.hxx index 0c903a9a8341..ad93ef9cad83 100644 --- a/sw/source/core/uibase/inc/insfnote.hxx +++ b/sw/source/core/uibase/inc/insfnote.hxx @@ -60,7 +60,7 @@ class SwInsFootNoteDlg: public SvxStandardDialog DECL_LINK(NumberExtCharHdl, void *); DECL_LINK(NextPrevHdl, Button *); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; void Init(); diff --git a/sw/source/core/uibase/inc/javaedit.hxx b/sw/source/core/uibase/inc/javaedit.hxx index 209c39a931fc..8b79071f0689 100644 --- a/sw/source/core/uibase/inc/javaedit.hxx +++ b/sw/source/core/uibase/inc/javaedit.hxx @@ -65,7 +65,7 @@ private: DECL_LINK(InsertFileHdl, PushButton *); DECL_LINK(DlgClosedHdl, void *); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; void CheckTravel(); void SetFld(); diff --git a/sw/source/core/uibase/inc/label.hxx b/sw/source/core/uibase/inc/label.hxx index 43eb936734e5..95e32f866656 100644 --- a/sw/source/core/uibase/inc/label.hxx +++ b/sw/source/core/uibase/inc/label.hxx @@ -52,7 +52,7 @@ class SwLabDlg : public SfxTabDialog sal_uInt16 m_nPrivateId; void _ReplaceGroup( const OUString &rMake ); - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: SwLabDlg( Window* pParent, const SfxItemSet& rSet, diff --git a/sw/source/core/uibase/inc/labelcfg.hxx b/sw/source/core/uibase/inc/labelcfg.hxx index a70260010d58..2188db5c636e 100644 --- a/sw/source/core/uibase/inc/labelcfg.hxx +++ b/sw/source/core/uibase/inc/labelcfg.hxx @@ -43,8 +43,8 @@ public: SwLabelConfig(); virtual ~SwLabelConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr); const std::vector<OUString>& GetManufacturers() const {return m_aManufacturers;} diff --git a/sw/source/core/uibase/inc/labimg.hxx b/sw/source/core/uibase/inc/labimg.hxx index d668383efb68..69fe4a3db911 100644 --- a/sw/source/core/uibase/inc/labimg.hxx +++ b/sw/source/core/uibase/inc/labimg.hxx @@ -37,9 +37,9 @@ public: SwLabItem& operator =(const SwLabItem& rItem); - virtual bool operator ==(const SfxPoolItem& rItem) const; + virtual bool operator ==(const SfxPoolItem& rItem) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; OUString aLstMake; // remember last selection OUString aLstType; @@ -116,8 +116,8 @@ public: SwLabItem& GetItem() {return aItem;} - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/mailconfigpage.hxx b/sw/source/core/uibase/inc/mailconfigpage.hxx index bf16067b5646..4d5d3aa36399 100644 --- a/sw/source/core/uibase/inc/mailconfigpage.hxx +++ b/sw/source/core/uibase/inc/mailconfigpage.hxx @@ -61,8 +61,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/sw/source/core/uibase/inc/maildispatcher.hxx b/sw/source/core/uibase/inc/maildispatcher.hxx index 512d6fde5b56..76bf4640587b 100644 --- a/sw/source/core/uibase/inc/maildispatcher.hxx +++ b/sw/source/core/uibase/inc/maildispatcher.hxx @@ -128,8 +128,8 @@ public: void addListener(::rtl::Reference<IMailDispatcherListener> listener); protected: - virtual void SAL_CALL run(); - virtual void SAL_CALL onTerminated(); + virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() SAL_OVERRIDE; private: std::list< ::rtl::Reference<IMailDispatcherListener> > cloneListener(); diff --git a/sw/source/core/uibase/inc/mailmergechildwindow.hxx b/sw/source/core/uibase/inc/mailmergechildwindow.hxx index f1ecd5a87c2c..f139fb206840 100644 --- a/sw/source/core/uibase/inc/mailmergechildwindow.hxx +++ b/sw/source/core/uibase/inc/mailmergechildwindow.hxx @@ -33,7 +33,7 @@ public: SwMailMergeChildWin(SfxBindings*, SfxChildWindow*, Window *pParent); ~SwMailMergeChildWin(); - virtual void FillInfo(SfxChildWinInfo&) const; + virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; }; class SwMailMergeChildWindow : public SfxChildWindow diff --git a/sw/source/core/uibase/inc/mailmergehelper.hxx b/sw/source/core/uibase/inc/mailmergehelper.hxx index fc87a3ec9949..8621ce08fcd5 100644 --- a/sw/source/core/uibase/inc/mailmergehelper.hxx +++ b/sw/source/core/uibase/inc/mailmergehelper.hxx @@ -74,11 +74,11 @@ class SW_DLLPUBLIC SwAddressPreview : public Window void DrawText_Impl( const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected); - virtual void Paint(const Rectangle&); - virtual void Resize(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void Paint(const Rectangle&) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; void UpdateScrollBar(); DECL_LINK(ScrollHdl, void*); @@ -163,8 +163,8 @@ public: {} ~SwAuthenticator(); - virtual OUString SAL_CALL getUserName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getUserName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -180,7 +180,7 @@ public: ~SwConnectionContext(); virtual ::com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class SwMutexBase @@ -202,13 +202,13 @@ public: ~SwConnectionListener(); virtual void SAL_CALL connected(const ::com::sun::star::lang::EventObject& aEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disconnected(const ::com::sun::star::lang::EventObject& aEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& aEvent) - throw(com::sun::star::uno::RuntimeException, std::exception); + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class SwMailTransferable : @@ -231,22 +231,22 @@ class SwMailTransferable : ~SwMailTransferable(); virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual ::sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - 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; }; @@ -272,33 +272,33 @@ public: ~SwMailMessage(); // attributes - virtual OUString SAL_CALL getSenderName() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getSenderAddress() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getReplyToAddress() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setReplyToAddress( const OUString& _replytoaddress ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getSubject() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSubject( const OUString& _subject ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSenderName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSenderAddress() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getReplyToAddress() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setReplyToAddress( const OUString& _replytoaddress ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSubject() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSubject( const OUString& _subject ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getBody() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setBody( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _body ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // methods - virtual void SAL_CALL addRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addCcRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addBccRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addCcRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addBccRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getRecipients( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getRecipients( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getCcRecipients( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getCcRecipients( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getBccRecipients( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getBccRecipients( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addAttachment( const ::com::sun::star::mail::MailAttachment& aMailAttachment ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::mail::MailAttachment > SAL_CALL - getAttachments( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAttachments( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SetSenderName(const OUString& rSenderName) {m_sSenderName = rSenderName;} void SetSenderAddress(const OUString& rSenderAddress) diff --git a/sw/source/core/uibase/inc/mailmergewizard.hxx b/sw/source/core/uibase/inc/mailmergewizard.hxx index f7a3b2ce944f..cabd7846b401 100644 --- a/sw/source/core/uibase/inc/mailmergewizard.hxx +++ b/sw/source/core/uibase/inc/mailmergewizard.hxx @@ -58,12 +58,12 @@ class SwMailMergeWizard : public ::svt::RoadmapWizard using svt::OWizardMachine::skipUntil; protected: - virtual svt::OWizardPage* createPage(WizardState _nState); - virtual void enterState( WizardState _nState ); + virtual svt::OWizardPage* createPage(WizardState _nState) SAL_OVERRIDE; + virtual void enterState( WizardState _nState ) SAL_OVERRIDE; // roadmap feature ?? // virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason ); - virtual OUString getStateDisplayName( WizardState _nState ) const; + virtual OUString getStateDisplayName( WizardState _nState ) const SAL_OVERRIDE; public: SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem); @@ -89,8 +89,8 @@ public: void updateRoadmapItemLabel( WizardState _nState ); - virtual short Execute(); - virtual void StartExecuteModal( const Link& rEndDialogHdl ); + virtual short Execute() SAL_OVERRIDE; + virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/mailmrge.hxx b/sw/source/core/uibase/inc/mailmrge.hxx index 8eb176ed751d..e93b16cb4850 100644 --- a/sw/source/core/uibase/inc/mailmrge.hxx +++ b/sw/source/core/uibase/inc/mailmrge.hxx @@ -122,8 +122,8 @@ class SwMailMergeDlg : public SvxStandardDialog DECL_LINK(ModifyHdl, void *); DECL_LINK( SaveTypeHdl, RadioButton* pBtn ); - virtual void Apply(); - virtual void Resize(); + virtual void Apply() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; bool ExecQryShell(); public: diff --git a/sw/source/core/uibase/inc/mergetbl.hxx b/sw/source/core/uibase/inc/mergetbl.hxx index 3926c21b7376..ffb8568e3450 100644 --- a/sw/source/core/uibase/inc/mergetbl.hxx +++ b/sw/source/core/uibase/inc/mergetbl.hxx @@ -30,7 +30,7 @@ class SwMergeTblDlg : public SvxStandardDialog sal_Bool& m_rMergePrev; protected: - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: SwMergeTblDlg( Window *pParent, sal_Bool& rWithPrev ); diff --git a/sw/source/core/uibase/inc/multmrk.hxx b/sw/source/core/uibase/inc/multmrk.hxx index b98192765931..fe40ee33653e 100644 --- a/sw/source/core/uibase/inc/multmrk.hxx +++ b/sw/source/core/uibase/inc/multmrk.hxx @@ -42,7 +42,7 @@ class SwMultiTOXMarkDlg : public SvxStandardDialog SwTOXMgr& rMgr; sal_uInt16 nPos; - void Apply(); + void Apply() SAL_OVERRIDE; public: SwMultiTOXMarkDlg( Window* pParent, SwTOXMgr &rTOXMgr ); ~SwMultiTOXMarkDlg(); diff --git a/sw/source/core/uibase/inc/navicfg.hxx b/sw/source/core/uibase/inc/navicfg.hxx index 77a14d667166..8368c86eaeac 100644 --- a/sw/source/core/uibase/inc/navicfg.hxx +++ b/sw/source/core/uibase/inc/navicfg.hxx @@ -37,8 +37,8 @@ public: SwNavigationConfig(); ~SwNavigationConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; sal_Int32 GetRootType()const {return nRootType;} void SetRootType(sal_Int32 nSet){ diff --git a/sw/source/core/uibase/inc/navipi.hxx b/sw/source/core/uibase/inc/navipi.hxx index 04a6c269c706..cb082903ab6a 100644 --- a/sw/source/core/uibase/inc/navipi.hxx +++ b/sw/source/core/uibase/inc/navipi.hxx @@ -43,8 +43,8 @@ class SwNavigationPI; class SwNavHelpToolBox : public SwHelpToolBox { - virtual void MouseButtonDown(const MouseEvent &rEvt); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void MouseButtonDown(const MouseEvent &rEvt) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId); }; @@ -130,11 +130,11 @@ class SwNavigationPI : public Window, protected: virtual sal_Bool Close(); - virtual void Resize(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; // release ObjectShellLock early enough for app end - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; NumEditAction& GetPageEdit(); sal_Bool ToggleTree(); @@ -152,7 +152,7 @@ public: void MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget, bool bWithCilds); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; static OUString CreateDropFileName( TransferableDataHelper& rData ); static OUString CleanEntry(const OUString& rEntry); diff --git a/sw/source/core/uibase/inc/num.hxx b/sw/source/core/uibase/inc/num.hxx index 7a59e849f7e4..6b27d3301d78 100644 --- a/sw/source/core/uibase/inc/num.hxx +++ b/sw/source/core/uibase/inc/num.hxx @@ -119,10 +119,10 @@ public: const SfxItemSet& rSet); ~SwNumPositionTabPage(); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); @@ -152,8 +152,8 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog sal_uInt16 m_nPositionPageId; protected: - virtual short Ok(); - virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage); + virtual short Ok() SAL_OVERRIDE; + virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) SAL_OVERRIDE; DECL_LINK(RemoveNumberingHdl, void *); public: SwSvxNumBulletTabDialog(Window* pParent, diff --git a/sw/source/core/uibase/inc/numberingtypelistbox.hxx b/sw/source/core/uibase/inc/numberingtypelistbox.hxx index 661252fb8e84..f2aa7c9dd7b5 100644 --- a/sw/source/core/uibase/inc/numberingtypelistbox.hxx +++ b/sw/source/core/uibase/inc/numberingtypelistbox.hxx @@ -38,7 +38,7 @@ public: SwNumberingTypeListBox( Window* pWin, WinBits nStyle = WB_BORDER ); ~SwNumberingTypeListBox(); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; void Reload(sal_uInt16 nTypeFlags); diff --git a/sw/source/core/uibase/inc/numpara.hxx b/sw/source/core/uibase/inc/numpara.hxx index 67aba90cb323..fbab11a0fc6f 100644 --- a/sw/source/core/uibase/inc/numpara.hxx +++ b/sw/source/core/uibase/inc/numpara.hxx @@ -71,8 +71,8 @@ public: const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void EnableNewStart(); void DisableOutline(); diff --git a/sw/source/core/uibase/inc/numprevw.hxx b/sw/source/core/uibase/inc/numprevw.hxx index 71374d899261..827109135a2e 100644 --- a/sw/source/core/uibase/inc/numprevw.hxx +++ b/sw/source/core/uibase/inc/numprevw.hxx @@ -35,7 +35,7 @@ class NumberingPreview : public Window sal_uInt16 nActLevel; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: NumberingPreview(Window* pParent, const ResId& rResId) diff --git a/sw/source/core/uibase/inc/optcomp.hxx b/sw/source/core/uibase/inc/optcomp.hxx index e0a1da8ea987..528e625b3ae2 100644 --- a/sw/source/core/uibase/inc/optcomp.hxx +++ b/sw/source/core/uibase/inc/optcomp.hxx @@ -66,8 +66,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/optload.hxx b/sw/source/core/uibase/inc/optload.hxx index 7aaf68fb3819..e52d4f203fea 100644 --- a/sw/source/core/uibase/inc/optload.hxx +++ b/sw/source/core/uibase/inc/optload.hxx @@ -65,8 +65,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; class SwCaptionOptDlg : public SfxSingleTabDialog @@ -78,7 +78,7 @@ public: class CaptionComboBox : public SwComboBox { protected: - virtual void KeyInput( const KeyEvent& ); + virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; public: CaptionComboBox(Window* pParent, WinBits nStyle) @@ -95,8 +95,8 @@ public: SwCaptionPreview( Window* pParent, WinBits nStyle ); void Init(); void SetPreviewText( const OUString& rText ); - virtual void Paint( const Rectangle& rRect ); - virtual Size GetOptimalSize() const; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; class SwCaptionOptPage : public SfxTabPage @@ -166,8 +166,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/optpage.hxx b/sw/source/core/uibase/inc/optpage.hxx index c8d81879aa37..a33c494a8ca6 100644 --- a/sw/source/core/uibase/inc/optpage.hxx +++ b/sw/source/core/uibase/inc/optpage.hxx @@ -76,8 +76,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; @@ -125,12 +125,12 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetFax( const std::vector<OUString>& ); void SelectFax( const OUString& ); void SetPreview(sal_Bool bPrev); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; @@ -197,11 +197,11 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetFontMode(sal_uInt8 nGroup) {nFontGroup = nGroup;} - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; class SwTableOptionsTabPage : public SfxTabPage @@ -239,11 +239,11 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetWrtShell(SwWrtShell* pSh) {pWrtShell = pSh;} - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; @@ -285,11 +285,11 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetWrtShell( SwWrtShell * pSh ) { m_pWrtShell = pSh; } - virtual void PageCreated( SfxAllItemSet aSet ); + virtual void PageCreated( SfxAllItemSet aSet ) SAL_OVERRIDE; }; /*----------------------------------------------------------------------- @@ -316,12 +316,12 @@ class SwMarkPreview : public Window using OutputDevice::DrawRect; void DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor); - void Paint(const Rectangle&); + void Paint(const Rectangle&) SAL_OVERRIDE; void PaintPage(const Rectangle &rRect); void InitColors( void ); protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: SwMarkPreview(Window* pParent, WinBits nWinBits); @@ -329,7 +329,7 @@ public: inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; } inline void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; } - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; /*----------------------------------------------------------------------- @@ -369,8 +369,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; /*------------------------------------------------------- @@ -388,8 +388,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; private: CheckBox* m_pTest1CBox; @@ -431,8 +431,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/outline.hxx b/sw/source/core/uibase/inc/outline.hxx index 6903d74d60bf..50496d5cfe2b 100644 --- a/sw/source/core/uibase/inc/outline.hxx +++ b/sw/source/core/uibase/inc/outline.hxx @@ -63,8 +63,8 @@ class SwOutlineTabDialog : public SfxTabDialog DECL_LINK( FormHdl, Button * ); DECL_LINK( MenuSelectHdl, Menu * ); - virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage); - virtual short Ok(); + virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) SAL_OVERRIDE; + virtual short Ok() SAL_OVERRIDE; public: SwOutlineTabDialog(Window* pParent, @@ -124,11 +124,11 @@ public: void SetWrtShell(SwWrtShell* pShell); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); }; diff --git a/sw/source/core/uibase/inc/pgfnote.hxx b/sw/source/core/uibase/inc/pgfnote.hxx index 270656b7095b..38717ef02d61 100644 --- a/sw/source/core/uibase/inc/pgfnote.hxx +++ b/sw/source/core/uibase/inc/pgfnote.hxx @@ -37,8 +37,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet &rSet); - virtual void Reset(const SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; private: SwFootNotePage(Window *pParent, const SfxItemSet &rSet); @@ -67,8 +67,8 @@ private: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; }; diff --git a/sw/source/core/uibase/inc/pggrid.hxx b/sw/source/core/uibase/inc/pggrid.hxx index 8afce35e8fa6..bd770e59114e 100644 --- a/sw/source/core/uibase/inc/pggrid.hxx +++ b/sw/source/core/uibase/inc/pggrid.hxx @@ -89,11 +89,11 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet &rSet); - virtual void Reset(const SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/popbox.hxx b/sw/source/core/uibase/inc/popbox.hxx index e085886eaa81..7bba9a53ffc0 100644 --- a/sw/source/core/uibase/inc/popbox.hxx +++ b/sw/source/core/uibase/inc/popbox.hxx @@ -32,10 +32,10 @@ class SwHelpToolBox: public ToolBox, public DropTargetHelper using ToolBox::DoubleClick; protected: - virtual void MouseButtonDown(const MouseEvent &rEvt); + virtual void MouseButtonDown(const MouseEvent &rEvt) SAL_OVERRIDE; virtual long DoubleClick(ToolBox *); - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; public: SwHelpToolBox(SwNavigationPI* pParent, const ResId &); diff --git a/sw/source/core/uibase/inc/pview.hxx b/sw/source/core/uibase/inc/pview.hxx index ac70a08e7aed..e1b82d79da30 100644 --- a/sw/source/core/uibase/inc/pview.hxx +++ b/sw/source/core/uibase/inc/pview.hxx @@ -63,11 +63,11 @@ public: ~SwPagePreviewWin(); // calls SwViewShell::Paint - virtual void Paint( const Rectangle& rRect ); - virtual void KeyInput( const KeyEvent & ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void DataChanged( const DataChangedEvent& ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent & ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; void SetViewShell( SwViewShell* pShell ); @@ -126,7 +126,7 @@ public: return maPaintedPreviewDocRect; } - void Scroll(long nXMove, long nYMove, sal_uInt16 nFlags = 0); + void Scroll(long nXMove, long nYMove, sal_uInt16 nFlags = 0) SAL_OVERRIDE; /** Method to enable/disable book preview @param _bBookPreview @@ -139,7 +139,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessible(); + CreateAccessible() SAL_OVERRIDE; virtual void SwitchView(); }; @@ -189,11 +189,11 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * ); SAL_DLLPRIVATE bool ChgPage( int eMvMode, int bUpdateScrollbar = sal_True ); - SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ); - SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); - SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const; + SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, - const SfxItemSet &rOptions ); + const SfxItemSet &rOptions ) SAL_OVERRIDE; SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool bInner ); @@ -210,8 +210,8 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SfxRequest* _pReq = 0 ); protected: - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); - virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; + virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; void SetZoom(SvxZoomType eSet, sal_uInt16 nFactor); diff --git a/sw/source/core/uibase/inc/redlndlg.hxx b/sw/source/core/uibase/inc/redlndlg.hxx index 2ee42bdef5c6..206511feb7da 100644 --- a/sw/source/core/uibase/inc/redlndlg.hxx +++ b/sw/source/core/uibase/inc/redlndlg.hxx @@ -139,8 +139,8 @@ public: SwModelessRedlineAcceptDlg(SfxBindings*, SwChildWinWrapper*, Window *pParent); ~SwModelessRedlineAcceptDlg(); - virtual void Activate(); - virtual void FillInfo(SfxChildWinInfo&) const; + virtual void Activate() SAL_OVERRIDE; + virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; void Initialize (SfxChildWinInfo* pInfo); }; @@ -154,7 +154,7 @@ public: SFX_DECL_CHILDWINDOW_WITHID( SwRedlineAcceptChild ); - virtual sal_Bool ReInitDlg(SwDocShell *pDocSh); + virtual sal_Bool ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/regionsw.hxx b/sw/source/core/uibase/inc/regionsw.hxx index 185f60246bcc..1101bfb8fe15 100644 --- a/sw/source/core/uibase/inc/regionsw.hxx +++ b/sw/source/core/uibase/inc/regionsw.hxx @@ -191,8 +191,8 @@ public: void SetWrtShell(SwWrtShell& rSh); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); @@ -233,8 +233,8 @@ public: SwSectionFtnEndTabPage( Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionFtnEndTabPage(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); @@ -251,8 +251,8 @@ public: SwSectionIndentTabPage( Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionIndentTabPage(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); @@ -272,8 +272,8 @@ class SwInsertSectionTabDialog : public SfxTabDialog sal_uInt16 m_nIndentPage; protected: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); - virtual short Ok(); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual short Ok() SAL_OVERRIDE; public: SwInsertSectionTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwInsertSectionTabDialog(); @@ -292,7 +292,7 @@ class SwSectionPropertyTabDialog : public SfxTabDialog sal_uInt16 m_nIndentPage; protected: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: SwSectionPropertyTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwSectionPropertyTabDialog(); diff --git a/sw/source/core/uibase/inc/rowht.hxx b/sw/source/core/uibase/inc/rowht.hxx index 022c1d2940f2..aaaeeb3a9e56 100644 --- a/sw/source/core/uibase/inc/rowht.hxx +++ b/sw/source/core/uibase/inc/rowht.hxx @@ -33,7 +33,7 @@ class SwTableHeightDlg : public SvxStandardDialog SwWrtShell &rSh; protected: - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: SwTableHeightDlg( Window *pParent, SwWrtShell &rS ); diff --git a/sw/source/core/uibase/inc/scroll.hxx b/sw/source/core/uibase/inc/scroll.hxx index ba0f66b33398..0d2743525d7d 100644 --- a/sw/source/core/uibase/inc/scroll.hxx +++ b/sw/source/core/uibase/inc/scroll.hxx @@ -37,7 +37,7 @@ public: void ExtendedShow( sal_Bool bVisible = sal_True ); void Hide() { Show( false ); } - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE; sal_Bool IsVisible(sal_Bool bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; } // changing of document size diff --git a/sw/source/core/uibase/inc/splittbl.hxx b/sw/source/core/uibase/inc/splittbl.hxx index 522f1d65cab4..013878e3108e 100644 --- a/sw/source/core/uibase/inc/splittbl.hxx +++ b/sw/source/core/uibase/inc/splittbl.hxx @@ -36,7 +36,7 @@ class SwSplitTblDlg : public SvxStandardDialog sal_uInt16 m_nSplit; protected: - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: SwSplitTblDlg( Window *pParent, SwWrtShell &rSh ); diff --git a/sw/source/core/uibase/inc/srcedtw.hxx b/sw/source/core/uibase/inc/srcedtw.hxx index c490dc4d6193..4560a86c68aa 100644 --- a/sw/source/core/uibase/inc/srcedtw.hxx +++ b/sw/source/core/uibase/inc/srcedtw.hxx @@ -42,13 +42,13 @@ class TextViewOutWin : public Window ExtTextView* pTextView; protected: - virtual void Paint( const Rectangle& ); - virtual void KeyInput( const KeyEvent& rKeyEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void DataChanged( const DataChangedEvent& ); + virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; public: TextViewOutWin(Window* pParent, WinBits nBits) : @@ -102,15 +102,15 @@ private: protected: - virtual void Resize(); - virtual void DataChanged( const DataChangedEvent& ); - virtual void GetFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; // virtual void LoseFocus(); void CreateTextEngine(); void DoSyntaxHighlight( sal_uInt16 nPara ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; DECL_LINK(ScrollHdl, ScrollBar*); @@ -131,7 +131,7 @@ public: TextViewOutWin* GetOutWin() {return pOutWin;} - virtual void Invalidate( sal_uInt16 nFlags = 0 ); + virtual void Invalidate( sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; void ClearModifyFlag() { pTextEngine->SetModified(false); } @@ -146,7 +146,7 @@ public: void SetStartLine(sal_uInt16 nLine){nStartLine = nLine;} - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; void HandleWheelCommand( const CommandEvent& rCEvt ); void SetTextEncoding(rtl_TextEncoding eEncoding); diff --git a/sw/source/core/uibase/inc/srcview.hxx b/sw/source/core/uibase/inc/srcview.hxx index 3a6d054e91ca..4513a116943e 100644 --- a/sw/source/core/uibase/inc/srcview.hxx +++ b/sw/source/core/uibase/inc/srcview.hxx @@ -41,7 +41,7 @@ class SwSrcView: public SfxViewShell void Init(); // for read-only switching - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; protected: sal_uInt16 StartSearchAndReplace(const SvxSearchItem& rItem, @@ -74,8 +74,8 @@ public: void Load(SwDocShell* pDocShell); - virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, sal_uInt16 nDiff = SFX_PRINTER_ALL, bool bIsAPI=false ); - virtual SfxPrinter* GetPrinter( bool bCreate = false ); + virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, sal_uInt16 nDiff = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE; + virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; sal_Int32 PrintSource( OutputDevice *pOutDev, sal_Int32 nPage, bool bCalcNumPagesOnly ); diff --git a/sw/source/core/uibase/inc/srtdlg.hxx b/sw/source/core/uibase/inc/srtdlg.hxx index 90fc60ab165a..e655b6eb88e2 100644 --- a/sw/source/core/uibase/inc/srtdlg.hxx +++ b/sw/source/core/uibase/inc/srtdlg.hxx @@ -74,7 +74,7 @@ class SwSortDlg : public SvxStandardDialog sal_uInt16 nX; sal_uInt16 nY; - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; sal_Unicode GetDelimChar() const; DECL_LINK( CheckHdl, CheckBox * ); diff --git a/sw/source/core/uibase/inc/swdtflvr.hxx b/sw/source/core/uibase/inc/swdtflvr.hxx index 0cef72140788..9a501a0641ca 100644 --- a/sw/source/core/uibase/inc/swdtflvr.hxx +++ b/sw/source/core/uibase/inc/swdtflvr.hxx @@ -136,14 +136,14 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper SwTransferable& operator=( const SwTransferable& ); protected: - virtual void AddSupportedFormats(); - virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor ); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, - const css::datatransfer::DataFlavor& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); - virtual void ObjectReleased(); + const css::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; + virtual void ObjectReleased() SAL_OVERRIDE; using TransferableHelper::StartDrag; @@ -205,7 +205,7 @@ public: void Invalidate() {pWrtShell = 0;} static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx b/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx index 8c38330b83d8..d63683bb03da 100644 --- a/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx +++ b/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx @@ -32,7 +32,7 @@ public: ~SwModalRedlineAcceptDlg(); void AcceptAll( sal_Bool bAccept ); - virtual void Activate(); + virtual void Activate() SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/swruler.hxx b/sw/source/core/uibase/inc/swruler.hxx index aebf0b97396d..589f714d77c4 100644 --- a/sw/source/core/uibase/inc/swruler.hxx +++ b/sw/source/core/uibase/inc/swruler.hxx @@ -39,7 +39,7 @@ public: * Paint the ruler. * \param rRect ignored */ - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; protected: SwViewShell * mpViewShell; //< Shell to check if there is any comments on doc and their visibility @@ -54,26 +54,26 @@ protected: * * When on comment control, it toggles the comment panel visibility. */ - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; /** * Callback function to handle a mouse move event. * * When on comment control, it let the control responsive by highlighting. */ - virtual void MouseMove(const MouseEvent& rMEvt); + virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; /** * Callback function to handle a context menu call (mouse right button click). * * When on comment control, it does not do anything. */ - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; /** * Update the view. * * Update the ruler appearance according to the document view and * current cursor position. */ - virtual void Update(); + virtual void Update() SAL_OVERRIDE; /** * Get the rectangle area that should be used to draw the comment control. diff --git a/sw/source/core/uibase/inc/swuiccoll.hxx b/sw/source/core/uibase/inc/swuiccoll.hxx index 53e2fabaabd1..9e6f49588b30 100644 --- a/sw/source/core/uibase/inc/swuiccoll.hxx +++ b/sw/source/core/uibase/inc/swuiccoll.hxx @@ -50,7 +50,7 @@ class SwCondCollPage : public SfxTabPage SwCondCollPage(Window *pParent, const SfxItemSet &rSet); virtual ~SwCondCollPage(); - virtual int DeactivatePage(SfxItemSet *pSet); + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; DECL_LINK( OnOffHdl, CheckBox* ); DECL_LINK( AssignRemoveHdl, PushButton*); @@ -64,8 +64,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet &rSet); - virtual void Reset (const SfxItemSet &rSet); + virtual bool FillItemSet( SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset (const SfxItemSet &rSet) SAL_OVERRIDE; void SetCollection( SwFmt* pFormat, sal_Bool bNew ); }; diff --git a/sw/source/core/uibase/inc/swuicnttab.hxx b/sw/source/core/uibase/inc/swuicnttab.hxx index 27385112a311..c267afeb7bbd 100644 --- a/sw/source/core/uibase/inc/swuicnttab.hxx +++ b/sw/source/core/uibase/inc/swuicnttab.hxx @@ -90,7 +90,7 @@ class SwMultiTOXTabDialog : public SfxTabDialog sal_Bool bExampleCreated; sal_Bool bGlobalFlag; - virtual short Ok(); + virtual short Ok() SAL_OVERRIDE; SwTOXDescription* CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); DECL_LINK(CreateExample_Hdl, void*); @@ -103,7 +103,7 @@ public: sal_Bool bGlobal = sal_False); ~SwMultiTOXTabDialog(); - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; SwForm* GetForm(CurTOXType eType); @@ -222,11 +222,11 @@ public: SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXSelectTabPage(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); @@ -314,8 +314,8 @@ public: sal_Bool CreateQuickHelp(Control* pCtrl, const SwFormToken& rToken, const HelpEvent& ); - virtual void GetFocus(); - virtual void setAllocation(const Size &rAllocation); + virtual void GetFocus() SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; void SetFocus2theAllBtn(); private: sal_uInt32 GetControlIndex(FormTokenType eType) const; @@ -327,7 +327,7 @@ class SwIdxTreeListBox : public SvTreeListBox { SwTOXEntryTabPage* pParent; - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: SwIdxTreeListBox(Window* pPar, WinBits nStyle); void SetTabPage(SwTOXEntryTabPage* pPar) { pParent = pPar; } @@ -435,10 +435,10 @@ public: SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXEntryTabPage(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); @@ -448,7 +448,7 @@ public: void PreTokenButtonRemoved(const SwFormToken& rToken); void SetFocus2theAllBtn(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; class SwTOXStylesTabPage : public SfxTabPage @@ -481,11 +481,11 @@ public: SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXStylesTabPage(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); diff --git a/sw/source/core/uibase/inc/swuiidxmrk.hxx b/sw/source/core/uibase/inc/swuiidxmrk.hxx index e552586e353b..7f2a53977543 100644 --- a/sw/source/core/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/core/uibase/inc/swuiidxmrk.hxx @@ -152,7 +152,7 @@ public: class SwIndexMarkFloatDlg : public SfxModelessDialog { SwIndexMarkPane m_aContent; - virtual void Activate(); + virtual void Activate() SAL_OVERRIDE; public: SwIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, @@ -168,7 +168,7 @@ class SwIndexMarkModalDlg : public SvxStandardDialog public: SwIndexMarkModalDlg(Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; void ReInitDlg(SwWrtShell& rWrtShell); }; @@ -228,7 +228,7 @@ public: class SwAuthMarkFloatDlg : public SfxModelessDialog { SwAuthorMarkPane m_aContent; - virtual void Activate(); + virtual void Activate() SAL_OVERRIDE; public: SwAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, @@ -244,7 +244,7 @@ class SwAuthMarkModalDlg : public SvxStandardDialog public: SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; void ReInitDlg(SwWrtShell& rWrtShell); }; diff --git a/sw/source/core/uibase/inc/swuipardlg.hxx b/sw/source/core/uibase/inc/swuipardlg.hxx index 7552b53a1a59..3c6f3cc951f3 100644 --- a/sw/source/core/uibase/inc/swuipardlg.hxx +++ b/sw/source/core/uibase/inc/swuipardlg.hxx @@ -35,7 +35,7 @@ class SwParaDlg: public SfxTabDialog sal_uInt16 m_nParaBckGrnd; sal_uInt16 m_nParaBorder; - void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); + void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; public: SwParaDlg( Window *pParent, diff --git a/sw/source/core/uibase/inc/swvset.hxx b/sw/source/core/uibase/inc/swvset.hxx index 10b71577f1d2..c229998213e6 100644 --- a/sw/source/core/uibase/inc/swvset.hxx +++ b/sw/source/core/uibase/inc/swvset.hxx @@ -25,7 +25,7 @@ class SwRulerValueSet : public SvxBmpNumValueSet public: SwRulerValueSet(Window* pParent, WinBits nWinStyle); ~SwRulerValueSet(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/swwrtshitem.hxx b/sw/source/core/uibase/inc/swwrtshitem.hxx index 36c3b52e8c95..8e3974a4be05 100644 --- a/sw/source/core/uibase/inc/swwrtshitem.hxx +++ b/sw/source/core/uibase/inc/swwrtshitem.hxx @@ -33,8 +33,8 @@ public: SwWrtShellItem( sal_uInt16 nWhich , SwWrtShell* pWrtSh); SwWrtShellItem( const SwWrtShellItem& ); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; SwWrtShell* GetValue() const { return pWrtSh; } diff --git a/sw/source/core/uibase/inc/tabledlg.hxx b/sw/source/core/uibase/inc/tabledlg.hxx index d18be07670dc..8349b4c7859c 100644 --- a/sw/source/core/uibase/inc/tabledlg.hxx +++ b/sw/source/core/uibase/inc/tabledlg.hxx @@ -38,7 +38,7 @@ class SwTableTabDlg : public SfxTabDialog sal_uInt16 m_nBackgroundId; sal_uInt16 m_nBorderId; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; public: SwTableTabDlg( Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh ); diff --git a/sw/source/core/uibase/inc/tblctrl.hxx b/sw/source/core/uibase/inc/tblctrl.hxx index fbf66057e2ae..679227d12496 100644 --- a/sw/source/core/uibase/inc/tblctrl.hxx +++ b/sw/source/core/uibase/inc/tblctrl.hxx @@ -30,8 +30,8 @@ public: SwTableOptimizeCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SwTableOptimizeCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; }; diff --git a/sw/source/core/uibase/inc/tbxanchr.hxx b/sw/source/core/uibase/inc/tbxanchr.hxx index 96eed47f58d5..d9c6d70fb49a 100644 --- a/sw/source/core/uibase/inc/tbxanchr.hxx +++ b/sw/source/core/uibase/inc/tbxanchr.hxx @@ -27,9 +27,9 @@ class SwTbxAnchor : public SfxToolBoxControl public: - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Click(); - virtual SfxPopupWindow* CreatePopupWindow(); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Click() SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sw/source/core/uibase/inc/tmpdlg.hxx b/sw/source/core/uibase/inc/tmpdlg.hxx index 54c57484336a..7af4a1807069 100644 --- a/sw/source/core/uibase/inc/tmpdlg.hxx +++ b/sw/source/core/uibase/inc/tmpdlg.hxx @@ -78,10 +78,10 @@ public: SwWrtShell* pActShell = 0, bool bNew = false ); - const SfxItemSet* GetRefreshedSet(); + const SfxItemSet* GetRefreshedSet() SAL_OVERRIDE; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); - virtual short Ok(); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual short Ok() SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/tmplctrl.hxx b/sw/source/core/uibase/inc/tmplctrl.hxx index 9deea7c83496..7d243df6edbb 100644 --- a/sw/source/core/uibase/inc/tmplctrl.hxx +++ b/sw/source/core/uibase/inc/tmplctrl.hxx @@ -25,11 +25,11 @@ class SwTemplateControl : public SfxStatusBarControl { protected: - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sw/source/core/uibase/inc/uiitems.hxx b/sw/source/core/uibase/inc/uiitems.hxx index 033adf755882..d90b35eac6a9 100644 --- a/sw/source/core/uibase/inc/uiitems.hxx +++ b/sw/source/core/uibase/inc/uiitems.hxx @@ -41,16 +41,16 @@ public: SwPageFtnInfoItem(const SwPageFtnInfoItem& rItem ); ~SwPageFtnInfoItem(); - 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; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; SwPageFtnInfo& GetPageFtnInfo() { return aFtnInfo; } const SwPageFtnInfo& GetPageFtnInfo() const { return aFtnInfo; } @@ -65,8 +65,8 @@ public: SwPtrItem( const sal_uInt16 nId = FN_PARAM_GRF_DIALOG, void* pPtr = 0); SwPtrItem( const SwPtrItem& rItem ); - 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; void SetValue(void * pPtr) { pMisc= pPtr; } void* GetValue() const { return pMisc; } @@ -81,11 +81,11 @@ public: SwUINumRuleItem( const SwUINumRuleItem& rItem ); virtual ~SwUINumRuleItem(); - 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; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; const SwNumRule* GetNumRule() const { return pRule; } SwNumRule* GetNumRule() { return pRule; } @@ -96,7 +96,7 @@ class SwBackgroundDestinationItem : public SfxUInt16Item public: SwBackgroundDestinationItem(sal_uInt16 nWhich, sal_uInt16 nValue); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; }; class SW_DLLPUBLIC SwPaMItem : public SfxPoolItem @@ -107,8 +107,8 @@ public: SwPaMItem( const sal_uInt16 nId = FN_PARAM_PAM, SwPaM* pPaM = NULL); SwPaMItem( const SwPaMItem& rItem ); - 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; void SetValue(SwPaM * pPaM) { m_pPaM= pPaM; } SwPaM* GetValue() const { return m_pPaM; } diff --git a/sw/source/core/uibase/inc/uinums.hxx b/sw/source/core/uibase/inc/uinums.hxx index a474dbd88bd1..b28fd2a5222e 100644 --- a/sw/source/core/uibase/inc/uinums.hxx +++ b/sw/source/core/uibase/inc/uinums.hxx @@ -108,7 +108,7 @@ public: virtual ~SwChapterNumRules(); virtual void ApplyNumRules( const SwNumRulesWithName &rCopy, - sal_uInt16 nIdx); + sal_uInt16 nIdx) SAL_OVERRIDE; }; // INLINE METHODE -------------------------------------------------------- diff --git a/sw/source/core/uibase/inc/uivwimp.hxx b/sw/source/core/uibase/inc/uivwimp.hxx index 075dbf626708..b0e94379bebe 100644 --- a/sw/source/core/uibase/inc/uivwimp.hxx +++ b/sw/source/core/uibase/inc/uivwimp.hxx @@ -55,7 +55,7 @@ public: // XEventListener virtual void SAL_CALL disposing( - const ::com::sun::star::lang::EventObject& rEventObject ) throw(::com::sun::star::uno::RuntimeException, std::exception); + const ::com::sun::star::lang::EventObject& rEventObject ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void ViewDestroyed() { pView = 0; } }; @@ -68,12 +68,12 @@ class SwClipboardChangeListener : public ::cppu::WeakImplHelper1< // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObject ) - throw ( com::sun::star::uno::RuntimeException, std::exception ); + throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XClipboardListener virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& rEventObject ) throw (com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; public: SwClipboardChangeListener( SwView& rView ) : pView( &rView ) {} diff --git a/sw/source/core/uibase/inc/unoatxt.hxx b/sw/source/core/uibase/inc/unoatxt.hxx index 3a27de5d55e7..90338fdb3973 100644 --- a/sw/source/core/uibase/inc/unoatxt.hxx +++ b/sw/source/core/uibase/inc/unoatxt.hxx @@ -66,26 +66,26 @@ public: SwXAutoTextContainer(); //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 nIndex) 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 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) 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; //XAutoTextContainer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup > SAL_CALL insertNewByName(const OUString& aGroupName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup > SAL_CALL insertNewByName(const OUString& aGroupName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -113,44 +113,44 @@ public: 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 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XAutoTextGroup - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTitles(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTitles(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNamed - virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setName(const OUString& Name_) 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 nIndex) 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 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void Invalidate(); }; @@ -195,7 +195,7 @@ protected: void implFlushDocument( bool _bCloseDoc = false ); // SfxListener overridables - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; protected: virtual ~SwXAutoTextEntry(); // ref-counted objects are not to be deleted from outside -> protected dtor @@ -206,33 +206,33 @@ public: 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 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - 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 > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - 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 ); - 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 ); - virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); - 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); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL insertControlCharacter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual OUString SAL_CALL getString(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getString(void) 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; //XAutoTextEntry - virtual void SAL_CALL applyTo(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange)throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL applyTo(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange)throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void Invalidate() {pGlossaries = 0;} const SwGlossaries* GetGlossaries() { return pGlossaries; } @@ -256,7 +256,7 @@ public: ~SwAutoTextEventDescriptor(); virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: @@ -267,7 +267,7 @@ protected: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void getByName( SvxMacro& rMacro, /// macro to be filled @@ -275,7 +275,7 @@ protected: throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/unodispatch.hxx b/sw/source/core/uibase/inc/unodispatch.hxx index eced0ec34c8c..23a2a7ab21e7 100644 --- a/sw/source/core/uibase/inc/unodispatch.hxx +++ b/sw/source/core/uibase/inc/unodispatch.hxx @@ -68,21 +68,21 @@ public: ~SwXDispatchProviderInterceptor(); //XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XDispatchProviderInterceptor - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // view destroyed void Invalidate(); @@ -110,15 +110,15 @@ public: virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XSelectionChangeListener - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static const sal_Char* GetDBChangeURL(); }; diff --git a/sw/source/core/uibase/inc/unomailmerge.hxx b/sw/source/core/uibase/inc/unomailmerge.hxx index 211c2cbfe41b..a0780f46af52 100644 --- a/sw/source/core/uibase/inc/unomailmerge.hxx +++ b/sw/source/core/uibase/inc/unomailmerge.hxx @@ -153,33 +153,33 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; // XCancellable - virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMailMergeBroadcaster - virtual void SAL_CALL addMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) 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; // 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; }; extern com::sun::star::uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw(); diff --git a/sw/source/core/uibase/inc/unomod.hxx b/sw/source/core/uibase/inc/unomod.hxx index 1d1c8823eb7c..306045104621 100644 --- a/sw/source/core/uibase/inc/unomod.hxx +++ b/sw/source/core/uibase/inc/unomod.hxx @@ -55,19 +55,19 @@ public: //XViewSettings virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPrintSettings virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getPrintSettings(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; enum SwXPrintSettingsType @@ -86,18 +86,18 @@ protected: SwDoc *mpDoc; virtual void _preSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _postSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _preGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _postGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual ~SwXPrintSettings() throw(); @@ -106,11 +106,11 @@ public: //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; class SwXViewSettings : public comphelper::ChainableHelperNoState @@ -129,18 +129,18 @@ protected: sal_Bool mbApplyVRulerMetric; virtual void _preSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _postSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _preGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _postGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual ~SwXViewSettings() throw(); @@ -148,9 +148,9 @@ public: SwXViewSettings(sal_Bool bWeb, SwView* pView); //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; sal_Bool IsValid() const {return bObjectValid;} void Invalidate() {bObjectValid = sal_False;} diff --git a/sw/source/core/uibase/inc/unotools.hxx b/sw/source/core/uibase/inc/unotools.hxx index e821ec97dd97..480590135b64 100644 --- a/sw/source/core/uibase/inc/unotools.hxx +++ b/sw/source/core/uibase/inc/unotools.hxx @@ -41,9 +41,9 @@ class SwFrmCtrlWindow : public VclEventBox public: SwFrmCtrlWindow(Window* pParent, SwOneExampleFrame* pFrame); - virtual void Command( const CommandEvent& rCEvt ); - virtual Size GetOptimalSize() const; - virtual void Resize(); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; }; class MenuResource : public Resource diff --git a/sw/source/core/uibase/inc/unotxvw.hxx b/sw/source/core/uibase/inc/unotxvw.hxx index 76f370ca1eba..9346cab1cd9a 100644 --- a/sw/source/core/uibase/inc/unotxvw.hxx +++ b/sw/source/core/uibase/inc/unotxvw.hxx @@ -76,76 +76,76 @@ protected: public: SwXTextView(SwView* pSwView); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw(); - virtual void SAL_CALL release( ) throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw() SAL_OVERRIDE; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XSelectionSupplier virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL select(const ::com::sun::star::uno::Any& rInterface) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL addSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFormLayerAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFormDesignMode( ::sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFormDesignMode( ::sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XControlAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XTextViewCursorSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > SAL_CALL getViewCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > SAL_CALL getViewCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XViewSettings - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XRubySelection virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL setRubyList( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + 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::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); - 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); + 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XTransferableSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable( ) throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void NotifySelChanged(); void NotifyDBChanged(); @@ -183,154 +183,154 @@ public: DECLARE_XINTERFACE() //XTextViewCursor - virtual sal_Bool SAL_CALL isVisible(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::awt::Point SAL_CALL getPosition(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL isVisible(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getPosition(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XTextCursor - neu virtual void SAL_CALL collapseToStart() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL collapseToEnd() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isCollapsed() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XPageCursor virtual sal_Bool SAL_CALL jumpToFirstPage() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL jumpToLastPage() throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL jumpToNextPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL jumpToPreviousPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL jumpToEndOfPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL jumpToStartOfPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL jumpToNextPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL jumpToPreviousPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL jumpToEndOfPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL jumpToStartOfPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getPage() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, - std::exception); + 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); + 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); + std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getString() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL setString(const OUString& aString) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XScreenCursor virtual sal_Bool SAL_CALL screenDown() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL screenUp() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XViewCursor virtual sal_Bool SAL_CALL goDown(sal_Int16 nCount, sal_Bool bExpand) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL goUp(sal_Int16 nCount, sal_Bool bExpand) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XLineCursor virtual sal_Bool SAL_CALL isAtStartOfLine() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAtEndOfLine() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL gotoEndOfLine(sal_Bool bExpand) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL gotoStartOfLine(sal_Bool bExpand) throw (::com::sun::star::uno::RuntimeException, - std::exception); + 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 ::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); + 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); - 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); + 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); + 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); + 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); + 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); + std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void Invalidate(){m_pView = 0;} // ITextCursorHelper - virtual const SwPaM* GetPaM() const; - virtual SwPaM* GetPaM(); - virtual const SwDoc* GetDoc() const; - virtual SwDoc* GetDoc(); + virtual const SwPaM* GetPaM() const SAL_OVERRIDE; + virtual SwPaM* GetPaM() SAL_OVERRIDE; + virtual const SwDoc* GetDoc() const SAL_OVERRIDE; + virtual SwDoc* GetDoc() SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/usrpref.hxx b/sw/source/core/uibase/inc/usrpref.hxx index 9169166c5a6b..8d04de4874f8 100644 --- a/sw/source/core/uibase/inc/usrpref.hxx +++ b/sw/source/core/uibase/inc/usrpref.hxx @@ -37,8 +37,8 @@ class SwContentViewConfig : public utl::ConfigItem ~SwContentViewConfig(); // utl::ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} @@ -54,8 +54,8 @@ class SwLayoutViewConfig : public utl::ConfigItem SwLayoutViewConfig(sal_Bool bWeb, SwMasterUsrPref& rParent); ~SwLayoutViewConfig(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -69,8 +69,8 @@ class SwGridConfig : public utl::ConfigItem SwGridConfig(sal_Bool bWeb, SwMasterUsrPref& rParent); ~SwGridConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -84,8 +84,8 @@ class SwCursorConfig : public utl::ConfigItem SwCursorConfig(SwMasterUsrPref& rParent); ~SwCursorConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -99,8 +99,8 @@ class SwWebColorConfig : public utl::ConfigItem SwWebColorConfig(SwMasterUsrPref& rParent); ~SwWebColorConfig(); - virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; void Load(); void SetModified(){ConfigItem::SetModified();} }; diff --git a/sw/source/core/uibase/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx index b5ee5317b55b..14f56ef54a0b 100644 --- a/sw/source/core/uibase/inc/view.hxx +++ b/sw/source/core/uibase/inc/view.hxx @@ -336,12 +336,12 @@ class SW_DLLPUBLIC SwView: public SfxViewShell { m_bCenterCrsr = bOn; m_bAlwaysShowSel = bOn; } // methods for printing - SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ); - SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const; + SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window* pParent, - const SfxItemSet& rSet); + const SfxItemSet& rSet) SAL_OVERRIDE; // for readonly switching - SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; SAL_DLLPRIVATE void _CheckReadonlyState(); SAL_DLLPRIVATE void _CheckReadonlySelection(); @@ -356,7 +356,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SAL_DLLPRIVATE void ShowAtResize(); - SAL_DLLPRIVATE virtual void Move(); + SAL_DLLPRIVATE virtual void Move() SAL_OVERRIDE; SAL_DLLPRIVATE void DocumentStatsChanged(); @@ -378,10 +378,10 @@ protected: virtual void SelectShell(); - virtual void Activate(bool); - virtual void Deactivate(bool); - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); - virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); + virtual void Activate(bool) SAL_OVERRIDE; + virtual void Deactivate(bool) SAL_OVERRIDE; + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; + virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; void SetImageButtonColor(Color& rColor); @@ -402,23 +402,23 @@ public: SfxDispatcher &GetDispatcher(); void GotFocus() const; - virtual SdrView* GetDrawView() const; - virtual bool HasUIFeature( sal_uInt32 nFeature ); - virtual void ShowCursor( bool bOn = true ); - virtual ErrCode DoVerb( long nVerb ); + virtual SdrView* GetDrawView() const SAL_OVERRIDE; + virtual bool HasUIFeature( sal_uInt32 nFeature ) SAL_OVERRIDE; + virtual void ShowCursor( bool bOn = true ) SAL_OVERRIDE; + virtual ErrCode DoVerb( long nVerb ) SAL_OVERRIDE; virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, - sal_uInt16 nDiff = SFX_PRINTER_ALL, bool bIsAPI=false); + sal_uInt16 nDiff = SFX_PRINTER_ALL, bool bIsAPI=false) SAL_OVERRIDE; ShellModes GetShellMode(); com::sun::star::view::XSelectionSupplier* GetUNOObject(); OUString GetSelectionTextParam( bool bCompleteWords, bool bEraseTrail ); - virtual bool HasSelection( bool bText ) const; - virtual OUString GetSelectionText( bool bCompleteWords = false ); + virtual bool HasSelection( bool bText ) const SAL_OVERRIDE; + virtual OUString GetSelectionText( bool bCompleteWords = false ) SAL_OVERRIDE; virtual bool PrepareClose( bool bUI = true ) SAL_OVERRIDE; - virtual void MarginChanged(); + virtual void MarginChanged() SAL_OVERRIDE; // replace word/selection with text from the thesaurus // (this code has special handling for "in word" character) @@ -493,7 +493,7 @@ public: void InsFrmMode(sal_uInt16 nCols); void SetZoom( SvxZoomType eZoomType, short nFactor = 100, sal_Bool bViewOnly = sal_False); - virtual void SetZoomFactor( const Fraction &rX, const Fraction & ); + virtual void SetZoomFactor( const Fraction &rX, const Fraction & ) SAL_OVERRIDE; void SetViewLayout( sal_uInt16 nColumns, bool bBookMode, sal_Bool bViewOnly = sal_False ); @@ -595,10 +595,10 @@ public: // so that in the SubShells' DTors m_pShell can be reset if applicable void ResetSubShell() { m_pShell = 0; } - virtual void WriteUserData(OUString &, bool bBrowse = false); - virtual void ReadUserData(const OUString &, bool bBrowse = false); - virtual void ReadUserDataSequence ( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool bBrowse ); - virtual void WriteUserDataSequence ( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool bBrowse ); + virtual void WriteUserData(OUString &, bool bBrowse = false) SAL_OVERRIDE; + virtual void ReadUserData(const OUString &, bool bBrowse = false) SAL_OVERRIDE; + virtual void ReadUserDataSequence ( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool bBrowse ) SAL_OVERRIDE; + virtual void WriteUserDataSequence ( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool bBrowse ) SAL_OVERRIDE; void SetCrsrAtTop( sal_Bool bFlag, sal_Bool bCenter = sal_False ) { m_bTopCrsr = bFlag, m_bCenterCrsr = bCenter; } diff --git a/sw/source/core/uibase/inc/viewlayoutctrl.hxx b/sw/source/core/uibase/inc/viewlayoutctrl.hxx index 531dc57d4196..2ca684f5c947 100644 --- a/sw/source/core/uibase/inc/viewlayoutctrl.hxx +++ b/sw/source/core/uibase/inc/viewlayoutctrl.hxx @@ -36,9 +36,9 @@ public: SwViewLayoutControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SwViewLayoutControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); - virtual bool MouseButtonDown( const MouseEvent & ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; + virtual bool MouseButtonDown( const MouseEvent & ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/wordcountdialog.hxx b/sw/source/core/uibase/inc/wordcountdialog.hxx index 3bebd69f4967..85c3b036502d 100644 --- a/sw/source/core/uibase/inc/wordcountdialog.hxx +++ b/sw/source/core/uibase/inc/wordcountdialog.hxx @@ -28,7 +28,7 @@ struct SwDocStat; class SwWordCountFloatDlg : public SfxModelessDialog { - virtual void Activate(); + virtual void Activate() SAL_OVERRIDE; void SetValues(const SwDocStat& rCurrent, const SwDocStat& rDoc); void showCJK(bool bShowCJK); diff --git a/sw/source/core/uibase/inc/workctrl.hxx b/sw/source/core/uibase/inc/workctrl.hxx index eef6332e01db..ef9000e30445 100644 --- a/sw/source/core/uibase/inc/workctrl.hxx +++ b/sw/source/core/uibase/inc/workctrl.hxx @@ -65,13 +65,13 @@ public: SwTbxInsertCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SwTbxInsertCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class SwTbxAutoTextCtrl : public SfxToolBoxControl @@ -86,11 +86,11 @@ public: SwTbxAutoTextCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SwTbxAutoTextCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; DECL_LINK(PopupHdl, PopupMenu*); }; @@ -107,19 +107,19 @@ public: SwTbxFieldCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SwTbxFieldCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; DECL_LINK(PopupHdl, PopupMenu*); }; class SwScrollNaviToolBox : public ToolBox { - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: SwScrollNaviToolBox(Window* pParent, WinBits nWinStyle ) : @@ -141,7 +141,7 @@ class SwScrollNaviPopup : public SfxPopupWindow protected: DECL_LINK(SelectHdl, ToolBox*); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: SwScrollNaviPopup( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window *pParent ); @@ -149,7 +149,7 @@ public: static OUString GetQuickHelpText(sal_Bool bNext); - virtual SfxPopupWindow* Clone() const; + virtual SfxPopupWindow* Clone() const SAL_OVERRIDE; void GrabFocus(){aToolBox.GrabFocus();} }; @@ -162,7 +162,7 @@ class SwHlpImageButton : public ImageButton SwHlpImageButton(Window* pParent, const ResId& rResId, sal_Bool bUpBtn) : ImageButton(pParent, rResId), bUp(bUpBtn){} - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; }; @@ -176,9 +176,9 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ); + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/inc/wrap.hxx b/sw/source/core/uibase/inc/wrap.hxx index 7a9aa1fd4bc1..3ded65121736 100644 --- a/sw/source/core/uibase/inc/wrap.hxx +++ b/sw/source/core/uibase/inc/wrap.hxx @@ -87,9 +87,9 @@ class SwWrapTabPage: public SfxTabPage void ApplyImageList(); void EnableModes(const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet *pSet); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; DECL_LINK( RangeModifyHdl, MetricField * ); DECL_LINK( WrapTypeHdl, RadioButton * ); @@ -102,8 +102,8 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual bool FillItemSet(SfxItemSet &rSet); - virtual void Reset(const SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; static sal_uInt16* GetRanges(); inline void SetNewFrame(sal_Bool bNewFrame) { bNew = bNewFrame; } diff --git a/sw/source/core/uibase/inc/wrtsh.hxx b/sw/source/core/uibase/inc/wrtsh.hxx index b0188f8d6403..352065bae666 100644 --- a/sw/source/core/uibase/inc/wrtsh.hxx +++ b/sw/source/core/uibase/inc/wrtsh.hxx @@ -328,13 +328,13 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); sal_Bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 ); void LaunchOLEObj( long nVerb = 0 ); // start server - virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ); + virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ) SAL_OVERRIDE; virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, const SwRect *pFlyPrtRect = 0, const SwRect *pFlyFrmRect = 0, - const bool bNoTxtFrmPrtAreaChanged = false ); + const bool bNoTxtFrmPrtAreaChanged = false ) SAL_OVERRIDE; virtual void ConnectObj( svt::EmbeddedObjectRef& xIPObj, const SwRect &rPrt, - const SwRect &rFrm ); + const SwRect &rFrm ) SAL_OVERRIDE; // styles and formats @@ -394,7 +394,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); sal_Bool StartDropDownFldDlg(SwField*, sal_Bool bNextButton, OString* pWindowState = 0); //"Handler" for changes at DrawView - for controls. - virtual void DrawSelChanged( ); + virtual void DrawSelChanged( ) SAL_OVERRIDE; // jump to bookmark and set the "selctions-flags" correctly again sal_Bool GotoMark( const ::sw::mark::IMark* const pMark ); @@ -435,8 +435,8 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); void NavigatorPaste( const NaviContentBookmark& rBkmk, const sal_uInt16 nAction ); - virtual void ApplyViewOptions( const SwViewOption &rOpt ); - virtual void SetReadonlyOption( sal_Bool bSet ); + virtual void ApplyViewOptions( const SwViewOption &rOpt ) SAL_OVERRIDE; + virtual void SetReadonlyOption( sal_Bool bSet ) SAL_OVERRIDE; // automatic update of styles void AutoUpdateFrame(SwFrmFmt* pFmt, const SfxItemSet& rStyleSet); @@ -471,7 +471,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); const SwRangeRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False); void ChangeHeaderOrFooter(const OUString& rStyleName, sal_Bool bHeader, sal_Bool bOn, sal_Bool bShowWarning); - virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ); + virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ) SAL_OVERRIDE; private: diff --git a/sw/source/core/uibase/inc/wview.hxx b/sw/source/core/uibase/inc/wview.hxx index c6a4d09315cc..199437debe6c 100644 --- a/sw/source/core/uibase/inc/wview.hxx +++ b/sw/source/core/uibase/inc/wview.hxx @@ -25,7 +25,7 @@ class SW_DLLPUBLIC SwWebView: public SwView { protected: - virtual void SelectShell(); + virtual void SelectShell() SAL_OVERRIDE; public: SFX_DECL_VIEWFACTORY(SwWebView); diff --git a/sw/source/core/uibase/inc/zoomctrl.hxx b/sw/source/core/uibase/inc/zoomctrl.hxx index 89818fdf4f72..52193f05970f 100644 --- a/sw/source/core/uibase/inc/zoomctrl.hxx +++ b/sw/source/core/uibase/inc/zoomctrl.hxx @@ -26,10 +26,10 @@ class SwZoomControl : public SvxZoomStatusBarControl private: OUString sPreviewZoom; public: - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sw/source/core/uibase/lingu/sdrhhcwrap.hxx b/sw/source/core/uibase/lingu/sdrhhcwrap.hxx index d6befe334b44..868727e4c189 100644 --- a/sw/source/core/uibase/lingu/sdrhhcwrap.hxx +++ b/sw/source/core/uibase/lingu/sdrhhcwrap.hxx @@ -47,7 +47,7 @@ public: virtual ~SdrHHCWrapper(); - virtual bool ConvertNextDocument(); + virtual bool ConvertNextDocument() SAL_OVERRIDE; void StartTextConversion(); }; diff --git a/sw/source/core/uibase/ribbar/workctrl.cxx b/sw/source/core/uibase/ribbar/workctrl.cxx index e1d58875f9ba..20f03c20bed9 100644 --- a/sw/source/core/uibase/ribbar/workctrl.cxx +++ b/sw/source/core/uibase/ribbar/workctrl.cxx @@ -622,8 +622,8 @@ public: ~SwZoomBox_Impl(); protected: - virtual void Select(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual void Select() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void ReleaseFocus(); diff --git a/sw/source/core/uibase/shells/grfsh.cxx b/sw/source/core/uibase/shells/grfsh.cxx index b8c9b422396a..eb5c5ca877d4 100644 --- a/sw/source/core/uibase/shells/grfsh.cxx +++ b/sw/source/core/uibase/shells/grfsh.cxx @@ -88,7 +88,7 @@ namespace m_pShell (pShell) {} - virtual void Update( Graphic& aGraphic ) + virtual void Update( Graphic& aGraphic ) SAL_OVERRIDE { m_pShell->ReRead(OUString(), OUString(), (const Graphic*) &aGraphic); } diff --git a/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx index d7b6e57153e0..fd534c8e37f1 100644 --- a/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx +++ b/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx @@ -66,7 +66,7 @@ namespace sw { namespace sidebar { const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState, - const bool bIsEnabled); + const bool bIsEnabled) SAL_OVERRIDE; SfxBindings* GetBindings() const { diff --git a/sw/source/core/uibase/sidebar/SwPanelFactory.cxx b/sw/source/core/uibase/sidebar/SwPanelFactory.cxx index 18220cdbdf80..94a6eba06d32 100644 --- a/sw/source/core/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/core/uibase/sidebar/SwPanelFactory.cxx @@ -60,7 +60,7 @@ public: throw( css::container::NoSuchElementException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception ); + cssu::RuntimeException, std::exception ) SAL_OVERRIDE; }; SwPanelFactory::SwPanelFactory (void) diff --git a/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx index c5e524c25a0f..4a8a269bfacd 100644 --- a/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx +++ b/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx @@ -45,7 +45,7 @@ namespace sw { namespace sidebar { const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState, - const bool bIsEnabled); + const bool bIsEnabled) SAL_OVERRIDE; private: WrapPropertyPanel( diff --git a/sw/source/core/uibase/table/tablepg.hxx b/sw/source/core/uibase/table/tablepg.hxx index 87b4722b2b19..8b5f5a5ef498 100644 --- a/sw/source/core/uibase/table/tablepg.hxx +++ b/sw/source/core/uibase/table/tablepg.hxx @@ -83,10 +83,10 @@ public: SwFormatTablePage( Window* pParent, const SfxItemSet& rSet ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; }; // TabPage Format/Table/Columns @@ -133,10 +133,10 @@ public: ~SwTableColumnPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; }; @@ -182,8 +182,8 @@ class SwTextFlowPage : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetShell(SwWrtShell* pSh); diff --git a/sw/source/core/uibase/uiview/pview.cxx b/sw/source/core/uibase/uiview/pview.cxx index ce9382ec0b21..06147f5a9c0c 100644 --- a/sw/source/core/uibase/uiview/pview.cxx +++ b/sw/source/core/uibase/uiview/pview.cxx @@ -142,7 +142,7 @@ class SwPreviewZoomDlg : public SvxStandardDialog NumericField* m_pRowEdit; NumericField* m_pColEdit; - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; public: SwPreviewZoomDlg( SwPagePreviewWin& rParent ); diff --git a/sw/source/core/uibase/uno/SwXDocumentSettings.hxx b/sw/source/core/uibase/uno/SwXDocumentSettings.hxx index 49edf23964a0..0a356247b0f9 100644 --- a/sw/source/core/uibase/uno/SwXDocumentSettings.hxx +++ b/sw/source/core/uibase/uno/SwXDocumentSettings.hxx @@ -50,18 +50,18 @@ protected: SfxPrinter* mpPrinter; virtual void _preSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _postSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _preGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _postGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; protected: virtual ~SwXDocumentSettings() throw(); @@ -70,23 +70,23 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire( ) - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL release( ) - throw (); + throw () SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(com::sun::star::uno::RuntimeException, std::exception); + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(com::sun::star::uno::RuntimeException, std::exception); + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(com::sun::star::uno::RuntimeException, std::exception); + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/uibase/uno/unomailmerge.cxx b/sw/source/core/uibase/uno/unomailmerge.cxx index e72c80a190d9..cc4923d2f8d9 100644 --- a/sw/source/core/uibase/uno/unomailmerge.cxx +++ b/sw/source/core/uibase/uno/unomailmerge.cxx @@ -201,11 +201,11 @@ namespace ~DelayedFileDeletion( ); // XCloseListener - virtual void SAL_CALL queryClosing( const EventObject& _rSource, sal_Bool _bGetsOwnership ) throw (util::CloseVetoException, RuntimeException, std::exception); - virtual void SAL_CALL notifyClosing( const EventObject& _rSource ) throw (RuntimeException, std::exception); + virtual void SAL_CALL queryClosing( const EventObject& _rSource, sal_Bool _bGetsOwnership ) throw (util::CloseVetoException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyClosing( const EventObject& _rSource ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception); + virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; private: void implTakeOwnership( ); diff --git a/sw/source/core/uibase/uno/unomodule.hxx b/sw/source/core/uibase/uno/unomodule.hxx index a32e2c5dfc4b..3152caa77bad 100644 --- a/sw/source/core/uibase/uno/unomodule.hxx +++ b/sw/source/core/uibase/uno/unomodule.hxx @@ -58,22 +58,22 @@ public: {} // XNotifyingDispatch - virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XDispatchProvider - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) ; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL , const OUString & sTargetFrameName, - sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException, std::exception ) ; + sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; // 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; }; #endif diff --git a/sw/source/core/uibase/utlui/bookctrl.cxx b/sw/source/core/uibase/utlui/bookctrl.cxx index 1e5770f62f1a..65d8d090bd8a 100644 --- a/sw/source/core/uibase/utlui/bookctrl.cxx +++ b/sw/source/core/uibase/utlui/bookctrl.cxx @@ -44,7 +44,7 @@ public: private: sal_uInt16 nCurId; - virtual void Select(); + virtual void Select() SAL_OVERRIDE; }; BookmarkPopup_Impl::BookmarkPopup_Impl() : diff --git a/sw/source/core/uibase/utlui/content.cxx b/sw/source/core/uibase/utlui/content.cxx index 735ad8863416..969cf14d6d75 100644 --- a/sw/source/core/uibase/utlui/content.cxx +++ b/sw/source/core/uibase/utlui/content.cxx @@ -3434,7 +3434,7 @@ public: virtual void Paint( const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, - const SvTreeListEntry* pEntry); + const SvTreeListEntry* pEntry) SAL_OVERRIDE; }; void SwContentTree::InitEntry(SvTreeListEntry* pEntry, diff --git a/sw/source/core/uibase/utlui/glbltree.cxx b/sw/source/core/uibase/utlui/glbltree.cxx index 259eef188958..173824113f3e 100644 --- a/sw/source/core/uibase/utlui/glbltree.cxx +++ b/sw/source/core/uibase/utlui/glbltree.cxx @@ -131,7 +131,7 @@ public: StartListening(rFrame); } - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; bool IsValid() const {return bValid;} }; diff --git a/sw/source/core/uibase/utlui/tmplctrl.cxx b/sw/source/core/uibase/utlui/tmplctrl.cxx index a4a59ffc5370..0f774e395fbc 100644 --- a/sw/source/core/uibase/utlui/tmplctrl.cxx +++ b/sw/source/core/uibase/utlui/tmplctrl.cxx @@ -42,7 +42,7 @@ public: private: sal_uInt16 nCurId; - virtual void Select(); + virtual void Select() SAL_OVERRIDE; }; SwTemplatePopup_Impl::SwTemplatePopup_Impl() : diff --git a/sw/source/core/uibase/wrtsh/wrtsh2.cxx b/sw/source/core/uibase/wrtsh/wrtsh2.cxx index 1634d1dae0b6..4149b48bf7d7 100644 --- a/sw/source/core/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/core/uibase/wrtsh/wrtsh2.cxx @@ -172,7 +172,7 @@ class FieldDeletionModify : public SwModify public: FieldDeletionModify(AbstractFldInputDlg* pInputFieldDlg) : mpInputFieldDlg(pInputFieldDlg) {} - void Modify( const SfxPoolItem* pOld, const SfxPoolItem *) + void Modify( const SfxPoolItem* pOld, const SfxPoolItem *) SAL_OVERRIDE { // Input fields have been deleted: better to close the dialog if (pOld->Which() == RES_FIELD_DELETED) diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx index ee8a518669a7..29fbef35a386 100644 --- a/sw/source/core/undo/unsect.cxx +++ b/sw/source/core/undo/unsect.cxx @@ -282,8 +282,8 @@ public: virtual ~SwUndoDelSection(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; SwUndo * MakeUndoDelSection(SwSectionFmt const& rFormat) @@ -392,8 +392,8 @@ public: virtual ~SwUndoUpdateSection(); - virtual void UndoImpl( ::sw::UndoRedoContext & ); - virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; }; SwUndo * diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index 3740b9310c7e..d9a807f671d5 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -83,7 +83,7 @@ public: void registerInMark(SwXBookmark & rThis, ::sw::mark::IMark *const pBkmk); protected: // SwClient - virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 24d1f699e969..da50429dddd5 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -96,13 +96,13 @@ public: SwVbaCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell ) {} // XCodeNameQuery - OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE { // not implemented... return OUString(); } - OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE { // Initialise the code name if ( msThisDocumentCodeName.isEmpty() ) @@ -179,17 +179,17 @@ public: SwVbaProjectNameProvider() { } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) 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 ) SAL_OVERRIDE { return ( mTemplateToProject.find( aName ) != mTemplateToProject.end() ); } - 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::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 { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); return uno::makeAny( mTemplateToProject.find( aName )->second ); } - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::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) SAL_OVERRIDE { uno::Sequence< OUString > aElements( mTemplateToProject.size() ); StringHashMap::iterator it_end = mTemplateToProject.end(); @@ -199,7 +199,7 @@ public: return aElements; } - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, std::exception ) + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE { OUString sProjectName; @@ -210,24 +210,24 @@ public: mTemplateToProject[ aName ] = sProjectName; } - virtual void SAL_CALL removeByName( const OUString& Name ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, std::exception ) + virtual void SAL_CALL removeByName( const OUString& Name ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE { if ( !hasByName( Name ) ) throw container::NoSuchElementException(); mTemplateToProject.erase( Name ); } - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, std::exception ) + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); insertByName( aName, aElement ); // insert will overwrite } // XElemenAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) 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 { return ::getCppuType((const OUString*)0); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return ( mTemplateToProject.size() > 0 ); @@ -244,7 +244,7 @@ public: // #FIXME #TODO is the code name for ThisDocument read anywhere? } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) 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 ) SAL_OVERRIDE { // #FIXME #TODO we really need to be checking against the codename for // ThisDocument @@ -253,7 +253,7 @@ public: return sal_False; } - ::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) + ::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 { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -264,14 +264,14 @@ public: OSL_TRACE("Creating Object ( ooo.vba.word.Document ) 0x%p", xDocObj.get() ); return uno::makeAny( xDocObj ); } - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::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) SAL_OVERRIDE { uno::Sequence< OUString > aNames; return aNames; } // XElemenAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception){ return uno::Type(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) { return sal_True; } + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return uno::Type(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return sal_True; } }; @@ -1072,13 +1072,13 @@ namespace SwXFrameEnumeration(const SwDoc* const pDoc); //XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements(void) throw( RuntimeException, std::exception ); - virtual Any SAL_CALL nextElement(void) throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL hasMoreElements(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Any SAL_CALL nextElement(void) throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; }; } diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index bf91fd3e89e3..1a980d699c33 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -382,13 +382,13 @@ namespace SwXShapesEnumeration(SwXDrawPage* const pDrawPage); //XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements(void) throw(uno::RuntimeException, std::exception); - virtual uno::Any SAL_CALL nextElement(void) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasMoreElements(void) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Any SAL_CALL nextElement(void) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw(uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(uno::RuntimeException, std::exception); - virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames(void) throw(uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName(void) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames(void) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index a416963f2dcc..80490e5dad21 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -429,7 +429,7 @@ public: protected: // SwClient - virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew); + virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew) SAL_OVERRIDE; }; namespace @@ -1180,7 +1180,7 @@ public: protected: // SwClient - virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew); + virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew) SAL_OVERRIDE; }; namespace @@ -2945,7 +2945,7 @@ public: protected: // SwClient - virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew); + virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew) SAL_OVERRIDE; }; OUString SAL_CALL diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 22229ea0872f..4013dc23ffea 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -609,7 +609,7 @@ public: SwFrameProperties_Impl(); virtual ~SwFrameProperties_Impl(){} - bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound); + bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound) SAL_OVERRIDE; }; SwFrameProperties_Impl::SwFrameProperties_Impl(): @@ -676,7 +676,7 @@ public: SwGraphicProperties_Impl(); virtual ~SwGraphicProperties_Impl(){} - virtual bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound); + virtual bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound) SAL_OVERRIDE; }; SwGraphicProperties_Impl::SwGraphicProperties_Impl( ) : @@ -777,7 +777,7 @@ public: SwFrameProperties_Impl(/*aSwMapProvider.GetPropertyMap(PROPERTY_MAP_EMBEDDED_OBJECT)*/ ){} virtual ~SwOLEProperties_Impl(){} - virtual bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound); + virtual bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound) SAL_OVERRIDE; }; bool SwOLEProperties_Impl::AnyToItemSet( diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 6bb544ef1dd4..e5ab1bf28806 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -89,7 +89,7 @@ public: void Invalidate(); protected: // SwClient - virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index b299e0a0e5e9..2a1722152f4f 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -198,28 +198,28 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (uno::RuntimeException, std::exception); + getSupportedServiceNames() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception); + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception); + uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexReplace virtual void SAL_CALL replaceByIndex(sal_Int32 Index, const uno::Any& rElement) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception); + lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -244,28 +244,28 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (uno::RuntimeException, std::exception); + getSupportedServiceNames() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception); + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception); + uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexReplace virtual void SAL_CALL replaceByIndex(sal_Int32 Index, const uno::Any& rElement) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception); + lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -382,7 +382,7 @@ public: } protected: // SwClient - virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew); + virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; @@ -1611,7 +1611,7 @@ public: void Invalidate(); protected: // SwClient - virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew); + virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; void SwXDocumentIndexMark::Impl::Invalidate() diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index f70b05d5203a..950e1eebc782 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -713,7 +713,7 @@ public: } protected: // SwClient - virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew); + virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 0da724eb88e3..51e07ab30272 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -480,7 +480,7 @@ public: uno::RuntimeException); protected: // SwClient - virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; void SwXParagraphEnumeration::Impl::Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew) @@ -750,7 +750,7 @@ public: protected: // SwClient - virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew); + virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; void SwXTextRange::Impl::Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) @@ -1547,7 +1547,7 @@ public: protected: // SwClient - virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; void SwXTextRanges::Impl::Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew) @@ -1730,7 +1730,7 @@ public: protected: // SwClient - virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; struct InvalidFrameDepend { diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 4cf500207431..86785fb0380c 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -169,7 +169,7 @@ public: throw (uno::RuntimeException); protected: // SwClient - virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew); + virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 23c39cdf9831..263414f9770c 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -76,7 +76,7 @@ public: void Invalidate(); protected: // SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; @@ -537,15 +537,15 @@ private: SwXMeta & m_rMeta; virtual void PrepareForAttach(uno::Reference< text::XTextRange > & xRange, - const SwPaM & rPam); + const SwPaM & rPam) SAL_OVERRIDE; virtual bool CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb) - throw (lang::IllegalArgumentException, uno::RuntimeException); + throw (lang::IllegalArgumentException, uno::RuntimeException) SAL_OVERRIDE; protected: - virtual const SwStartNode *GetStartNode() const; + virtual const SwStartNode *GetStartNode() const SAL_OVERRIDE; virtual uno::Reference< text::XTextCursor > - CreateCursor() throw (uno::RuntimeException); + CreateCursor() throw (uno::RuntimeException) SAL_OVERRIDE; public: SwXMetaText(SwDoc & rDoc, SwXMeta & rMeta); @@ -554,22 +554,22 @@ public: void Invalidate() { SwXText::Invalidate(); }; // XInterface - virtual void SAL_CALL acquire() throw() + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OSL_FAIL("ERROR: SwXMetaText::acquire"); } - virtual void SAL_CALL release() throw() + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OSL_FAIL("ERROR: SwXMetaText::release"); } // XTypeProvider virtual uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() throw (uno::RuntimeException, std::exception); + getImplementationId() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XText virtual uno::Reference< text::XTextCursor > SAL_CALL - createTextCursor() throw (uno::RuntimeException, std::exception); + createTextCursor() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Reference< text::XTextCursor > SAL_CALL createTextCursorByRange( const uno::Reference< text::XTextRange > & xTextPosition) - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; SwXMeta & GetXMeta() { return m_rMeta; } @@ -690,7 +690,7 @@ public: inline const ::sw::MetaField * GetMetaField() const; protected: // SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 5bcb4c16f7b4..887a8b0773d3 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -158,7 +158,7 @@ public: uno::RuntimeException); protected: // SwClient - virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew); + virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 2fc83fad646c..8bb4612735f8 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -2614,7 +2614,7 @@ public: } protected: // SwClient - virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew); + virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; diff --git a/sw/source/filter/ascii/wrtasc.hxx b/sw/source/filter/ascii/wrtasc.hxx index 5a76ef7eb1bc..4082aade4064 100644 --- a/sw/source/filter/ascii/wrtasc.hxx +++ b/sw/source/filter/ascii/wrtasc.hxx @@ -30,7 +30,7 @@ class SwASCWriter : public Writer { OUString m_sLineEnd; - virtual sal_uLong WriteStream(); + virtual sal_uLong WriteStream() SAL_OVERRIDE; public: SwASCWriter( const OUString& rFilterName ); diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index b67db8c9c772..90b5dcd7096a 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -382,29 +382,29 @@ public: // XImageConsumer virtual void SAL_CALL init( sal_Int32 Width, sal_Int32 Height) - throw( uno::RuntimeException, std::exception ); + throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setColorModel( sal_Int16 BitCount, const uno::Sequence< sal_Int32 >& RGBAPal, sal_Int32 RedMask, sal_Int32 GreenMask, sal_Int32 BlueMask, sal_Int32 AlphaMask) - throw( uno::RuntimeException, std::exception ); + throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setPixelsByBytes( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, const uno::Sequence< sal_Int8 >& ProducerData, sal_Int32 Offset, sal_Int32 Scansize) - throw( uno::RuntimeException, std::exception ); + throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setPixelsByLongs( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, const uno::Sequence< sal_Int32 >& ProducerData, sal_Int32 Offset, sal_Int32 Scansize) - throw( uno::RuntimeException, std::exception ); + throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL complete( sal_Int32 Status, const uno::Reference< awt::XImageProducer > & Producer) - throw( uno::RuntimeException, std::exception ); + throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const EventObject& Source ) throw ( uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const EventObject& Source ) throw ( uno::RuntimeException, std::exception) SAL_OVERRIDE; }; SwHTMLImageWatcher::SwHTMLImageWatcher( diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 84833c9e71f0..93d1bd13025d 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -74,7 +74,7 @@ class SwHTMLWrtTable : public SwWriteTable const SvxBrushItem *pBrushItem ) const; virtual sal_Bool ShouldExpandSub( const SwTableBox *pBox, - sal_Bool bExpandedBefore, sal_uInt16 nDepth ) const; + sal_Bool bExpandedBefore, sal_uInt16 nDepth ) const SAL_OVERRIDE; static sal_Bool HasTabBackground( const SwTableLine& rLine, sal_Bool bTop, sal_Bool bBottom, sal_Bool bLeft, sal_Bool bRight ); diff --git a/sw/source/filter/html/htmlvsh.hxx b/sw/source/filter/html/htmlvsh.hxx index 0db12f9f6ede..a8f1363fc028 100644 --- a/sw/source/filter/html/htmlvsh.hxx +++ b/sw/source/filter/html/htmlvsh.hxx @@ -26,7 +26,7 @@ class SwViewShell; class SwHTMLViewShellClient : public SwClient { protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; public: diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx index 1ba92df1f8f9..adfc1eea08bd 100644 --- a/sw/source/filter/html/svxcss1.hxx +++ b/sw/source/filter/html/svxcss1.hxx @@ -251,13 +251,13 @@ protected: // zuletzt angelegten Styles kopiert. // Diese Methode sollte in abgleiteten Parsern nicht mehr // ueberladen werden! - virtual bool SelectorParsed( CSS1Selector *pSelector, bool bFirst ); + virtual bool SelectorParsed( CSS1Selector *pSelector, bool bFirst ) SAL_OVERRIDE; // Diese Methode wird fuer jede geparste Property aufgerufen // sie fuegt das Item in den ItemSet 'pItemSet' ein // Sie sollte in abgeleiteten Parsern nicht mehr ueberladen werden! virtual sal_Bool DeclarationParsed( const OUString& rProperty, - const CSS1Expression *pExpr ); + const CSS1Expression *pExpr ) SAL_OVERRIDE; public: diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx index cdf24be7f927..63a0e58db1db 100644 --- a/sw/source/filter/html/swcss1.hxx +++ b/sw/source/filter/html/swcss1.hxx @@ -70,7 +70,7 @@ class SwCSS1Parser : public SvxCSS1Parser protected: virtual sal_Bool StyleParsed( const CSS1Selector *pSelector, SfxItemSet& rItemSet, - SvxCSS1PropertyInfo& rPropInfo ); + SvxCSS1PropertyInfo& rPropInfo ) SAL_OVERRIDE; using CSS1Parser::ParseStyleSheet; @@ -78,13 +78,13 @@ public: SwCSS1Parser( SwDoc *pDoc, sal_uInt32 aFHeight[7], const OUString& rBaseURL, sal_Bool bNewDoc ); virtual ~SwCSS1Parser(); - virtual sal_Bool ParseStyleSheet( const OUString& rIn ); + virtual sal_Bool ParseStyleSheet( const OUString& rIn ) SAL_OVERRIDE; // Die Font-Hoehe fuer eine bestimmte Font-Groesse (0-6) ermitteln - virtual sal_uInt32 GetFontHeight( sal_uInt16 nSize ) const; + virtual sal_uInt32 GetFontHeight( sal_uInt16 nSize ) const SAL_OVERRIDE; // Die aktuelle Font-Liste holen (auch 0 ist erlaubt) - virtual const FontList *GetFontList() const; + virtual const FontList *GetFontList() const SAL_OVERRIDE; // das Zeichen-Format zu einem Token und einer ggf leeren Klasse // ermitteln @@ -160,7 +160,7 @@ public: inline void SetATagStyles(); inline void SetDelayedStyles(); - virtual void SetDfltEncoding( rtl_TextEncoding eEnc ); + virtual void SetDfltEncoding( rtl_TextEncoding eEnc ) SAL_OVERRIDE; }; inline void SwCSS1Parser::AddFirstLetterExt( OUString& rFmtName ) diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index e7d75e976762..70648b7aef81 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -879,13 +879,13 @@ public: // used in tables protected: // Executed for each token recognized by CallParser - virtual void NextToken( int nToken ); + virtual void NextToken( int nToken ) SAL_OVERRIDE; virtual ~SwHTMLParser(); // If the document is removed, remove the parser as well - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; - virtual void AddMetaUserDefined( OUString const & i_rMetaName ); + virtual void AddMetaUserDefined( OUString const & i_rMetaName ) SAL_OVERRIDE; public: @@ -896,16 +896,16 @@ public: SfxMedium* pMed = 0, sal_Bool bReadUTF8 = sal_False, sal_Bool bIgnoreHTMLComments = sal_False ); - virtual SvParserState CallParser(); + virtual SvParserState CallParser() SAL_OVERRIDE; sal_uInt16 ToTwips( sal_uInt16 nPixel ) const; // for reading asynchronously from SvStream - virtual void Continue( int nToken ); + virtual void Continue( int nToken ) SAL_OVERRIDE; virtual bool ParseMetaOptions( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties>&, - SvKeyValueIterator* ); + SvKeyValueIterator* ) SAL_OVERRIDE; }; struct SwPendingStackData diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 3c294edae53b..5ec54e40d116 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -277,7 +277,7 @@ class SwHTMLWriter : public Writer void CollectLinkTargets(); protected: - sal_uLong WriteStream(); + sal_uLong WriteStream() SAL_OVERRIDE; public: std::vector<OUString> aImgMapNames; // geschriebene Image Maps diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx index 1b9d1cac031b..c77864c6b122 100644 --- a/sw/source/filter/inc/fltini.hxx +++ b/sw/source/filter/inc/fltini.hxx @@ -32,30 +32,30 @@ class SwNodeIndex; class HTMLReader: public Reader { // wir wollen die Streams / Storages nicht geoeffnet haben - virtual int SetStrmStgPtr(); - virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &); - virtual OUString GetTemplateName() const; + virtual int SetStrmStgPtr() SAL_OVERRIDE; + virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE; + virtual OUString GetTemplateName() const SAL_OVERRIDE; public: HTMLReader(); }; class WW1Reader : public Reader { - virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &); + virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE; }; class XMLReader : public Reader { - virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &); + virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE; public: - virtual int GetReaderType(); + virtual int GetReaderType() SAL_OVERRIDE; XMLReader(); // read the sections of the document, which is equal to the medium. // returns the count of it virtual size_t GetSectionList( SfxMedium& rMedium, - std::vector<OUString*>& rStrings ) const; + std::vector<OUString*>& rStrings ) const SAL_OVERRIDE; }; // die speziellen Writer diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 8222c9f7572d..479f0998199d 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -211,8 +211,8 @@ public: virtual ~SwFltAnchor(); // "pure virtual Methoden" vom SfxPoolItem - virtual bool operator==(const SfxPoolItem&) const; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; + virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; void SetFrmFmt(SwFrmFmt * _pFrmFmt); const SwFrmFmt* GetFrmFmt() const; SwFrmFmt* GetFrmFmt(); @@ -225,7 +225,7 @@ class SwFltAnchorClient : public SwClient public: SwFltAnchorClient(SwFltAnchor * pFltAnchor); - virtual void Modify (const SfxPoolItem *pOld, const SfxPoolItem *pNew); + virtual void Modify (const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; }; class SW_DLLPUBLIC SwFltRedline : public SfxPoolItem @@ -263,8 +263,8 @@ public: nAutorNoPrev( rCpy.nAutorNoPrev ) {} // "pure virtual Methoden" vom SfxPoolItem - virtual bool operator==(const SfxPoolItem& rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; + virtual bool operator==(const SfxPoolItem& rItem) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; }; class SW_DLLPUBLIC SwFltBookmark : public SfxPoolItem @@ -285,8 +285,8 @@ public: SwFltBookmark( const SwFltBookmark& ); // "pure virtual Methoden" vom SfxPoolItem - virtual bool operator==(const SfxPoolItem&) const; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; + virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; long GetHandle() const { return mnHandle; } const OUString& GetName() const { return maName; } @@ -307,8 +307,8 @@ public: SwFltTOX(SwTOXBase* pBase, sal_uInt16 _nCols = 0); SwFltTOX(const SwFltTOX&); // "pure virtual Methoden" vom SfxPoolItem - virtual bool operator==(const SfxPoolItem&) const; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; + virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; SwTOXBase* GetBase() { return pTOXBase; } sal_uInt16 GetCols() const { return nCols; } void SetHadBreakItem( sal_Bool bVal ) { bHadBreakItem = bVal; } @@ -325,8 +325,8 @@ public: SwFltSection( SwSectionData *const pSect ); SwFltSection( const SwFltSection& ); // "pure virtual Methoden" vom SfxPoolItem - virtual bool operator==(const SfxPoolItem&) const; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; + virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; SwSectionData * GetSectionData() { return m_pSection; } }; // Der WWEndStack verhaelt sich wie der WWControlStck, nur dass die Attribute @@ -421,32 +421,32 @@ public: void SetReadNoTable() { bReadNoTbl = sal_True; } sal_Bool IsTableWidthSet() const { return 0 != nTableWidth; } - virtual SwFltOutBase& operator << (const SfxPoolItem& rItem); + virtual SwFltOutBase& operator << (const SfxPoolItem& rItem) SAL_OVERRIDE; - virtual const SfxPoolItem& GetAttr(sal_uInt16 nWhich); - virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich); + virtual const SfxPoolItem& GetAttr(sal_uInt16 nWhich) SAL_OVERRIDE; + virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich) SAL_OVERRIDE; sal_Bool IsInTable(); - virtual const SfxPoolItem& GetCellAttr(sal_uInt16 nWhich); - virtual bool BeginTable(); - virtual void NextTableCell(); - virtual void NextTableRow(); - virtual void SetTableWidth(SwTwips nW); - virtual void SetTableOrient(sal_Int16 eOri); - virtual void SetCellWidth(SwTwips nWidth, sal_uInt16 nCell); - virtual void SetCellHeight(SwTwips nH); - virtual void SetCellBorder(const SvxBoxItem& rFmtBox, sal_uInt16 nCell); - virtual void SetCellSpace(sal_uInt16 nSp); - virtual void DeleteCell(sal_uInt16 nCell); - virtual void EndTable(); + virtual const SfxPoolItem& GetCellAttr(sal_uInt16 nWhich) SAL_OVERRIDE; + virtual bool BeginTable() SAL_OVERRIDE; + virtual void NextTableCell() SAL_OVERRIDE; + virtual void NextTableRow() SAL_OVERRIDE; + virtual void SetTableWidth(SwTwips nW) SAL_OVERRIDE; + virtual void SetTableOrient(sal_Int16 eOri) SAL_OVERRIDE; + virtual void SetCellWidth(SwTwips nWidth, sal_uInt16 nCell) SAL_OVERRIDE; + virtual void SetCellHeight(SwTwips nH) SAL_OVERRIDE; + virtual void SetCellBorder(const SvxBoxItem& rFmtBox, sal_uInt16 nCell) SAL_OVERRIDE; + virtual void SetCellSpace(sal_uInt16 nSp) SAL_OVERRIDE; + virtual void DeleteCell(sal_uInt16 nCell) SAL_OVERRIDE; + virtual void EndTable() SAL_OVERRIDE; SwFrmFmt* MakeFly( RndStdIds eAnchor, SfxItemSet* pSet ); - virtual bool IsInFly(); - virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr); - virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich); + virtual bool IsInFly() SAL_OVERRIDE; + virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr) SAL_OVERRIDE; + virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich) SAL_OVERRIDE; virtual bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos, - const SfxItemSet* pMoreAttrs = 0 ); - virtual void EndFly(); + const SfxItemSet* pMoreAttrs = 0 ) SAL_OVERRIDE; + virtual void EndFly() SAL_OVERRIDE; }; class SwFltFormatCollection : public SwFltOutBase @@ -473,17 +473,17 @@ public: void SetHasFly() { bHasFly = true; } SfxItemSet* GetpFlyAttrs() { return pFlyAttrs; } - virtual SwFltOutBase& operator << (const SfxPoolItem& rItem); - virtual const SfxPoolItem& GetAttr(sal_uInt16 nWhich); - virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich); + virtual SwFltOutBase& operator << (const SfxPoolItem& rItem) SAL_OVERRIDE; + virtual const SfxPoolItem& GetAttr(sal_uInt16 nWhich) SAL_OVERRIDE; + virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich) SAL_OVERRIDE; - virtual bool IsInFly(); - virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr); - virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich); + virtual bool IsInFly() SAL_OVERRIDE; + virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr) SAL_OVERRIDE; + virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich) SAL_OVERRIDE; virtual bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos, - const SfxItemSet* pMoreAttrs = 0 ); + const SfxItemSet* pMoreAttrs = 0 ) SAL_OVERRIDE; bool BeginStyleFly( SwFltOutDoc* pOutDoc ); - virtual void EndFly(); + virtual void EndFly() SAL_OVERRIDE; }; // dies nun ist die zauberhafteklasse: intention: alle eins nach dem diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index aad6a8d4e142..2948833c6530 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star; /// Glue class to call RtfImport as an internal filter, needed by copy&paste support. class SwRTFReader : public Reader { - virtual sal_uLong Read( SwDoc &, const OUString& rBaseURL, SwPaM &,const OUString &); + virtual sal_uLong Read( SwDoc &, const OUString& rBaseURL, SwPaM &,const OUString &) SAL_OVERRIDE; }; sal_uLong SwRTFReader::Read( SwDoc &rDoc, const OUString& /*rBaseURL*/, SwPaM& rPam, const OUString &) diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx index 7dadb105907e..a83c1e55be03 100644 --- a/sw/source/filter/ww1/w1class.hxx +++ b/sw/source/filter/ww1/w1class.hxx @@ -343,7 +343,7 @@ public: class Ww1SingleSprmByteSized : public Ww1SingleSprm { public: - sal_uInt16 Size(sal_uInt8*); + sal_uInt16 Size(sal_uInt8*) SAL_OVERRIDE; Ww1SingleSprmByteSized(sal_uInt16 nBytes, sal_Char* sName = 0) : Ww1SingleSprm(nBytes, sName) { } @@ -351,7 +351,7 @@ public: class Ww1SingleSprmWordSized : public Ww1SingleSprm { public: - sal_uInt16 Size(sal_uInt8*); + sal_uInt16 Size(sal_uInt8*) SAL_OVERRIDE; Ww1SingleSprmWordSized(sal_uInt16 nBytes, sal_Char* sName = 0) : Ww1SingleSprm(nBytes, sName) { } @@ -399,7 +399,7 @@ public: class Ww1SingleSprmTab : public Ww1SingleSprm { public: std::ostream& Dump(std::ostream&, sal_uInt8*, sal_uInt16); - sal_uInt16 Size(sal_uInt8*); + sal_uInt16 Size(sal_uInt8*) SAL_OVERRIDE; Ww1SingleSprmTab(sal_uInt16 nBytes, sal_Char* sName = 0) : Ww1SingleSprm(nBytes, sName) { } @@ -410,8 +410,8 @@ public: Ww1SingleSprmPJc(sal_Char* sName) : Ww1SingleSprmByte(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); - void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; + void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPDxa : public Ww1SingleSprmWord { @@ -419,7 +419,7 @@ public: Ww1SingleSprmPDxa(sal_Char* sName) : Ww1SingleSprmWord(sName) { } - void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPDxaRight : public Ww1SingleSprmPDxa { @@ -427,7 +427,7 @@ public: Ww1SingleSprmPDxaRight(sal_Char* sName) : Ww1SingleSprmPDxa(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPDxaLeft : public Ww1SingleSprmPDxa { @@ -435,7 +435,7 @@ public: Ww1SingleSprmPDxaLeft(sal_Char* sName) : Ww1SingleSprmPDxa(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPDxaLeft1 : public Ww1SingleSprmPDxa { @@ -443,7 +443,7 @@ public: Ww1SingleSprmPDxaLeft1(sal_Char* sName) : Ww1SingleSprmPDxa(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPFKeep : public Ww1SingleSprmBool { @@ -451,8 +451,8 @@ public: Ww1SingleSprmPFKeep(sal_Char* sName) : Ww1SingleSprmBool(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); - void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; + void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPFKeepFollow : public Ww1SingleSprmBool { @@ -460,8 +460,8 @@ public: Ww1SingleSprmPFKeepFollow(sal_Char* sName) : Ww1SingleSprmBool(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); - void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; + void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPPageBreakBefore : public Ww1SingleSprmBool { @@ -469,8 +469,8 @@ public: Ww1SingleSprmPPageBreakBefore(sal_Char* sName) : Ww1SingleSprmBool(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); - void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; + void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPBrc : public Ww1SingleSprmWord { @@ -486,7 +486,7 @@ public: Ww1SingleSprmPBrc(sal_Char* sName) : Ww1SingleSprmWord(sName) { } - void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; // SetBorder() is needed for tables, too. That's why it's public static editeng::SvxBorderLine* SetBorder(editeng::SvxBorderLine*, W1_BRC10*); }; @@ -510,21 +510,21 @@ public: Ww1SingleSprmPBrc10(sal_uInt16 nL, sal_Char* sName) : Ww1SingleSprmPBrc(sName), nLine(nL) {} - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmParaSpace : public Ww1SingleSprmWord { public: Ww1SingleSprmParaSpace(sal_Char* sName) : Ww1SingleSprmWord(sName) {} - void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPDyaBefore : public Ww1SingleSprmParaSpace { public: Ww1SingleSprmPDyaBefore(sal_Char* sName) : Ww1SingleSprmParaSpace(sName) {} - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPDyaAfter : public Ww1SingleSprmParaSpace { @@ -532,7 +532,7 @@ public: Ww1SingleSprmPDyaAfter(sal_Char* sName) : Ww1SingleSprmParaSpace(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPDyaLine : public Ww1SingleSprmWord { @@ -540,8 +540,8 @@ public: Ww1SingleSprmPDyaLine(sal_Char* sName) : Ww1SingleSprmWord(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); - void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; + void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPChgTabsPapx : public Ww1SingleSprmByteSized { @@ -550,8 +550,8 @@ public: Ww1SingleSprmByteSized(0, sName) { } // Size() is not yet activated! - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); - void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; + void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmSGprfIhdt : public Ww1SingleSprmByte { @@ -559,7 +559,7 @@ public: Ww1SingleSprmSGprfIhdt(sal_Char* sName) : Ww1SingleSprmByte(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmSColumns : public Ww1SingleSprmWord { @@ -567,7 +567,7 @@ public: Ww1SingleSprmSColumns(sal_Char* sName) : Ww1SingleSprmWord(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPFInTable : public Ww1SingleSprmBool { @@ -575,8 +575,8 @@ public: Ww1SingleSprmPFInTable(sal_Char* sName) : Ww1SingleSprmBool(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); - void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; + void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPTtp : public Ww1SingleSprmBool { @@ -584,8 +584,8 @@ public: Ww1SingleSprmPTtp(sal_Char* sName) : Ww1SingleSprmBool(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); - void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; + void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmTJc : public Ww1SingleSprmWord { @@ -599,7 +599,7 @@ public: Ww1SingleSprmTDxaGapHalf(sal_Char* sName) : Ww1SingleSprmWord(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmTDefTable10 : public Ww1SingleSprmWordSized { @@ -607,7 +607,7 @@ public: Ww1SingleSprmTDefTable10(sal_Char* sName) : Ww1SingleSprmWordSized(0, sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmTDyaRowHeight : public Ww1SingleSprmWord { @@ -615,7 +615,7 @@ public: Ww1SingleSprmTDyaRowHeight(sal_Char* sName) : Ww1SingleSprmWord(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; // Class definitions for table fastsave attributes @@ -628,7 +628,7 @@ public: Ww1SingleSprmPpc(sal_Char* sName) : Ww1SingleSprmByte(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPDxaAbs : public Ww1SingleSprmWord { @@ -636,7 +636,7 @@ public: Ww1SingleSprmPDxaAbs(sal_Char* sName) : Ww1SingleSprmWord(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPDyaAbs : public Ww1SingleSprmWord { @@ -644,7 +644,7 @@ public: Ww1SingleSprmPDyaAbs(sal_Char* sName) : Ww1SingleSprmWord(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPDxaWidth : public Ww1SingleSprmWord { @@ -652,7 +652,7 @@ public: Ww1SingleSprmPDxaWidth(sal_Char* sName) : Ww1SingleSprmWord(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; class Ww1SingleSprmPFromText : public Ww1SingleSprmWord { @@ -660,7 +660,7 @@ public: Ww1SingleSprmPFromText(sal_Char* sName) : Ww1SingleSprmWord(sName) { } - void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&); + void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE; }; // The data type Sprm actually appearing in the file diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 308cce8ccd5e..8deff4fe8400 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -134,68 +134,68 @@ class DocxAttributeOutput : public AttributeOutputBase, public oox::vml::VMLText { public: /// Export the state of RTL/CJK. - virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ); + virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) SAL_OVERRIDE; /// Start of the paragraph. - virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo ); + virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo ) SAL_OVERRIDE; /// End of the paragraph. - virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ); + virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE; /// Empty paragraph. - virtual void EmptyParagraph(); + virtual void EmptyParagraph() SAL_OVERRIDE; /// Called in order to output section breaks. - virtual void SectionBreaks(const SwTxtNode& rNode); + virtual void SectionBreaks(const SwTxtNode& rNode) SAL_OVERRIDE; /// Called before we start outputting the attributes. - virtual void StartParagraphProperties(); + virtual void StartParagraphProperties() SAL_OVERRIDE; /// Called after we end outputting the attributes. - virtual void EndParagraphProperties( const SfxItemSet* pParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted); + virtual void EndParagraphProperties( const SfxItemSet* pParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted) SAL_OVERRIDE; /// Start of the text run. - virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ); + virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) SAL_OVERRIDE; /// End of the text run. - virtual void EndRun(); + virtual void EndRun() SAL_OVERRIDE; /// Called before we start outputting the attributes. - virtual void StartRunProperties(); + virtual void StartRunProperties() SAL_OVERRIDE; /// Called after we end outputting the attributes. - virtual void EndRunProperties( const SwRedlineData* pRedlineData ); + virtual void EndRunProperties( const SwRedlineData* pRedlineData ) SAL_OVERRIDE; - virtual void FootnoteEndnoteRefTag(); + virtual void FootnoteEndnoteRefTag() SAL_OVERRIDE; - virtual void SectFootnoteEndnotePr(); + virtual void SectFootnoteEndnotePr() SAL_OVERRIDE; - virtual void WritePostitFieldReference(); + virtual void WritePostitFieldReference() SAL_OVERRIDE; /// Output text (inside a run). - virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ); + virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ) SAL_OVERRIDE; /// Output text (without markup). - virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ); + virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ) SAL_OVERRIDE; /// Output ruby start. - virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby ); + virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby ) SAL_OVERRIDE; /// Output ruby end. - virtual void EndRuby(); + virtual void EndRuby() SAL_OVERRIDE; /// Output URL start. - virtual bool StartURL( const OUString& rUrl, const OUString& rTarget ); + virtual bool StartURL( const OUString& rUrl, const OUString& rTarget ) SAL_OVERRIDE; /// Output URL end. - virtual bool EndURL(); + virtual bool EndURL() SAL_OVERRIDE; - virtual void FieldVanish( const OUString& rTxt, ww::eField eType ); + virtual void FieldVanish( const OUString& rTxt, ww::eField eType ) SAL_OVERRIDE; /// Output redlining. /// /// The common attribute that can be among the run properties. - virtual void Redline( const SwRedlineData* pRedline ); + virtual void Redline( const SwRedlineData* pRedline ) SAL_OVERRIDE; /// Output redlining. /// @@ -208,37 +208,37 @@ public: /// End of the tag that encloses the run. void EndRedline( const SwRedlineData * pRedlineData ); - virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop& rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ); + virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop& rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE; /// Output style. - virtual void ParagraphStyle( sal_uInt16 nStyle ); + virtual void ParagraphStyle( sal_uInt16 nStyle ) SAL_OVERRIDE; - virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); + virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; virtual void TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo ); - virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ); - virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableRowEnd( sal_uInt32 nDepth = 1 ); + virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo ) SAL_OVERRIDE; + virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) SAL_OVERRIDE; + virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableRowEnd( sal_uInt32 nDepth = 1 ) SAL_OVERRIDE; /// Start of the styles table. - virtual void StartStyles(); + virtual void StartStyles() SAL_OVERRIDE; /// End of the styles table. - virtual void EndStyles( sal_uInt16 nNumberOfStyles ); + virtual void EndStyles( sal_uInt16 nNumberOfStyles ) SAL_OVERRIDE; /// Write default style. - virtual void DefaultStyle( sal_uInt16 nStyle ); + virtual void DefaultStyle( sal_uInt16 nStyle ) SAL_OVERRIDE; /// Write Doc Defaults void DocDefaults( ); @@ -256,55 +256,55 @@ public: /// Start of a style in the styles table. virtual void StartStyle( const OUString& rName, StyleType eType, sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwId, sal_uInt16 nId, - bool bAutoUpdate ); + bool bAutoUpdate ) SAL_OVERRIDE; /// End of a style in the styles table. - virtual void EndStyle(); + virtual void EndStyle() SAL_OVERRIDE; /// Start of (paragraph or run) properties of a style. - virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ); + virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ) SAL_OVERRIDE; /// End of (paragraph or run) properties of a style. - virtual void EndStyleProperties( bool bParProp ); + virtual void EndStyleProperties( bool bParProp ) SAL_OVERRIDE; /// Numbering rule and Id. - virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt ); + virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt ) SAL_OVERRIDE; /// Page break /// As a paragraph property - the paragraph should be on the next page. - virtual void PageBreakBefore( bool bBreak ); + virtual void PageBreakBefore( bool bBreak ) SAL_OVERRIDE; /// Write a section break /// msword::ColumnBreak or msword::PageBreak - virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ); + virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) SAL_OVERRIDE; /// Start of the section properties. - virtual void StartSection(); + virtual void StartSection() SAL_OVERRIDE; /// End of the section properties. - virtual void EndSection(); + virtual void EndSection() SAL_OVERRIDE; /// Protection of forms. - virtual void SectionFormProtection( bool bProtected ); + virtual void SectionFormProtection( bool bProtected ) SAL_OVERRIDE; /// Numbering of the lines in the document. - virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ); + virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ) SAL_OVERRIDE; /// Has different headers/footers for the title page. - virtual void SectionTitlePage(); + virtual void SectionTitlePage() SAL_OVERRIDE; /// Description of the page borders. - virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt ); + virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt ) SAL_OVERRIDE; /// Columns populated from right/numbers on the right side? - virtual void SectionBiDi( bool bBiDi ); + virtual void SectionBiDi( bool bBiDi ) SAL_OVERRIDE; /// The style of the page numbers. /// - virtual void SectionPageNumbering( sal_uInt16 nNumType, ::boost::optional<sal_uInt16> oPageRestartNumber ); + virtual void SectionPageNumbering( sal_uInt16 nNumType, ::boost::optional<sal_uInt16> oPageRestartNumber ) SAL_OVERRIDE; /// The type of breaking. - virtual void SectionType( sal_uInt8 nBreakCode ); + virtual void SectionType( sal_uInt8 nBreakCode ) SAL_OVERRIDE; /// Start the font. void StartFont( const OUString& rFamilyName ) const; @@ -328,13 +328,13 @@ public: void EmbedFont( const OUString& name, FontFamily family, FontPitch pitch, rtl_TextEncoding encoding ); /// Definition of a numbering instance. - virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ); + virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) SAL_OVERRIDE; /// Start of the abstract numbering definition instance. - virtual void StartAbstractNumbering( sal_uInt16 nId ); + virtual void StartAbstractNumbering( sal_uInt16 nId ) SAL_OVERRIDE; /// End of the abstract numbering definition instance. - virtual void EndAbstractNumbering(); + virtual void EndAbstractNumbering() SAL_OVERRIDE; /// All the numbering level information. virtual void NumberingLevel( sal_uInt8 nLevel, @@ -349,7 +349,7 @@ public: sal_Int16 nFirstLineIndex, sal_Int16 nListTabPos, const OUString &rNumberingString, - const SvxBrushItem* pBrush = 0 ); + const SvxBrushItem* pBrush = 0 ) SAL_OVERRIDE; void WriteField_Impl( const SwField* pFld, ww::eField eType, const OUString& rFldCmd, sal_uInt8 nMode ); void WriteFormData_Impl( const ::sw::mark::IFieldmark& rFieldmark ); @@ -430,235 +430,235 @@ private: protected: /// Output frames - the implementation. - virtual void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft ); + virtual void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft ) SAL_OVERRIDE; /// Sfx item Sfx item RES_CHRATR_CASEMAP - virtual void CharCaseMap( const SvxCaseMapItem& rCaseMap ); + virtual void CharCaseMap( const SvxCaseMapItem& rCaseMap ) SAL_OVERRIDE; /// Sfx item Sfx item RES_CHRATR_COLOR - virtual void CharColor( const SvxColorItem& rColor); + virtual void CharColor( const SvxColorItem& rColor) SAL_OVERRIDE; /// Sfx item Sfx item RES_CHRATR_CONTOUR - virtual void CharContour( const SvxContourItem& rContour ); + virtual void CharContour( const SvxContourItem& rContour ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CROSSEDOUT - virtual void CharCrossedOut( const SvxCrossedOutItem& rCrossedOut ); + virtual void CharCrossedOut( const SvxCrossedOutItem& rCrossedOut ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_ESCAPEMENT - virtual void CharEscapement( const SvxEscapementItem& rEscapement ); + virtual void CharEscapement( const SvxEscapementItem& rEscapement ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_FONT - virtual void CharFont( const SvxFontItem& rFont ); + virtual void CharFont( const SvxFontItem& rFont ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_FONTSIZE - virtual void CharFontSize( const SvxFontHeightItem& rFontSize ); + virtual void CharFontSize( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_KERNING - virtual void CharKerning( const SvxKerningItem& rKerning ); + virtual void CharKerning( const SvxKerningItem& rKerning ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_LANGUAGE - virtual void CharLanguage( const SvxLanguageItem& rLanguage ); + virtual void CharLanguage( const SvxLanguageItem& rLanguage ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_POSTURE - virtual void CharPosture( const SvxPostureItem& rPosture ); + virtual void CharPosture( const SvxPostureItem& rPosture ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_SHADOWED - virtual void CharShadow( const SvxShadowedItem& rShadow ); + virtual void CharShadow( const SvxShadowedItem& rShadow ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_UNDERLINE - virtual void CharUnderline( const SvxUnderlineItem& rUnderline ); + virtual void CharUnderline( const SvxUnderlineItem& rUnderline ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_WEIGHT - virtual void CharWeight( const SvxWeightItem& rWeight ); + virtual void CharWeight( const SvxWeightItem& rWeight ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_AUTOKERN - virtual void CharAutoKern( const SvxAutoKernItem& ); + virtual void CharAutoKern( const SvxAutoKernItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_BLINK - virtual void CharAnimatedText( const SvxBlinkItem& rBlink ); + virtual void CharAnimatedText( const SvxBlinkItem& rBlink ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_BACKGROUND - virtual void CharBackground( const SvxBrushItem& rBrush ); + virtual void CharBackground( const SvxBrushItem& rBrush ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CJK_FONT - virtual void CharFontCJK( const SvxFontItem& rFont ); + virtual void CharFontCJK( const SvxFontItem& rFont ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CJK_FONTSIZE - virtual void CharFontSizeCJK( const SvxFontHeightItem& rFontSize ) { CharFontSize( rFontSize ); } + virtual void CharFontSizeCJK( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE { CharFontSize( rFontSize ); } /// Sfx item RES_CHRATR_CJK_LANGUAGE - virtual void CharLanguageCJK( const SvxLanguageItem& rLanguageItem ) { CharLanguage( rLanguageItem ); } + virtual void CharLanguageCJK( const SvxLanguageItem& rLanguageItem ) SAL_OVERRIDE { CharLanguage( rLanguageItem ); } /// Sfx item RES_CHRATR_CJK_POSTURE - virtual void CharPostureCJK( const SvxPostureItem& rPosture ); + virtual void CharPostureCJK( const SvxPostureItem& rPosture ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CJK_WEIGHT - virtual void CharWeightCJK( const SvxWeightItem& rWeight ); + virtual void CharWeightCJK( const SvxWeightItem& rWeight ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CTL_FONT - virtual void CharFontCTL( const SvxFontItem& rFont ); + virtual void CharFontCTL( const SvxFontItem& rFont ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CTL_FONTSIZE - virtual void CharFontSizeCTL( const SvxFontHeightItem& rFontSize ) { CharFontSize( rFontSize ); } + virtual void CharFontSizeCTL( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE { CharFontSize( rFontSize ); } /// Sfx item RES_CHRATR_CTL_LANGUAGE - virtual void CharLanguageCTL( const SvxLanguageItem& rLanguageItem ) { CharLanguage( rLanguageItem); } + virtual void CharLanguageCTL( const SvxLanguageItem& rLanguageItem ) SAL_OVERRIDE { CharLanguage( rLanguageItem); } /// Sfx item RES_CHRATR_CTL_POSTURE - virtual void CharPostureCTL( const SvxPostureItem& rWeight ); + virtual void CharPostureCTL( const SvxPostureItem& rWeight ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CTL_WEIGHT - virtual void CharWeightCTL( const SvxWeightItem& rWeight ); + virtual void CharWeightCTL( const SvxWeightItem& rWeight ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_BidiRTL - virtual void CharBidiRTL( const SfxPoolItem& ); + virtual void CharBidiRTL( const SfxPoolItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_IdctHint - virtual void CharIdctHint( const SfxPoolItem& ); + virtual void CharIdctHint( const SfxPoolItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_ROTATE - virtual void CharRotate( const SvxCharRotateItem& rRotate ); + virtual void CharRotate( const SvxCharRotateItem& rRotate ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_EMPHASIS_MARK - virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisMark ); + virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisMark ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_TWO_LINES - virtual void CharTwoLines( const SvxTwoLinesItem& rTwoLines ); + virtual void CharTwoLines( const SvxTwoLinesItem& rTwoLines ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_SCALEW - virtual void CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth ); + virtual void CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_RELIEF - virtual void CharRelief( const SvxCharReliefItem& rRelief); + virtual void CharRelief( const SvxCharReliefItem& rRelief) SAL_OVERRIDE; /// Sfx item RES_CHRATR_HIDDEN - virtual void CharHidden( const SvxCharHiddenItem& rHidden ); + virtual void CharHidden( const SvxCharHiddenItem& rHidden ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_BOX - virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ); + virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_HIGHLIGHT - virtual void CharHighlight( const SvxBrushItem& rHighlight ); + virtual void CharHighlight( const SvxBrushItem& rHighlight ) SAL_OVERRIDE; /// Sfx item RES_TXTATR_INETFMT - virtual void TextINetFormat( const SwFmtINetFmt& ); + virtual void TextINetFormat( const SwFmtINetFmt& ) SAL_OVERRIDE; /// Sfx item RES_TXTATR_CHARFMT - virtual void TextCharFormat( const SwFmtCharFmt& ); + virtual void TextCharFormat( const SwFmtCharFmt& ) SAL_OVERRIDE; /// Sfx item RES_TXTATR_FTN - virtual void TextFootnote_Impl( const SwFmtFtn& ); + virtual void TextFootnote_Impl( const SwFmtFtn& ) SAL_OVERRIDE; /// Output the footnote/endnote reference (if there's one to output). void FootnoteEndnoteReference(); /// Sfx item RES_PARATR_LINESPACING - virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ); + virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) SAL_OVERRIDE; /// Sfx item RES_PARATR_ADJUST - virtual void ParaAdjust( const SvxAdjustItem& rAdjust ); + virtual void ParaAdjust( const SvxAdjustItem& rAdjust ) SAL_OVERRIDE; /// Sfx item RES_PARATR_SPLIT - virtual void ParaSplit( const SvxFmtSplitItem& rSplit ); + virtual void ParaSplit( const SvxFmtSplitItem& rSplit ) SAL_OVERRIDE; /// Sfx item RES_PARATR_WIDOWS - virtual void ParaWidows( const SvxWidowsItem& rWidows ); + virtual void ParaWidows( const SvxWidowsItem& rWidows ) SAL_OVERRIDE; /// Sfx item RES_PARATR_TABSTOP - virtual void ParaTabStop( const SvxTabStopItem& rTabStop ); + virtual void ParaTabStop( const SvxTabStopItem& rTabStop ) SAL_OVERRIDE; /// Sfx item RES_PARATR_HYPHENZONE - virtual void ParaHyphenZone( const SvxHyphenZoneItem& ); + virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_NUMRULE - virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId ); + virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE; /// Sfx item RES_PARATR_SCRIPTSPACE - virtual void ParaScriptSpace( const SfxBoolItem& ); + virtual void ParaScriptSpace( const SfxBoolItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_HANGINGPUNCTUATION - virtual void ParaHangingPunctuation( const SfxBoolItem& ); + virtual void ParaHangingPunctuation( const SfxBoolItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_FORBIDDEN_RULES - virtual void ParaForbiddenRules( const SfxBoolItem& ); + virtual void ParaForbiddenRules( const SfxBoolItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_VERTALIGN - virtual void ParaVerticalAlign( const SvxParaVertAlignItem& rAlign ); + virtual void ParaVerticalAlign( const SvxParaVertAlignItem& rAlign ) SAL_OVERRIDE; /// Sfx item RES_PARATR_SNAPTOGRID - virtual void ParaSnapToGrid( const SvxParaGridItem& ); + virtual void ParaSnapToGrid( const SvxParaGridItem& ) SAL_OVERRIDE; /// Sfx item RES_FRM_SIZE - virtual void FormatFrameSize( const SwFmtFrmSize& ); + virtual void FormatFrameSize( const SwFmtFrmSize& ) SAL_OVERRIDE; /// Sfx item RES_PAPER_BIN - virtual void FormatPaperBin( const SvxPaperBinItem& ); + virtual void FormatPaperBin( const SvxPaperBinItem& ) SAL_OVERRIDE; /// Sfx item RES_LR_SPACE - virtual void FormatLRSpace( const SvxLRSpaceItem& rLRSpace ); + virtual void FormatLRSpace( const SvxLRSpaceItem& rLRSpace ) SAL_OVERRIDE; /// Sfx item RES_UL_SPACE - virtual void FormatULSpace( const SvxULSpaceItem& rULSpace ); + virtual void FormatULSpace( const SvxULSpaceItem& rULSpace ) SAL_OVERRIDE; /// Sfx item RES_SURROUND - virtual void FormatSurround( const SwFmtSurround& ); + virtual void FormatSurround( const SwFmtSurround& ) SAL_OVERRIDE; /// Sfx item RES_VERT_ORIENT - virtual void FormatVertOrientation( const SwFmtVertOrient& ); + virtual void FormatVertOrientation( const SwFmtVertOrient& ) SAL_OVERRIDE; /// Sfx item RES_HORI_ORIENT - virtual void FormatHorizOrientation( const SwFmtHoriOrient& ); + virtual void FormatHorizOrientation( const SwFmtHoriOrient& ) SAL_OVERRIDE; /// Sfx item RES_ANCHOR - virtual void FormatAnchor( const SwFmtAnchor& ); + virtual void FormatAnchor( const SwFmtAnchor& ) SAL_OVERRIDE; /// Sfx item RES_BACKGROUND - virtual void FormatBackground( const SvxBrushItem& ); + virtual void FormatBackground( const SvxBrushItem& ) SAL_OVERRIDE; /// Sfx item RES_FILL_STYLE - virtual void FormatFillStyle( const XFillStyleItem& ); + virtual void FormatFillStyle( const XFillStyleItem& ) SAL_OVERRIDE; /// Sfx item RES_FILL_GRADIENT - virtual void FormatFillGradient( const XFillGradientItem& ); + virtual void FormatFillGradient( const XFillGradientItem& ) SAL_OVERRIDE; /// Sfx item RES_BOX - virtual void FormatBox( const SvxBoxItem& ); + virtual void FormatBox( const SvxBoxItem& ) SAL_OVERRIDE; /// Sfx item RES_COL - virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize ); + virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE; /// Sfx item RES_KEEP - virtual void FormatKeep( const SvxFmtKeepItem& ); + virtual void FormatKeep( const SvxFmtKeepItem& ) SAL_OVERRIDE; /// Sfx item RES_TEXTGRID - virtual void FormatTextGrid( const SwTextGridItem& ); + virtual void FormatTextGrid( const SwTextGridItem& ) SAL_OVERRIDE; /// Sfx item RES_LINENUMBER - virtual void FormatLineNumbering( const SwFmtLineNumber& ); + virtual void FormatLineNumbering( const SwFmtLineNumber& ) SAL_OVERRIDE; /// Sfx item RES_FRAMEDIR - virtual void FormatFrameDirection( const SvxFrameDirectionItem& ); + virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_GRABBAG - virtual void ParaGrabBag( const SfxGrabBagItem& ); + virtual void ParaGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_GRABBAG - virtual void CharGrabBag( const SfxGrabBagItem& ); + virtual void CharGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE; // Sfx item RES_PARATR_OUTLINELEVEL - virtual void ParaOutlineLevel( const SfxUInt16Item& ); + virtual void ParaOutlineLevel( const SfxUInt16Item& ) SAL_OVERRIDE; /// Write the expanded field - virtual void WriteExpand( const SwField* pFld ); + virtual void WriteExpand( const SwField* pFld ) SAL_OVERRIDE; - virtual void RefField( const SwField& rFld, const OUString& rRef ); - virtual void HiddenField( const SwField& rFld ); - virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd ); - virtual void PostitField( const SwField* pFld ); - virtual bool DropdownField( const SwField* pFld ); - virtual bool PlaceholderField( const SwField* pFld ); + virtual void RefField( const SwField& rFld, const OUString& rRef ) SAL_OVERRIDE; + virtual void HiddenField( const SwField& rFld ) SAL_OVERRIDE; + virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE; + virtual void PostitField( const SwField* pFld ) SAL_OVERRIDE; + virtual bool DropdownField( const SwField* pFld ) SAL_OVERRIDE; + virtual bool PlaceholderField( const SwField* pFld ) SAL_OVERRIDE; - virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ); + virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ) SAL_OVERRIDE; /// Reference to the export, where to get the data from DocxExport &m_rExport; @@ -874,7 +874,7 @@ public: virtual ~DocxAttributeOutput(); /// Return the right export class. - virtual DocxExport& GetExport(); + virtual DocxExport& GetExport() SAL_OVERRIDE; const DocxExport& GetExport() const { return const_cast< DocxAttributeOutput* >( this )->GetExport(); } /// For eg. the output of the styles, we need to switch the serializer to an other one. @@ -899,8 +899,8 @@ public: void WritePostitFields(); /// VMLTextExport - virtual void WriteOutliner(const OutlinerParaObject& rParaObj); - virtual oox::drawingml::DrawingML& GetDrawingML(); + virtual void WriteOutliner(const OutlinerParaObject& rParaObj) SAL_OVERRIDE; + virtual oox::drawingml::DrawingML& GetDrawingML() SAL_OVERRIDE; virtual void switchHeaderFooter(bool isHeaderFooter, sal_Int32 index); void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize) SAL_OVERRIDE; diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index c4d5a77a80fe..2c55b2b3e0e7 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -108,63 +108,63 @@ public: const DocxExportFilter& GetFilter() const { return *m_pFilter; }; /// Access to the attribute output class. - virtual AttributeOutputBase& AttrOutput() const; + virtual AttributeOutputBase& AttrOutput() const SAL_OVERRIDE; /// Access to the sections/headers/footres. - virtual MSWordSections& Sections() const; + virtual MSWordSections& Sections() const SAL_OVERRIDE; /// Determines if the format is expected to support unicode. - virtual bool SupportsUnicode() const { return true; } + virtual bool SupportsUnicode() const SAL_OVERRIDE { return true; } - virtual bool SupportsOneColumnBreak() const { return true; } + virtual bool SupportsOneColumnBreak() const SAL_OVERRIDE { return true; } - virtual bool FieldsQuoted() const { return true; } + virtual bool FieldsQuoted() const SAL_OVERRIDE { return true; } - virtual bool AddSectionBreaksForTOX() const { return true; } + virtual bool AddSectionBreaksForTOX() const SAL_OVERRIDE { return true; } - virtual bool ignoreAttributeForStyles( sal_uInt16 nWhich ) const; + virtual bool ignoreAttributeForStyles( sal_uInt16 nWhich ) const SAL_OVERRIDE; /// Guess the script (asian/western). - virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ); + virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) SAL_OVERRIDE; - virtual void AppendBookmarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ); + virtual void AppendBookmarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE; - virtual void AppendBookmark( const OUString& rName, bool bSkip = false ); + virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) SAL_OVERRIDE; - virtual void AppendAnnotationMarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ); + virtual void AppendAnnotationMarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE; - virtual void ExportGrfBullet(const SwTxtNode&); + virtual void ExportGrfBullet(const SwTxtNode&) SAL_OVERRIDE; /// Returns the relationd id OString AddRelation( const OUString& rType, const OUString& rTarget ); - virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/ ) { /* FIXME no-op for docx, most probably should not even be in MSWordExportBase */ } - virtual void WriteChar( sal_Unicode ) { /* FIXME */ fprintf( stderr, "HACK! WriteChar() has nothing to do for docx.\n" ); } + virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/ ) SAL_OVERRIDE { /* FIXME no-op for docx, most probably should not even be in MSWordExportBase */ } + virtual void WriteChar( sal_Unicode ) SAL_OVERRIDE { /* FIXME */ fprintf( stderr, "HACK! WriteChar() has nothing to do for docx.\n" ); } /// Return value indicates if an inherited outline numbering is suppressed. - virtual bool DisallowInheritingOutlineNumbering( const SwFmt &rFmt ); + virtual bool DisallowInheritingOutlineNumbering( const SwFmt &rFmt ) SAL_OVERRIDE; /// Output the actual headers and footers. virtual void WriteHeadersFooters( sal_uInt8 nHeadFootFlags, - const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, sal_uInt8 nBreakCode ); + const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, sal_uInt8 nBreakCode ) SAL_OVERRIDE; /// Write the field virtual void OutputField( const SwField* pFld, ww::eField eFldType, - const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ); + const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) SAL_OVERRIDE; /// Write the data of the form field - virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ); - virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ); + virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE; + virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE; virtual void DoComboBox(const OUString &rName, const OUString &rHelp, const OUString &ToolTip, const OUString &rSelected, - com::sun::star::uno::Sequence<OUString> &rListItems); + com::sun::star::uno::Sequence<OUString> &rListItems) SAL_OVERRIDE; - virtual void DoFormText(const SwInputField * pFld); + virtual void DoFormText(const SwInputField * pFld) SAL_OVERRIDE; - virtual sal_uLong ReplaceCr( sal_uInt8 nChar ); + virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) SAL_OVERRIDE; /// Returns the relationd id OString OutputChart( com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr m_pSerializer ); @@ -178,34 +178,34 @@ public: protected: /// Format-dependent part of the actual export. - virtual void ExportDocument_Impl(); + virtual void ExportDocument_Impl() SAL_OVERRIDE; /// Output page/section breaks virtual void OutputPageSectionBreaks( const SwTxtNode& ); /// Output SwEndNode - virtual void OutputEndNode( const SwEndNode& ); + virtual void OutputEndNode( const SwEndNode& ) SAL_OVERRIDE; /// Output SwTableNode virtual void OutputTableNode( const SwTableNode& ); /// Output SwGrfNode - virtual void OutputGrfNode( const SwGrfNode& ); + virtual void OutputGrfNode( const SwGrfNode& ) SAL_OVERRIDE; /// Output SwOLENode - virtual void OutputOLENode( const SwOLENode& ); + virtual void OutputOLENode( const SwOLENode& ) SAL_OVERRIDE; - virtual void OutputLinkedOLE( const OUString& ); + virtual void OutputLinkedOLE( const OUString& ) SAL_OVERRIDE; - virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ); + virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) SAL_OVERRIDE; - virtual void SectionBreaksAndFrames( const SwTxtNode& /*rNode*/ ) {} + virtual void SectionBreaksAndFrames( const SwTxtNode& /*rNode*/ ) SAL_OVERRIDE {} /// Get ready for a new section. virtual void PrepareNewPageDesc( const SfxItemSet* pSet, const SwNode& rNd, const SwFmtPageDesc* pNewPgDescFmt = 0, - const SwPageDesc* pNewPgDesc = 0 ); + const SwPageDesc* pNewPgDesc = 0 ) SAL_OVERRIDE; private: /// Setup pStyles and write styles.xml @@ -218,7 +218,7 @@ private: void WritePostitFields(); /// Write the numbering table. - virtual void WriteNumbering(); + virtual void WriteNumbering() SAL_OVERRIDE; /// Write reference to a header/foorter + the actual xml containing the text. void WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* pType ); diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx index c1a86da85e12..582903a60412 100644 --- a/sw/source/filter/ww8/docxexportfilter.hxx +++ b/sw/source/filter/ww8/docxexportfilter.hxx @@ -34,22 +34,22 @@ public: // FIXME these should not even exist for the export-only filter! // For now, let's just do empty implementations of those. - virtual bool importDocument() { return false; } - virtual const ::oox::drawingml::Theme* getCurrentTheme() const { return NULL; } + virtual bool importDocument() SAL_OVERRIDE { return false; } + virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE { return NULL; } virtual sal_Int32 getSchemeClr( sal_Int32 ) const { return 0; } - virtual ::oox::vml::Drawing* getVmlDrawing() { return NULL; } - virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() { return NULL; } - virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() { return ::oox::drawingml::table::TableStyleListPtr(); } + virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE { return NULL; } + virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE { return NULL; } + virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE { return ::oox::drawingml::table::TableStyleListPtr(); } // Actual export of the DOCX document - virtual bool exportDocument(); + virtual bool exportDocument() SAL_OVERRIDE; private: /// Implementatio of the filter abstract method. - virtual OUString implGetImplementationName() const; + virtual OUString implGetImplementationName() const SAL_OVERRIDE; - virtual ::oox::ole::VbaProject* implCreateVbaProject() const + virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE { return NULL; // FIXME: implement me ! } diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx index f42c4e5cdffa..a03ff22cdfe9 100644 --- a/sw/source/filter/ww8/escher.hxx +++ b/sw/source/filter/ww8/escher.hxx @@ -31,7 +31,7 @@ class SwFmtVertOrient; class WinwordAnchoring : public EscherExClientRecord_Base { public: - void WriteData(EscherEx& rEx) const; + void WriteData(EscherEx& rEx) const SAL_OVERRIDE; void SetAnchoring(const SwFrmFmt& rFmt); /** method to perform conversion of positioning attributes with the help @@ -81,7 +81,7 @@ public: private: /** Overloaded to create a new memory stream for picture data. */ - virtual SvStream* ImplQueryPictureStream(); + virtual SvStream* ImplQueryPictureStream() SAL_OVERRIDE; private: boost::shared_ptr< SvStream > mxPicStrm; @@ -155,23 +155,23 @@ private: sal_uInt32 nTxtBox, DrawObjPointerVector &rPVec); void WriteOCXControl(const SwFrmFmt& rFmt,sal_uInt32 nShapeId); virtual sal_Int32 WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType, - EscherPropertyContainer& rPropOpt); + EscherPropertyContainer& rPropOpt) SAL_OVERRIDE; virtual sal_uInt32 QueryTextID( const com::sun::star::uno::Reference< - com::sun::star::drawing::XShape > &,sal_uInt32); + com::sun::star::drawing::XShape > &,sal_uInt32) SAL_OVERRIDE; virtual void SetPicId(const SdrObject &rSdrObj, sal_uInt32 nShapeId, - EscherPropertyContainer &rPropOpt); + EscherPropertyContainer &rPropOpt) SAL_OVERRIDE; public: SwEscherEx( SvStream* pStrm, WW8Export& rWW8Wrt ); virtual ~SwEscherEx(); void FinishEscher(); - virtual void WritePictures(); + virtual void WritePictures() SAL_OVERRIDE; - virtual void WriteFrmExtraData(const SwFrmFmt& rFmt); + virtual void WriteFrmExtraData(const SwFrmFmt& rFmt) SAL_OVERRIDE; EscherExHostAppData* StartShape(const com::sun::star::uno::Reference< - com::sun::star::drawing::XShape > &, const Rectangle*) {return &aHostData;} + com::sun::star::drawing::XShape > &, const Rectangle*) SAL_OVERRIDE {return &aHostData;} private: //No copying SwEscherEx(const SwEscherEx&); diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index c64b8e03a2c9..0d00506b2ede 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -39,153 +39,153 @@ class RtfAttributeOutput : public AttributeOutputBase friend class RtfStringBufferValue; public: /// Export the state of RTL/CJK. - virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ); + virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) SAL_OVERRIDE; /// Start of the paragraph. - virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo ); + virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo ) SAL_OVERRIDE; /// End of the paragraph. - virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ); + virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE; /// Empty paragraph. - virtual void EmptyParagraph(); + virtual void EmptyParagraph() SAL_OVERRIDE; /// Called in order to output section breaks. - virtual void SectionBreaks(const SwTxtNode& rNode); + virtual void SectionBreaks(const SwTxtNode& rNode) SAL_OVERRIDE; /// Called before we start outputting the attributes. - virtual void StartParagraphProperties(); + virtual void StartParagraphProperties() SAL_OVERRIDE; /// Called after we end outputting the attributes. - virtual void EndParagraphProperties( const SfxItemSet* pParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted ); + virtual void EndParagraphProperties( const SfxItemSet* pParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted ) SAL_OVERRIDE; /// Start of the text run. - virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ); + virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) SAL_OVERRIDE; /// End of the text run. - virtual void EndRun(); + virtual void EndRun() SAL_OVERRIDE; /// Called before we start outputting the attributes. - virtual void StartRunProperties(); + virtual void StartRunProperties() SAL_OVERRIDE; /// Called after we end outputting the attributes. - virtual void EndRunProperties( const SwRedlineData* pRedlineData ); + virtual void EndRunProperties( const SwRedlineData* pRedlineData ) SAL_OVERRIDE; /// Output text (inside a run). - virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ); + virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ) SAL_OVERRIDE; // Access to (anyway) private buffers, used by the sdr exporter OStringBuffer& RunText(); OStringBuffer& Styles(); /// Output text (without markup). - virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ); + virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ) SAL_OVERRIDE; /// Output ruby start. - virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby ); + virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby ) SAL_OVERRIDE; /// Output ruby end. - virtual void EndRuby(); + virtual void EndRuby() SAL_OVERRIDE; /// Output URL start. - virtual bool StartURL( const OUString& rUrl, const OUString& rTarget ); + virtual bool StartURL( const OUString& rUrl, const OUString& rTarget ) SAL_OVERRIDE; /// Output URL end. - virtual bool EndURL(); + virtual bool EndURL() SAL_OVERRIDE; - virtual void FieldVanish( const OUString& rTxt, ww::eField eType ); + virtual void FieldVanish( const OUString& rTxt, ww::eField eType ) SAL_OVERRIDE; /// Output redlining. /// /// The common attribute that can be among the run properties. - virtual void Redline( const SwRedlineData* pRedline ); + virtual void Redline( const SwRedlineData* pRedline ) SAL_OVERRIDE; - virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop& rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ); + virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop& rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE; /// Output style. - virtual void ParagraphStyle( sal_uInt16 nStyle ); - - virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo ); - virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ); - virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableRowEnd( sal_uInt32 nDepth ); + virtual void ParagraphStyle( sal_uInt16 nStyle ) SAL_OVERRIDE; + + virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo ) SAL_OVERRIDE; + virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) SAL_OVERRIDE; + virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableRowEnd( sal_uInt32 nDepth ) SAL_OVERRIDE; /// Start of the styles table. - virtual void StartStyles(); + virtual void StartStyles() SAL_OVERRIDE; /// End of the styles table. - virtual void EndStyles( sal_uInt16 nNumberOfStyles ); + virtual void EndStyles( sal_uInt16 nNumberOfStyles ) SAL_OVERRIDE; /// Write default style. - virtual void DefaultStyle( sal_uInt16 nStyle ); + virtual void DefaultStyle( sal_uInt16 nStyle ) SAL_OVERRIDE; /// Start of a style in the styles table. virtual void StartStyle( const OUString& rName, StyleType eType, sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwId, sal_uInt16 nId, - bool bAutoUpdate ); + bool bAutoUpdate ) SAL_OVERRIDE; /// End of a style in the styles table. - virtual void EndStyle(); + virtual void EndStyle() SAL_OVERRIDE; /// Start of (paragraph or run) properties of a style. - virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ); + virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ) SAL_OVERRIDE; /// End of (paragraph or run) properties of a style. - virtual void EndStyleProperties( bool bParProp ); + virtual void EndStyleProperties( bool bParProp ) SAL_OVERRIDE; /// Numbering rule and Id. - virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt ); + virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt ) SAL_OVERRIDE; /// Page break /// As a paragraph property - the paragraph should be on the next page. - virtual void PageBreakBefore( bool bBreak ); + virtual void PageBreakBefore( bool bBreak ) SAL_OVERRIDE; /// Write a section break /// msword::ColumnBreak or msword::PageBreak - virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ); + virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) SAL_OVERRIDE; /// Start of the section properties. - virtual void StartSection(); + virtual void StartSection() SAL_OVERRIDE; /// End of the section properties. - virtual void EndSection(); + virtual void EndSection() SAL_OVERRIDE; /// Protection of forms. - virtual void SectionFormProtection( bool bProtected ); + virtual void SectionFormProtection( bool bProtected ) SAL_OVERRIDE; /// Numbering of the lines in the document. - virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ); + virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ) SAL_OVERRIDE; /// Has different headers/footers for the title page. - virtual void SectionTitlePage(); + virtual void SectionTitlePage() SAL_OVERRIDE; /// Description of the page borders. - virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt ); + virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt ) SAL_OVERRIDE; /// Columns populated from right/numbers on the right side? - virtual void SectionBiDi( bool bBiDi ); + virtual void SectionBiDi( bool bBiDi ) SAL_OVERRIDE; /// The style of the page numbers. /// - virtual void SectionPageNumbering( sal_uInt16 nNumType, ::boost::optional<sal_uInt16> oPageRestartNumber ); + virtual void SectionPageNumbering( sal_uInt16 nNumType, ::boost::optional<sal_uInt16> oPageRestartNumber ) SAL_OVERRIDE; /// The type of breaking. - virtual void SectionType( sal_uInt8 nBreakCode ); + virtual void SectionType( sal_uInt8 nBreakCode ) SAL_OVERRIDE; /// Definition of a numbering instance. - virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ); + virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) SAL_OVERRIDE; /// Start of the abstract numbering definition instance. virtual void StartAbstractNumbering( sal_uInt16 nId ) SAL_OVERRIDE; @@ -206,7 +206,7 @@ public: sal_Int16 nFirstLineIndex, sal_Int16 nListTabPos, const OUString &rNumberingString, - const SvxBrushItem* pBrush = 0);//For i120928,to export graphic of bullet + const SvxBrushItem* pBrush = 0) SAL_OVERRIDE;//For i120928,to export graphic of bullet void WriteField_Impl( const SwField* pFld, ww::eField eType, const OUString& rFldCmd, sal_uInt8 nMode ); void WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds ); @@ -215,230 +215,230 @@ public: protected: /// Output frames - the implementation. - virtual void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft ); + virtual void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft ) SAL_OVERRIDE; /// Sfx item Sfx item RES_CHRATR_CASEMAP - virtual void CharCaseMap( const SvxCaseMapItem& rCaseMap ); + virtual void CharCaseMap( const SvxCaseMapItem& rCaseMap ) SAL_OVERRIDE; /// Sfx item Sfx item RES_CHRATR_COLOR - virtual void CharColor( const SvxColorItem& rColor); + virtual void CharColor( const SvxColorItem& rColor) SAL_OVERRIDE; /// Sfx item Sfx item RES_CHRATR_CONTOUR - virtual void CharContour( const SvxContourItem& rContour ); + virtual void CharContour( const SvxContourItem& rContour ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CROSSEDOUT - virtual void CharCrossedOut( const SvxCrossedOutItem& rCrossedOut ); + virtual void CharCrossedOut( const SvxCrossedOutItem& rCrossedOut ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_ESCAPEMENT - virtual void CharEscapement( const SvxEscapementItem& rEscapement ); + virtual void CharEscapement( const SvxEscapementItem& rEscapement ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_FONT - virtual void CharFont( const SvxFontItem& rFont ); + virtual void CharFont( const SvxFontItem& rFont ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_FONTSIZE - virtual void CharFontSize( const SvxFontHeightItem& rFontSize ); + virtual void CharFontSize( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_KERNING - virtual void CharKerning( const SvxKerningItem& rKerning ); + virtual void CharKerning( const SvxKerningItem& rKerning ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_LANGUAGE - virtual void CharLanguage( const SvxLanguageItem& rLanguage ); + virtual void CharLanguage( const SvxLanguageItem& rLanguage ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_POSTURE - virtual void CharPosture( const SvxPostureItem& rPosture ); + virtual void CharPosture( const SvxPostureItem& rPosture ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_SHADOWED - virtual void CharShadow( const SvxShadowedItem& rShadow ); + virtual void CharShadow( const SvxShadowedItem& rShadow ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_UNDERLINE - virtual void CharUnderline( const SvxUnderlineItem& rUnderline ); + virtual void CharUnderline( const SvxUnderlineItem& rUnderline ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_WEIGHT - virtual void CharWeight( const SvxWeightItem& rWeight ); + virtual void CharWeight( const SvxWeightItem& rWeight ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_AUTOKERN - virtual void CharAutoKern( const SvxAutoKernItem& ); + virtual void CharAutoKern( const SvxAutoKernItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_BLINK - virtual void CharAnimatedText( const SvxBlinkItem& rBlink ); + virtual void CharAnimatedText( const SvxBlinkItem& rBlink ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_BACKGROUND - virtual void CharBackground( const SvxBrushItem& rBrush ); + virtual void CharBackground( const SvxBrushItem& rBrush ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CJK_FONT - virtual void CharFontCJK( const SvxFontItem& rFont ); + virtual void CharFontCJK( const SvxFontItem& rFont ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CJK_FONTSIZE - virtual void CharFontSizeCJK( const SvxFontHeightItem& rFontSize ); + virtual void CharFontSizeCJK( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CJK_LANGUAGE - virtual void CharLanguageCJK( const SvxLanguageItem& rLanguageItem ); + virtual void CharLanguageCJK( const SvxLanguageItem& rLanguageItem ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CJK_POSTURE - virtual void CharPostureCJK( const SvxPostureItem& rPosture ); + virtual void CharPostureCJK( const SvxPostureItem& rPosture ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CJK_WEIGHT - virtual void CharWeightCJK( const SvxWeightItem& rWeight ); + virtual void CharWeightCJK( const SvxWeightItem& rWeight ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CTL_FONT - virtual void CharFontCTL( const SvxFontItem& rFont ); + virtual void CharFontCTL( const SvxFontItem& rFont ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CTL_FONTSIZE - virtual void CharFontSizeCTL( const SvxFontHeightItem& rFontSize ); + virtual void CharFontSizeCTL( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CTL_LANGUAGE - virtual void CharLanguageCTL( const SvxLanguageItem& rLanguageItem ); + virtual void CharLanguageCTL( const SvxLanguageItem& rLanguageItem ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CTL_POSTURE - virtual void CharPostureCTL( const SvxPostureItem& rWeight ); + virtual void CharPostureCTL( const SvxPostureItem& rWeight ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CTL_WEIGHT - virtual void CharWeightCTL( const SvxWeightItem& rWeight ); + virtual void CharWeightCTL( const SvxWeightItem& rWeight ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_BidiRTL - virtual void CharBidiRTL( const SfxPoolItem& ); + virtual void CharBidiRTL( const SfxPoolItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_IdctHint - virtual void CharIdctHint( const SfxPoolItem& ); + virtual void CharIdctHint( const SfxPoolItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_ROTATE - virtual void CharRotate( const SvxCharRotateItem& rRotate ); + virtual void CharRotate( const SvxCharRotateItem& rRotate ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_EMPHASIS_MARK - virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisMark ); + virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisMark ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_TWO_LINES - virtual void CharTwoLines( const SvxTwoLinesItem& rTwoLines ); + virtual void CharTwoLines( const SvxTwoLinesItem& rTwoLines ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_SCALEW - virtual void CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth ); + virtual void CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_RELIEF - virtual void CharRelief( const SvxCharReliefItem& rRelief); + virtual void CharRelief( const SvxCharReliefItem& rRelief) SAL_OVERRIDE; /// Sfx item RES_CHRATR_HIDDEN - virtual void CharHidden( const SvxCharHiddenItem& rHidden ); + virtual void CharHidden( const SvxCharHiddenItem& rHidden ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_BOX - virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ); + virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_HIGHLIGHT - virtual void CharHighlight( const SvxBrushItem& ){}; + virtual void CharHighlight( const SvxBrushItem& ) SAL_OVERRIDE {}; /// Sfx item RES_TXTATR_INETFMT - virtual void TextINetFormat( const SwFmtINetFmt& ); + virtual void TextINetFormat( const SwFmtINetFmt& ) SAL_OVERRIDE; /// Sfx item RES_TXTATR_CHARFMT - virtual void TextCharFormat( const SwFmtCharFmt& ); + virtual void TextCharFormat( const SwFmtCharFmt& ) SAL_OVERRIDE; /// Sfx item RES_TXTATR_FTN - virtual void TextFootnote_Impl( const SwFmtFtn& ); + virtual void TextFootnote_Impl( const SwFmtFtn& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_LINESPACING - virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ); + virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) SAL_OVERRIDE; /// Sfx item RES_PARATR_ADJUST - virtual void ParaAdjust( const SvxAdjustItem& rAdjust ); + virtual void ParaAdjust( const SvxAdjustItem& rAdjust ) SAL_OVERRIDE; /// Sfx item RES_PARATR_SPLIT - virtual void ParaSplit( const SvxFmtSplitItem& rSplit ); + virtual void ParaSplit( const SvxFmtSplitItem& rSplit ) SAL_OVERRIDE; /// Sfx item RES_PARATR_WIDOWS - virtual void ParaWidows( const SvxWidowsItem& rWidows ); + virtual void ParaWidows( const SvxWidowsItem& rWidows ) SAL_OVERRIDE; /// Sfx item RES_PARATR_TABSTOP - virtual void ParaTabStop( const SvxTabStopItem& rTabStop ); + virtual void ParaTabStop( const SvxTabStopItem& rTabStop ) SAL_OVERRIDE; /// Sfx item RES_PARATR_HYPHENZONE - virtual void ParaHyphenZone( const SvxHyphenZoneItem& ); + virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_NUMRULE - virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId ); + virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE; /// Sfx item RES_PARATR_SCRIPTSPACE - virtual void ParaScriptSpace( const SfxBoolItem& ); + virtual void ParaScriptSpace( const SfxBoolItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_HANGINGPUNCTUATION - virtual void ParaHangingPunctuation( const SfxBoolItem& ); + virtual void ParaHangingPunctuation( const SfxBoolItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_FORBIDDEN_RULES - virtual void ParaForbiddenRules( const SfxBoolItem& ); + virtual void ParaForbiddenRules( const SfxBoolItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_VERTALIGN - virtual void ParaVerticalAlign( const SvxParaVertAlignItem& rAlign ); + virtual void ParaVerticalAlign( const SvxParaVertAlignItem& rAlign ) SAL_OVERRIDE; /// Sfx item RES_PARATR_SNAPTOGRID - virtual void ParaSnapToGrid( const SvxParaGridItem& ); + virtual void ParaSnapToGrid( const SvxParaGridItem& ) SAL_OVERRIDE; /// Sfx item RES_FRM_SIZE - virtual void FormatFrameSize( const SwFmtFrmSize& ); + virtual void FormatFrameSize( const SwFmtFrmSize& ) SAL_OVERRIDE; /// Sfx item RES_PAPER_BIN - virtual void FormatPaperBin( const SvxPaperBinItem& ); + virtual void FormatPaperBin( const SvxPaperBinItem& ) SAL_OVERRIDE; /// Sfx item RES_LR_SPACE - virtual void FormatLRSpace( const SvxLRSpaceItem& rLRSpace ); + virtual void FormatLRSpace( const SvxLRSpaceItem& rLRSpace ) SAL_OVERRIDE; /// Sfx item RES_UL_SPACE - virtual void FormatULSpace( const SvxULSpaceItem& rULSpace ); + virtual void FormatULSpace( const SvxULSpaceItem& rULSpace ) SAL_OVERRIDE; /// Sfx item RES_SURROUND - virtual void FormatSurround( const SwFmtSurround& ); + virtual void FormatSurround( const SwFmtSurround& ) SAL_OVERRIDE; /// Sfx item RES_VERT_ORIENT - virtual void FormatVertOrientation( const SwFmtVertOrient& ); + virtual void FormatVertOrientation( const SwFmtVertOrient& ) SAL_OVERRIDE; /// Sfx item RES_HORI_ORIENT - virtual void FormatHorizOrientation( const SwFmtHoriOrient& ); + virtual void FormatHorizOrientation( const SwFmtHoriOrient& ) SAL_OVERRIDE; /// Sfx item RES_ANCHOR - virtual void FormatAnchor( const SwFmtAnchor& ); + virtual void FormatAnchor( const SwFmtAnchor& ) SAL_OVERRIDE; /// Sfx item RES_BACKGROUND - virtual void FormatBackground( const SvxBrushItem& ); + virtual void FormatBackground( const SvxBrushItem& ) SAL_OVERRIDE; /// Sfx item RES_FILL_STYLE - virtual void FormatFillStyle( const XFillStyleItem& ); + virtual void FormatFillStyle( const XFillStyleItem& ) SAL_OVERRIDE; /// Sfx item RES_FILL_GRADIENT - virtual void FormatFillGradient( const XFillGradientItem& ); + virtual void FormatFillGradient( const XFillGradientItem& ) SAL_OVERRIDE; /// Sfx item RES_BOX - virtual void FormatBox( const SvxBoxItem& ); + virtual void FormatBox( const SvxBoxItem& ) SAL_OVERRIDE; /// Sfx item RES_COL - virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize ); + virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE; /// Sfx item RES_KEEP - virtual void FormatKeep( const SvxFmtKeepItem& ); + virtual void FormatKeep( const SvxFmtKeepItem& ) SAL_OVERRIDE; /// Sfx item RES_TEXTGRID - virtual void FormatTextGrid( const SwTextGridItem& ); + virtual void FormatTextGrid( const SwTextGridItem& ) SAL_OVERRIDE; /// Sfx item RES_LINENUMBER - virtual void FormatLineNumbering( const SwFmtLineNumber& ); + virtual void FormatLineNumbering( const SwFmtLineNumber& ) SAL_OVERRIDE; /// Sfx item RES_FRAMEDIR - virtual void FormatFrameDirection( const SvxFrameDirectionItem& ); + virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_GRABBAG - virtual void ParaGrabBag( const SfxGrabBagItem& ); + virtual void ParaGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_GRABBAG - virtual void CharGrabBag( const SfxGrabBagItem& ); + virtual void CharGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_OUTLINELEVEL - virtual void ParaOutlineLevel( const SfxUInt16Item& ); + virtual void ParaOutlineLevel( const SfxUInt16Item& ) SAL_OVERRIDE; /// Write the expanded field - virtual void WriteExpand( const SwField* pFld ); + virtual void WriteExpand( const SwField* pFld ) SAL_OVERRIDE; - virtual void RefField( const SwField& rFld, const OUString& rRef ); - virtual void HiddenField( const SwField& rFld ); - virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd ); - virtual void PostitField( const SwField* pFld ); - virtual bool DropdownField( const SwField* pFld ); - virtual bool PlaceholderField( const SwField* pFld ); + virtual void RefField( const SwField& rFld, const OUString& rRef ) SAL_OVERRIDE; + virtual void HiddenField( const SwField& rFld ) SAL_OVERRIDE; + virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE; + virtual void PostitField( const SwField* pFld ) SAL_OVERRIDE; + virtual bool DropdownField( const SwField* pFld ) SAL_OVERRIDE; + virtual bool PlaceholderField( const SwField* pFld ) SAL_OVERRIDE; /// Reference to the export, where to get the data from RtfExport &m_rExport; @@ -602,7 +602,7 @@ public: virtual ~RtfAttributeOutput(); /// Return the right export class. - virtual MSWordExportBase& GetExport(); + virtual MSWordExportBase& GetExport() SAL_OVERRIDE; OStringBuffer m_aTabStop; diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 10b99b0f0621..306b086dacda 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -1210,7 +1210,7 @@ class SwRTFWriter : public Writer public: SwRTFWriter( const OUString& rFilterName, const OUString& rBaseURL ); virtual ~SwRTFWriter(); - virtual sal_uLong WriteStream(); + virtual sal_uLong WriteStream() SAL_OVERRIDE; }; SwRTFWriter::SwRTFWriter( const OUString& rFltName, const OUString & rBaseURL ) diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index c23bff0754eb..103429fd5d55 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -51,93 +51,93 @@ class RtfExport : public MSWordExportBase public: /// Access to the attribute output class. - virtual AttributeOutputBase& AttrOutput() const; + virtual AttributeOutputBase& AttrOutput() const SAL_OVERRIDE; /// Access to the sections/headers/footres. - virtual MSWordSections& Sections() const; + virtual MSWordSections& Sections() const SAL_OVERRIDE; /// Access to the Rtf Sdr exporter. virtual RtfSdrExport& SdrExporter() const; /// Determines if the format is expected to support unicode. - virtual bool SupportsUnicode() const { return true; } + virtual bool SupportsUnicode() const SAL_OVERRIDE { return true; } - virtual bool SupportsOneColumnBreak() const { return false; } + virtual bool SupportsOneColumnBreak() const SAL_OVERRIDE { return false; } - virtual bool FieldsQuoted() const { return true; } + virtual bool FieldsQuoted() const SAL_OVERRIDE { return true; } - virtual bool AddSectionBreaksForTOX() const { return false; } + virtual bool AddSectionBreaksForTOX() const SAL_OVERRIDE { return false; } /// Guess the script (asian/western). - virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ); + virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) SAL_OVERRIDE; - virtual void AppendBookmarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ); + virtual void AppendBookmarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE; - virtual void AppendBookmark( const OUString& rName, bool bSkip = false ); + virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) SAL_OVERRIDE; - virtual void AppendAnnotationMarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ); + virtual void AppendAnnotationMarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE; //For i120928,add an interface to export graphic of bullet - virtual void ExportGrfBullet(const SwTxtNode& rNd); + virtual void ExportGrfBullet(const SwTxtNode& rNd) SAL_OVERRIDE; - virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/ ) { /* no-op for rtf, most probably should not even be in MSWordExportBase */ } - virtual void WriteChar( sal_Unicode ); + virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/ ) SAL_OVERRIDE { /* no-op for rtf, most probably should not even be in MSWordExportBase */ } + virtual void WriteChar( sal_Unicode ) SAL_OVERRIDE; /// Write the numbering table. - virtual void WriteNumbering(); + virtual void WriteNumbering() SAL_OVERRIDE; /// Write the revision table. virtual void WriteRevTab(); /// Output the actual headers and footers. virtual void WriteHeadersFooters( sal_uInt8 nHeadFootFlags, - const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, sal_uInt8 nBreakCode ); + const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, sal_uInt8 nBreakCode ) SAL_OVERRIDE; /// Write the field virtual void OutputField( const SwField* pFld, ww::eField eFldType, - const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ); + const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) SAL_OVERRIDE; /// Write the data of the form field - virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ); - virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ); + virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE; + virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE; virtual void DoComboBox(const OUString &rName, const OUString &rHelp, const OUString &ToolTip, const OUString &rSelected, - com::sun::star::uno::Sequence<OUString> &rListItems); + com::sun::star::uno::Sequence<OUString> &rListItems) SAL_OVERRIDE; - virtual void DoFormText(const SwInputField * pFld); + virtual void DoFormText(const SwInputField * pFld) SAL_OVERRIDE; - virtual sal_uLong ReplaceCr( sal_uInt8 nChar ); + virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) SAL_OVERRIDE; protected: /// Format-dependent part of the actual export. - virtual void ExportDocument_Impl(); + virtual void ExportDocument_Impl() SAL_OVERRIDE; - virtual void SectionBreaksAndFrames( const SwTxtNode& /*rNode*/ ) {} + virtual void SectionBreaksAndFrames( const SwTxtNode& /*rNode*/ ) SAL_OVERRIDE {} /// Get ready for a new section. virtual void PrepareNewPageDesc( const SfxItemSet* pSet, const SwNode& rNd, const SwFmtPageDesc* pNewPgDescFmt = 0, - const SwPageDesc* pNewPgDesc = 0 ); + const SwPageDesc* pNewPgDesc = 0 ) SAL_OVERRIDE; /// Return value indicates if an inherited outline numbering is suppressed. - virtual bool DisallowInheritingOutlineNumbering(const SwFmt &rFmt); + virtual bool DisallowInheritingOutlineNumbering(const SwFmt &rFmt) SAL_OVERRIDE; /// Output SwTxtNode is depending on outline export mode virtual void OutputTextNode( const SwTxtNode& ) SAL_OVERRIDE; /// Output SwGrfNode - virtual void OutputGrfNode( const SwGrfNode& ); + virtual void OutputGrfNode( const SwGrfNode& ) SAL_OVERRIDE; /// Output SwOLENode - virtual void OutputOLENode( const SwOLENode& ); + virtual void OutputOLENode( const SwOLENode& ) SAL_OVERRIDE; - virtual void OutputLinkedOLE(const OUString&); + virtual void OutputLinkedOLE(const OUString&) SAL_OVERRIDE; - virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ); + virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) SAL_OVERRIDE; public: /// Pass the pDocument, pCurrentPam and pOriginalPam to the base class. diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx index 9c9cdb703088..e275e583762b 100644 --- a/sw/source/filter/ww8/rtfexportfilter.hxx +++ b/sw/source/filter/ww8/rtfexportfilter.hxx @@ -30,7 +30,7 @@ class RtfWriter : public Writer { protected: - sal_uLong WriteStream() { return 0; } + sal_uLong WriteStream() SAL_OVERRIDE { return 0; } }; /// The physical access to the RTF document (for writing). @@ -49,13 +49,13 @@ public: // XFilter virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL cancel( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XExporter virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; RtfWriter m_aWriter; }; diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 21101e9c5b45..2dc14f9b3aa2 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -234,7 +234,7 @@ public: WW8_WrPlcSepx( MSWordExportBase& rExport ); ~WW8_WrPlcSepx(); - virtual bool HeaderFooterWritten(); // override + virtual bool HeaderFooterWritten() SAL_OVERRIDE; // override void AppendSep( WW8_CP nStartCp, const SwPageDesc* pPd, @@ -378,8 +378,8 @@ public: MainTxtPlcDrawObj() {} private: virtual void RegisterWithFib(WW8Fib &rFib, sal_uInt32 nStart, - sal_uInt32 nLen) const; - virtual WW8_CP GetCpOffset(const WW8Fib &) const; + sal_uInt32 nLen) const SAL_OVERRIDE; + virtual WW8_CP GetCpOffset(const WW8Fib &) const SAL_OVERRIDE; private: //No copying MainTxtPlcDrawObj(const MainTxtPlcDrawObj&); @@ -392,8 +392,8 @@ public: HdFtPlcDrawObj() {} private: virtual void RegisterWithFib(WW8Fib &rFib, sal_uInt32 nStart, - sal_uInt32 nLen) const; - virtual WW8_CP GetCpOffset(const WW8Fib &rFib) const; + sal_uInt32 nLen) const SAL_OVERRIDE; + virtual WW8_CP GetCpOffset(const WW8Fib &rFib) const SAL_OVERRIDE; private: //No copying HdFtPlcDrawObj(const HdFtPlcDrawObj&); @@ -407,7 +407,7 @@ typedef std::vector<aBookmarkPair>::iterator SwImplBookmarksIter; class WW8_WrtRedlineAuthor : public sw::util::WrtRedlineAuthor { public: - virtual void Write(Writer &rWrt); + virtual void Write(Writer &rWrt) SAL_OVERRIDE; }; /** Structure that is used to save some of the WW8Export/DocxExport data. @@ -885,8 +885,8 @@ public: SwWW8Writer(const OUString& rFltName, const OUString& rBaseURL); virtual ~SwWW8Writer(); - virtual sal_uLong WriteStorage(); - virtual sal_uLong WriteMedium( SfxMedium& ); + virtual sal_uLong WriteStorage() SAL_OVERRIDE; + virtual sal_uLong WriteMedium( SfxMedium& ) SAL_OVERRIDE; // TODO most probably we want to be able to get these in // MSExportFilterBase @@ -918,7 +918,7 @@ public: bool InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec ); using StgWriter::Write; - virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ); + virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ) SAL_OVERRIDE; //Seems not an expected to provide method to access the private member SfxMedium* GetMedia() { return mpMedium; } @@ -955,22 +955,22 @@ private: public: /// Access to the attribute output class. - virtual AttributeOutputBase& AttrOutput() const; + virtual AttributeOutputBase& AttrOutput() const SAL_OVERRIDE; /// Access to the sections/headers/footres. - virtual MSWordSections& Sections() const; + virtual MSWordSections& Sections() const SAL_OVERRIDE; /// False for WW6, true for WW8. - virtual bool SupportsUnicode() const { return bWrtWW8; } + virtual bool SupportsUnicode() const SAL_OVERRIDE { return bWrtWW8; } - virtual bool SupportsOneColumnBreak() const { return false; } + virtual bool SupportsOneColumnBreak() const SAL_OVERRIDE { return false; } - virtual bool FieldsQuoted() const { return false; } + virtual bool FieldsQuoted() const SAL_OVERRIDE { return false; } - virtual bool AddSectionBreaksForTOX() const { return false; } + virtual bool AddSectionBreaksForTOX() const SAL_OVERRIDE { return false; } private: /// Format-dependent part of the actual export. - virtual void ExportDocument_Impl(); + virtual void ExportDocument_Impl() SAL_OVERRIDE; void PrepareStorage(); void WriteFkpPlcUsw(); @@ -983,7 +983,7 @@ private: const SwNumRule& rRul, const SwNumFmt& rFmt, sal_uInt8 nSwLevel ); /// Output the numbering table. - virtual void WriteNumbering(); + virtual void WriteNumbering() SAL_OVERRIDE; void OutOverrideListTab(); void OutListNamesTab(); @@ -996,10 +996,10 @@ private: void DoCheckBox(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet); public: - virtual void OutputOlst( const SwNumRule& rRule ); + virtual void OutputOlst( const SwNumRule& rRule ) SAL_OVERRIDE; /// Setup the pA's info. - virtual void SetupSectionPositions( WW8_PdAttrDesc* pA ); + virtual void SetupSectionPositions( WW8_PdAttrDesc* pA ) SAL_OVERRIDE; void Out_SwNumLvl( sal_uInt8 nSwLevel ); void Out_NumRuleAnld( const SwNumRule& rRul, const SwNumFmt& rFmt, @@ -1034,7 +1034,7 @@ public: /// Write the field virtual void OutputField( const SwField* pFld, ww::eField eFldType, - const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ); + const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) SAL_OVERRIDE; void StartCommentOutput( const OUString& rName ); void EndCommentOutput( const OUString& rName ); @@ -1042,12 +1042,12 @@ public: bool TestOleNeedsGraphic(const SwAttrSet& rSet, SvStorageRef xOleStg, SvStorageRef xObjStg, OUString &rStorageName, SwOLENode *pOLENd); - virtual void AppendBookmarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ); - virtual void AppendBookmark( const OUString& rName, bool bSkip = false ); + virtual void AppendBookmarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE; + virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) SAL_OVERRIDE; - virtual void AppendAnnotationMarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ); + virtual void AppendAnnotationMarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE; - virtual void ExportGrfBullet(const SwTxtNode& rNd); + virtual void ExportGrfBullet(const SwTxtNode& rNd) SAL_OVERRIDE; void OutGrfBullets(const sw::Frame &rFrame); void MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo); @@ -1055,10 +1055,10 @@ public: void WriteAsStringTable(const ::std::vector<OUString>&, sal_Int32& rfcSttbf, sal_Int32& rlcbSttbf, sal_uInt16 nExtraLen = 0); - virtual sal_uLong ReplaceCr( sal_uInt8 nChar ); + virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) SAL_OVERRIDE; - virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t() ); - void WriteChar( sal_Unicode c ); + virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t() ) SAL_OVERRIDE; + void WriteChar( sal_Unicode c ) SAL_OVERRIDE; void OutSwString(const OUString&, sal_Int32 nStt, sal_Int32 nLen, bool bUnicode, rtl_TextEncoding eChrSet); @@ -1072,14 +1072,14 @@ public: inline bool IsUnicode() const { return pPiece->IsUnicode(); } - virtual void SectionBreaksAndFrames( const SwTxtNode& rNode ); + virtual void SectionBreaksAndFrames( const SwTxtNode& rNode ) SAL_OVERRIDE; /// Helper method for OutputSectionBreaks() and OutputFollowPageDesc(). // #i76300# virtual void PrepareNewPageDesc( const SfxItemSet* pSet, const SwNode& rNd, const SwFmtPageDesc* pNewPgDescFmt = 0, - const SwPageDesc* pNewPgDesc = 0 ); + const SwPageDesc* pNewPgDesc = 0 ) SAL_OVERRIDE; void Out_BorderLine(ww::bytes& rO, const ::editeng::SvxBorderLine* pLine, sal_uInt16 nDist, sal_uInt16 nSprmNo, sal_uInt16 nSprmNoVer9, @@ -1093,7 +1093,7 @@ public: sal_uInt16 nDist, bool bShadow); // #i77805# - new return value indicates, if an inherited outline numbering is suppressed - virtual bool DisallowInheritingOutlineNumbering(const SwFmt &rFmt); + virtual bool DisallowInheritingOutlineNumbering(const SwFmt &rFmt) SAL_OVERRIDE; unsigned int GetHdFtIndex() const { return mnHdFtIndex; } void SetHdFtIndex(unsigned int nHdFtIndex) { mnHdFtIndex = nHdFtIndex; } @@ -1105,7 +1105,7 @@ public: static sal_uInt8 GetNumId( sal_uInt16 eNumType ); /// Guess the script (asian/western). - virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ); + virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) SAL_OVERRIDE; sal_uInt16 DupNumRuleWithLvlStart(const SwNumRule *pRule,sal_uInt8 nLvl,sal_uInt16 nVal); @@ -1133,15 +1133,15 @@ public: const OUString &rHelp, const OUString &ToolTip, const OUString &rSelected, - com::sun::star::uno::Sequence<OUString> &rListItems); + com::sun::star::uno::Sequence<OUString> &rListItems) SAL_OVERRIDE; - virtual void DoFormText(const SwInputField * pFld); + virtual void DoFormText(const SwInputField * pFld) SAL_OVERRIDE; void GetCurrentItems(ww::bytes &rItems) const; /// Write the data of the form field - virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ); - virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ); + virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE; + virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE; /// Fields. WW8_WrPlcFld* CurrentFieldPlc() const; @@ -1150,26 +1150,26 @@ public: SvStream& Strm() const { return m_pWriter->Strm(); } /// Remember some of the memebers so that we can recurse in WriteText(). - virtual void SaveData( sal_uLong nStt, sal_uLong nEnd ); + virtual void SaveData( sal_uLong nStt, sal_uLong nEnd ) SAL_OVERRIDE; /// Restore what was saved in SaveData(). - virtual void RestoreData(); + virtual void RestoreData() SAL_OVERRIDE; /// Output the actual headers and footers. virtual void WriteHeadersFooters( sal_uInt8 nHeadFootFlags, const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, - sal_uInt8 nBreakCode); + sal_uInt8 nBreakCode) SAL_OVERRIDE; protected: /// Output SwGrfNode - virtual void OutputGrfNode( const SwGrfNode& ); + virtual void OutputGrfNode( const SwGrfNode& ) SAL_OVERRIDE; /// Output SwOLENode - virtual void OutputOLENode( const SwOLENode& ); + virtual void OutputOLENode( const SwOLENode& ) SAL_OVERRIDE; - virtual void OutputLinkedOLE( const OUString& ); + virtual void OutputLinkedOLE( const OUString& ) SAL_OVERRIDE; - virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ); + virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) SAL_OVERRIDE; private: /// No copying. @@ -1256,7 +1256,7 @@ class WW8_WrPlcTxtBoxes : public WW8_WrPlcSubDoc // double Plc for Textboxes private: sal_uInt8 nTyp; std::vector<sal_uInt32> aShapeIds; // VARARR of ShapeIds for the SwFrmFmts - virtual const std::vector<sal_uInt32>* GetShapeIdArr() const; + virtual const std::vector<sal_uInt32>* GetShapeIdArr() const SAL_OVERRIDE; //No copying WW8_WrPlcTxtBoxes(const WW8_WrPlcTxtBoxes&); @@ -1465,8 +1465,8 @@ public: void NextPos() { if ( nAktSwPos < SAL_MAX_INT32 ) nAktSwPos = SearchNext( nAktSwPos + 1 ); } void OutAttr( sal_Int32 nSwPos ); - virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const; - virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const; + virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const SAL_OVERRIDE; bool OutAttrWithRange(sal_Int32 nPos); sal_Int32 WhereNext() const { return nAktSwPos; } rtl_TextEncoding GetNextCharSet() const; @@ -1525,8 +1525,8 @@ public: void NextPos() { if ( nAktSwPos < SAL_MAX_INT32 ) nAktSwPos = SearchNext( nAktSwPos + 1 ); } void OutAttr( sal_Int32 nSwPos, bool bRuby = false ); - virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const; - virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const; + virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const SAL_OVERRIDE; int OutAttrWithRange(sal_Int32 nPos); const SwRedlineData* GetParagraphLevelRedline( ); const SwRedlineData* GetRunLevelRedline( sal_Int32 nPos ); diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index 8fc38db312b3..0078a84cbe9b 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -27,162 +27,162 @@ class WW8AttributeOutput : public AttributeOutputBase { public: /// Export the state of RTL/CJK. - virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ); + virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) SAL_OVERRIDE; /// Start of the paragraph. - virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/ ) {} + virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/ ) SAL_OVERRIDE {} /// End of the paragraph. - virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ); + virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE; /// Called in order to output section breaks. - virtual void SectionBreaks(const SwTxtNode& /*rNode*/) {} + virtual void SectionBreaks(const SwTxtNode& /*rNode*/) SAL_OVERRIDE {} /// Called before we start outputting the attributes. - virtual void StartParagraphProperties() {} + virtual void StartParagraphProperties() SAL_OVERRIDE {} /// Called after we end outputting the attributes. - virtual void EndParagraphProperties( const SfxItemSet* /*pParagraphMarkerProperties*/, const SwRedlineData* /*pRedlineData*/, const SwRedlineData* /*pRedlineParagraphMarkerDeleted*/, const SwRedlineData* /*pRedlineParagraphMarkerInserted*/) {} + virtual void EndParagraphProperties( const SfxItemSet* /*pParagraphMarkerProperties*/, const SwRedlineData* /*pRedlineData*/, const SwRedlineData* /*pRedlineParagraphMarkerDeleted*/, const SwRedlineData* /*pRedlineParagraphMarkerInserted*/) SAL_OVERRIDE {} /// Empty paragraph. - virtual void EmptyParagraph(); + virtual void EmptyParagraph() SAL_OVERRIDE; /// Start of the text run. /// - virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ); + virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) SAL_OVERRIDE; - virtual void OnTOXEnding(); + virtual void OnTOXEnding() SAL_OVERRIDE; /// End of the text run. /// /// No-op for binary filters. - virtual void EndRun() {} + virtual void EndRun() SAL_OVERRIDE {} /// Before we start outputting the attributes. - virtual void StartRunProperties(); + virtual void StartRunProperties() SAL_OVERRIDE; /// After we end outputting the attributes. - virtual void EndRunProperties( const SwRedlineData* pRedlineData ); + virtual void EndRunProperties( const SwRedlineData* pRedlineData ) SAL_OVERRIDE; /// Output text. - virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet ); + virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet ) SAL_OVERRIDE; /// Output text (without markup). - virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ); + virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ) SAL_OVERRIDE; /// Output ruby start. - virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby ); + virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby ) SAL_OVERRIDE; /// Output ruby end. - virtual void EndRuby(); + virtual void EndRuby() SAL_OVERRIDE; /// Output URL start. - virtual bool StartURL( const OUString &rUrl, const OUString &rTarget ); + virtual bool StartURL( const OUString &rUrl, const OUString &rTarget ) SAL_OVERRIDE; /// Output URL end. - virtual bool EndURL(); + virtual bool EndURL() SAL_OVERRIDE; - virtual void FieldVanish( const OUString& rTxt, ww::eField eType ); + virtual void FieldVanish( const OUString& rTxt, ww::eField eType ) SAL_OVERRIDE; /// Output redlining. - virtual void Redline( const SwRedlineData* pRedline ); + virtual void Redline( const SwRedlineData* pRedline ) SAL_OVERRIDE; - virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ); + virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE; /// Output FKP (Formatted disK Page) - necessary for binary formats only. /// FIXME having it in AttributeOutputBase is probably a hack, it /// should be in WW8AttributeOutput only... - virtual void OutputFKP(); + virtual void OutputFKP() SAL_OVERRIDE; /// Output style. - virtual void ParagraphStyle( sal_uInt16 nStyle ); - - virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ); - virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ); - virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ); - virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ); - virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ); - virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ); - virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ); - virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ); - virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ); - virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ); - virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ); - virtual void TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo ); - virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ); - virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableRowEnd( sal_uInt32 nDepth = 1 ); + virtual void ParagraphStyle( sal_uInt16 nStyle ) SAL_OVERRIDE; + + virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; + virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; + virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; + virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; + virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; + virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; + virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; + virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; + virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; + virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; + virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; + virtual void TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo ) SAL_OVERRIDE; + virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) SAL_OVERRIDE; + virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableRowEnd( sal_uInt32 nDepth = 1 ) SAL_OVERRIDE; /// Start of the styles table. - virtual void StartStyles(); + virtual void StartStyles() SAL_OVERRIDE; /// End of the styles table. - virtual void EndStyles( sal_uInt16 nNumberOfStyles ); + virtual void EndStyles( sal_uInt16 nNumberOfStyles ) SAL_OVERRIDE; /// Write default style. - virtual void DefaultStyle( sal_uInt16 nStyle ); + virtual void DefaultStyle( sal_uInt16 nStyle ) SAL_OVERRIDE; /// Start of a style in the styles table. virtual void StartStyle( const OUString& rName, StyleType eType, sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwIdi, sal_uInt16 nId, - bool bAutoUpdate ); + bool bAutoUpdate ) SAL_OVERRIDE; /// End of a style in the styles table. - virtual void EndStyle(); + virtual void EndStyle() SAL_OVERRIDE; /// Start of (paragraph or run) properties of a style. - virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ); + virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ) SAL_OVERRIDE; /// End of (paragraph or run) properties of a style. - virtual void EndStyleProperties( bool bParProp ); + virtual void EndStyleProperties( bool bParProp ) SAL_OVERRIDE; /// Numbering rule and Id. - virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt ); + virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt ) SAL_OVERRIDE; /// Page break /// As a paragraph property - the paragraph should be on the next page. - virtual void PageBreakBefore( bool bBreak ); + virtual void PageBreakBefore( bool bBreak ) SAL_OVERRIDE; /// Write a section break /// msword::ColumnBreak or msword::PageBreak - virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ); + virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) SAL_OVERRIDE; /// Start of the section properties. - virtual void StartSection(); + virtual void StartSection() SAL_OVERRIDE; /// End of the section properties. /// /// No-op for binary filters. - virtual void EndSection() {} + virtual void EndSection() SAL_OVERRIDE {} /// Protection of forms. - virtual void SectionFormProtection( bool bProtected ); + virtual void SectionFormProtection( bool bProtected ) SAL_OVERRIDE; /// Numbering of the lines in the document. - virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ); + virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ) SAL_OVERRIDE; /// Has different headers/footers for the title page. - virtual void SectionTitlePage(); + virtual void SectionTitlePage() SAL_OVERRIDE; /// Description of the page borders. - virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt ); + virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt ) SAL_OVERRIDE; /// Columns populated from right/numbers on the right side? - virtual void SectionBiDi( bool bBiDi ); + virtual void SectionBiDi( bool bBiDi ) SAL_OVERRIDE; /// The style of the page numbers. /// - virtual void SectionPageNumbering( sal_uInt16 nNumType, ::boost::optional<sal_uInt16> oPageRestartNumber ); + virtual void SectionPageNumbering( sal_uInt16 nNumType, ::boost::optional<sal_uInt16> oPageRestartNumber ) SAL_OVERRIDE; /// The type of breaking. - virtual void SectionType( sal_uInt8 nBreakCode ); + virtual void SectionType( sal_uInt8 nBreakCode ) SAL_OVERRIDE; /// Special header/footer flags, needed for old versions only. - virtual void SectionWW6HeaderFooterFlags( sal_uInt8 nHeadFootFlags ); + virtual void SectionWW6HeaderFooterFlags( sal_uInt8 nHeadFootFlags ) SAL_OVERRIDE; /// Definition of a numbering instance. - virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ); + virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) SAL_OVERRIDE; /// All the numbering level information. virtual void NumberingLevel( sal_uInt8 nLevel, @@ -197,236 +197,236 @@ public: sal_Int16 nFirstLineIndex, sal_Int16 nListTabPos, const OUString &rNumberingString, - const SvxBrushItem* pBrush = 0); //For i120928,transfer graphic of bullet + const SvxBrushItem* pBrush = 0) SAL_OVERRIDE; //For i120928,transfer graphic of bullet protected: /// Output frames - the implementation. - void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft ); + void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft ) SAL_OVERRIDE; /// Sfx item Sfx item RES_CHRATR_CASEMAP - virtual void CharCaseMap( const SvxCaseMapItem& ); + virtual void CharCaseMap( const SvxCaseMapItem& ) SAL_OVERRIDE; /// Sfx item Sfx item RES_CHRATR_COLOR - virtual void CharColor( const SvxColorItem& ); + virtual void CharColor( const SvxColorItem& ) SAL_OVERRIDE; /// Sfx item Sfx item RES_CHRATR_CONTOUR - virtual void CharContour( const SvxContourItem& ); + virtual void CharContour( const SvxContourItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CROSSEDOUT - virtual void CharCrossedOut( const SvxCrossedOutItem& rHt ); + virtual void CharCrossedOut( const SvxCrossedOutItem& rHt ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_ESCAPEMENT - virtual void CharEscapement( const SvxEscapementItem& ); + virtual void CharEscapement( const SvxEscapementItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_FONT - virtual void CharFont( const SvxFontItem& ); + virtual void CharFont( const SvxFontItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_FONTSIZE - virtual void CharFontSize( const SvxFontHeightItem& ); + virtual void CharFontSize( const SvxFontHeightItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_KERNING - virtual void CharKerning( const SvxKerningItem& ); + virtual void CharKerning( const SvxKerningItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_LANGUAGE - virtual void CharLanguage( const SvxLanguageItem& ); + virtual void CharLanguage( const SvxLanguageItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_POSTURE - virtual void CharPosture( const SvxPostureItem& ); + virtual void CharPosture( const SvxPostureItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_SHADOWED - virtual void CharShadow( const SvxShadowedItem& ); + virtual void CharShadow( const SvxShadowedItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_UNDERLINE - virtual void CharUnderline( const SvxUnderlineItem& ); + virtual void CharUnderline( const SvxUnderlineItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_WEIGHT - virtual void CharWeight( const SvxWeightItem& ); + virtual void CharWeight( const SvxWeightItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_AUTOKERN - virtual void CharAutoKern( const SvxAutoKernItem& ); + virtual void CharAutoKern( const SvxAutoKernItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_BLINK - virtual void CharAnimatedText( const SvxBlinkItem& ); + virtual void CharAnimatedText( const SvxBlinkItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_BACKGROUND - virtual void CharBackground( const SvxBrushItem& ); + virtual void CharBackground( const SvxBrushItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CJK_FONT - virtual void CharFontCJK( const SvxFontItem& ); + virtual void CharFontCJK( const SvxFontItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CJK_FONTSIZE - virtual void CharFontSizeCJK( const SvxFontHeightItem& rHt ) { CharFontSize( rHt ); } + virtual void CharFontSizeCJK( const SvxFontHeightItem& rHt ) SAL_OVERRIDE { CharFontSize( rHt ); } /// Sfx item RES_CHRATR_CJK_LANGUAGE - virtual void CharLanguageCJK( const SvxLanguageItem& rHt ) { CharLanguage( rHt ); } + virtual void CharLanguageCJK( const SvxLanguageItem& rHt ) SAL_OVERRIDE { CharLanguage( rHt ); } /// Sfx item RES_CHRATR_CJK_POSTURE - virtual void CharPostureCJK( const SvxPostureItem& rHt ) { CharPosture( rHt ); } + virtual void CharPostureCJK( const SvxPostureItem& rHt ) SAL_OVERRIDE { CharPosture( rHt ); } /// Sfx item RES_CHRATR_CJK_WEIGHT - virtual void CharWeightCJK( const SvxWeightItem& rHt ) { CharWeight( rHt ); } + virtual void CharWeightCJK( const SvxWeightItem& rHt ) SAL_OVERRIDE { CharWeight( rHt ); } /// Sfx item RES_CHRATR_CTL_FONT - virtual void CharFontCTL( const SvxFontItem& ); + virtual void CharFontCTL( const SvxFontItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CTL_FONTSIZE - virtual void CharFontSizeCTL( const SvxFontHeightItem& rHt ) { CharFontSize( rHt ); } + virtual void CharFontSizeCTL( const SvxFontHeightItem& rHt ) SAL_OVERRIDE { CharFontSize( rHt ); } /// Sfx item RES_CHRATR_CTL_LANGUAGE - virtual void CharLanguageCTL( const SvxLanguageItem& rHt ) { CharLanguage( rHt ); } + virtual void CharLanguageCTL( const SvxLanguageItem& rHt ) SAL_OVERRIDE { CharLanguage( rHt ); } /// Sfx item RES_CHRATR_CTL_POSTURE - virtual void CharPostureCTL( const SvxPostureItem& ); + virtual void CharPostureCTL( const SvxPostureItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_CTL_WEIGHT - virtual void CharWeightCTL( const SvxWeightItem& ); + virtual void CharWeightCTL( const SvxWeightItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_BidiRTL - virtual void CharBidiRTL( const SfxPoolItem& rHt ); + virtual void CharBidiRTL( const SfxPoolItem& rHt ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_IdctHint - virtual void CharIdctHint( const SfxPoolItem& rHt ); + virtual void CharIdctHint( const SfxPoolItem& rHt ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_ROTATE - virtual void CharRotate( const SvxCharRotateItem& ); + virtual void CharRotate( const SvxCharRotateItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_EMPHASIS_MARK - virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rHt ); + virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rHt ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_TWO_LINES - virtual void CharTwoLines( const SvxTwoLinesItem& ); + virtual void CharTwoLines( const SvxTwoLinesItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_SCALEW - virtual void CharScaleWidth( const SvxCharScaleWidthItem& ); + virtual void CharScaleWidth( const SvxCharScaleWidthItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_RELIEF - virtual void CharRelief( const SvxCharReliefItem& ); + virtual void CharRelief( const SvxCharReliefItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_HIDDEN - virtual void CharHidden( const SvxCharHiddenItem& ); + virtual void CharHidden( const SvxCharHiddenItem& ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_BOX - virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ); + virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ) SAL_OVERRIDE; /// Sfx item RES_CHRATR_HIGHLIGHT - virtual void CharHighlight( const SvxBrushItem& ){}; + virtual void CharHighlight( const SvxBrushItem& ) SAL_OVERRIDE {}; /// Sfx item RES_TXTATR_INETFMT - virtual void TextINetFormat( const SwFmtINetFmt& ); + virtual void TextINetFormat( const SwFmtINetFmt& ) SAL_OVERRIDE; /// Sfx item RES_TXTATR_CHARFMT - virtual void TextCharFormat( const SwFmtCharFmt& ); + virtual void TextCharFormat( const SwFmtCharFmt& ) SAL_OVERRIDE; /// Sfx item RES_TXTATR_FTN - virtual void TextFootnote_Impl( const SwFmtFtn& ); + virtual void TextFootnote_Impl( const SwFmtFtn& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_LINESPACING - virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ); + virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) SAL_OVERRIDE; /// Sfx item RES_PARATR_ADJUST - virtual void ParaAdjust( const SvxAdjustItem& rHt ); + virtual void ParaAdjust( const SvxAdjustItem& rHt ) SAL_OVERRIDE; /// Sfx item RES_PARATR_SPLIT - virtual void ParaSplit( const SvxFmtSplitItem& ); + virtual void ParaSplit( const SvxFmtSplitItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_WIDOWS - virtual void ParaWidows( const SvxWidowsItem& rHt ); + virtual void ParaWidows( const SvxWidowsItem& rHt ) SAL_OVERRIDE; /// Sfx item RES_PARATR_TABSTOP - virtual void ParaTabStop( const SvxTabStopItem& rHt ); + virtual void ParaTabStop( const SvxTabStopItem& rHt ) SAL_OVERRIDE; /// Sfx item RES_PARATR_HYPHENZONE - virtual void ParaHyphenZone( const SvxHyphenZoneItem& ); + virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_NUMRULE - virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId ); + virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE; /// Sfx item RES_PARATR_SCRIPTSPACE - virtual void ParaScriptSpace( const SfxBoolItem& ); + virtual void ParaScriptSpace( const SfxBoolItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_HANGINGPUNCTUATION - virtual void ParaHangingPunctuation( const SfxBoolItem& ); + virtual void ParaHangingPunctuation( const SfxBoolItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_FORBIDDEN_RULES - virtual void ParaForbiddenRules( const SfxBoolItem& ); + virtual void ParaForbiddenRules( const SfxBoolItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_VERTALIGN - virtual void ParaVerticalAlign( const SvxParaVertAlignItem& ); + virtual void ParaVerticalAlign( const SvxParaVertAlignItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_SNAPTOGRID - virtual void ParaSnapToGrid( const SvxParaGridItem& ); + virtual void ParaSnapToGrid( const SvxParaGridItem& ) SAL_OVERRIDE; /// Sfx item RES_FRM_SIZE - virtual void FormatFrameSize( const SwFmtFrmSize& ); + virtual void FormatFrameSize( const SwFmtFrmSize& ) SAL_OVERRIDE; /// Sfx item RES_PAPER_BIN - virtual void FormatPaperBin( const SvxPaperBinItem& ); + virtual void FormatPaperBin( const SvxPaperBinItem& ) SAL_OVERRIDE; /// Sfx item RES_LR_SPACE - virtual void FormatLRSpace( const SvxLRSpaceItem& ); + virtual void FormatLRSpace( const SvxLRSpaceItem& ) SAL_OVERRIDE; /// Sfx item RES_UL_SPACE - virtual void FormatULSpace( const SvxULSpaceItem& rHt ); + virtual void FormatULSpace( const SvxULSpaceItem& rHt ) SAL_OVERRIDE; /// Sfx item RES_SURROUND - virtual void FormatSurround( const SwFmtSurround& ); + virtual void FormatSurround( const SwFmtSurround& ) SAL_OVERRIDE; /// Sfx item RES_VERT_ORIENT - virtual void FormatVertOrientation( const SwFmtVertOrient& ); + virtual void FormatVertOrientation( const SwFmtVertOrient& ) SAL_OVERRIDE; /// Sfx item RES_HORI_ORIENT - virtual void FormatHorizOrientation( const SwFmtHoriOrient& ); + virtual void FormatHorizOrientation( const SwFmtHoriOrient& ) SAL_OVERRIDE; /// Sfx item RES_ANCHOR - virtual void FormatAnchor( const SwFmtAnchor& ); + virtual void FormatAnchor( const SwFmtAnchor& ) SAL_OVERRIDE; /// Sfx item RES_BACKGROUND - virtual void FormatBackground( const SvxBrushItem& ); + virtual void FormatBackground( const SvxBrushItem& ) SAL_OVERRIDE; /// Sfx item RES_FILL_STYLE - virtual void FormatFillStyle( const XFillStyleItem& ); + virtual void FormatFillStyle( const XFillStyleItem& ) SAL_OVERRIDE; /// Sfx item RES_FILL_GRADIENT - virtual void FormatFillGradient( const XFillGradientItem& ); + virtual void FormatFillGradient( const XFillGradientItem& ) SAL_OVERRIDE; /// Sfx item RES_BOX - virtual void FormatBox( const SvxBoxItem& ); + virtual void FormatBox( const SvxBoxItem& ) SAL_OVERRIDE; /// Sfx item RES_COL - virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize ); + virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE; /// Sfx item RES_KEEP - virtual void FormatKeep( const SvxFmtKeepItem& ); + virtual void FormatKeep( const SvxFmtKeepItem& ) SAL_OVERRIDE; /// Sfx item RES_TEXTGRID - virtual void FormatTextGrid( const SwTextGridItem& ); + virtual void FormatTextGrid( const SwTextGridItem& ) SAL_OVERRIDE; /// Sfx item RES_LINENUMBER - virtual void FormatLineNumbering( const SwFmtLineNumber& ); + virtual void FormatLineNumbering( const SwFmtLineNumber& ) SAL_OVERRIDE; /// Sfx item RES_FRAMEDIR - virtual void FormatFrameDirection( const SvxFrameDirectionItem& ); + virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) SAL_OVERRIDE; /// Sfx item RES_PARATR_GRABBAG - virtual void ParaGrabBag( const SfxGrabBagItem& ); + virtual void ParaGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE; /// Sfx item RES_TXTATR_GRABBAG - virtual void CharGrabBag( const SfxGrabBagItem& ); + virtual void CharGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE; // Sfx item RES_PARATR_OUTLINELEVEL - virtual void ParaOutlineLevel( const SfxUInt16Item& ); + virtual void ParaOutlineLevel( const SfxUInt16Item& ) SAL_OVERRIDE; /// Write the expanded field - virtual void WriteExpand( const SwField* pFld ); + virtual void WriteExpand( const SwField* pFld ) SAL_OVERRIDE; - virtual void RefField ( const SwField& rFld, const OUString& rRef ); - virtual void HiddenField( const SwField& rFld ); - virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd ); - virtual void PostitField( const SwField* pFld ); - virtual bool DropdownField( const SwField* pFld ); - virtual bool PlaceholderField( const SwField* pFld ); + virtual void RefField ( const SwField& rFld, const OUString& rRef ) SAL_OVERRIDE; + virtual void HiddenField( const SwField& rFld ) SAL_OVERRIDE; + virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE; + virtual void PostitField( const SwField* pFld ) SAL_OVERRIDE; + virtual bool DropdownField( const SwField* pFld ) SAL_OVERRIDE; + virtual bool PlaceholderField( const SwField* pFld ) SAL_OVERRIDE; - virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ); + virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ) SAL_OVERRIDE; /// Reference to the export, where to get the data from WW8Export &m_rWW8Export; @@ -461,7 +461,7 @@ public: virtual ~WW8AttributeOutput() {} /// Return the right export class. - virtual WW8Export& GetExport() { return m_rWW8Export; } + virtual WW8Export& GetExport() SAL_OVERRIDE { return m_rWW8Export; } const WW8Export& GetExport() const { return m_rWW8Export; } protected: diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index ed003a22ef19..79b748be2ce2 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -441,8 +441,8 @@ struct SBBItem public: Sttb(); ~Sttb(); - bool Read(SvStream &rS); - void Print( FILE* fp ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* fp ) SAL_OVERRIDE; OUString getStringAtIndex( sal_uInt32 ); }; diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index a07f083f74da..bc8ff1362e88 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -140,13 +140,13 @@ struct WW8LFOInfo; class WW8Reader : public StgReader { - virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &); + virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE; sal_uLong OpenMainStream( SvStorageStreamRef& rRef, sal_uInt16& rBuffSize ); public: - virtual int GetReaderType(); + virtual int GetReaderType() SAL_OVERRIDE; - virtual sal_Bool HasGlossaries() const; - virtual sal_Bool ReadGlossaries( SwTextBlocks&, sal_Bool bSaveRelFiles ) const; + virtual sal_Bool HasGlossaries() const SAL_OVERRIDE; + virtual sal_Bool ReadGlossaries( SwTextBlocks&, sal_Bool bSaveRelFiles ) const SAL_OVERRIDE; }; class SwWW8ImplReader; @@ -333,13 +333,13 @@ private: const SwTxtNode &rTxtNode); protected: virtual void SetAttrInDoc(const SwPosition& rTmpPos, - SwFltStackEntry& rEntry); + SwFltStackEntry& rEntry) SAL_OVERRIDE; - virtual sal_Int32 GetCurrAttrCP() const; - virtual bool IsParaEndInCPs(sal_Int32 nStart,sal_Int32 nEnd,bool bSdOD=true) const; + virtual sal_Int32 GetCurrAttrCP() const SAL_OVERRIDE; + virtual bool IsParaEndInCPs(sal_Int32 nStart,sal_Int32 nEnd,bool bSdOD=true) const SAL_OVERRIDE; //Clear the para end position recorded in reader intermittently for the least impact on loading performance - virtual void ClearParaEndPosition(); - virtual bool CheckSdOD(sal_Int32 nStart,sal_Int32 nEnd); + virtual void ClearParaEndPosition() SAL_OVERRIDE; + virtual bool CheckSdOD(sal_Int32 nStart,sal_Int32 nEnd) SAL_OVERRIDE; public: SwWW8FltControlStack(SwDoc* pDo, sal_uLong nFieldFl, SwWW8ImplReader& rReader_ ) @@ -349,7 +349,7 @@ public: void NewAttr(const SwPosition& rPos, const SfxPoolItem& rAttr); - virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, sal_Bool bTstEnde=sal_True, long nHand=LONG_MAX, sal_Bool consumedByField=sal_False); + virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, sal_Bool bTstEnde=sal_True, long nHand=LONG_MAX, sal_Bool consumedByField=sal_False) SAL_OVERRIDE; void SetToggleAttr(sal_uInt8 nId, bool bOn) { @@ -433,7 +433,7 @@ public: std::set<OUString, SwWW8::ltstr> aReferencedTOCBookmarks; protected: virtual void SetAttrInDoc( const SwPosition& rTmpPos, - SwFltStackEntry& rEntry ); + SwFltStackEntry& rEntry ) SAL_OVERRIDE; }; class SwWW8FltRefStack : public SwFltEndStack @@ -452,7 +452,7 @@ public: protected: SwFltStackEntry *RefToVar(const SwField* pFld,SwFltStackEntry& rEntry); virtual void SetAttrInDoc(const SwPosition& rTmpPos, - SwFltStackEntry& rEntry); + SwFltStackEntry& rEntry) SAL_OVERRIDE; private: //No copying SwWW8FltRefStack(const SwWW8FltRefStack&); @@ -477,7 +477,7 @@ public: SwMacroInfo(); virtual ~SwMacroInfo(); - virtual SdrObjUserData* Clone( SdrObject* pObj ) const; + virtual SdrObjUserData* Clone( SdrObject* pObj ) const SAL_OVERRIDE; void SetHlink( const OUString& rHlink ) { maHlink = rHlink; } const OUString& GetHlink() const { return maHlink; } @@ -663,7 +663,7 @@ public: com::sun::star::lang::XMultiServiceFactory> &rServiceFactory, com::sun::star::uno::Reference < com::sun::star::form::XFormComponent> &rFComp, - com::sun::star::awt::Size &rSz); + com::sun::star::awt::Size &rSz) SAL_OVERRIDE; }; class WW8FormulaListBox : public WW8FormulaControl @@ -680,7 +680,7 @@ public: com::sun::star::lang::XMultiServiceFactory> &rServiceFactory, com::sun::star::uno::Reference < com::sun::star::form::XFormComponent> &rFComp, - com::sun::star::awt::Size &rSz); + com::sun::star::awt::Size &rSz) SAL_OVERRIDE; }; class WW8FormulaEditBox : public WW8FormulaControl @@ -696,7 +696,7 @@ public: com::sun::star::lang::XMultiServiceFactory> & /* rServiceFactory */, com::sun::star::uno::Reference < com::sun::star::form::XFormComponent> & /* rFComp */, - com::sun::star::awt::Size & /* rSz */) { return sal_False; } + com::sun::star::awt::Size & /* rSz */) SAL_OVERRIDE { return sal_False; } }; class SwMSConvertControls: public oox::ole::MSConvertOCXControls @@ -708,7 +708,7 @@ public: com::sun::star::form::XFormComponent >& rFComp, const ::com::sun::star::awt::Size& rSize, com::sun::star::uno::Reference < - com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl); + com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl) SAL_OVERRIDE; bool ExportControl(WW8Export &rWrt, const SdrObject *pObj); virtual sal_Bool ReadOCXStream( SotStorageRef& rSrc1, com::sun::star::uno::Reference< @@ -728,8 +728,8 @@ private: std::map<sal_uInt32,OString> aOldEscherBlipCache; virtual sal_Bool GetOLEStorageName( long nOLEId, OUString& rStorageName, - SvStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const; - virtual sal_Bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos ) const; + SvStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const SAL_OVERRIDE; + virtual sal_Bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos ) const SAL_OVERRIDE; // #i32596# - new parameter <_nCalledByGroup>, which // indicates, if the OLE object is imported inside a group object virtual SdrObject* ImportOLE( long nOLEId, @@ -737,7 +737,7 @@ private: const Rectangle& rBoundRect, const Rectangle& rVisArea, const int _nCalledByGroup, - sal_Int64 nAspect ) const; + sal_Int64 nAspect ) const SAL_OVERRIDE; //No copying SwMSDffManager(const SwMSDffManager&); @@ -750,7 +750,7 @@ public: void DisableFallbackStream(); void EnableFallbackStream(); protected: - virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pObj ); + virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) SAL_OVERRIDE; }; class wwSection diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index aecadb718195..d4f2b08cffc8 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -410,12 +410,12 @@ private: public: WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, WW8PLCFx_PCD* pPLCFx_PCD, const WW8ScannerBase* pBase ); - virtual sal_uLong GetIdx() const; - virtual void SetIdx( sal_uLong nI ); - virtual bool SeekPos(WW8_CP nCpPos); - virtual WW8_FC Where(); - virtual void GetSprms( WW8PLCFxDesc* p ); - virtual void advance(); + virtual sal_uLong GetIdx() const SAL_OVERRIDE; + virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE; + virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; + virtual WW8_FC Where() SAL_OVERRIDE; + virtual void GetSprms( WW8PLCFxDesc* p ) SAL_OVERRIDE; + virtual void advance() SAL_OVERRIDE; WW8PLCFpcd_Iter* GetIter() const { return pPcdI; } }; @@ -436,12 +436,12 @@ public: WW8_CP nStartCp, bool bVer67P); virtual ~WW8PLCFx_PCD(); virtual sal_uLong GetIMax() const; - virtual sal_uLong GetIdx() const; - virtual void SetIdx( sal_uLong nI ); - virtual bool SeekPos(WW8_CP nCpPos); - virtual WW8_FC Where(); - virtual long GetNoSprms( WW8_CP& rStart, WW8_CP&, sal_Int32& rLen ); - virtual void advance(); + virtual sal_uLong GetIdx() const SAL_OVERRIDE; + virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE; + virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; + virtual WW8_FC Where() SAL_OVERRIDE; + virtual long GetNoSprms( WW8_CP& rStart, WW8_CP&, sal_Int32& rLen ) SAL_OVERRIDE; + virtual void advance() SAL_OVERRIDE; WW8_CP AktPieceStartFc2Cp( WW8_FC nStartPos ); WW8_FC AktPieceStartCp2Fc( WW8_CP nCp ); void AktPieceFc2Cp(WW8_CP& rStartPos, WW8_CP& rEndPos, @@ -573,13 +573,13 @@ public: WW8PLCFx_Fc_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt, const WW8Fib& rFib, ePLCFT ePl, WW8_FC nStartFcL ); virtual ~WW8PLCFx_Fc_FKP(); - virtual sal_uLong GetIdx() const; - virtual void SetIdx( sal_uLong nIdx ); - virtual bool SeekPos(WW8_FC nFcPos); - virtual WW8_FC Where(); + virtual sal_uLong GetIdx() const SAL_OVERRIDE; + virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE; + virtual bool SeekPos(WW8_FC nFcPos) SAL_OVERRIDE; + virtual WW8_FC Where() SAL_OVERRIDE; sal_uInt8* GetSprmsAndPos( WW8_FC& rStart, WW8_FC& rEnd, sal_Int32& rLen ); - virtual void advance(); - virtual sal_uInt16 GetIstd() const; + virtual void advance() SAL_OVERRIDE; + virtual sal_uInt16 GetIstd() const SAL_OVERRIDE; void GetPCDSprms( WW8PLCFxDesc& rDesc ); const sal_uInt8* HasSprm( sal_uInt16 nId ); bool HasSprm(sal_uInt16 nId, std::vector<const sal_uInt8 *> &rResult); @@ -609,14 +609,14 @@ public: sal_uLong GetPCDIMax() const; sal_uLong GetPCDIdx() const; void SetPCDIdx( sal_uLong nIdx ); - virtual sal_uLong GetIdx2() const; - virtual void SetIdx2( sal_uLong nIdx ); - virtual bool SeekPos(WW8_CP nCpPos); - virtual WW8_CP Where(); - virtual void GetSprms( WW8PLCFxDesc* p ); - virtual void advance(); - virtual void Save( WW8PLCFxSave1& rSave ) const; - virtual void Restore( const WW8PLCFxSave1& rSave ); + virtual sal_uLong GetIdx2() const SAL_OVERRIDE; + virtual void SetIdx2( sal_uLong nIdx ) SAL_OVERRIDE; + virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; + virtual WW8_CP Where() SAL_OVERRIDE; + virtual void GetSprms( WW8PLCFxDesc* p ) SAL_OVERRIDE; + virtual void advance() SAL_OVERRIDE; + virtual void Save( WW8PLCFxSave1& rSave ) const SAL_OVERRIDE; + virtual void Restore( const WW8PLCFxSave1& rSave ) SAL_OVERRIDE; }; /// Iterator for Piece Table Exceptions of Sepx @@ -638,13 +638,13 @@ public: WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTblxySt, const WW8Fib& rFib, WW8_CP nStartCp ); virtual ~WW8PLCFx_SEPX(); - virtual sal_uLong GetIdx() const; - virtual void SetIdx( sal_uLong nIdx ); + virtual sal_uLong GetIdx() const SAL_OVERRIDE; + virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE; long GetIMax() const { return ( pPLCF ) ? pPLCF->GetIMax() : 0; } - virtual bool SeekPos(WW8_CP nCpPos); - virtual WW8_FC Where(); - virtual void GetSprms( WW8PLCFxDesc* p ); - virtual void advance(); + virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; + virtual WW8_FC Where() SAL_OVERRIDE; + virtual void GetSprms( WW8PLCFxDesc* p ) SAL_OVERRIDE; + virtual void advance() SAL_OVERRIDE; const sal_uInt8* HasSprm( sal_uInt16 nId ) const; const sal_uInt8* HasSprm( sal_uInt16 nId, sal_uInt8 n2nd ) const; const sal_uInt8* HasSprm( sal_uInt16 nId, const sal_uInt8* pOtherSprms, @@ -668,10 +668,10 @@ public: WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp, long nFcRef, long nLenRef, long nFcTxt, long nLenTxt, long nStruc = 0); virtual ~WW8PLCFx_SubDoc(); - virtual sal_uLong GetIdx() const; - virtual void SetIdx( sal_uLong nIdx ); - virtual bool SeekPos(WW8_CP nCpPos); - virtual WW8_FC Where(); + virtual sal_uLong GetIdx() const SAL_OVERRIDE; + virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE; + virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; + virtual WW8_FC Where() SAL_OVERRIDE; // liefert Reference Descriptoren const void* GetData( long nIdx = -1 ) const @@ -681,8 +681,8 @@ public: //liefert Angabe, wo Kopf und Fusszeilen-Text zu finden ist bool Get(long& rStart, void*& rpValue) const; - virtual void GetSprms(WW8PLCFxDesc* p); - virtual void advance(); + virtual void GetSprms(WW8PLCFxDesc* p) SAL_OVERRIDE; + virtual void advance() SAL_OVERRIDE; long Count() const { return ( pRef ) ? pRef->GetIMax() : 0; } }; @@ -699,12 +699,12 @@ private: public: WW8PLCFx_FLD(SvStream* pSt, const WW8Fib& rMyFib, short nType); virtual ~WW8PLCFx_FLD(); - virtual sal_uLong GetIdx() const; - virtual void SetIdx( sal_uLong nIdx ); - virtual bool SeekPos(WW8_CP nCpPos); - virtual WW8_FC Where(); - virtual void GetSprms(WW8PLCFxDesc* p); - virtual void advance(); + virtual sal_uLong GetIdx() const SAL_OVERRIDE; + virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE; + virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; + virtual WW8_FC Where() SAL_OVERRIDE; + virtual void GetSprms(WW8PLCFxDesc* p) SAL_OVERRIDE; + virtual void advance() SAL_OVERRIDE; bool StartPosIsFieldStart(); bool EndPosIsFieldEnd(WW8_CP&); bool GetPara(long nIdx, WW8FieldDesc& rF); @@ -731,14 +731,14 @@ public: WW8PLCFx_Book(SvStream* pTblSt,const WW8Fib& rFib); virtual ~WW8PLCFx_Book(); long GetIMax() const { return nIMax; } - virtual sal_uLong GetIdx() const; - virtual void SetIdx( sal_uLong nI ); - virtual sal_uLong GetIdx2() const; - virtual void SetIdx2( sal_uLong nIdx ); - virtual bool SeekPos(WW8_CP nCpPos); - virtual WW8_FC Where(); - virtual long GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen ); - virtual void advance(); + virtual sal_uLong GetIdx() const SAL_OVERRIDE; + virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE; + virtual sal_uLong GetIdx2() const SAL_OVERRIDE; + virtual void SetIdx2( sal_uLong nIdx ) SAL_OVERRIDE; + virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; + virtual WW8_FC Where() SAL_OVERRIDE; + virtual long GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen ) SAL_OVERRIDE; + virtual void advance() SAL_OVERRIDE; const OUString* GetName() const; WW8_CP GetStartPos() const { return ( nIsEnd ) ? WW8_CP_MAX : pBook[0]->Where(); } diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index c6cfa0eb8c82..f4298dac1767 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -39,8 +39,8 @@ class MSOWordCommandConvertor : public MSOCommandConvertor public: MSOWordCommandConvertor(); - virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); - virtual OUString MSOTCIDToOOCommand( sal_Int16 key ); + virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ) SAL_OVERRIDE; + virtual OUString MSOTCIDToOOCommand( sal_Int16 key ) SAL_OVERRIDE; }; MSOWordCommandConvertor::MSOWordCommandConvertor() diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx index d0482e95e49a..7b4bb2e26059 100644 --- a/sw/source/filter/ww8/ww8toolbar.hxx +++ b/sw/source/filter/ww8/ww8toolbar.hxx @@ -17,9 +17,9 @@ class Xst : public TBBase public: Xst(){} - bool Read(SvStream &rS); + bool Read(SvStream &rS) SAL_OVERRIDE; OUString getString() { return sString; } - void Print( FILE* fp ); + void Print( FILE* fp ) SAL_OVERRIDE; }; class SwCTBWrapper; @@ -33,8 +33,8 @@ class SwTBC : public TBBase public: SwTBC(); ~SwTBC(); - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; bool ImportToolBarControl( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, bool ); OUString GetCustomText(); }; @@ -57,8 +57,8 @@ class SwCTB : public TBBase public: SwCTB(); ~SwCTB(); - bool Read(SvStream &rS); - void Print( FILE* fp ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* fp ) SAL_OVERRIDE; bool IsMenuToolbar(); bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& ); bool ImportMenuTB( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); @@ -79,8 +79,8 @@ class TBDelta : public TBBase public: TBDelta(); ~TBDelta(){} - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; bool ControlIsModified(); bool ControlIsInserted(); bool ControlIsChanged(); @@ -105,7 +105,7 @@ public: Tcg255SubStruct( bool bReadId ); ~Tcg255SubStruct(){} virtual sal_uInt8 id() const { return ch; } - bool Read(SvStream &rS); + bool Read(SvStream &rS) SAL_OVERRIDE; }; class SwCTBWrapper; @@ -126,10 +126,10 @@ class Customization : public TBBase public: Customization( SwCTBWrapper* rapper ); ~Customization(); - bool Read(SvStream &rS); + bool Read(SvStream &rS) SAL_OVERRIDE; bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& ); bool ImportMenu( SwCTBWrapper&, CustomToolBarImportHelper& ); - void Print( FILE* ); + void Print( FILE* ) SAL_OVERRIDE; sal_Int32 GetTBIDForTB(){ return tbidForTBD; } SwCTB* GetCustomizationData() { return customizationDataCTB.get(); }; }; @@ -160,12 +160,12 @@ public: ~SwCTBWrapper(); void InsertDropIndex( sal_Int32 aIndex ) { dropDownMenuIndices.push_back( aIndex ); } SwTBC* GetTBCAtOffset( sal_uInt32 nStreamOffset ); - bool Read(SvStream &rS); + bool Read(SvStream &rS) SAL_OVERRIDE; bool ImportCustomToolBar( SfxObjectShell& rDocSh ); Customization* GetCustomizaton( sal_Int16 index ); SwCTB* GetCustomizationData( const OUString& name ); - void Print( FILE* ); + void Print( FILE* ) SAL_OVERRIDE; }; class MCD : public TBBase @@ -184,8 +184,8 @@ public: MCD(); MCD(const MCD&); MCD& operator = ( const MCD&); - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; }; class PlfMcd : public Tcg255SubStruct @@ -197,8 +197,8 @@ class PlfMcd : public Tcg255SubStruct public: PlfMcd( bool bReadId = true ); - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; }; class Acd : public TBBase @@ -211,8 +211,8 @@ class Acd : public TBBase public: Acd(); ~Acd(){} - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; }; class PlfAcd: public Tcg255SubStruct @@ -225,8 +225,8 @@ class PlfAcd: public Tcg255SubStruct public: PlfAcd( bool bReadId = true ); ~PlfAcd(); - bool Read(SvStream &rS); - void Print(FILE*); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print(FILE*) SAL_OVERRIDE; }; class Kme : public TBBase @@ -244,8 +244,8 @@ class Kme : public TBBase public: Kme(); ~Kme(); - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; }; class PlfKme : public Tcg255SubStruct @@ -258,8 +258,8 @@ class PlfKme : public Tcg255SubStruct public: PlfKme( bool bReadId = true ); ~PlfKme(); - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; }; class TcgSttbfCore : public TBBase @@ -282,8 +282,8 @@ class TcgSttbfCore : public TBBase public: TcgSttbfCore(); ~TcgSttbfCore(); - bool Read(SvStream &rS); - void Print( FILE* fp ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* fp ) SAL_OVERRIDE; }; class TcgSttbf : public Tcg255SubStruct @@ -295,8 +295,8 @@ class TcgSttbf : public Tcg255SubStruct public: TcgSttbf( bool bReadId = true ); ~TcgSttbf(){} - bool Read(SvStream &rS); - void Print( FILE* fp ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* fp ) SAL_OVERRIDE; }; class Xstz : public TBBase @@ -310,8 +310,8 @@ class Xstz : public TBBase public: Xstz(); ~Xstz(){} - bool Read(SvStream &rS); - void Print( FILE* fp ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* fp ) SAL_OVERRIDE; }; class MacroName : public TBBase @@ -324,8 +324,8 @@ class MacroName : public TBBase public: MacroName(); ~MacroName(){} - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; }; class MacroNames : public Tcg255SubStruct @@ -339,8 +339,8 @@ class MacroNames : public Tcg255SubStruct public: MacroNames( bool bReadId = true ); ~MacroNames(); - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; }; class Tcg255 : public TBBase @@ -353,8 +353,8 @@ class Tcg255 : public TBBase public: Tcg255(); ~Tcg255(); - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; bool ImportCustomToolBar( SfxObjectShell& rDocSh ); }; @@ -368,9 +368,9 @@ class Tcg: public TBBase public: Tcg(); ~Tcg(){} - bool Read(SvStream &rS); + bool Read(SvStream &rS) SAL_OVERRIDE; bool ImportCustomToolBar( SfxObjectShell& rDocSh ); - void Print( FILE* ); + void Print( FILE* ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index bfba14f14ae3..2ec718bb533f 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -43,15 +43,15 @@ class SwXMLWriter : public StgWriter using StgWriter::Write; protected: - virtual sal_uLong WriteStorage(); - virtual sal_uLong WriteMedium( SfxMedium& aTargetMedium ); + virtual sal_uLong WriteStorage() SAL_OVERRIDE; + virtual sal_uLong WriteMedium( SfxMedium& aTargetMedium ) SAL_OVERRIDE; public: SwXMLWriter( const OUString& rBaseURL ); virtual ~SwXMLWriter(); - virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ); + virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ) SAL_OVERRIDE; private: diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx index 8264496fdd11..ddf1140fff67 100644 --- a/sw/source/filter/xml/xmlbrshi.hxx +++ b/sw/source/filter/xml/xmlbrshi.hxx @@ -69,9 +69,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; const SvxBrushItem& GetItem() const { return *pItem; } }; diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index 0414747767a9..c69263e81437 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -88,16 +88,16 @@ class SwXMLExport : public SvXMLExport SwXMLTableInfo_Impl& rTblInfo, sal_uInt16 nHeaderRows = 0 ); - virtual void _ExportMeta(); - virtual void _ExportFontDecls(); - virtual void _ExportStyles( bool bUsed ); - virtual void _ExportAutoStyles(); - virtual void _ExportMasterStyles(); - virtual void SetBodyAttributes(); - virtual void _ExportContent(); - virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps); - virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps); - virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ); + virtual void _ExportMeta() SAL_OVERRIDE; + virtual void _ExportFontDecls() SAL_OVERRIDE; + virtual void _ExportStyles( bool bUsed ) SAL_OVERRIDE; + virtual void _ExportAutoStyles() SAL_OVERRIDE; + virtual void _ExportMasterStyles() SAL_OVERRIDE; + virtual void SetBodyAttributes() SAL_OVERRIDE; + virtual void _ExportContent() SAL_OVERRIDE; + virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) SAL_OVERRIDE; + virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) SAL_OVERRIDE; + virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ) SAL_OVERRIDE; // string constants for table cell export const OUString sNumberFormat; @@ -109,11 +109,11 @@ private: void DeleteTableLines(); protected: - virtual XMLTextParagraphExport* CreateTextParagraphExport(); - virtual SvXMLAutoStylePoolP* CreateAutoStylePool(); - virtual XMLPageExport* CreatePageExport(); - virtual XMLShapeExport* CreateShapeExport(); - virtual XMLFontAutoStylePool* CreateFontAutoStylePool(); + virtual XMLTextParagraphExport* CreateTextParagraphExport() SAL_OVERRIDE; + virtual SvXMLAutoStylePoolP* CreateAutoStylePool() SAL_OVERRIDE; + virtual XMLPageExport* CreatePageExport() SAL_OVERRIDE; + virtual XMLShapeExport* CreateShapeExport() SAL_OVERRIDE; + virtual XMLFontAutoStylePool* CreateFontAutoStylePool() SAL_OVERRIDE; public: SwXMLExport( @@ -122,7 +122,7 @@ public: virtual ~SwXMLExport(); - virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ); + virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) SAL_OVERRIDE; inline const SvXMLUnitConverter& GetTwipUnitConverter() const; @@ -141,7 +141,7 @@ public: // XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; const SwDoc* getDoc() const; SwDoc* getDoc(); diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 98a2f5501b86..da2aab803750 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -264,7 +264,7 @@ class SwXMLTextStyleContext_Impl : public XMLTextStyleContext protected: - virtual uno::Reference < style::XStyle > Create(); + virtual uno::Reference < style::XStyle > Create() SAL_OVERRIDE; public: @@ -280,9 +280,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< xml::sax::XAttributeList > & xAttrList ); + const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual void Finish( bool bOverwrite ); + virtual void Finish( bool bOverwrite ) SAL_OVERRIDE; }; TYPEINIT1( SwXMLTextStyleContext_Impl, XMLTextStyleContext ); @@ -440,7 +440,7 @@ protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, - const OUString& rValue ); + const OUString& rValue ) SAL_OVERRIDE; const SwXMLImport& GetSwImport() const { return (const SwXMLImport&)GetImport(); } @@ -458,11 +458,11 @@ public: sal_uInt16 nFamily); virtual ~SwXMLItemSetStyleContext_Impl(); - virtual void CreateAndInsert( sal_Bool bOverwrite ); + virtual void CreateAndInsert( sal_Bool bOverwrite ) SAL_OVERRIDE; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< xml::sax::XAttributeList > & xAttrList ); + const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; // The item set may be empty! SfxItemSet *GetItemSet() { return pItemSet; } @@ -722,17 +722,17 @@ protected: virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< xml::sax::XAttributeList > & xAttrList ); + const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< xml::sax::XAttributeList > & xAttrList ); + const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; // HACK virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper( - sal_uInt16 nFamily ) const; + sal_uInt16 nFamily ) const SAL_OVERRIDE; virtual uno::Reference < container::XNameContainer > - GetStylesContainer( sal_uInt16 nFamily ) const; - virtual OUString GetServiceName( sal_uInt16 nFamily ) const; + GetStylesContainer( sal_uInt16 nFamily ) const SAL_OVERRIDE; + virtual OUString GetServiceName( sal_uInt16 nFamily ) const SAL_OVERRIDE; // HACK public: @@ -746,9 +746,9 @@ public: sal_Bool bAuto ); virtual ~SwXMLStylesContext_Impl(); - virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; + virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; TYPEINIT1( SwXMLStylesContext_Impl, SvXMLStylesContext ); @@ -920,7 +920,7 @@ void SwXMLStylesContext_Impl::EndElement() class SwXMLMasterStylesContext_Impl : public XMLTextMasterStylesContext { protected: - virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; + virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE; SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } const SwXMLImport& GetSwImport() const @@ -935,7 +935,7 @@ public: const OUString& rLName , const uno::Reference< xml::sax::XAttributeList > & xAttrList ); virtual ~SwXMLMasterStylesContext_Impl(); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; TYPEINIT1( SwXMLMasterStylesContext_Impl, XMLTextMasterStylesContext ); diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index 03e7b9c5a00d..008ffc21e289 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -263,7 +263,7 @@ protected: const SvXMLExportPropertyMapper& rPropExp , const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap - ) const; + ) const SAL_OVERRIDE; public: SwXMLAutoStylePoolP( SvXMLExport& rExport ); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 2f3d39ecd43a..60d7be7aea03 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -122,7 +122,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; }; SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport, @@ -169,7 +169,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; }; SwXMLDocContext_Impl::SwXMLDocContext_Impl( SwXMLImport& rImport, @@ -260,7 +260,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; }; SwXMLOfficeDocContext_Impl::SwXMLOfficeDocContext_Impl( @@ -321,7 +321,7 @@ public: TYPEINFO_OVERRIDE(); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; SwXMLDocStylesContext_Impl::SwXMLDocStylesContext_Impl( diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index 3f1a920ca728..1369894ff601 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -100,11 +100,11 @@ protected: virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual XMLTextImportHelper* CreateTextImport(); + virtual XMLTextImportHelper* CreateTextImport() SAL_OVERRIDE; - virtual XMLShapeImportHelper* CreateShapeImport(); + virtual XMLShapeImportHelper* CreateShapeImport() SAL_OVERRIDE; public: SwXMLImport( @@ -117,16 +117,16 @@ public: virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL endDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // 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); + 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; void InsertStyles( sal_Bool bAuto ); void FinishStyles(); @@ -176,18 +176,18 @@ public: OUString *pParent=0 ) const; virtual void SetStatistics( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats); - virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps); - virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps); + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) SAL_OVERRIDE; + virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) SAL_OVERRIDE; + virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) SAL_OVERRIDE; virtual void SetDocumentSpecificSettings(const OUString& _rSettingsGroupName, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings); + const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings) SAL_OVERRIDE; SvStorage *GetPackage() { return &xPackage; } void SetProgressValue( sal_Int32 nValue ); // initialize XForms - virtual void initXForms(); + virtual void initXForms() SAL_OVERRIDE; // get the document properties, but only if they actually need importing ::com::sun::star::uno::Reference< diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx index 4e2ccdc55bad..c5f7651c347d 100644 --- a/sw/source/filter/xml/xmlitem.hxx +++ b/sw/source/filter/xml/xmlitem.hxx @@ -50,7 +50,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; // This method is called from this instance implementation of // CreateChildContext if the element matches an entry in the diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index 538412e1fa0f..cb1976b5de20 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -76,7 +76,7 @@ public: const SfxPoolItem& rItem, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - const SfxItemSet *pSet = NULL ) const; + const SfxItemSet *pSet = NULL ) const SAL_OVERRIDE; virtual void handleElementItem( SvXMLExport& rExport, @@ -84,7 +84,7 @@ public: const SfxPoolItem& rItem, const SvXMLUnitConverter& rUnitConverter, const SfxItemSet& rSet, - sal_uInt16 nFlags ) const; + sal_uInt16 nFlags ) const SAL_OVERRIDE; inline void SetAbsWidth( sal_uInt32 nAbs ); }; diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index dec2c5c33a14..d3a425fe6fe6 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -70,19 +70,19 @@ public: SfxItemSet& rSet, const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, - const SvXMLNamespaceMap& rNamespaceMap ); + const SvXMLNamespaceMap& rNamespaceMap ) SAL_OVERRIDE; virtual bool handleNoItem(SvXMLItemMapEntry const& rEntry, SfxItemSet & rSet, OUString const& rValue, SvXMLUnitConverter const& rUnitConverter, - SvXMLNamespaceMap const& rNamespaceMap); + SvXMLNamespaceMap const& rNamespaceMap) SAL_OVERRIDE; virtual void finished(SfxItemSet & rSet, - SvXMLUnitConverter const& rUnitConverter) const; + SvXMLUnitConverter const& rUnitConverter) const SAL_OVERRIDE; - virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ); + virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ) SAL_OVERRIDE; private: void Reset(); @@ -261,7 +261,7 @@ public: const ::uno::Reference< xml::sax::XAttributeList > & xAttrList, SfxItemSet& rItemSet, const SvXMLItemMapEntry& rEntry, - const SvXMLUnitConverter& rUnitConv ); + const SvXMLUnitConverter& rUnitConv ) SAL_OVERRIDE; }; SwXMLItemSetContext_Impl::SwXMLItemSetContext_Impl( diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index c72031d7a01f..289725d56fe7 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -436,8 +436,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); - virtual void EndElement(); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } }; @@ -844,7 +844,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } }; @@ -901,9 +901,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } }; @@ -1022,7 +1022,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } }; @@ -1082,7 +1082,7 @@ public: ~SwXMLDDETableContext_Impl(); virtual void StartElement( - const Reference<xml::sax::XAttributeList> & xAttrList); + const Reference<xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE; OUString& GetConnectionName() { return sConnectionName; } OUString& GetDDEApplication() { return sDDEApplication; } diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index 28d6725056b4..874dac575686 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -150,7 +150,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } @@ -187,10 +187,10 @@ public: const SwStartNode *InsertTableSection(const SwStartNode *pPrevSttNd = 0, OUString const* pStringValueStyleName = 0); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > GetXTextContent() const; + ::com::sun::star::text::XTextContent > GetXTextContent() const SAL_OVERRIDE; void SetHasSubTables( bool bNew ) { bHasSubTables = bNew; } }; diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx index d04345bba744..4c2785be5045 100644 --- a/sw/source/filter/xml/xmltext.cxx +++ b/sw/source/filter/xml/xmltext.cxx @@ -36,11 +36,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ); + const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; // The body element's text:global attribute can be ignored, because // we must have the correct object shell already. - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; SwXMLBodyContentContext_Impl::SwXMLBodyContentContext_Impl( SwXMLImport& rImport, diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index 109c089dc872..99ff8608e618 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -48,21 +48,21 @@ class SwXMLTextParagraphExport : public XMLTextParagraphExport protected: virtual void exportStyleContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ); + ::com::sun::star::style::XStyle > & rStyle ) SAL_OVERRIDE; virtual void _collectTextEmbeddedAutoStyles( const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet ); + ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; virtual void _exportTextEmbedded( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ); + ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ) SAL_OVERRIDE; virtual void exportTable( const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextContent > & rTextContent, - sal_Bool bAutoStyles, sal_Bool bProgress ); + sal_Bool bAutoStyles, sal_Bool bProgress ) SAL_OVERRIDE; public: SwXMLTextParagraphExport( @@ -73,7 +73,7 @@ public: virtual void setTextEmbeddedGraphicURL( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& rPropSet, - OUString& rStreamName ) const; + OUString& rStreamName ) const SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTE_HXX diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index 4210cc1e6c87..1cd0357ce7d4 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -33,7 +33,7 @@ protected: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; public: SwXMLTextImportHelper( @@ -53,14 +53,14 @@ public: const OUString& rHRef, const OUString& rStyleName, const OUString& rTblName, - sal_Int32 nWidth, sal_Int32 nHeight ); + sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertOOoLink( SvXMLImport& rImport, const OUString& rHRef, const OUString& rStyleName, const OUString& rTblName, - sal_Int32 nWidth, sal_Int32 nHeight ); + sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertApplet( @@ -68,14 +68,14 @@ public: const OUString &rCode, sal_Bool bMayScript, const OUString& rHRef, - sal_Int32 nWidth, sal_Int32 nHeight ); + sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertPlugin( const OUString &rMimeType, const OUString& rHRef, - sal_Int32 nWidth, sal_Int32 nHeight ); + sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> @@ -83,13 +83,13 @@ public: const OUString &rName, const OUString &rHRef, const OUString &rStyleName, - sal_Int32 nWidth, sal_Int32 nHeight ); + sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; virtual void endAppletOrPlugin( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &rPropSet, - ::std::map < const OUString, OUString > &rParamMap); + ::std::map < const OUString, OUString > &rParamMap) SAL_OVERRIDE; - virtual sal_Bool IsInHeaderFooter() const; + virtual sal_Bool IsInHeaderFooter() const SAL_OVERRIDE; // redlining helper methods // (here is the real implementation) @@ -99,22 +99,22 @@ public: const OUString& rAuthor, /// name of the author const OUString& rComment, /// redline comment const ::com::sun::star::util::DateTime& rDateTime, /// date+time - sal_Bool bMergeLastPara); /// merge last paragraph + sal_Bool bMergeLastPara) SAL_OVERRIDE; /// merge last paragraph virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor> RedlineCreateText( ::com::sun::star::uno::Reference< /// needed to get the document ::com::sun::star::text::XTextCursor> & rOldCursor, - const OUString& rId); /// ID used to RedlineAdd() call + const OUString& rId) SAL_OVERRIDE; /// ID used to RedlineAdd() call virtual void RedlineSetCursor( const OUString& rId, /// ID used to RedlineAdd() call sal_Bool bStart, /// start or end Cursor - sal_Bool bIsOutsideOfParagraph); + sal_Bool bIsOutsideOfParagraph) SAL_OVERRIDE; virtual void RedlineAdjustStartNodeCursor( - sal_Bool bStart); - virtual void SetShowChanges( sal_Bool bShowChanges ); - virtual void SetRecordChanges( sal_Bool bRecordChanges ); + sal_Bool bStart) SAL_OVERRIDE; + virtual void SetShowChanges( sal_Bool bShowChanges ) SAL_OVERRIDE; + virtual void SetRecordChanges( sal_Bool bRecordChanges ) SAL_OVERRIDE; virtual void SetChangesProtectionKey( - const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ); + const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTI_HXX diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 085759dc0e71..1483feb98212 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -93,7 +93,7 @@ class SwDropCapsPict : public Control Size maTextSize; Reference< css::i18n::XBreakIterator > xBreak; - virtual void Paint(const Rectangle &rRect); + virtual void Paint(const Rectangle &rRect) SAL_OVERRIDE; void CheckScript( void ); Size CalcTextSize( void ); inline void InitPrinter( void ); @@ -122,10 +122,10 @@ public: void UpdatePaintSettings( void ); // also invalidates control! - virtual void Resize(); - virtual Size GetOptimalSize() const; + virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; - void SetText( const OUString& rT ); + void SetText( const OUString& rT ) SAL_OVERRIDE; void SetLines( sal_uInt8 nL ); void SetDistance( sal_uInt16 nD ); void SetValues( const OUString& rText, sal_uInt8 nLines, sal_uInt16 nDistance ); diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index f7ca4aeac8db..88ad0cf243fa 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -147,7 +147,7 @@ public: : SvSimpleTable(rParent, nBits) { } - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; void setColSizes(); }; diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 1f4f99cd8c20..5b14c35e7413 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -65,8 +65,8 @@ class SwAddressControl_Impl : public Control void MakeVisible(const Rectangle& aRect); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; using Window::SetData; diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 87e01e18fa25..2991cca7d793 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -819,8 +819,8 @@ class SwAssignFieldsControl : public Control DECL_LINK(MatchHdl_Impl, ListBox*); DECL_LINK(GotFocusHdl_Impl, ListBox*); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; void MakeVisible( sal_Int32 nIndex ); public: diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index c064fa29aaf9..1294ba0e7025 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -73,9 +73,9 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage void EnableAddressBlock(sal_Bool bAll, sal_Bool bSelective); - virtual void ActivatePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); - virtual bool canAdvance() const; + virtual void ActivatePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; + virtual bool canAdvance() const SAL_OVERRIDE; public: SwMailMergeAddressBlockPage(SwMailMergeWizard* _pParent); @@ -125,7 +125,7 @@ public: void SetAddressDialog(SwCustomizeAddressBlockDialog *pParent); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; }; #define MOVE_ITEM_LEFT 1 @@ -143,20 +143,20 @@ class AddressMultiLineEdit : public VclMultiLineEdit, public SfxListener using VclMultiLineEdit::SetText; protected: - bool PreNotify( NotifyEvent& rNEvt ); + bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: AddressMultiLineEdit(Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER); ~AddressMultiLineEdit(); void SetAddressDialog(SwCustomizeAddressBlockDialog *pParent); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetSelectionChangedHdl( const Link& rLink ) {m_aSelectionLink = rLink;} - void SetText( const OUString& rStr ); + void SetText( const OUString& rStr ) SAL_OVERRIDE; OUString GetAddress(); void InsertNewEntry( const OUString& rStr ); @@ -176,8 +176,8 @@ class SwRestrictedComboBox : public ComboBox OUString sForbiddenChars; protected: - virtual void KeyInput( const KeyEvent& ); - virtual void Modify(); + virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; public: SwRestrictedComboBox(Window* pParent, WinBits nStyle = 0) : ComboBox( pParent, nStyle ) diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index faacb4344956..2788b3e70a5e 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -47,7 +47,7 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage DECL_LINK(DocSelectHdl, RadioButton*); DECL_LINK(FileSelectHdl, PushButton*); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; public: SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent); diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index 84d12f662e71..ebd1ddc5a62e 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -84,9 +84,9 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage, DECL_LINK(GreetingSelectHdl_Impl, void *); DECL_LINK(AssignHdl_Impl, PushButton*); - virtual void UpdatePreview(); - virtual void ActivatePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void UpdatePreview() SAL_OVERRIDE; + virtual void ActivatePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; public: SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent); ~SwMailMergeGreetingsPage(); diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index 7eefddbb6c06..4fbc7f590706 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -79,8 +79,8 @@ class SwMailMergeLayoutPage : public svt::OWizardPage bool bExample); static void InsertGreeting(SwWrtShell& rShell, SwMailMergeConfigItem& rConfigItem, bool bExample); - virtual void ActivatePage(); - virtual bool commitPage(::svt::WizardTypes::CommitPageReason _eReason); + virtual void ActivatePage() SAL_OVERRIDE; + virtual bool commitPage(::svt::WizardTypes::CommitPageReason _eReason) SAL_OVERRIDE; public: SwMailMergeLayoutPage( SwMailMergeWizard* _pParent); ~SwMailMergeLayoutPage(); diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index 8a5c7756e035..9f7fc710c3d1 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -123,8 +123,8 @@ class SwMailMergeOutputPage : public svt::OWizardPage DECL_LINK(DocumentSelectionHdl_Impl, RadioButton*); DECL_LINK(SaveCancelHdl_Impl, void *); protected: - virtual bool canAdvance() const; - virtual void ActivatePage(); + virtual bool canAdvance() const SAL_OVERRIDE; + virtual void ActivatePage() SAL_OVERRIDE; public: SwMailMergeOutputPage( SwMailMergeWizard* _pParent); ~SwMailMergeOutputPage(); @@ -200,7 +200,7 @@ class SW_DLLPUBLIC SwSendMailDialog : public ModelessDialog //SfxModalDialog SAL_DLLPRIVATE void SendMails(); SAL_DLLPRIVATE void UpdateTransferStatus(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; public: SwSendMailDialog( Window* pParent, SwMailMergeConfigItem& ); diff --git a/sw/source/ui/dbui/mmpreparemergepage.hxx b/sw/source/ui/dbui/mmpreparemergepage.hxx index 9893b0ac2ac5..bdaef54ae3ff 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.hxx +++ b/sw/source/ui/dbui/mmpreparemergepage.hxx @@ -44,8 +44,8 @@ class SwMailMergePrepareMergePage : public svt::OWizardPage DECL_LINK(ExcludeHdl_Impl, CheckBox*); DECL_LINK(MoveHdl_Impl, void*); - virtual void ActivatePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void ActivatePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; public: SwMailMergePrepareMergePage( SwMailMergeWizard* _pParent); diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 55a3bdb60ff8..8654412509ac 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -54,7 +54,7 @@ public: \ : pDlg(p) \ {} \ virtual ~Class(); \ - virtual short Execute() ; + virtual short Execute() SAL_OVERRIDE ; #define IMPL_ABSTDLG_BASE(Class) \ Class::~Class() \ @@ -70,30 +70,30 @@ class SwWordCountFloatDlg; class AbstractSwWordCountFloatDlg_Impl : public AbstractSwWordCountFloatDlg { DECL_ABSTDLG_BASE(AbstractSwWordCountFloatDlg_Impl,SwWordCountFloatDlg) - virtual void UpdateCounts(); - virtual void SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat); - virtual Window * GetWindow(); //this method is added for return a Window type pointer + virtual void UpdateCounts() SAL_OVERRIDE; + virtual void SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat) SAL_OVERRIDE; + virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg { DECL_ABSTDLG_BASE(AbstractSwInsertAbstractDlg_Impl,SwInsertAbstractDlg) - virtual sal_uInt8 GetLevel() const ; - virtual sal_uInt8 GetPara() const ; + virtual sal_uInt8 GetLevel() const SAL_OVERRIDE ; + virtual sal_uInt8 GetPara() const SAL_OVERRIDE ; }; class SwAbstractSfxDialog_Impl :public SfxAbstractDialog { DECL_ABSTDLG_BASE(SwAbstractSfxDialog_Impl,SfxModalDialog) - virtual const SfxItemSet* GetOutputItemSet() const; - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; }; class AbstractSwAsciiFilterDlg_Impl : public AbstractSwAsciiFilterDlg { DECL_ABSTDLG_BASE( AbstractSwAsciiFilterDlg_Impl,SwAsciiFilterDlg ) - virtual void FillOptions( SwAsciiOptions& rOptions ); + virtual void FillOptions( SwAsciiOptions& rOptions ) SAL_OVERRIDE; }; @@ -105,28 +105,28 @@ class VclAbstractDialog_Impl : public VclAbstractDialog class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg { DECL_ABSTDLG_BASE(AbstractSwBreakDlg_Impl,SwBreakDlg) - virtual OUString GetTemplateName(); - virtual sal_uInt16 GetKind(); - virtual ::boost::optional<sal_uInt16> GetPageNumber(); + virtual OUString GetTemplateName() SAL_OVERRIDE; + virtual sal_uInt16 GetKind() SAL_OVERRIDE; + virtual ::boost::optional<sal_uInt16> GetPageNumber() SAL_OVERRIDE; }; class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for { DECL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl, SwSplitTblDlg) - virtual sal_uInt16 GetSplitMode(); + virtual sal_uInt16 GetSplitMode() SAL_OVERRIDE; }; class AbstractTabDialog_Impl : virtual public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( sal_uInt16 nId ); - virtual void SetCurPageId( const OString &rName ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void SetCurPageId( const OString &rName ) SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; + virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; //From class Window. - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; }; class AbstractApplyTabDialog_Impl : public AbstractTabDialog_Impl, virtual public SfxAbstractApplyTabDialog @@ -139,14 +139,14 @@ public: DECL_LINK(ApplyHdl, void*); private: Link m_aHandler; - virtual void SetApplyHdl( const Link& rLink ); + virtual void SetApplyHdl( const Link& rLink ) SAL_OVERRIDE; }; class AbstractSwConvertTableDlg_Impl : public AbstractSwConvertTableDlg { DECL_ABSTDLG_BASE( AbstractSwConvertTableDlg_Impl,SwConvertTableDlg) virtual void GetValues( sal_Unicode& rDelim,SwInsertTableOptions& rInsTblFlags, - SwTableAutoFmt const*& prTAFmt); + SwTableAutoFmt const*& prTAFmt) SAL_OVERRIDE; }; class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPilot @@ -155,85 +155,85 @@ class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPil virtual void DataToDoc( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet); + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet) SAL_OVERRIDE; }; class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog { DECL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl, sw::DropDownFieldDialog) - virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const; //this method inherit from SystemWindow - virtual void SetWindowState( const OString& rStr );//this method inherit from SystemWindow + virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const SAL_OVERRIDE; //this method inherit from SystemWindow + virtual void SetWindowState( const OString& rStr ) SAL_OVERRIDE;//this method inherit from SystemWindow }; class AbstractSwLabDlg_Impl : public AbstractSwLabDlg { DECL_ABSTDLG_BASE(AbstractSwLabDlg_Impl,SwLabDlg) - virtual void SetCurPageId( sal_uInt16 nId ); - virtual void SetCurPageId( const OString &rName ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void SetCurPageId( const OString &rName ) SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; + virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; //From class Window. - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; - virtual const OUString& GetBusinessCardStr() const; - virtual Printer *GetPrt(); + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; + virtual const OUString& GetBusinessCardStr() const SAL_OVERRIDE; + virtual Printer *GetPrt() SAL_OVERRIDE; }; class AbstractSwSelGlossaryDlg_Impl : public AbstractSwSelGlossaryDlg { DECL_ABSTDLG_BASE(AbstractSwSelGlossaryDlg_Impl,SwSelGlossaryDlg) - virtual void InsertGlos(const OUString &rRegion, const OUString &rGlosName); // inline - virtual sal_uInt16 GetSelectedIdx() const; // inline - virtual void SelectEntryPos(sal_uInt16 nIdx); // inline + virtual void InsertGlos(const OUString &rRegion, const OUString &rGlosName) SAL_OVERRIDE; // inline + virtual sal_uInt16 GetSelectedIdx() const SAL_OVERRIDE; // inline + virtual void SelectEntryPos(sal_uInt16 nIdx) SAL_OVERRIDE; // inline }; class AbstractSwAutoFormatDlg_Impl : public AbstractSwAutoFormatDlg { DECL_ABSTDLG_BASE(AbstractSwAutoFormatDlg_Impl,SwAutoFormatDlg ) - virtual void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const; + virtual void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const SAL_OVERRIDE; }; class AbstractSwFldDlg_Impl : public AbstractSwFldDlg { DECL_ABSTDLG_BASE(AbstractSwFldDlg_Impl,SwFldDlg ) - virtual void SetCurPageId( sal_uInt16 nId ); - virtual void SetCurPageId( const OString &rName ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void SetCurPageId( const OString &rName ) SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; + virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; //From class Window. - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; - virtual void Start( sal_Bool bShow = sal_True ); //this method from SfxTabDialog - virtual void ShowReferencePage(); - virtual void Initialize(SfxChildWinInfo *pInfo); - virtual void ReInitDlg(); - virtual void ActivateDatabasePage(); - virtual Window * GetWindow(); //this method is added for return a Window type pointer + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; + virtual void Start( sal_Bool bShow = sal_True ) SAL_OVERRIDE; //this method from SfxTabDialog + virtual void ShowReferencePage() SAL_OVERRIDE; + virtual void Initialize(SfxChildWinInfo *pInfo) SAL_OVERRIDE; + virtual void ReInitDlg() SAL_OVERRIDE; + virtual void ActivateDatabasePage() SAL_OVERRIDE; + virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg { DECL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl,SwRenameXNamedDlg ) - virtual void SetForbiddenChars( const OUString& rSet ); + virtual void SetForbiddenChars( const OUString& rSet ) SAL_OVERRIDE; virtual void SetAlternativeAccess( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird ); + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird ) SAL_OVERRIDE; }; class AbstractSwModalRedlineAcceptDlg_Impl : public AbstractSwModalRedlineAcceptDlg { DECL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl,SwModalRedlineAcceptDlg ) - virtual void AcceptAll( sal_Bool bAccept ); + virtual void AcceptAll( sal_Bool bAccept ) SAL_OVERRIDE; }; class SwGlossaryDlg; class AbstractGlossaryDlg_Impl : public AbstractGlossaryDlg { DECL_ABSTDLG_BASE(AbstractGlossaryDlg_Impl,SwGlossaryDlg) - virtual OUString GetCurrGrpName() const; - virtual OUString GetCurrShortName() const; + virtual OUString GetCurrGrpName() const SAL_OVERRIDE; + virtual OUString GetCurrShortName() const SAL_OVERRIDE; }; class SwFldInputDlg; @@ -241,21 +241,21 @@ class AbstractFldInputDlg_Impl : public AbstractFldInputDlg { DECL_ABSTDLG_BASE(AbstractFldInputDlg_Impl,SwFldInputDlg) //from class SalFrame - virtual void SetWindowState( const OString & rStr ) ; - virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const ; - virtual void EndDialog(long); + virtual void SetWindowState( const OString & rStr ) SAL_OVERRIDE ; + virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const SAL_OVERRIDE ; + virtual void EndDialog(long) SAL_OVERRIDE; }; class SwInsFootNoteDlg; class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg { DECL_ABSTDLG_BASE(AbstractInsFootNoteDlg_Impl,SwInsFootNoteDlg) - virtual OUString GetFontName(); - virtual sal_Bool IsEndNote(); - virtual OUString GetStr(); + virtual OUString GetFontName() SAL_OVERRIDE; + virtual sal_Bool IsEndNote() SAL_OVERRIDE; + virtual OUString GetStr() SAL_OVERRIDE; //from class Window - virtual void SetHelpId( const OString& sHelpId ); - virtual void SetText( const OUString& rStr ); + virtual void SetHelpId( const OString& sHelpId ) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; }; class SwInsTableDlg; @@ -264,87 +264,87 @@ class AbstractInsTableDlg_Impl : public AbstractInsTableDlg DECL_ABSTDLG_BASE(AbstractInsTableDlg_Impl,SwInsTableDlg) virtual void GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol, SwInsertTableOptions& rInsTblFlags, OUString& rTableAutoFmtName, - SwTableAutoFmt *& prTAFmt ); + SwTableAutoFmt *& prTAFmt ) SAL_OVERRIDE; }; class SwJavaEditDialog; class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog { DECL_ABSTDLG_BASE(AbstractJavaEditDialog_Impl,SwJavaEditDialog) - virtual OUString GetScriptText() const; - virtual OUString GetScriptType() const; - virtual sal_Bool IsUrl() const; - virtual sal_Bool IsNew() const; - virtual bool IsUpdate() const; + virtual OUString GetScriptText() const SAL_OVERRIDE; + virtual OUString GetScriptType() const SAL_OVERRIDE; + virtual sal_Bool IsUrl() const SAL_OVERRIDE; + virtual sal_Bool IsNew() const SAL_OVERRIDE; + virtual bool IsUpdate() const SAL_OVERRIDE; }; class SwMailMergeDlg; class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg { DECL_ABSTDLG_BASE(AbstractMailMergeDlg_Impl,SwMailMergeDlg) - virtual sal_uInt16 GetMergeType() ; - virtual const OUString& GetSaveFilter() const; - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const; - virtual bool IsSaveIndividualDocs() const; - virtual bool IsGenerateFromDataBase() const; - virtual OUString GetColumnName() const; - virtual OUString GetPath() const; + virtual sal_uInt16 GetMergeType() SAL_OVERRIDE ; + virtual const OUString& GetSaveFilter() const SAL_OVERRIDE; + virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const SAL_OVERRIDE; + virtual bool IsSaveIndividualDocs() const SAL_OVERRIDE; + virtual bool IsGenerateFromDataBase() const SAL_OVERRIDE; + virtual OUString GetColumnName() const SAL_OVERRIDE; + virtual OUString GetPath() const SAL_OVERRIDE; }; class SwMailMergeCreateFromDlg; class AbstractMailMergeCreateFromDlg_Impl : public AbstractMailMergeCreateFromDlg { DECL_ABSTDLG_BASE(AbstractMailMergeCreateFromDlg_Impl,SwMailMergeCreateFromDlg) - virtual sal_Bool IsThisDocument() const ; + virtual sal_Bool IsThisDocument() const SAL_OVERRIDE ; }; class SwMailMergeFieldConnectionsDlg; class AbstractMailMergeFieldConnectionsDlg_Impl : public AbstractMailMergeFieldConnectionsDlg { DECL_ABSTDLG_BASE(AbstractMailMergeFieldConnectionsDlg_Impl,SwMailMergeFieldConnectionsDlg) - virtual sal_Bool IsUseExistingConnections() const ; + virtual sal_Bool IsUseExistingConnections() const SAL_OVERRIDE ; }; class SwMultiTOXTabDialog; class AbstractMultiTOXTabDialog_Impl : public AbstractMultiTOXTabDialog { DECL_ABSTDLG_BASE(AbstractMultiTOXTabDialog_Impl,SwMultiTOXTabDialog) - virtual SwForm* GetForm(CurTOXType eType); - virtual CurTOXType GetCurrentTOXType() const ; - virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes); + virtual SwForm* GetForm(CurTOXType eType) SAL_OVERRIDE; + virtual CurTOXType GetCurrentTOXType() const SAL_OVERRIDE ; + virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes) SAL_OVERRIDE; //from SfxTabDialog - virtual const SfxItemSet* GetOutputItemSet() const; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; }; class SwEditRegionDlg; class AbstractEditRegionDlg_Impl : public AbstractEditRegionDlg { DECL_ABSTDLG_BASE(AbstractEditRegionDlg_Impl,SwEditRegionDlg) - virtual void SelectSection(const OUString& rSectionName); + virtual void SelectSection(const OUString& rSectionName) SAL_OVERRIDE; }; class SwInsertSectionTabDialog; class AbstractInsertSectionTabDialog_Impl : public AbstractInsertSectionTabDialog { DECL_ABSTDLG_BASE(AbstractInsertSectionTabDialog_Impl,SwInsertSectionTabDialog) - virtual void SetSectionData(SwSectionData const& rSect); + virtual void SetSectionData(SwSectionData const& rSect) SAL_OVERRIDE; }; class SwIndexMarkFloatDlg; class AbstractIndexMarkFloatDlg_Impl : public AbstractMarkFloatDlg { DECL_ABSTDLG_BASE(AbstractIndexMarkFloatDlg_Impl,SwIndexMarkFloatDlg) - virtual void ReInitDlg(SwWrtShell& rWrtShell); - virtual Window * GetWindow(); //this method is added for return a Window type pointer + virtual void ReInitDlg(SwWrtShell& rWrtShell) SAL_OVERRIDE; + virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class SwAuthMarkFloatDlg; class AbstractAuthMarkFloatDlg_Impl : public AbstractMarkFloatDlg { DECL_ABSTDLG_BASE(AbstractAuthMarkFloatDlg_Impl,SwAuthMarkFloatDlg) - virtual void ReInitDlg(SwWrtShell& rWrtShell); - virtual Window * GetWindow(); //this method is added for return a Window type pointer + virtual void ReInitDlg(SwWrtShell& rWrtShell) SAL_OVERRIDE; + virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class SwMailMergeWizard; @@ -359,13 +359,13 @@ public: : pDlg(p) {} virtual ~AbstractMailMergeWizard_Impl(); - virtual void StartExecuteModal( const Link& rEndDialogHdl ); - virtual long GetResult(); + virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE; + virtual long GetResult() SAL_OVERRIDE; - virtual void SetReloadDocument(const OUString& rURL); - virtual OUString GetReloadDocument() const; - virtual sal_Bool ShowPage( sal_uInt16 nLevel ); - virtual sal_uInt16 GetRestartPage() const; + virtual void SetReloadDocument(const OUString& rURL) SAL_OVERRIDE; + virtual OUString GetReloadDocument() const SAL_OVERRIDE; + virtual sal_Bool ShowPage( sal_uInt16 nLevel ) SAL_OVERRIDE; + virtual sal_uInt16 GetRestartPage() const SAL_OVERRIDE; }; //AbstractDialogFactory_Impl implementations @@ -379,134 +379,134 @@ public: const SfxItemSet& rAttr, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, sal_uInt32 nResId - ); + ) SAL_OVERRIDE; virtual AbstractSwWordCountFloatDlg* CreateSwWordCountDialog(SfxBindings* pBindings, - SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo); - virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent); + SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo) SAL_OVERRIDE; + virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent) SAL_OVERRIDE; virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh, - SvStream* pStream ); - virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ); - virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh); - virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw); + SvStream* pStream ) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) SAL_OVERRIDE; + virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) SAL_OVERRIDE; virtual SfxAbstractTabDialog * CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, - sal_uInt8 nDialogMode, const OUString* pFmtStr = 0); - virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable); - virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId); + sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) SAL_OVERRIDE; + virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) SAL_OVERRIDE; virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource, com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp, - const SwDBData& rData); - virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh); + const SwDBData& rData) SAL_OVERRIDE; + virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE; virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog (Window *pParent, SwWrtShell &rSh, - SwField* pField, sal_Bool bNextButton = sal_False); - virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ); + SwField* pField, sal_Bool bNextButton = sal_False) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ) SAL_OVERRIDE; virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, - SwNewDBMgr* pNewDBMgr, bool bLabel); + SwNewDBMgr* pNewDBMgr, bool bLabel) SAL_OVERRIDE; - virtual SwLabDlgMethod GetSwLabDlgStaticMethod (); + virtual SwLabDlgMethod GetSwLabDlgStaticMethod () SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString *pCollName = 0, sal_Bool bDraw = sal_False, - const OString& sDefPage = OString() ); + const OString& sDefPage = OString() ) SAL_OVERRIDE; - virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName); - virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ); - virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ); + virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ) SAL_OVERRIDE; + virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ) SAL_OVERRIDE; virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, sal_Bool bSetAutoFmt = sal_True, - const SwTableAutoFmt* pSelFmt = 0 ); - virtual SfxAbstractDialog * CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ); + const SwTableAutoFmt* pSelFmt = 0 ) SAL_OVERRIDE; + virtual SfxAbstractDialog * CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) SAL_OVERRIDE; - virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ); - virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc); + virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool, - const SfxItemSet* pItemSet, SwWrtShell* pSh); - virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent); - virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ); + const SfxItemSet* pItemSet, SwWrtShell* pSh) SAL_OVERRIDE; + virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) SAL_OVERRIDE; + virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) SAL_OVERRIDE; virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess); - virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent); + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) SAL_OVERRIDE; + virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev); + virtual VclAbstractDialog* CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateFrmTabDialog( const OString &rDialogType, SfxViewFrame *pFrame, Window *pParent, const SfxItemSet& rCoreSet, bool bNewFrm = true, bool bFmt = false, const OString& sDefPage = OString(), - const OUString* pFmtStr = 0); + const OUString* pFmtStr = 0) SAL_OVERRIDE; virtual SfxAbstractApplyTabDialog* CreateTemplateDialog( Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage = OString(), SwWrtShell* pActShell = 0, - bool bNew = false); + bool bNew = false) SAL_OVERRIDE; virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, - SwWrtShell *pWrtShell); + SwWrtShell *pWrtShell) SAL_OVERRIDE; virtual AbstractFldInputDlg* CreateFldInputDlg(Window *pParent, - SwWrtShell &rSh, SwField* pField, bool bNextButton = false); + SwWrtShell &rSh, SwField* pField, bool bNextButton = false) SAL_OVERRIDE; virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( - Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False); - virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent ); - virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView); - virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView); + Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent ) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView) SAL_OVERRIDE; + virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView) SAL_OVERRIDE; virtual AbstractJavaEditDialog* CreateJavaEditDialog(Window* pParent, - SwWrtShell* pWrtSh); + SwWrtShell* pWrtSh) SAL_OVERRIDE; virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId, Window* pParent, SwWrtShell& rSh, const OUString& rSourceName, const OUString& rTblName, sal_Int32 nCommandType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ); - virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(Window* pParent); - virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent); - virtual VclAbstractDialog* CreateMultiTOXMarkDlg(Window* pParent, SwTOXMgr &rTOXMgr); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) SAL_OVERRIDE; + virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(Window* pParent) SAL_OVERRIDE; + virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateMultiTOXMarkDlg(Window* pParent, SwTOXMgr &rTOXMgr) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId, Window* pParent, const SfxItemSet* pSwItemSet, - SwWrtShell &); + SwWrtShell &) SAL_OVERRIDE; virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, - sal_Bool bGlobal = sal_False); - virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh); + sal_Bool bGlobal = sal_False) SAL_OVERRIDE; + virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) SAL_OVERRIDE; virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( - Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); + Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) SAL_OVERRIDE; virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo, - sal_Bool bNew=sal_True); + sal_Bool bNew=sal_True) SAL_OVERRIDE; virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo, - sal_Bool bNew=sal_True); + sal_Bool bNew=sal_True) SAL_OVERRIDE; virtual VclAbstractDialog * CreateIndexMarkModalDlg( - Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ); + Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) SAL_OVERRIDE; - virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem); + virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem) SAL_OVERRIDE; - virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc(); - virtual GlossarySetActGroup SetGlossaryActGroupFunc(); + virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc() SAL_OVERRIDE; + virtual GlossarySetActGroup SetGlossaryActGroupFunc() SAL_OVERRIDE; // For TabPage - virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ); + virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) SAL_OVERRIDE; - virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ); + virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) SAL_OVERRIDE; }; diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 4f3a78af1feb..bacc89652263 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -64,11 +64,11 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 01d866b620cb..b1941e8608a6 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -63,11 +63,11 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; inline void SetPrt(Printer* pPrinter) { pPrt = pPrinter; } }; diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 59201444817f..aa8f6de4621d 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -55,9 +55,9 @@ class SwLabPreview : public Window SwLabItem aItem; - virtual void Paint(const Rectangle&); + virtual void Paint(const Rectangle&) SAL_OVERRIDE; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void DrawArrow(const Point& rP1, const Point& rP2, bool bArrow); @@ -109,11 +109,11 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*)GetParentDialog();} }; diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index d07a309c1676..1b30708b33a1 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -60,11 +60,11 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; inline Printer* GetPrt() { return (pPrinter); } }; diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 14c9c20c8845..1f89e60c768b 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -97,8 +97,8 @@ public: SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg); ~SwXSelChgLstnr_Impl(); - virtual void SAL_CALL selectionChanged( const EventObject& aEvent ) throw (RuntimeException, std::exception); - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception); + virtual void SAL_CALL selectionChanged( const EventObject& aEvent ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; }; SwXSelChgLstnr_Impl::SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg) : diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 57b5959e9af5..c4e7d794da6c 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -65,11 +65,11 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*) GetParentDialog();} @@ -117,10 +117,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; class SwPrivateDataPage : public SfxTabPage @@ -155,10 +155,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; class SwBusinessDataPage : public SfxTabPage @@ -191,10 +191,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx index e26f5fd037ef..4d92ac11fa05 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.hxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.hxx @@ -24,7 +24,7 @@ class SwFldRefTreeListBox : public SvTreeListBox { protected: - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: SwFldRefTreeListBox(Window* pParent, WinBits nStyle); diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index a446ae3a0bd1..916afe4afafa 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -65,7 +65,7 @@ class SwFldDBPage : public SwFldPage using SwFldPage::SetWrtShell; protected: - virtual sal_uInt16 GetGroup(); + virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: SwFldDBPage(Window* pParent, const SfxItemSet& rSet); @@ -74,10 +74,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual void FillUserData(); + virtual void FillUserData() SAL_OVERRIDE; void ActivateMailMergeAddress(); void SetWrtShell(SwWrtShell& rSh); diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 464e1ecbf053..be263ebcd079 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -56,7 +56,7 @@ class SwFldDokInfPage : public SwFldPage sal_Int32 FillSelectionLB(sal_uInt16 nSubTypeId); protected: - virtual sal_uInt16 GetGroup(); + virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: SwFldDokInfPage(Window* pWindow, const SfxItemSet& rSet); @@ -65,10 +65,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual void FillUserData(); + virtual void FillUserData() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index ec6ec8179dcd..c62820ef7a60 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -58,7 +58,7 @@ class SwFldDokPage : public SwFldPage sal_Int32 FillFormatLB(sal_uInt16 nTypeId); protected: - virtual sal_uInt16 GetGroup(); + virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: SwFldDokPage(Window* pWindow, const SfxItemSet& rSet); @@ -67,10 +67,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual void FillUserData(); + virtual void FillUserData() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 032fb4c94710..4a4b2e2aa583 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -80,7 +80,7 @@ class SwFldFuncPage : public SwFldPage OUString TurnMacroString(const OUString &rMacro); protected: - virtual sal_uInt16 GetGroup(); + virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: SwFldFuncPage(Window* pParent, const SfxItemSet& rSet); @@ -89,10 +89,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual void FillUserData(); + virtual void FillUserData() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index 791d4e81e173..719e701cee09 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -82,7 +82,7 @@ public: virtual ~SwFldPage(); - virtual void ActivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; inline SwFldMgr& GetFldMgr() { return m_aMgr; } void SetWrtShell( SwWrtShell* m_pWrtShell ); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index 99414d70f9c9..7f7e8f90d46b 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -74,7 +74,7 @@ class SwFldRefPage : public SwFldPage sal_Int32 GetSavedSelectedPos() const; protected: - virtual sal_uInt16 GetGroup(); + virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: SwFldRefPage(Window* pParent, const SfxItemSet& rSet); @@ -83,10 +83,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual void FillUserData(); + virtual void FillUserData() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index ec335bae5106..fb4f0bec5f06 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -37,7 +37,7 @@ class SelectionListBox : public ListBox { bool bCallAddSelection; - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: SelectionListBox(Window* pParent, WinBits nStyle); @@ -87,7 +87,7 @@ class SwFldVarPage : public SwFldPage sal_Int32 FillFormatLB(sal_uInt16 nTypeId); protected: - virtual sal_uInt16 GetGroup(); + virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: SwFldVarPage(Window* pParent, const SfxItemSet& rSet); @@ -96,10 +96,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual void FillUserData(); + virtual void FillUserData() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index e6ef0660b442..6e4f8ecdcce1 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -67,7 +67,7 @@ public: SwSequenceOptionDialog( Window *pParent, SwView &rV, const OUString& rSeqFldType ); virtual ~SwSequenceOptionDialog(); - virtual void Apply(); + virtual void Apply() SAL_OVERRIDE; bool IsApplyBorderAndShadow( void ) { return m_pApplyBorderAndShadowCB->IsChecked(); } void SetApplyBorderAndShadow( bool bSet ) { m_pApplyBorderAndShadowCB->Check(bSet); } diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 00872409616f..8009c364671d 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -166,11 +166,11 @@ class SwEntryBrowseBox : public SwEntryBrowseBox_Base void SetModified() {bModified = true;} protected: - virtual bool SeekRow( long nRow ); - virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const; - virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol); - virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol); - virtual bool SaveModified(); + virtual bool SeekRow( long nRow ) SAL_OVERRIDE; + virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const SAL_OVERRIDE; + virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) SAL_OVERRIDE; + virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol) SAL_OVERRIDE; + virtual bool SaveModified() SAL_OVERRIDE; std::vector<long> GetOptimalColWidths() const; @@ -179,11 +179,11 @@ public: void ReadEntries(SvStream& rInStr); void WriteEntries(SvStream& rOutStr); - bool IsModified()const; + bool IsModified()const SAL_OVERRIDE; - virtual OUString GetCellText( long nRow, sal_uInt16 nColumn ) const; - virtual void Resize(); - virtual Size GetOptimalSize() const; + virtual OUString GetCellText( long nRow, sal_uInt16 nColumn ) const SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; class SwAutoMarkDlg_Impl : public ModalDialog @@ -554,9 +554,9 @@ class SwIndexTreeLB : public SvSimpleTable { public: SwIndexTreeLB(SvSimpleTableContainer& rParent, WinBits nBits = 0); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Resize(); - virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE; void setColSizes(); }; @@ -1501,8 +1501,8 @@ public: { } - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; bool IsNextControl() const {return bNextControl;} void SetPrevNextLink( const Link& rLink ) {aPrevNextControlLink = rLink;} @@ -1586,8 +1586,8 @@ public: { } - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; bool IsNextControl() const {return bNextControl;} void SetPrevNextLink(const Link& rLink) {aPrevNextControlLink = rLink;} diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 88dc169e13d0..3d53c07d55ba 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -72,8 +72,8 @@ public: ~SwEndNoteOptionPage(); static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual bool FillItemSet(SfxItemSet &rSet); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; void SetShell( SwWrtShell &rShell ); }; diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 63a453cb26bc..e3bac3f614a5 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -53,9 +53,9 @@ public: void DetectRTL(SwWrtShell* pWrtShell); - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; private: SwTableAutoFmt aCurData; diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx index ba58458f4292..f2249f21ff52 100644 --- a/sw/source/ui/uno/swdetect.hxx +++ b/sw/source/ui/uno/swdetect.hxx @@ -66,7 +66,7 @@ public: SFX_DECL_XSERVICEINFO_NOFACTORY // XExtendedFilterDetect - virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx index c975bbcd7151..ec03ce593859 100644 --- a/sw/source/ui/vba/vbaaddin.hxx +++ b/sw/source/ui/vba/vbaaddin.hxx @@ -37,16 +37,16 @@ public: virtual ~SwVbaAddin(); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoload() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getInstalled() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setInstalled( ::sal_Bool _installed ) 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& _name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoload() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getInstalled() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setInstalled( ::sal_Bool _installed ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAADDIN_HXX diff --git a/sw/source/ui/vba/vbaaddins.hxx b/sw/source/ui/vba/vbaaddins.hxx index bb0006f5a7d2..0d6ecb20e414 100644 --- a/sw/source/ui/vba/vbaaddins.hxx +++ b/sw/source/ui/vba/vbaaddins.hxx @@ -32,13 +32,13 @@ public: virtual ~SwVbaAddins() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaAddins_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAADDINS_HXX diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index 051e9b1dc9d1..6e0abdf74c22 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -42,27 +42,27 @@ public: virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); // XApplication - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getDisplayAutoCompleteTips() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getDisplayAutoCompleteTips() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; protected: - virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAAPPLICATION_HXX diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx index 6d7975fa3932..6db5ee674e3f 100644 --- a/sw/source/ui/vba/vbaautotextentry.hxx +++ b/sw/source/ui/vba/vbaautotextentry.hxx @@ -39,11 +39,11 @@ public: virtual ~SwVbaAutoTextEntry(); // XAutoTextEntry - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) throw ( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; /* class SwVbaAutoTextEntries */ @@ -59,13 +59,13 @@ public: virtual ~SwVbaAutoTextEntries() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaAutoTextEntries_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAAUTOTEXTENTRY_HXX diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx index f764ef7303b2..38fa40c37d00 100644 --- a/sw/source/ui/vba/vbabookmark.hxx +++ b/sw/source/ui/vba/vbabookmark.hxx @@ -44,15 +44,15 @@ public: virtual ~SwVbaBookmark(); // Methods - virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL Delete() throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL Select() throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL Range() 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& ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL Delete() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL Select() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Range() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBABOOKMARK_HXX diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index ee0b1bacee70..75484d9abc4b 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -36,7 +36,7 @@ class BookmarksEnumeration : public EnumerationHelperImpl public: BookmarksEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< container::XNamed > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); OUString aName = xNamed->getName(); @@ -59,20 +59,20 @@ public: mxNameAccess.set( mxIndexAccess, uno::UNO_QUERY_THROW ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return mxIndexAccess->getElementType(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return mxIndexAccess->hasElements(); } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxIndexAccess->getElementType(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxIndexAccess->hasElements(); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return cachePos; } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxNameAccess->getElementNames(); } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { if( mxNameAccess->hasByName( aName ) ) { @@ -95,11 +95,11 @@ public: return sal_False; } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxIndexAccess->getCount(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE { return mxIndexAccess->getByIndex( Index ); } diff --git a/sw/source/ui/vba/vbabookmarks.hxx b/sw/source/ui/vba/vbabookmarks.hxx index 11a60f1fc273..3aad9114591d 100644 --- a/sw/source/ui/vba/vbabookmarks.hxx +++ b/sw/source/ui/vba/vbabookmarks.hxx @@ -46,22 +46,22 @@ public: static void addBookmarkByName( const css::uno::Reference< css::frame::XModel >& xModel, const OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw (css::uno::RuntimeException); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaBookmarks_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; // XBookmarks - virtual sal_Int32 SAL_CALL getDefaultSorting() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDefaultSorting( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getShowHidden() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDefaultSorting() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultSorting( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getShowHidden() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL Exists( const OUString& rName ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL Exists( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBABOOKMARKS_HXX diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 33ac997c4226..d12be6df7ffb 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -136,12 +136,12 @@ private: } SwVbaBorder(); // no impl protected: - virtual OUString getServiceImplName() + virtual OUString getServiceImplName() SAL_OVERRIDE { return OUString("SwVbaBorder"); } - virtual css::uno::Sequence<OUString> getServiceNames() + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE { static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) @@ -154,7 +154,7 @@ protected: public: SwVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, VbaPalette& rPalette) : SwVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {} - uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) + uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nLineStyle = word::WdLineStyle::wdLineStyleNone; table::BorderLine aBorderLine; @@ -175,7 +175,7 @@ public: } return uno::makeAny( nLineStyle ); } - void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) + void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { // Urk no choice but to silently ignore we don't support this attribute // #TODO would be nice to support the word line styles @@ -255,11 +255,11 @@ public: { } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return SAL_N_ELEMENTS( supportedIndexTable ); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nIndex = getTableIndex( Index ); @@ -270,11 +270,11 @@ public: } throw lang::IndexOutOfBoundsException(); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<word::XBorder>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } @@ -292,12 +292,12 @@ class RangeBorderEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: RangeBorderEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); diff --git a/sw/source/ui/vba/vbaborders.hxx b/sw/source/ui/vba/vbaborders.hxx index d08f486138ce..764b889274e4 100644 --- a/sw/source/ui/vba/vbaborders.hxx +++ b/sw/source/ui/vba/vbaborders.hxx @@ -31,24 +31,24 @@ class VbaPalette; class SwVbaBorders : public SwVbaBorders_BASE { // XEnumerationAccess - virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException) SAL_OVERRIDE; css::uno::Reference< css::beans::XPropertySet > m_xProps; public: SwVbaBorders( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::table::XCellRange >& xRange, VbaPalette& rPalette ); virtual ~SwVbaBorders() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBABORDERS_HXX diff --git a/sw/source/ui/vba/vbacell.hxx b/sw/source/ui/vba/vbacell.hxx index 8a31bfc5ad60..633d732a8e62 100644 --- a/sw/source/ui/vba/vbacell.hxx +++ b/sw/source/ui/vba/vbacell.hxx @@ -38,20 +38,20 @@ public: virtual ~SwVbaCell(); // Attributes - virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBACELL_HXX diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index 196a8a1b0273..7526814043dd 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -36,12 +36,12 @@ public: CellsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 ) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if( nIndex < mxIndexAccess->getCount() ) { @@ -68,11 +68,11 @@ public: } virtual ~CellCollectionHelper() {} - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( mnRight - mnLeft + 1 ) * ( mnBottom - mnTop + 1 ); } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); @@ -88,16 +88,16 @@ public: throw css::lang::IndexOutOfBoundsException(); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<word::XCell>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new CellsEnumWrapper( this ); } diff --git a/sw/source/ui/vba/vbacells.hxx b/sw/source/ui/vba/vbacells.hxx index 0b0d49cedba8..d1c5912f397a 100644 --- a/sw/source/ui/vba/vbacells.hxx +++ b/sw/source/ui/vba/vbacells.hxx @@ -38,25 +38,25 @@ public: virtual ~SwVbaCells() {} // Attributes - virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaCells_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBACELLS_HXX diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx index 5f2070158d63..26aadabd9062 100644 --- a/sw/source/ui/vba/vbacolumn.hxx +++ b/sw/source/ui/vba/vbacolumn.hxx @@ -40,15 +40,15 @@ public: virtual ~SwVbaColumn(); // Methods - virtual sal_Int32 SAL_CALL getWidth() throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setWidth( sal_Int32 _width ) throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getWidth() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setWidth( sal_Int32 _width ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void SelectColumn( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) throw (css::uno::RuntimeException); // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBACOLUMN_HXX diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx index 2cd51bc6dd11..596318db67fc 100644 --- a/sw/source/ui/vba/vbacolumns.cxx +++ b/sw/source/ui/vba/vbacolumns.cxx @@ -41,12 +41,12 @@ public: { mxIndexAccess.set( mxTextTable->getColumns(), uno::UNO_QUERY ); } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if( nIndex < mxIndexAccess->getCount() ) { diff --git a/sw/source/ui/vba/vbacolumns.hxx b/sw/source/ui/vba/vbacolumns.hxx index d356b1bc2f71..74533ade2d97 100644 --- a/sw/source/ui/vba/vbacolumns.hxx +++ b/sw/source/ui/vba/vbacolumns.hxx @@ -44,21 +44,21 @@ public: SwVbaColumns( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol ) throw ( css::uno::RuntimeException ); virtual ~SwVbaColumns() {} - virtual sal_Int32 SAL_CALL getWidth( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getWidth( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XCollection - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ); + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaColumns_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBACOLUMNS_HXX diff --git a/sw/source/ui/vba/vbadialog.hxx b/sw/source/ui/vba/vbadialog.hxx index f8737ed1e0e9..d07a0308c125 100644 --- a/sw/source/ui/vba/vbadialog.hxx +++ b/sw/source/ui/vba/vbadialog.hxx @@ -33,10 +33,10 @@ public: virtual ~SwVbaDialog() {} // Methods - virtual OUString mapIndexToName( sal_Int32 nIndex ); + virtual OUString mapIndexToName( sal_Int32 nIndex ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBADIALOG_HXX diff --git a/sw/source/ui/vba/vbadialogs.hxx b/sw/source/ui/vba/vbadialogs.hxx index 8dd4c75f3c99..486a547b769f 100644 --- a/sw/source/ui/vba/vbadialogs.hxx +++ b/sw/source/ui/vba/vbadialogs.hxx @@ -35,11 +35,11 @@ public: virtual ~SwVbaDialogs() {} // XCollection - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBADIALOGS_HXX diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx index 6fc4eb9ffa23..c3e3f8cfa1c6 100644 --- a/sw/source/ui/vba/vbadocument.hxx +++ b/sw/source/ui/vba/vbadocument.hxx @@ -41,53 +41,53 @@ public: virtual ~SwVbaDocument(); // XDocument - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getContent() throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Range( const css::uno::Any& rStart, const css::uno::Any& rEnd ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL BuiltInDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL CustomDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Bookmarks( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL Variables( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL getAttachedTemplate() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL TablesOfContents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL FormFields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getProtectionType() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setProtectionType( ::sal_Int32 _protectiontype ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getUpdateStylesOnOpen() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setUpdateStylesOnOpen( ::sal_Bool _updatestylesonopen ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoHyphenation() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoHyphenation( ::sal_Bool _autohyphenation ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getHyphenationZone() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHyphenationZone( ::sal_Int32 _hyphenationzone ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getConsecutiveHyphensLimit() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getContent() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Range( const css::uno::Any& rStart, const css::uno::Any& rEnd ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL BuiltInDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL CustomDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Bookmarks( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Variables( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getAttachedTemplate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL TablesOfContents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL FormFields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getProtectionType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setProtectionType( ::sal_Int32 _protectiontype ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getUpdateStylesOnOpen() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setUpdateStylesOnOpen( ::sal_Bool _updatestylesonopen ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoHyphenation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoHyphenation( ::sal_Bool _autohyphenation ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getHyphenationZone() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHyphenationZone( ::sal_Int32 _hyphenationzone ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getConsecutiveHyphensLimit() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; using VbaDocumentBase::Protect; - virtual void SAL_CALL Protect( ::sal_Int32 Type, const css::uno::Any& NOReset, const css::uno::Any& Password, const css::uno::Any& UseIRM, const css::uno::Any& EnforceStyleLock ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL PrintOut( const css::uno::Any& Background, const css::uno::Any& Append, const css::uno::Any& Range, const css::uno::Any& OutputFileName, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Item, const css::uno::Any& Copies, const css::uno::Any& Pages, const css::uno::Any& PageType, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& FileName, const css::uno::Any& ActivePrinterMacGX, const css::uno::Any& ManualDuplexPrint, const css::uno::Any& PrintZoomColumn, const css::uno::Any& PrintZoomRow, const css::uno::Any& PrintZoomPaperWidth, const css::uno::Any& PrintZoomPaperHeight ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL PrintPreview( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ClosePrintPreview( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Frames( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Protect( ::sal_Int32 Type, const css::uno::Any& NOReset, const css::uno::Any& Password, const css::uno::Any& UseIRM, const css::uno::Any& EnforceStyleLock ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL PrintOut( const css::uno::Any& Background, const css::uno::Any& Append, const css::uno::Any& Range, const css::uno::Any& OutputFileName, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Item, const css::uno::Any& Copies, const css::uno::Any& Pages, const css::uno::Any& PageType, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& FileName, const css::uno::Any& ActivePrinterMacGX, const css::uno::Any& ManualDuplexPrint, const css::uno::Any& PrintZoomColumn, const css::uno::Any& PrintZoomRow, const css::uno::Any& PrintZoomPaperWidth, const css::uno::Any& PrintZoomPaperHeight ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL PrintPreview( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ClosePrintPreview( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Frames( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInvocation - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENT_HXX diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 4963ba7578f1..07094554a95a 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -88,7 +88,7 @@ public: BuiltinPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) { } - virtual uno::Any getPropertyValue( const OUString& rPropName ) + virtual uno::Any getPropertyValue( const OUString& rPropName ) SAL_OVERRIDE { if ( rPropName == "EditingDuration" ) { @@ -149,7 +149,7 @@ public: return getUserDefinedProperties()->getPropertyValue(rPropName); } } - virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) + virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) SAL_OVERRIDE { if ("EditingDuration" == rPropName) { @@ -269,12 +269,12 @@ public: CustomPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :BuiltinPropertyGetSetHelper( xModel ) { } - virtual uno::Any getPropertyValue( const OUString& rPropName ) + virtual uno::Any getPropertyValue( const OUString& rPropName ) SAL_OVERRIDE { return getUserDefinedProperties()->getPropertyValue(rPropName); } virtual void setPropertyValue( - const OUString& rPropName, const uno::Any& rValue) + const OUString& rPropName, const uno::Any& rValue) SAL_OVERRIDE { return getUserDefinedProperties()->setPropertyValue(rPropName, rValue); } @@ -290,7 +290,7 @@ public: mxModelProps.set( m_xModel, uno::UNO_QUERY_THROW ); mpDocShell = word::getDocShell( xModel ); } - virtual uno::Any getPropertyValue( const OUString& rPropName ) + virtual uno::Any getPropertyValue( const OUString& rPropName ) SAL_OVERRIDE { try { @@ -335,7 +335,7 @@ public: return aReturn; } - virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) + virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) SAL_OVERRIDE { uno::Sequence< beans::NamedValue > stats( m_xDocProps->getDocumentStatistics()); @@ -449,22 +449,22 @@ protected: public: SwVbaBuiltInDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ); // XDocumentProperty - virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getName( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual ::sal_Int8 SAL_CALL getType( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual uno::Any SAL_CALL getValue( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); + virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int8 SAL_CALL getType( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Any SAL_CALL getValue( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; //XDefaultProperty - virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception) { return OUString("Value"); } + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("Value"); } // XHelperInterface - virtual OUString getServiceImplName(); - virtual uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; class SwVbaCustomDocumentProperty : public SwVbaBuiltInDocumentProperty @@ -473,14 +473,14 @@ public: SwVbaCustomDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ); - virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); - virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -647,11 +647,11 @@ class DocPropEnumeration : public DocPropEnumeration_BASE public: DocPropEnumeration( const DocProps& rProps ) : mDocProps( rProps ), mIt( mDocProps.begin() ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mIt != mDocProps.end(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -683,11 +683,11 @@ protected: } } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mDocProps.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) SAL_OVERRIDE { // correct the correct by the base class for 1 based indices DocProps::iterator it = mDocProps.find( ++Index ); @@ -695,7 +695,7 @@ protected: throw lang::IndexOutOfBoundsException(); return uno::makeAny( it->second ); } - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -703,7 +703,7 @@ protected: return uno::Any( it->second ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Sequence< OUString > aNames( getCount() ); OUString* pName = aNames.getArray(); @@ -713,7 +713,7 @@ protected: return aNames; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { DocPropsByName::iterator it = mNamedDocProps.find( aName ); if ( it == mNamedDocProps.end() ) @@ -721,15 +721,15 @@ protected: return sal_True; } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<XDocumentProperty>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mDocProps.size() > 0; } - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new DocPropEnumeration( mDocProps ); } @@ -803,12 +803,12 @@ public: uno::UNO_SET_THROW); }; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxUserDefinedProp->getPropertySetInfo()->getProperties().getLength(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) SAL_OVERRIDE { uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties(); if ( Index >= aProps.getLength() ) @@ -818,7 +818,7 @@ public: return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); } - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -827,7 +827,7 @@ public: return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties(); uno::Sequence< OUString > aNames( aProps.getLength() ); @@ -839,24 +839,24 @@ public: return aNames; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { OSL_TRACE("hasByName(%s) returns %d", OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) ); return mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<XDocumentProperty>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return getCount() > 0; } - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { // create a map of properties ( the key doesn't matter ) OSL_TRACE("Creating an enumeration"); diff --git a/sw/source/ui/vba/vbadocumentproperties.hxx b/sw/source/ui/vba/vbadocumentproperties.hxx index 57e43b44198e..21d254581c77 100644 --- a/sw/source/ui/vba/vbadocumentproperties.hxx +++ b/sw/source/ui/vba/vbadocumentproperties.hxx @@ -34,16 +34,16 @@ public: SwVbaBuiltinDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XDocumentProperties - virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties @@ -51,9 +51,9 @@ class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties public: SwVbaCustomDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XDocumentProperties - virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); + virtual OUString getServiceImplName() SAL_OVERRIDE; }; #endif /* SW_VBA_DOCUMENTPROPERTY_HXX */ diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index d3747e935fae..6b40b3de0427 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -70,7 +70,7 @@ class DocumentEnumImpl : public EnumerationHelperImpl public: DocumentEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_aApplication( aApplication ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< text::XTextDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return getDocument( m_xContext, xDoc, m_aApplication ); diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx index 83eda1d9fec0..9025c1013448 100644 --- a/sw/source/ui/vba/vbadocuments.hxx +++ b/sw/source/ui/vba/vbadocuments.hxx @@ -34,18 +34,18 @@ public: virtual ~SwVbaDocuments() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaDocuments_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; // Methods - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENTS_HXX diff --git a/sw/source/ui/vba/vbaeventshelper.hxx b/sw/source/ui/vba/vbaeventshelper.hxx index 8927a978f121..dfe01124b875 100644 --- a/sw/source/ui/vba/vbaeventshelper.hxx +++ b/sw/source/ui/vba/vbaeventshelper.hxx @@ -31,10 +31,10 @@ public: virtual ~SwVbaEventsHelper(); protected: - virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException); - virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException); - virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); + virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 9a39d9c3586d..ee593bc077f4 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -241,11 +241,11 @@ public: FieldEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< container::XEnumeration >& xEnumeration ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxEnumeration( xEnumeration ) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -266,10 +266,10 @@ public: mxEnumerationAccess.set( xSupp->getTextFields(), uno::UNO_QUERY_THROW ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return mxEnumerationAccess->getElementType(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return mxEnumerationAccess->hasElements(); } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxEnumerationAccess->getElementType(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxEnumerationAccess->hasElements(); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< container::XEnumeration > xEnumeration = mxEnumerationAccess->createEnumeration(); sal_Int32 nCount = 0; @@ -280,7 +280,7 @@ public: } return nCount; } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE { if( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -298,7 +298,7 @@ public: throw lang::IndexOutOfBoundsException(); } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< container::XEnumeration > xEnumeration = mxEnumerationAccess->createEnumeration(); return uno::Reference< container::XEnumeration >( new FieldEnumeration( mxParent, mxContext, mxModel, xEnumeration ) ); diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx index 4bc82f8f4140..7a872d01bdb7 100644 --- a/sw/source/ui/vba/vbafield.hxx +++ b/sw/source/ui/vba/vbafield.hxx @@ -34,10 +34,10 @@ class SwVbaField : public SwVbaField_BASE public: SwVbaField( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextField >& xTextField) throw ( css::uno::RuntimeException); - virtual sal_Bool SAL_CALL Update() throw ( css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL Update() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; // *** SwVbaFields *********************************************** @@ -55,17 +55,17 @@ private: public: SwVbaFields( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ); // XFields - virtual css::uno::Reference< ::ooo::vba::word::XField > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& PreserveFormatting ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL Update() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ::ooo::vba::word::XField > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& PreserveFormatting ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL Update() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx index a5d8902a4dab..e554d87da002 100644 --- a/sw/source/ui/vba/vbafind.hxx +++ b/sw/source/ui/vba/vbafind.hxx @@ -58,36 +58,36 @@ public: virtual ~SwVbaFind(); // Attributes - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getReplacement() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setReplacement( const css::uno::Any& _replacement ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getForward() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setForward( ::sal_Bool _forward ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getWrap() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWrap( ::sal_Int32 _wrap ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getFormat() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFormat( ::sal_Bool _format ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMatchCase() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMatchCase( ::sal_Bool _matchcase ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMatchWholeWord() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMatchWholeWord( ::sal_Bool _matchwholeword ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMatchWildcards() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMatchWildcards( ::sal_Bool _matchwildcards ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMatchSoundsLike() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMatchSoundsLike( ::sal_Bool _matchsoundslike ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMatchAllWordForms() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMatchAllWordForms( ::sal_Bool _matchallwordforms ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getReplacement() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setReplacement( const css::uno::Any& _replacement ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getForward() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setForward( ::sal_Bool _forward ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getWrap() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWrap( ::sal_Int32 _wrap ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFormat( ::sal_Bool _format ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMatchCase() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMatchCase( ::sal_Bool _matchcase ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMatchWholeWord() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMatchWholeWord( ::sal_Bool _matchwholeword ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMatchWildcards() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMatchWildcards( ::sal_Bool _matchwildcards ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMatchSoundsLike() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMatchSoundsLike( ::sal_Bool _matchsoundslike ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMatchAllWordForms() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMatchAllWordForms( ::sal_Bool _matchallwordforms ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual ::sal_Bool SAL_CALL Execute( const css::uno::Any& FindText, const css::uno::Any& MatchCase, const css::uno::Any& MatchWholeWord, const css::uno::Any& MatchWildcards, const css::uno::Any& MatchSoundsLike, const css::uno::Any& MatchAllWordForms, const css::uno::Any& Forward, const css::uno::Any& Wrap, const css::uno::Any& Format, const css::uno::Any& ReplaceWith, const css::uno::Any& Replace, const css::uno::Any& MatchKashida, const css::uno::Any& MatchDiacritics, const css::uno::Any& MatchAlefHamza, const css::uno::Any& MatchControl, const css::uno::Any& MatchPrefix, const css::uno::Any& MatchSuffix, const css::uno::Any& MatchPhrase, const css::uno::Any& IgnoreSpace, const css::uno::Any& IgnorePunct ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ClearFormatting( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL Execute( const css::uno::Any& FindText, const css::uno::Any& MatchCase, const css::uno::Any& MatchWholeWord, const css::uno::Any& MatchWildcards, const css::uno::Any& MatchSoundsLike, const css::uno::Any& MatchAllWordForms, const css::uno::Any& Forward, const css::uno::Any& Wrap, const css::uno::Any& Format, const css::uno::Any& ReplaceWith, const css::uno::Any& Replace, const css::uno::Any& MatchKashida, const css::uno::Any& MatchDiacritics, const css::uno::Any& MatchAlefHamza, const css::uno::Any& MatchControl, const css::uno::Any& MatchPrefix, const css::uno::Any& MatchSuffix, const css::uno::Any& MatchPhrase, const css::uno::Any& IgnoreSpace, const css::uno::Any& IgnorePunct ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ClearFormatting( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAFIND_HXX diff --git a/sw/source/ui/vba/vbafont.hxx b/sw/source/ui/vba/vbafont.hxx index 6fd0e34b847f..2021b7820a93 100644 --- a/sw/source/ui/vba/vbafont.hxx +++ b/sw/source/ui/vba/vbafont.hxx @@ -32,20 +32,20 @@ public: virtual ~SwVbaFont(){} // Attributes - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getSubscript() throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL getSuperscript() throw ( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getSubscript() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getSuperscript() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbaformfields.hxx b/sw/source/ui/vba/vbaformfields.hxx index e6990ff4935b..860069e44de2 100644 --- a/sw/source/ui/vba/vbaformfields.hxx +++ b/sw/source/ui/vba/vbaformfields.hxx @@ -37,13 +37,13 @@ public: virtual ~SwVbaFormFields() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaFormFields_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAFORMFIELDS_HXX diff --git a/sw/source/ui/vba/vbaframe.hxx b/sw/source/ui/vba/vbaframe.hxx index 8bb50f7ac2b4..6b4c125dc1e5 100644 --- a/sw/source/ui/vba/vbaframe.hxx +++ b/sw/source/ui/vba/vbaframe.hxx @@ -37,11 +37,11 @@ public: virtual ~SwVbaFrame(); // Methods - virtual void SAL_CALL Select() throw ( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL Select() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAFRAME_HXX diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx index bfa1ca2856a9..dcd1b604d89d 100644 --- a/sw/source/ui/vba/vbaframes.cxx +++ b/sw/source/ui/vba/vbaframes.cxx @@ -39,12 +39,12 @@ public: FramesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : mxParent( xParent ), mxContext( xContext), mxIndexAccess( xIndexAccess ), mxModel( xModel ), nCurrentPos(0) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nCurrentPos < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasMoreElements() ) throw container::NoSuchElementException(); diff --git a/sw/source/ui/vba/vbaframes.hxx b/sw/source/ui/vba/vbaframes.hxx index 8810c9e6b2dd..fb3f3b06c78a 100644 --- a/sw/source/ui/vba/vbaframes.hxx +++ b/sw/source/ui/vba/vbaframes.hxx @@ -37,13 +37,13 @@ public: virtual ~SwVbaFrames() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaFrames_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index 92df9b43825c..d98d55c34e45 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -48,24 +48,24 @@ public: virtual ~SwVbaGlobals(); // XGlobals - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiServiceFactory - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAGLOBALS_HXX diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx index 489127c0ed44..fb28fb3caa49 100644 --- a/sw/source/ui/vba/vbaheaderfooter.hxx +++ b/sw/source/ui/vba/vbaheaderfooter.hxx @@ -39,15 +39,15 @@ public: virtual ~SwVbaHeaderFooter(){} // Attributes - virtual ::sal_Bool SAL_CALL getIsHeader() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getLinkToPrevious() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLinkToPrevious( ::sal_Bool _linktoprevious ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getIsHeader() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getLinkToPrevious() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLinkToPrevious( ::sal_Bool _linktoprevious ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAHEADERFOOTER_HXX diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx index 57909c49e216..31cf0c6a0498 100644 --- a/sw/source/ui/vba/vbaheadersfooters.cxx +++ b/sw/source/ui/vba/vbaheadersfooters.cxx @@ -39,22 +39,22 @@ public: ~HeadersFootersIndexAccess(){} // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { // first page, evenpages and primary page return 3; } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if( Index < 1 || Index > 3 ) throw container::NoSuchElementException(); return uno::makeAny( uno::Reference< word::XHeaderFooter >( new SwVbaHeaderFooter( mxParent, mxContext, mxModel, mxPageStyleProps, mbHeader, Index ) ) ); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<word::XHeaderFooter>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } @@ -66,12 +66,12 @@ class HeadersFootersEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: HeadersFootersEnumWrapper( SwVbaHeadersFooters* _pHeadersFooters ) : pHeadersFooters( _pHeadersFooters ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < pHeadersFooters->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex < pHeadersFooters->getCount() ) return pHeadersFooters->Item( uno::makeAny( ++nIndex ), uno::Any() ); diff --git a/sw/source/ui/vba/vbaheadersfooters.hxx b/sw/source/ui/vba/vbaheadersfooters.hxx index b89fd03ee6c6..8d8253dfa2b2 100644 --- a/sw/source/ui/vba/vbaheadersfooters.hxx +++ b/sw/source/ui/vba/vbaheadersfooters.hxx @@ -36,16 +36,16 @@ public: SwVbaHeadersFooters( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, sal_Bool isHeader ); virtual ~SwVbaHeadersFooters() {} - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& )throw (css::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& )throw (css::uno::RuntimeException) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaHeadersFooters_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAHEADERSFOOTERS_HXX diff --git a/sw/source/ui/vba/vbalistformat.hxx b/sw/source/ui/vba/vbalistformat.hxx index 12762c77b9b7..cb021f1774a4 100644 --- a/sw/source/ui/vba/vbalistformat.hxx +++ b/sw/source/ui/vba/vbalistformat.hxx @@ -38,12 +38,12 @@ public: virtual ~SwVbaListFormat(); // Methods - virtual void SAL_CALL ApplyListTemplate( const css::uno::Reference< ::ooo::vba::word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ConvertNumbersToText( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL ApplyListTemplate( const css::uno::Reference< ::ooo::vba::word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ConvertNumbersToText( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTFORMAT_HXX diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx index e582e6cba074..1d5104256849 100644 --- a/sw/source/ui/vba/vbalistgalleries.cxx +++ b/sw/source/ui/vba/vbalistgalleries.cxx @@ -29,12 +29,12 @@ class ListGalleriesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: ListGalleriesEnumWrapper( SwVbaListGalleries* pGalleries ) : pListGalleries( pGalleries ), nIndex( 1 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex <= pListGalleries->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex <= pListGalleries->getCount() ) return pListGalleries->Item( uno::makeAny( nIndex++ ), uno::Any() ); diff --git a/sw/source/ui/vba/vbalistgalleries.hxx b/sw/source/ui/vba/vbalistgalleries.hxx index 6853c5546cb6..175176336217 100644 --- a/sw/source/ui/vba/vbalistgalleries.hxx +++ b/sw/source/ui/vba/vbalistgalleries.hxx @@ -35,16 +35,16 @@ public: SwVbaListGalleries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc ) throw (css::uno::RuntimeException); virtual ~SwVbaListGalleries() {} - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ); + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaListGalleries_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTGALLERIES_HXX diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx index 720c4691ceeb..9b821fce4d21 100644 --- a/sw/source/ui/vba/vbalistgallery.hxx +++ b/sw/source/ui/vba/vbalistgallery.hxx @@ -37,11 +37,11 @@ public: virtual ~SwVbaListGallery(); // Methods - virtual css::uno::Any SAL_CALL ListTemplates( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ); + virtual css::uno::Any SAL_CALL ListTemplates( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTGALLERY_HXX diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx index 9f850fe9030a..eabe9b743f95 100644 --- a/sw/source/ui/vba/vbalistlevel.hxx +++ b/sw/source/ui/vba/vbalistlevel.hxx @@ -38,33 +38,33 @@ public: virtual ~SwVbaListLevel(); // Attributes - virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ::ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFont( const css::uno::Reference< ::ooo::vba::word::XFont >& _font ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getLinkedStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLinkedStyle( const OUString& _linkedstyle ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getNumberFormat() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setNumberFormat( const OUString& _numberformat ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getNumberPosition() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setNumberPosition( float _numberposition ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getNumberStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setNumberStyle( ::sal_Int32 _numberstyle ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getResetOnHigher() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setResetOnHigher( ::sal_Int32 _resetonhigher ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getStartAt() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStartAt( ::sal_Int32 _startat ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getTabPosition() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTabPosition( float _tabposition ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getTextPosition() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTextPosition( float _textposition ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getTrailingCharacter() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFont( const css::uno::Reference< ::ooo::vba::word::XFont >& _font ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getLinkedStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLinkedStyle( const OUString& _linkedstyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getNumberFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNumberFormat( const OUString& _numberformat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getNumberPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNumberPosition( float _numberposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getNumberStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNumberStyle( ::sal_Int32 _numberstyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getResetOnHigher() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setResetOnHigher( ::sal_Int32 _resetonhigher ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getStartAt() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStartAt( ::sal_Int32 _startat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getTabPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTabPosition( float _tabposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getTextPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTextPosition( float _textposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getTrailingCharacter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTLEVEL_HXX diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx index b081cd02ce9c..5b374e235141 100644 --- a/sw/source/ui/vba/vbalistlevels.cxx +++ b/sw/source/ui/vba/vbalistlevels.cxx @@ -29,12 +29,12 @@ class ListLevelsEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: ListLevelsEnumWrapper( SwVbaListLevels* pLevels ) : pListLevels( pLevels ), nIndex( 1 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex <= pListLevels->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex <= pListLevels->getCount() ) return pListLevels->Item( uno::makeAny( nIndex++ ), uno::Any() ); diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx index f4285eda59af..7b50c2a61298 100644 --- a/sw/source/ui/vba/vbalistlevels.hxx +++ b/sw/source/ui/vba/vbalistlevels.hxx @@ -35,16 +35,16 @@ public: SwVbaListLevels( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, SwVbaListHelperRef pHelper ) throw ( css::uno::RuntimeException ); virtual ~SwVbaListLevels() {} - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ); + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaListLevels_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTLEVELS_HXX diff --git a/sw/source/ui/vba/vbalisttemplate.hxx b/sw/source/ui/vba/vbalisttemplate.hxx index a9b831e6adf9..dc37c68bf84b 100644 --- a/sw/source/ui/vba/vbalisttemplate.hxx +++ b/sw/source/ui/vba/vbalisttemplate.hxx @@ -39,11 +39,11 @@ public: void applyListTemplate( css::uno::Reference< css::beans::XPropertySet >& xProps ) throw ( css::uno::RuntimeException ); // Methods - virtual css::uno::Any SAL_CALL ListLevels( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ); + virtual css::uno::Any SAL_CALL ListLevels( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTTEMPLATE_HXX diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx index ef84d8e690c7..d7c1b37869a2 100644 --- a/sw/source/ui/vba/vbalisttemplates.cxx +++ b/sw/source/ui/vba/vbalisttemplates.cxx @@ -28,12 +28,12 @@ class ListTemplatesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: ListTemplatesEnumWrapper( SwVbaListTemplates* pTemplates ) : pListTemplates( pTemplates ), nIndex( 1 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex <= pListTemplates->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex <= pListTemplates->getCount() ) return pListTemplates->Item( uno::makeAny( nIndex++ ), uno::Any() ); diff --git a/sw/source/ui/vba/vbalisttemplates.hxx b/sw/source/ui/vba/vbalisttemplates.hxx index 64c56491bbc7..f2a4e78d1b6f 100644 --- a/sw/source/ui/vba/vbalisttemplates.hxx +++ b/sw/source/ui/vba/vbalisttemplates.hxx @@ -36,16 +36,16 @@ public: SwVbaListTemplates( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nType ) throw (css::uno::RuntimeException); virtual ~SwVbaListTemplates() {} - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ); + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaListTemplates_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTTEMPLATES_HXX diff --git a/sw/source/ui/vba/vbaoptions.hxx b/sw/source/ui/vba/vbaoptions.hxx index b0d9b9e0c308..b1feafe551ab 100644 --- a/sw/source/ui/vba/vbaoptions.hxx +++ b/sw/source/ui/vba/vbaoptions.hxx @@ -37,43 +37,43 @@ public: virtual ~SwVbaOptions(); // Attributes - virtual ::sal_Int32 SAL_CALL getDefaultBorderLineStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getDefaultBorderLineWidth() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getDefaultBorderColorIndex() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getReplaceSelection() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setReplaceSelection( ::sal_Bool _replaceselection ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMapPaperSize() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMapPaperSize( ::sal_Bool _mappapersize ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyHeadings() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatAsYouTypeApplyHeadings( ::sal_Bool _autoformatasyoutypeapplyheadings ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyBulletedLists() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatAsYouTypeApplyBulletedLists( ::sal_Bool _autoformatasyoutypeapplybulletedlists ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyNumberedLists() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatAsYouTypeApplyNumberedLists( ::sal_Bool _autoformatasyoutypeapplynumberedlists ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeFormatListItemBeginning() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatAsYouTypeFormatListItemBeginning( ::sal_Bool _autoformatasyoutypeformatlistitembeginning ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeDefineStyles() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatAsYouTypeDefineStyles( ::sal_Bool _autoformatasyoutypedefinestyles ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatApplyHeadings() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatApplyHeadings( ::sal_Bool _autoformatapplyheadings ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatApplyLists() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatApplyLists( ::sal_Bool _autoformatapplylists ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutoFormatApplyBulletedLists() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFormatApplyBulletedLists( ::sal_Bool _autoformatapplybulletedlists ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getDefaultBorderLineStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getDefaultBorderLineWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getDefaultBorderColorIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getReplaceSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setReplaceSelection( ::sal_Bool _replaceselection ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMapPaperSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMapPaperSize( ::sal_Bool _mappapersize ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyHeadings() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatAsYouTypeApplyHeadings( ::sal_Bool _autoformatasyoutypeapplyheadings ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyBulletedLists() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatAsYouTypeApplyBulletedLists( ::sal_Bool _autoformatasyoutypeapplybulletedlists ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyNumberedLists() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatAsYouTypeApplyNumberedLists( ::sal_Bool _autoformatasyoutypeapplynumberedlists ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeFormatListItemBeginning() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatAsYouTypeFormatListItemBeginning( ::sal_Bool _autoformatasyoutypeformatlistitembeginning ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatAsYouTypeDefineStyles() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatAsYouTypeDefineStyles( ::sal_Bool _autoformatasyoutypedefinestyles ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatApplyHeadings() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatApplyHeadings( ::sal_Bool _autoformatapplyheadings ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatApplyLists() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatApplyLists( ::sal_Bool _autoformatapplylists ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutoFormatApplyBulletedLists() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFormatApplyBulletedLists( ::sal_Bool _autoformatapplybulletedlists ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual css::uno::Any SAL_CALL DefaultFilePath( sal_Int32 _path ) throw ( css::uno::RuntimeException, std::exception ); + virtual css::uno::Any SAL_CALL DefaultFilePath( sal_Int32 _path ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //PropListener - virtual void setValueEvent( const css::uno::Any& value ); - virtual css::uno::Any getValueEvent(); + virtual void setValueEvent( const css::uno::Any& value ) SAL_OVERRIDE; + virtual css::uno::Any getValueEvent() SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAOPTIONS_HXX diff --git a/sw/source/ui/vba/vbapagesetup.hxx b/sw/source/ui/vba/vbapagesetup.hxx index fdc6dd20a3a5..abac682b4321 100644 --- a/sw/source/ui/vba/vbapagesetup.hxx +++ b/sw/source/ui/vba/vbapagesetup.hxx @@ -41,20 +41,20 @@ public: virtual ~SwVbaPageSetup(){} // Attributes - virtual double SAL_CALL getGutter() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setGutter( double _gutter ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getHeaderDistance() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeaderDistance( double _headerdistance ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getFooterDistance() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFooterDistance( double _footerdistance ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getDifferentFirstPageHeaderFooter() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDifferentFirstPageHeaderFooter( sal_Bool status ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getSectionStart() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) throw (css::uno::RuntimeException, std::exception); + virtual double SAL_CALL getGutter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setGutter( double _gutter ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getHeaderDistance() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeaderDistance( double _headerdistance ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getFooterDistance() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFooterDistance( double _footerdistance ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getDifferentFirstPageHeaderFooter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDifferentFirstPageHeaderFooter( sal_Bool status ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getSectionStart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx index 896bc3cc404f..55c31da23a3b 100644 --- a/sw/source/ui/vba/vbapalette.cxx +++ b/sw/source/ui/vba/vbapalette.cxx @@ -57,12 +57,12 @@ public: DefaultPalette(){} // Methods XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return SAL_N_ELEMENTS(ColorTable); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -70,11 +70,11 @@ public: } // Methods XElementAcess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ::getCppuType( (sal_Int32*)0 ); } - virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } diff --git a/sw/source/ui/vba/vbapane.hxx b/sw/source/ui/vba/vbapane.hxx index 06784dac79d0..6c248a7b0989 100644 --- a/sw/source/ui/vba/vbapane.hxx +++ b/sw/source/ui/vba/vbapane.hxx @@ -36,12 +36,12 @@ public: virtual ~SwVbaPane(); // Methods - virtual css::uno::Any SAL_CALL View( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL View( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAPANE_HXX diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index c38fb7d6be4e..b0bd993c63bc 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -36,21 +36,21 @@ public: ~PanesIndexAccess(){} // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return 1; } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if( Index != 1 ) throw container::NoSuchElementException(); return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( mxParent, mxContext, mxModel ) ) ); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<word::XPane>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } @@ -62,12 +62,12 @@ class PanesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: PanesEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); diff --git a/sw/source/ui/vba/vbapanes.hxx b/sw/source/ui/vba/vbapanes.hxx index 16925ec36283..00030ac9decc 100644 --- a/sw/source/ui/vba/vbapanes.hxx +++ b/sw/source/ui/vba/vbapanes.hxx @@ -37,13 +37,13 @@ public: virtual ~SwVbaPanes() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaPanes_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAPANES_HXX diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx index 7dba6ba1fa9d..1a6c0915f905 100644 --- a/sw/source/ui/vba/vbaparagraph.cxx +++ b/sw/source/ui/vba/vbaparagraph.cxx @@ -90,10 +90,10 @@ public: { } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return cppu::UnoType<text::XTextRange>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return sal_True; } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<text::XTextRange>::get(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nCount = 0; uno::Reference< container::XEnumeration > xParEnum = getEnumeration(); @@ -107,7 +107,7 @@ public: } return nCount; } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE { if( Index < getCount() ) { @@ -127,7 +127,7 @@ public: throw lang::IndexOutOfBoundsException(); } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return getEnumeration(); } diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx index 7ae4a74de57f..b03491059f1c 100644 --- a/sw/source/ui/vba/vbaparagraph.hxx +++ b/sw/source/ui/vba/vbaparagraph.hxx @@ -40,13 +40,13 @@ public: virtual ~SwVbaParagraph(); // XParagraph - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL getStyle() throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setStyle( const css::uno::Any& style ) throw ( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getStyle() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setStyle( const css::uno::Any& style ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; /* class SwVbaParagraphs */ @@ -61,13 +61,13 @@ public: virtual ~SwVbaParagraphs() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaParagraphs_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAPARAGRAPH_HXX diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx index f99bf8431e66..e4f4071fc30c 100644 --- a/sw/source/ui/vba/vbaparagraphformat.hxx +++ b/sw/source/ui/vba/vbaparagraphformat.hxx @@ -47,42 +47,42 @@ public: virtual ~SwVbaParagraphFormat(); // Attributes - virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getFirstLineIndent() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFirstLineIndent( float _firstlineindent ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getKeepTogether() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setKeepTogether( const css::uno::Any& _keeptogether ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getKeepWithNext() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setKeepWithNext( const css::uno::Any& _keepwithnext ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getHyphenation() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHyphenation( const css::uno::Any& _hyphenation ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getLineSpacing() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLineSpacing( float _linespacing ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getLineSpacingRule() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLineSpacingRule( ::sal_Int32 _linespacingrule ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getNoLineNumber() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setNoLineNumber( const css::uno::Any& _nolinenumber ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getOutlineLevel() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setOutlineLevel( ::sal_Int32 _outlinelevel ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getPageBreakBefore() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPageBreakBefore( const css::uno::Any& _pagebreakbefore ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getSpaceBefore() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSpaceBefore( float _spacebefore ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getSpaceAfter() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSpaceAfter( float _spaceafter ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getLeftIndent() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLeftIndent( float _leftindent ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getRightIndent() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRightIndent( float _rightindent ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getTabStops() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTabStops( const css::uno::Any& _tabstops ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getWidowControl() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getFirstLineIndent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFirstLineIndent( float _firstlineindent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getKeepTogether() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setKeepTogether( const css::uno::Any& _keeptogether ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getKeepWithNext() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setKeepWithNext( const css::uno::Any& _keepwithnext ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getHyphenation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHyphenation( const css::uno::Any& _hyphenation ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getLineSpacing() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLineSpacing( float _linespacing ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getLineSpacingRule() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLineSpacingRule( ::sal_Int32 _linespacingrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getNoLineNumber() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNoLineNumber( const css::uno::Any& _nolinenumber ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getOutlineLevel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setOutlineLevel( ::sal_Int32 _outlinelevel ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPageBreakBefore() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPageBreakBefore( const css::uno::Any& _pagebreakbefore ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getSpaceBefore() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSpaceBefore( float _spacebefore ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getSpaceAfter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSpaceAfter( float _spaceafter ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getLeftIndent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLeftIndent( float _leftindent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getRightIndent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRightIndent( float _rightindent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getTabStops() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTabStops( const css::uno::Any& _tabstops ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getWidowControl() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAPARAGRAPHFORMAT_HXX diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx index 3783bc1462d9..af3d90ea5350 100644 --- a/sw/source/ui/vba/vbarange.hxx +++ b/sw/source/ui/vba/vbarange.hxx @@ -50,42 +50,42 @@ public: virtual ~SwVbaRange(); css::uno::Reference< css::text::XTextDocument > getDocument() const { return mxTextDocument; } - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::text::XText > getXText() const { return mxText; } void setXTextCursor( const css::uno::Reference< css::text::XTextCursor >& xTextCursor ) { mxTextCursor = xTextCursor; } void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::uno::RuntimeException); // Attribute - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XListFormat > SAL_CALL getListFormat() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XListFormat > SAL_CALL getListFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getLanguageID() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getLanguageID() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBARANGE_HXX diff --git a/sw/source/ui/vba/vbareplacement.hxx b/sw/source/ui/vba/vbareplacement.hxx index 68a24def79e7..804733859b11 100644 --- a/sw/source/ui/vba/vbareplacement.hxx +++ b/sw/source/ui/vba/vbareplacement.hxx @@ -36,15 +36,15 @@ public: virtual ~SwVbaReplacement(); // Attributes - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //Methods - virtual void SAL_CALL ClearFormatting() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL ClearFormatting() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAREPLACEMENT_HXX diff --git a/sw/source/ui/vba/vbarevision.hxx b/sw/source/ui/vba/vbarevision.hxx index cb8e59ac03ac..249f4eb6037e 100644 --- a/sw/source/ui/vba/vbarevision.hxx +++ b/sw/source/ui/vba/vbarevision.hxx @@ -39,12 +39,12 @@ public: virtual ~SwVbaRevision(); // Methods - virtual void SAL_CALL Accept( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Reject( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Accept( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Reject( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAREVISION_HXX diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx index 632292c43458..8a07e0df500a 100644 --- a/sw/source/ui/vba/vbarevisions.cxx +++ b/sw/source/ui/vba/vbarevisions.cxx @@ -35,11 +35,11 @@ class RedlinesEnumeration : public RevisionEnumeration_BASE RevisionMap::iterator mIt; public: RedlinesEnumeration( const RevisionMap& sMap ) : mRevisionMap( sMap ), mIt( mRevisionMap.begin() ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( mIt != mRevisionMap.end() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -55,11 +55,11 @@ public: RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) throw (uno::RuntimeException); // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return cppu::UnoType<beans::XPropertySet>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return ( !mRevisionMap.empty() ); } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<beans::XPropertySet>::get(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( !mRevisionMap.empty() ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) { return mRevisionMap.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mRevisionMap.size(); } + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -68,7 +68,7 @@ RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const u } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new RedlinesEnumeration( mRevisionMap ); } @@ -96,7 +96,7 @@ class RevisionsEnumeration : public EnumerationHelperImpl public: RevisionsEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< beans::XPropertySet > xRevision( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XRevision > ( new SwVbaRevision( m_xParent, m_xContext, m_xModel, xRevision ) ) ); diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx index 78e9b3003b20..78bf3c8bbd0e 100644 --- a/sw/source/ui/vba/vbarevisions.hxx +++ b/sw/source/ui/vba/vbarevisions.hxx @@ -38,17 +38,17 @@ public: virtual ~SwVbaRevisions() {} // Methods - virtual void SAL_CALL AcceptAll( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL RejectAll( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL AcceptAll( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL RejectAll( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaRevisions_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAREVISIONS_HXX diff --git a/sw/source/ui/vba/vbarow.hxx b/sw/source/ui/vba/vbarow.hxx index 9e1566683ca4..1a54abc46038 100644 --- a/sw/source/ui/vba/vbarow.hxx +++ b/sw/source/ui/vba/vbarow.hxx @@ -40,20 +40,20 @@ public: virtual ~SwVbaRow(); // Attributes - virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; static void SelectRow( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) throw (css::uno::RuntimeException); // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAROW_HXX diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx index ea16a3076038..e916e7db536c 100644 --- a/sw/source/ui/vba/vbarows.cxx +++ b/sw/source/ui/vba/vbarows.cxx @@ -43,12 +43,12 @@ public: { mxIndexAccess.set( mxTextTable->getRows(), uno::UNO_QUERY ); } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if( nIndex < mxIndexAccess->getCount() ) { diff --git a/sw/source/ui/vba/vbarows.hxx b/sw/source/ui/vba/vbarows.hxx index c4d33108e5e0..6a14a89c1542 100644 --- a/sw/source/ui/vba/vbarows.hxx +++ b/sw/source/ui/vba/vbarows.hxx @@ -48,29 +48,29 @@ public: virtual ~SwVbaRows() {} // Attributes - virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getAllowBreakAcrossPages() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAllowBreakAcrossPages( const css::uno::Any& _allowbreakacrosspages ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getSpaceBetweenColumns() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSpaceBetweenColumns( float _spacebetweencolumns ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getAllowBreakAcrossPages() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAllowBreakAcrossPages( const css::uno::Any& _allowbreakacrosspages ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getSpaceBetweenColumns() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSpaceBetweenColumns( float _spacebetweencolumns ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XCollection - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ); + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaRows_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAROWS_HXX diff --git a/sw/source/ui/vba/vbasection.hxx b/sw/source/ui/vba/vbasection.hxx index 2bde8049bb22..36ee9ee7ba89 100644 --- a/sw/source/ui/vba/vbasection.hxx +++ b/sw/source/ui/vba/vbasection.hxx @@ -36,17 +36,17 @@ public: virtual ~SwVbaSection(); // Attributes - virtual ::sal_Bool SAL_CALL getProtectedForForms() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setProtectedForForms( ::sal_Bool _protectedforforms ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getProtectedForForms() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setProtectedForForms( ::sal_Bool _protectedforforms ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual css::uno::Any SAL_CALL Headers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Footers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Headers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Footers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBASECTION_HXX diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index 4b949de0700c..709844bf048a 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -38,12 +38,12 @@ class SectionEnumeration : public SectionEnumeration_BASE public: SectionEnumeration( const XSectionVec& rVec ) : mxSections( rVec ), mIt( mxSections.begin() ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( mIt != mxSections.end() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( hasMoreElements() ) return uno::makeAny( *mIt++ ); @@ -91,11 +91,11 @@ public: ~SectionCollectionHelper(){} // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxSections.size(); } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); @@ -103,16 +103,16 @@ public: uno::Reference< beans::XPropertySet > xPageProps( mxSections[ Index ], uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XSection >( new SwVbaSection( mxParent, mxContext, mxModel, xPageProps ) ) ); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<word::XSection>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new SectionEnumeration( mxSections ); } @@ -124,7 +124,7 @@ class SectionsEnumWrapper : public EnumerationHelperImpl public: SectionsEnumWrapper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ){} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< beans::XPropertySet > xPageProps( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XSection > ( new SwVbaSection( m_xParent, m_xContext, mxModel, xPageProps ) ) ); diff --git a/sw/source/ui/vba/vbasections.hxx b/sw/source/ui/vba/vbasections.hxx index 461212c7696a..5864933d498e 100644 --- a/sw/source/ui/vba/vbasections.hxx +++ b/sw/source/ui/vba/vbasections.hxx @@ -39,15 +39,15 @@ public: virtual ~SwVbaSections() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // SwVbaSections_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBASECTIONS_HXX diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx index 29b170ac5b83..6703a98b83d9 100644 --- a/sw/source/ui/vba/vbaselection.hxx +++ b/sw/source/ui/vba/vbaselection.hxx @@ -54,60 +54,60 @@ public: virtual ~SwVbaSelection(); // Attribute - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL HomeKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL TypeText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL MoveDown( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL MoveUp( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL TypeParagraph() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XFind > SAL_CALL getFind() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL TypeBackspace() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL GoTo( const css::uno::Any& _what, const css::uno::Any& _which, const css::uno::Any& _count, const css::uno::Any& _name ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Information( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XHeaderFooter > SAL_CALL getHeaderFooter() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL ShapeRange( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL SelectRow() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL SelectColumn() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Cells( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Copy( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL CopyAsPicture( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Paste( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Collapse( const css::uno::Any& Direction ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL WholeStory( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL HomeKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL TypeText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL MoveDown( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL MoveUp( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL TypeParagraph() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XFind > SAL_CALL getFind() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL TypeBackspace() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL GoTo( const css::uno::Any& _what, const css::uno::Any& _which, const css::uno::Any& _count, const css::uno::Any& _name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Information( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XHeaderFooter > SAL_CALL getHeaderFooter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL ShapeRange( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL SelectRow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL SelectColumn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Cells( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Copy( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL CopyAsPicture( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Paste( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Collapse( const css::uno::Any& Direction ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL WholeStory( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL SplitTable() throw (css::uno::RuntimeException, - std::exception); - virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBASELECTION_HXX diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx index 3a9c87e57d4c..54e1983c4a4c 100644 --- a/sw/source/ui/vba/vbastyle.hxx +++ b/sw/source/ui/vba/vbastyle.hxx @@ -44,29 +44,29 @@ public: static void setLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (css::uno::RuntimeException); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setNameLocal( const OUString& _namelocal ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ::ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAutomaticallyUpdate() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutomaticallyUpdate( ::sal_Bool _automaticallyupdate ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getBaseStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setBaseStyle( const css::uno::Any& _basestyle ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getNextParagraphStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setNextParagraphStyle( const css::uno::Any& _nextparagraphstyle ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getListLevelNumber() 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& Name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNameLocal( const OUString& _namelocal ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAutomaticallyUpdate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutomaticallyUpdate( ::sal_Bool _automaticallyupdate ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getBaseStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setBaseStyle( const css::uno::Any& _basestyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getNextParagraphStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNextParagraphStyle( const css::uno::Any& _nextparagraphstyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getListLevelNumber() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XDefaultProperty - virtual OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) { return OUString("Name"); } + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("Name"); } // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif //SW_VBA_AXIS_HXX diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index 6b0222c4bd7f..c721ac96ed7d 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -174,20 +174,20 @@ public: mxParaStyles.set( xStyleFamilies->getByName("ParagraphStyles"), uno::UNO_QUERY_THROW ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return cppu::UnoType<style::XStyle>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return getCount() > 0; } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<style::XStyle>::get(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return getCount() > 0; } // XNameAcess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return cachePos; } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxParaStyles->getElementNames(); } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { // search in the MSOStyleName table first for( const MSOStyleNameTable* pTable = aMSOStyleNameTable; pTable->pMSOStyleName != NULL; pTable++ ) @@ -227,12 +227,12 @@ public: } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< container::XIndexAccess > xIndexAccess( mxParaStyles, uno::UNO_QUERY_THROW ); return xIndexAccess->getCount(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -241,7 +241,7 @@ public: return xIndexAccess->getByIndex( Index ); } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { throw uno::RuntimeException("Not implemented", uno::Reference< uno::XInterface >() ); } @@ -253,12 +253,12 @@ class StylesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: StylesEnumWrapper( SwVbaStyles* _pStyles ) : pStyles( _pStyles ), nIndex( 1 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex <= pStyles->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex <= pStyles->getCount() ) return pStyles->Item( uno::makeAny( nIndex++ ), uno::Any() ); diff --git a/sw/source/ui/vba/vbastyles.hxx b/sw/source/ui/vba/vbastyles.hxx index 69680a57657b..0a36c0b1f92c 100644 --- a/sw/source/ui/vba/vbastyles.hxx +++ b/sw/source/ui/vba/vbastyles.hxx @@ -30,14 +30,14 @@ class SwVbaStyles: public SwVbaStyles_BASE public: SwVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::script::BasicErrorException ); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); - virtual css::uno::Any createCollectionObject(const css::uno::Any&); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any createCollectionObject(const css::uno::Any&) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbasystem.hxx b/sw/source/ui/vba/vbasystem.hxx index 2d1289b1428d..f43de3410de7 100644 --- a/sw/source/ui/vba/vbasystem.hxx +++ b/sw/source/ui/vba/vbasystem.hxx @@ -38,8 +38,8 @@ public: void Initialize( const OUString& rFileName, const OString& rGroupName, const OString& rKey ); //PropListener - virtual void setValueEvent( const css::uno::Any& value ); - virtual css::uno::Any getValueEvent(); + virtual void setValueEvent( const css::uno::Any& value ) SAL_OVERRIDE; + virtual css::uno::Any getValueEvent() SAL_OVERRIDE; }; class SwVbaSystem : public SwVbaSystem_BASE @@ -52,13 +52,13 @@ public: virtual ~SwVbaSystem(); // XSystem - virtual sal_Int32 SAL_CALL getCursor() throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setCursor( sal_Int32 _cursor ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) throw ( css::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCursor() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setCursor( sal_Int32 _cursor ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBASYSTEM_HXX diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx index 496102dc728e..58714a38b53b 100644 --- a/sw/source/ui/vba/vbatable.hxx +++ b/sw/source/ui/vba/vbatable.hxx @@ -34,18 +34,18 @@ class SwVbaTable : public SwVbaTable_BASE public: SwVbaTable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextTable >& xTextTable) throw ( css::uno::RuntimeException); css::uno::Reference< css::text::XTextDocument > getDocument() const { return mxTextDocument; }; - virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Select( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Select( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL ConvertToText( const css::uno::Any& Separator, const css::uno::Any& NestedTables ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbatableofcontents.hxx b/sw/source/ui/vba/vbatableofcontents.hxx index 8949fb875c0c..0e48ffd6972a 100644 --- a/sw/source/ui/vba/vbatableofcontents.hxx +++ b/sw/source/ui/vba/vbatableofcontents.hxx @@ -39,22 +39,22 @@ public: virtual ~SwVbaTableOfContents(); // Attributes - virtual ::sal_Int32 SAL_CALL getLowerHeadingLevel() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getTabLeader() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTabLeader( ::sal_Int32 _tableader ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getUseFields() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setUseFields( ::sal_Bool _useFields ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getUseOutlineLevels() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setUseOutlineLevels( ::sal_Bool _useOutlineLevels ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getLowerHeadingLevel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getTabLeader() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTabLeader( ::sal_Int32 _tableader ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getUseFields() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setUseFields( ::sal_Bool _useFields ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getUseOutlineLevels() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setUseOutlineLevels( ::sal_Bool _useOutlineLevels ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Update( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Update( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBATABLEOFCONTENTS_HXX diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index ae94ba1194be..01b05f219d34 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -82,11 +82,11 @@ public: cachePos = mxTables.begin(); } // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxTables.size(); } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -94,17 +94,17 @@ public: return uno::makeAny( xTable ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return cppu::UnoType<text::XTextTable>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return getCount() > 0 ; } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<text::XTextTable>::get(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return getCount() > 0 ; } // XNameAcess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasByName(aName) ) throw container::NoSuchElementException(); uno::Reference< text::XTextTable > xTable( *cachePos, uno::UNO_QUERY_THROW ); return uno::makeAny( xTable ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Sequence< OUString > sNames( mxTables.size() ); OUString* pString = sNames.getArray(); @@ -117,7 +117,7 @@ public: } return sNames; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { cachePos = mxTables.begin(); XTextTableVec::iterator it_end = mxTables.end(); @@ -142,11 +142,11 @@ public: TableEnumerationImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xDocument, const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxParent( xParent ), mxContext( xContext ), mxDocument( xDocument ), mxIndexAccess( xIndexAccess ), mnCurIndex(0) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( mnCurIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasMoreElements() ) throw container::NoSuchElementException(); diff --git a/sw/source/ui/vba/vbatables.hxx b/sw/source/ui/vba/vbatables.hxx index 4d78a5dc514c..6c78571ebe70 100644 --- a/sw/source/ui/vba/vbatables.hxx +++ b/sw/source/ui/vba/vbatables.hxx @@ -31,16 +31,16 @@ class SwVbaTables : public SwVbaTables_BASE public: SwVbaTables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XTables - virtual css::uno::Reference< ov::word::XTable > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& NumRows, const css::uno::Any& NumColumns, const css::uno::Any& DefaultTableBehavior, const css::uno::Any& AutoFitBehavior ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::word::XTable > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& NumRows, const css::uno::Any& NumColumns, const css::uno::Any& DefaultTableBehavior, const css::uno::Any& AutoFitBehavior ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index 37788ca4a271..1d2f09d3685f 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -36,12 +36,12 @@ public: TablesOfContentsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 ) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if( nIndex < mxIndexAccess->getCount() ) { @@ -77,11 +77,11 @@ public: virtual ~TableOfContentsCollectionHelper() {} - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return maToc.size(); } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -89,16 +89,16 @@ public: uno::Reference< text::XDocumentIndex > xToc( maToc[Index], uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XTableOfContents >( new SwVbaTableOfContents( mxParent, mxContext, mxTextDocument, xToc ) ) ); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<word::XTableOfContents>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new TablesOfContentsEnumWrapper( this ); } diff --git a/sw/source/ui/vba/vbatablesofcontents.hxx b/sw/source/ui/vba/vbatablesofcontents.hxx index b9ba4a1baae7..94eba25a16fb 100644 --- a/sw/source/ui/vba/vbatablesofcontents.hxx +++ b/sw/source/ui/vba/vbatablesofcontents.hxx @@ -38,16 +38,16 @@ public: virtual ~SwVbaTablesOfContents() {} // Methods - virtual css::uno::Reference< ::ooo::vba::word::XTableOfContents > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& UseHeadingStyles, const css::uno::Any& UpperHeadingLevel, const css::uno::Any& LowerHeadingLevel, const css::uno::Any& UseFields, const css::uno::Any& TableID, const css::uno::Any& RightAlignPageNumbers, const css::uno::Any& IncludePageNumbers, const css::uno::Any& AddedStyles, const css::uno::Any& UseHyperlinks, const css::uno::Any& HidePageNumbersInWeb, const css::uno::Any& UseOutlineLevels ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ::ooo::vba::word::XTableOfContents > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& UseHeadingStyles, const css::uno::Any& UpperHeadingLevel, const css::uno::Any& LowerHeadingLevel, const css::uno::Any& UseFields, const css::uno::Any& TableID, const css::uno::Any& RightAlignPageNumbers, const css::uno::Any& IncludePageNumbers, const css::uno::Any& AddedStyles, const css::uno::Any& UseHyperlinks, const css::uno::Any& HidePageNumbersInWeb, const css::uno::Any& UseOutlineLevels ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaTablesOfContents_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBATABLESOFCONTENTS_HXX diff --git a/sw/source/ui/vba/vbatabstop.hxx b/sw/source/ui/vba/vbatabstop.hxx index 9c646517e060..ea722af2d16e 100644 --- a/sw/source/ui/vba/vbatabstop.hxx +++ b/sw/source/ui/vba/vbatabstop.hxx @@ -37,8 +37,8 @@ public: virtual ~SwVbaTabStop(); // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBATABSTOP_HXX diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index f81675c220f4..eeb835a68e5f 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -48,12 +48,12 @@ public: TabStopsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 ) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if( nIndex < mxIndexAccess->getCount() ) { @@ -79,11 +79,11 @@ public: virtual ~TabStopCollectionHelper() {} - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return maTabStops.getLength(); } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); @@ -91,16 +91,16 @@ public: const style::TabStop* pTabs = maTabStops.getConstArray(); return uno::makeAny( uno::Reference< word::XTabStop >( new SwVbaTabStop( mxParent, mxContext, mxParaProps, pTabs[ Index ] ) ) ); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<word::XTabStop>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new TabStopsEnumWrapper( this ); } diff --git a/sw/source/ui/vba/vbatabstops.hxx b/sw/source/ui/vba/vbatabstops.hxx index 2b6bb59d5782..f8bd0dd65e89 100644 --- a/sw/source/ui/vba/vbatabstops.hxx +++ b/sw/source/ui/vba/vbatabstops.hxx @@ -38,17 +38,17 @@ public: virtual ~SwVbaTabStops() {} // Methods - virtual css::uno::Reference< ::ooo::vba::word::XTabStop > SAL_CALL Add( float Position, const css::uno::Any& Alignment, const css::uno::Any& Leader ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ClearAll( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ::ooo::vba::word::XTabStop > SAL_CALL Add( float Position, const css::uno::Any& Alignment, const css::uno::Any& Leader ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ClearAll( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaTabStops_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBATABSTOPS_HXX diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx index 1937428826d3..8678f44a1a4d 100644 --- a/sw/source/ui/vba/vbatemplate.hxx +++ b/sw/source/ui/vba/vbatemplate.hxx @@ -35,12 +35,12 @@ public: virtual ~SwVbaTemplate(); // XTemplate - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBATEMPLATE_HXX diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx index b773cfb7df3a..fa7469010634 100644 --- a/sw/source/ui/vba/vbavariable.hxx +++ b/sw/source/ui/vba/vbavariable.hxx @@ -38,15 +38,15 @@ public: virtual ~SwVbaVariable(); // XVariable - virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL getValue() throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setValue( const css::uno::Any& rValue ) throw ( css::uno::RuntimeException, std::exception ); - virtual sal_Int32 SAL_CALL getIndex() 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& ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& rValue ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getIndex() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAVARIABLE_HXX diff --git a/sw/source/ui/vba/vbavariables.hxx b/sw/source/ui/vba/vbavariables.hxx index dd77e1b71ad7..443bbad436c4 100644 --- a/sw/source/ui/vba/vbavariables.hxx +++ b/sw/source/ui/vba/vbavariables.hxx @@ -38,16 +38,16 @@ public: virtual ~SwVbaVariables() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // SwVbaVariables_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; // XVariables - virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAVARIABLES_HXX diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx index d8eac8164cca..3cbeefac2eaa 100644 --- a/sw/source/ui/vba/vbaview.hxx +++ b/sw/source/ui/vba/vbaview.hxx @@ -44,18 +44,18 @@ public: virtual ~SwVbaView(); // XView - virtual ::sal_Int32 SAL_CALL getSeekView() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getSplitSpecial() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSplitSpecial( ::sal_Int32 _splitspecial ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getTableGridLines() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getSeekView() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getSplitSpecial() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSplitSpecial( ::sal_Int32 _splitspecial ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getTableGridLines() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAVIEW_HXX diff --git a/sw/source/ui/vba/vbawindow.hxx b/sw/source/ui/vba/vbawindow.hxx index 03c3ad45018a..7ac5908aff3d 100644 --- a/sw/source/ui/vba/vbawindow.hxx +++ b/sw/source/ui/vba/vbawindow.hxx @@ -38,18 +38,18 @@ public: throw (css::uno::RuntimeException); // Attributes - virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getWindowState() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getWindowState() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL Activate( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL ActivePane() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Activate( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL ActivePane() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAWINDOW_HXX diff --git a/sw/source/ui/vba/vbawrapformat.hxx b/sw/source/ui/vba/vbawrapformat.hxx index de17ef6948ee..14a701d3f21d 100644 --- a/sw/source/ui/vba/vbawrapformat.hxx +++ b/sw/source/ui/vba/vbawrapformat.hxx @@ -41,21 +41,21 @@ private: public: SwVbaWrapFormat( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); - virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getSide() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSide( ::sal_Int32 _side ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getDistanceTop() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDistanceTop( float _distancetop ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getDistanceBottom() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDistanceBottom( float _distancebottom ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getDistanceLeft() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDistanceLeft( float _distanceleft ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getDistanceRight() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDistanceRight( float _distanceright ) throw (css::uno::RuntimeException, std::exception); - - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getSide() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSide( ::sal_Int32 _side ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getDistanceTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDistanceTop( float _distancetop ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getDistanceBottom() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDistanceBottom( float _distancebottom ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getDistanceLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDistanceLeft( float _distanceleft ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getDistanceRight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDistanceRight( float _distanceright ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAWRAPFORMAT_HXX |