From 70cc2b191b95fbc210bc1f0f6a7159f341894f0f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 26 Mar 2014 16:37:00 +0100 Subject: First batch of adding SAL_OVERRRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a --- include/editeng/unoedprx.hxx | 130 +++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 65 deletions(-) (limited to 'include/editeng/unoedprx.hxx') diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index a459c8b31607..770cec8ca115 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -33,65 +33,65 @@ public: SvxAccessibleTextAdapter(); virtual ~SvxAccessibleTextAdapter(); - virtual sal_Int32 GetParagraphCount() const; - virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const; - virtual OUString GetText( const ESelection& rSel ) const; - virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const; - virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const; - virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); - virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ); - virtual void GetPortions( sal_Int32 nPara, std::vector& rList ) const; + virtual sal_Int32 GetParagraphCount() const SAL_OVERRIDE; + virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const SAL_OVERRIDE; + virtual OUString GetText( const ESelection& rSel ) const SAL_OVERRIDE; + virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const SAL_OVERRIDE; + virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE; + virtual void GetPortions( sal_Int32 nPara, std::vector& rList ) const SAL_OVERRIDE; virtual sal_uInt16 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ); - virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const; - virtual sal_uInt16 GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const; - - virtual void QuickInsertText( const OUString& rText, const ESelection& rSel ); - virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); - virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); - virtual void QuickInsertLineBreak( const ESelection& rSel ); - - virtual SfxItemPool* GetPool() const; - - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); - - virtual bool IsValid() const; - - virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const; - virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const; - virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const; - virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const; - virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const; - virtual Rectangle GetParaBounds( sal_Int32 nPara ) const; - virtual MapMode GetMapMode() const; - virtual OutputDevice* GetRefDevice() const; - virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const; - virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const; - virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const; - virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const; - virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const; - virtual void SetUpdateModeForAcc( bool bUp); - virtual bool GetUpdateModeForAcc() const; - virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const; - virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const; - - virtual bool Delete( const ESelection& ); - virtual bool InsertText( const OUString&, const ESelection& ); - virtual bool QuickFormatDoc( bool bFull = false ); - virtual sal_Int16 GetDepth( sal_Int32 nPara ) const; - virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ); - - virtual const SfxItemSet* GetEmptyItemSetPtr(); + virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual sal_uInt16 GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const SAL_OVERRIDE; + + virtual void QuickInsertText( const OUString& rText, const ESelection& rSel ) SAL_OVERRIDE; + virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ) SAL_OVERRIDE; + virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ) SAL_OVERRIDE; + virtual void QuickInsertLineBreak( const ESelection& rSel ) SAL_OVERRIDE; + + virtual SfxItemPool* GetPool() const SAL_OVERRIDE; + + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor ) SAL_OVERRIDE; + virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) SAL_OVERRIDE; + + virtual bool IsValid() const SAL_OVERRIDE; + + virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const SAL_OVERRIDE; + virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const SAL_OVERRIDE; + virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const SAL_OVERRIDE; + virtual Rectangle GetParaBounds( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual MapMode GetMapMode() const SAL_OVERRIDE; + virtual OutputDevice* GetRefDevice() const SAL_OVERRIDE; + virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const SAL_OVERRIDE; + virtual bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const SAL_OVERRIDE; + virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const SAL_OVERRIDE; + virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const SAL_OVERRIDE; + virtual void SetUpdateModeForAcc( bool bUp) SAL_OVERRIDE; + virtual bool GetUpdateModeForAcc() const SAL_OVERRIDE; + virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const SAL_OVERRIDE; + virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const SAL_OVERRIDE; + + virtual bool Delete( const ESelection& ) SAL_OVERRIDE; + virtual bool InsertText( const OUString&, const ESelection& ) SAL_OVERRIDE; + virtual bool QuickFormatDoc( bool bFull = false ) SAL_OVERRIDE; + virtual sal_Int16 GetDepth( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual bool SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth ) SAL_OVERRIDE; + + virtual const SfxItemSet* GetEmptyItemSetPtr() SAL_OVERRIDE; // implementation functions for XParagraphAppend and XTextPortionAppend // (not needed for accessibility, only for new import API) - virtual void AppendParagraph(); - virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ); + virtual void AppendParagraph() SAL_OVERRIDE; + virtual sal_Int32 AppendTextPortion( sal_Int32 nPara, const OUString &rText, const SfxItemSet &rSet ) SAL_OVERRIDE; //XTextCopy - virtual void CopyText(const SvxTextForwarder& rSource); + virtual void CopyText(const SvxTextForwarder& rSource) SAL_OVERRIDE; void SetForwarder( SvxTextForwarder& ); bool HaveImageBullet( sal_Int32 nPara ) const; @@ -117,17 +117,17 @@ public: virtual ~SvxAccessibleTextEditViewAdapter(); // SvxViewForwarder interface - virtual bool IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual bool IsValid() const SAL_OVERRIDE; + virtual Rectangle GetVisArea() const SAL_OVERRIDE; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; // SvxEditViewForwarder interface - virtual bool GetSelection( ESelection& rSelection ) const; - virtual bool SetSelection( const ESelection& rSelection ); - virtual bool Copy(); - virtual bool Cut(); - virtual bool Paste(); + virtual bool GetSelection( ESelection& rSelection ) const SAL_OVERRIDE; + virtual bool SetSelection( const ESelection& rSelection ) SAL_OVERRIDE; + virtual bool Copy() SAL_OVERRIDE; + virtual bool Cut() SAL_OVERRIDE; + virtual bool Paste() SAL_OVERRIDE; void SetForwarder( SvxEditViewForwarder&, SvxAccessibleTextAdapter& ); @@ -142,14 +142,14 @@ public: SvxEditSourceAdapter(); ~SvxEditSourceAdapter(); - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); + virtual SvxEditSource* Clone() const SAL_OVERRIDE; + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; SvxAccessibleTextAdapter* GetTextForwarderAdapter(); // covariant return types don't work on MSVC - virtual SvxViewForwarder* GetViewForwarder(); + virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE; SvxAccessibleTextEditViewAdapter* GetEditViewForwarderAdapter( bool bCreate = false ); // covariant return types don't work on MSVC - virtual void UpdateData(); - virtual SfxBroadcaster& GetBroadcaster() const; + virtual void UpdateData() SAL_OVERRIDE; + virtual SfxBroadcaster& GetBroadcaster() const SAL_OVERRIDE; SAL_WNODEPRECATED_DECLARATIONS_PUSH void SetEditSource( ::std::auto_ptr< SvxEditSource > pAdaptee ); -- cgit