diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-20 12:38:10 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-26 08:42:28 +0200 |
commit | b44cbb26efe1d0b0950b1e1613e131b506dc3876 (patch) | |
tree | 9b4d5d99e5dad0971079b997a02a6d96536709ca /include/editeng | |
parent | 26ad60aec69310fecd918f1c2e09056aa4782320 (diff) |
new loplugin: change virtual methods to non-virtual
Where we can prove that the virtual method is never overriden.
In the case of pure-virtual methods, we remove the method entirely.
Sometimes this leads to entire methods and fields being
eliminated.
Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae
Diffstat (limited to 'include/editeng')
-rw-r--r-- | include/editeng/AccessibleContextBase.hxx | 2 | ||||
-rw-r--r-- | include/editeng/AccessibleEditableTextPara.hxx | 4 | ||||
-rw-r--r-- | include/editeng/AccessibleImageBullet.hxx | 4 | ||||
-rw-r--r-- | include/editeng/AccessibleStaticTextBase.hxx | 16 | ||||
-rw-r--r-- | include/editeng/editeng.hxx | 8 | ||||
-rw-r--r-- | include/editeng/flditem.hxx | 2 | ||||
-rw-r--r-- | include/editeng/justifyitem.hxx | 6 | ||||
-rw-r--r-- | include/editeng/outliner.hxx | 32 | ||||
-rw-r--r-- | include/editeng/splwrap.hxx | 6 | ||||
-rw-r--r-- | include/editeng/svxrtf.hxx | 10 | ||||
-rw-r--r-- | include/editeng/unoedprx.hxx | 2 | ||||
-rw-r--r-- | include/editeng/unoedsrc.hxx | 8 | ||||
-rw-r--r-- | include/editeng/unopracc.hxx | 2 | ||||
-rw-r--r-- | include/editeng/unotext.hxx | 40 |
14 files changed, 71 insertions, 71 deletions
diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx index 3584ca7602e1..f50aa485413c 100644 --- a/include/editeng/AccessibleContextBase.hxx +++ b/include/editeng/AccessibleContextBase.hxx @@ -164,7 +164,7 @@ public: @param rRelationSet The new relation set that replaces the old one. */ - virtual void SetRelationSet ( + void SetRelationSet ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet>& rxRelationSet) throw (::com::sun::star::uno::RuntimeException); diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index 0764d703e270..026ebc9042e1 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -167,7 +167,7 @@ namespace accessibility virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceName - virtual OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); /** Set the current index in the accessibility parent @@ -230,7 +230,7 @@ namespace accessibility void Dispose(); /// Calls all Listener objects to tell them the change. Don't hold locks when calling this! - virtual void FireEvent(const sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const; + void FireEvent(const sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const; /// Sets the given state on the internal state set and fires STATE_CHANGE event. Don't hold locks when calling this! void SetState( const sal_Int16 nStateId ); diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx index 02cbc75843ba..fa78d5abfd07 100644 --- a/include/editeng/AccessibleImageBullet.hxx +++ b/include/editeng/AccessibleImageBullet.hxx @@ -94,7 +94,7 @@ namespace accessibility virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceName - virtual OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); /** Set the current index in the accessibility parent @@ -148,7 +148,7 @@ namespace accessibility sal_Int32 GetParagraphIndex() const { return mnParagraphIndex; } /// Calls all Listener objects to tell them the change. Don't hold locks when calling this! - virtual void FireEvent(const sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const; + void FireEvent(const sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const; private: diff --git a/include/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx index 06bd708c869a..3ce0c4bb8f78 100644 --- a/include/editeng/AccessibleStaticTextBase.hxx +++ b/include/editeng/AccessibleStaticTextBase.hxx @@ -121,7 +121,7 @@ namespace accessibility should only be called from the main office thread. */ - virtual const SvxEditSource& GetEditSource() const; + const SvxEditSource& GetEditSource() const; /** Set the current edit source @@ -150,7 +150,7 @@ namespace accessibility The new edit source to set. Object ownership is transferred from the caller to the callee. */ - virtual void SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource ); + void SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource ); /** Set the event source @@ -162,14 +162,14 @@ namespace accessibility The interface that should be set as the source for accessibility events sent by this object. */ - virtual void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface ); + void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface ); /** Get the event source @return the interface that is set as the source for accessibility events sent by this object. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const; + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const; /** Set offset of EditEngine from parent @@ -184,13 +184,13 @@ namespace accessibility @param rPoint The offset in screen coordinates (i.e. pixel) */ - virtual void SetOffset( const Point& rPoint ); + void SetOffset( const Point& rPoint ); /** Query offset of EditEngine from parent @return the offset in screen coordinates (i.e. pixel) */ - virtual Point GetOffset() const; + Point GetOffset() const; /** Update the visible children @@ -208,7 +208,7 @@ namespace accessibility internally. Normally, there should not be a need to call this method. */ - virtual void UpdateChildren(); + void UpdateChildren(); /** Drop all references and enter disposed state @@ -218,7 +218,7 @@ namespace accessibility return default values or throw a uno::DisposedException exception). */ - virtual void Dispose(); + void Dispose(); // XAccessibleText interface implementation virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 444a732c61de..f85c43b00836 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -298,7 +298,7 @@ public: void SetText(sal_Int32 nPara, const OUString& rText); virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ); - virtual const SfxItemSet& GetParaAttribs( sal_Int32 nPara ) const; + const SfxItemSet& GetParaAttribs( sal_Int32 nPara ) const; void GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const; @@ -464,7 +464,7 @@ public: virtual void ParagraphConnected( sal_Int32 nLeftParagraph, sal_Int32 nRightParagraph ); virtual void ParaAttribsChanged( sal_Int32 nParagraph ); virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); - virtual void ParagraphHeightChanged( sal_Int32 nPara ); + void ParagraphHeightChanged( sal_Int32 nPara ); virtual void DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, @@ -486,7 +486,7 @@ public: const Color& rOverlineColor, const Color& rTextLineColor); virtual OUString GetUndoComment( sal_uInt16 nUndoId ) const; - virtual bool FormattingParagraph( sal_Int32 nPara ); + bool FormattingParagraph( sal_Int32 nPara ); virtual bool SpellNextDocument(); virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); virtual void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); @@ -508,7 +508,7 @@ public: static SvxFont CreateSvxFontFromItemSet( const SfxItemSet& rItemSet ); static bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); } static bool HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable ); - virtual SdrObject* GetCurTextObj() { return NULL; } + SdrObject* GetCurTextObj() { return NULL; } /** sets a link that is called at the beginning of a drag operation at an edit view */ void SetBeginDropHdl( const Link& rLink ); Link GetBeginDropHdl() const; diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index e35e503b0c37..7386faea93af 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -59,7 +59,7 @@ public: virtual bool operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; - virtual MetaAction* createEndComment() const; + MetaAction* createEndComment() const; }; /** diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index 6e09634ab4ab..de71bd96f1a2 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -45,7 +45,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual OUString GetValueText( sal_uInt16 nVal ) const; + OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; @@ -78,7 +78,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual OUString GetValueText( sal_uInt16 nVal ) const; + OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; @@ -107,7 +107,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual OUString GetValueText( sal_uInt16 nVal ) const; + OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index f27818f9d9d5..b56ac7fd6878 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -646,7 +646,7 @@ protected: void ParagraphDeleted( sal_Int32 nParagraph ); void ParaAttribsChanged( sal_Int32 nParagraph ); - virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); + void StyleSheetChanged( SfxStyleSheet* pStyle ); void InvalidateBullet(sal_Int32 nPara); void PaintBullet( sal_Int32 nPara, const Point& rStartPos, @@ -655,7 +655,7 @@ protected: // used by OutlinerEditEng. Allows Outliner objects to provide // bullet access to the EditEngine. - virtual const SvxNumberFormat* GetNumberFormat( sal_Int32 nPara ) const; + const SvxNumberFormat* GetNumberFormat( sal_Int32 nPara ) const; public: @@ -744,28 +744,28 @@ public: Paragraph* GetHdlParagraph() const { return pHdlParagraph; } bool IsExpanding() const { return bIsExpanding; } - virtual void ExpandHdl(); + void ExpandHdl(); void SetExpandHdl( const Link& rLink ) { aExpandHdl = rLink; } Link GetExpandHdl() const { return aExpandHdl; } - virtual void ParagraphInsertedHdl(); + void ParagraphInsertedHdl(); void SetParaInsertedHdl(const Link& rLink){aParaInsertedHdl=rLink;} Link GetParaInsertedHdl() const { return aParaInsertedHdl; } - virtual void ParagraphRemovingHdl(); + void ParagraphRemovingHdl(); void SetParaRemovingHdl(const Link& rLink){aParaRemovingHdl=rLink;} Link GetParaRemovingHdl() const { return aParaRemovingHdl; } - virtual void DepthChangedHdl(); + void DepthChangedHdl(); void SetDepthChangedHdl(const Link& rLink){aDepthChangedHdl=rLink;} Link GetDepthChangedHdl() const { return aDepthChangedHdl; } sal_Int16 GetPrevDepth() const { return static_cast<sal_Int16>(nDepthChangedHdlPrevDepth); } sal_uInt16 GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; } - virtual long RemovingPagesHdl( OutlinerView* ); + long RemovingPagesHdl( OutlinerView* ); void SetRemovingPagesHdl(const Link& rLink){aRemovingPagesHdl=rLink;} Link GetRemovingPagesHdl() const { return aRemovingPagesHdl; } - virtual long IndentingPagesHdl( OutlinerView* ); + long IndentingPagesHdl( OutlinerView* ); void SetIndentingPagesHdl(const Link& rLink){aIndentingPagesHdl=rLink;} Link GetIndentingPagesHdl() const { return aIndentingPagesHdl; } // valid only in the two upper handlers @@ -834,7 +834,7 @@ public: void StripPortions(); - virtual void DrawingText( const Point& rStartPos, const OUString& rText, + void DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, const long* pDXArray, const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft, @@ -847,7 +847,7 @@ public: const Color& rOverlineColor, const Color& rTextLineColor); - virtual void DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar, + void DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar, const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph, @@ -910,8 +910,8 @@ public: bool UpdateFields(); void RemoveFields( bool bKeepFieldText, TypeId aType = NULL ); - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); - virtual void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ); void SetSpeller( ::com::sun::star::uno::Reference< @@ -986,11 +986,11 @@ public: void SetEndPasteOrDropHdl( const Link& rLink ); Link GetEndPasteOrDropHdl() const { return maEndPasteOrDropHdl; } - virtual sal_Int16 GetNumberingStartValue( sal_Int32 nPara ); - virtual void SetNumberingStartValue( sal_Int32 nPara, sal_Int16 nNumberingStartValue ); + sal_Int16 GetNumberingStartValue( sal_Int32 nPara ); + void SetNumberingStartValue( sal_Int32 nPara, sal_Int16 nNumberingStartValue ); - virtual bool IsParaIsNumberingRestart( sal_Int32 nPara ); - virtual void SetParaIsNumberingRestart( sal_Int32 nPara, bool bParaIsNumberingRestart ); + bool IsParaIsNumberingRestart( sal_Int32 nPara ); + void SetParaIsNumberingRestart( sal_Int32 nPara, bool bParaIsNumberingRestart ); /** determine the bullets/numbering status of the given paragraphs diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index 2763be8ecaae..b09bff62ee58 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -125,8 +125,8 @@ protected: virtual bool SpellContinue(); // Check Areas // Result available through GetLast virtual void ReplaceAll( const OUString &rNewText, sal_Int16 nLanguage ); //Replace word from the replace list - virtual void StartThesaurus( const OUString &rWord, sal_uInt16 nLang ); - virtual ::com::sun::star::uno::Reference< + void StartThesaurus( const OUString &rWord, sal_uInt16 nLang ); + ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetAllRightDic() const; virtual void SpellEnd(); // Finish area @@ -135,7 +135,7 @@ protected: virtual void ChangeWord( const OUString& rNewWord, const sal_uInt16 nLang ); // Wort via Thesaurus ersetzen virtual void ChangeThesWord( const OUString& rNewWord ); - virtual void SetLanguage( const sal_uInt16 nLang ); // Change Language + void SetLanguage( const sal_uInt16 nLang ); // Change Language virtual void AutoCorrect( const OUString& rAktStr, const OUString& rNewStr ); virtual void InsertHyphen( const sal_uInt16 nPos ); // Insert hyphen diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index 4971578bbfd1..b33cf16a4f7d 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -240,9 +240,9 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser RTF_CharTypeDef eType, SfxItemSet& rSet, SfxPoolItem& rItem ); protected: - virtual void EnterEnvironment(); - virtual void LeaveEnvironment(); - virtual void ResetPard(); + void EnterEnvironment(); + void LeaveEnvironment(); + void ResetPard(); virtual void InsertPara() = 0; @@ -263,7 +263,7 @@ protected: // Read Document-Info ::com::sun::star::util::DateTime GetDateTimeStamp( ); OUString& GetTextToEndGroup( OUString& rStr ); - virtual void ReadInfo( const sal_Char* pChkForVerNo = 0 ); + void ReadInfo( const sal_Char* pChkForVerNo = 0 ); inline SfxItemSet& GetAttrSet(); // no text yet inserted? (SttPos from the top stack entry!) @@ -341,7 +341,7 @@ public: // get RTF default ItemSets. Must be used by pard/plain tokens or in // reset of Style-Items const SfxItemSet& GetRTFDefaults(); - virtual bool UncompressableStackEntry(const SvxRTFItemStackType &rSet) const; + bool UncompressableStackEntry(const SvxRTFItemStackType &rSet) const; }; // The stack for the attributes: diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index 091adcc9b96a..a9404de5862c 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -42,7 +42,7 @@ public: virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE; virtual void GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const SAL_OVERRIDE; - virtual sal_uInt16 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ); + sal_uInt16 CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ); virtual SfxItemState GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const SAL_OVERRIDE; virtual SfxItemState GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const SAL_OVERRIDE; diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx index 2bfe5746b0ed..431053fdad44 100644 --- a/include/editeng/unoedsrc.hxx +++ b/include/editeng/unoedsrc.hxx @@ -210,7 +210,7 @@ public: */ virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const = 0; - virtual OUString GetNumStr(sal_uInt16) const { return OUString(); } + OUString GetNumStr(sal_uInt16) const { return OUString(); } virtual void SetUpdateModeForAcc(bool) {} virtual bool GetUpdateModeForAcc() const { return true; } @@ -536,9 +536,9 @@ public: */ virtual bool Paste() = 0; - virtual bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return false; }; - virtual bool IsShapeParaFocusable( ) { return true; }; - virtual bool BreakParaWrongList(sal_Int32, sal_Int32&, sal_Int32&, sal_Int32){ return false; }; + bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return false; }; + bool IsShapeParaFocusable( ) { return true; }; + bool BreakParaWrongList(sal_Int32, sal_Int32&, sal_Int32&, sal_Int32){ return false; }; }; #endif diff --git a/include/editeng/unopracc.hxx b/include/editeng/unopracc.hxx index 953bf6f01326..162c6131e752 100644 --- a/include/editeng/unopracc.hxx +++ b/include/editeng/unopracc.hxx @@ -43,7 +43,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // uno::XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index da7708ce98ea..1612e5db3130 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -199,7 +199,7 @@ public: virtual bool IsValid() const SAL_OVERRIDE; - virtual void SetNotifyHdl( const Link& ); + void SetNotifyHdl( const Link& ); 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; @@ -255,25 +255,25 @@ protected: ESelection maSelection; const SvxItemPropertySet* mpPropSet; - virtual void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Int32 nPara = -1 ) 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); - virtual ::com::sun::star::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Int32 nPara = -1 ) 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); + ::com::sun::star::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - 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, sal_Int32 nPara = -1 ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL _getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara = -1 ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL _setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Int32 nPara = -1 ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL _getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara = -1 ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL _getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL _getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); // returns true if property found or false if unknown property - virtual bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::beans::PropertyState& rState); + bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::beans::PropertyState& rState); - virtual void SAL_CALL _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException ); + void SAL_CALL _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException ); void SetEditSource( SvxEditSource* _pEditSource ) throw(); - virtual void getPropertyValue( const SfxItemPropertySimpleEntry* pMap, com::sun::star::uno::Any& rAny, const SfxItemSet& rSet ) + void getPropertyValue( const SfxItemPropertySimpleEntry* pMap, com::sun::star::uno::Any& rAny, const SfxItemSet& rSet ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const com::sun::star::uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException ); + void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const com::sun::star::uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException ); SvxUnoTextRangeBase( const SvxItemPropertySet* _pSet ) throw(); SvxUnoTextRangeBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet ) throw(); @@ -285,13 +285,13 @@ public: const ESelection& GetSelection() const throw() { CheckSelection( ((SvxUnoTextRangeBase*)this)->maSelection, mpEditSource->GetTextForwarder() ); return maSelection; }; void SetSelection( const ESelection& rSelection ) throw(); - virtual void CollapseToStart(void) throw(); - virtual void CollapseToEnd(void) throw(); - virtual bool IsCollapsed(void) throw(); - virtual bool GoLeft(sal_Int16 nCount, bool Expand) throw(); - virtual bool GoRight(sal_Int16 nCount, bool Expand) throw(); - virtual void GotoStart(bool Expand) throw(); - virtual void GotoEnd(bool Expand) throw(); + void CollapseToStart(void) throw(); + void CollapseToEnd(void) throw(); + bool IsCollapsed(void) throw(); + bool GoLeft(sal_Int16 nCount, bool Expand) throw(); + bool GoRight(sal_Int16 nCount, bool Expand) throw(); + void GotoStart(bool Expand) throw(); + void GotoEnd(bool Expand) throw(); //const SfxItemPropertyMapEntry* getPropertyMapEntries() const throw() { return maPropSet.getPropertyMapEntries(); } const SvxItemPropertySet* getPropertySet() const throw() { return mpPropSet; } |