summaryrefslogtreecommitdiff
path: root/starmath/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
commit567ef6d5782cdb729b49005caf6005610ce03e22 (patch)
tree7e3be1da41382e555d9091914ef7e064852a4fd4 /starmath/source
parentc36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (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 'starmath/source')
-rw-r--r--starmath/source/accessibility.hxx268
-rw-r--r--starmath/source/cfgitem.hxx4
-rw-r--r--starmath/source/mathmlexport.hxx14
-rw-r--r--starmath/source/mathmlimport.cxx100
-rw-r--r--starmath/source/mathmlimport.hxx10
-rw-r--r--starmath/source/ooxmlexport.hxx22
-rw-r--r--starmath/source/rtfexport.hxx22
-rw-r--r--starmath/source/smdetect.hxx2
8 files changed, 221 insertions, 221 deletions
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index ec04727148d8..97e281bded19 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -98,58 +98,58 @@ public:
const ::com::sun::star::uno::Any &rNewVal);
// XAccessible
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) 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);
- 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);
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) 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 grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) 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) SAL_OVERRIDE;
+ virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) 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) SAL_OVERRIDE;
+ virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) 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 grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- 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);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) 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) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) 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);
- 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);
+ 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) 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) 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);
- 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 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;
+ 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;
// 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;
};
@@ -178,10 +178,10 @@ public:
SmViewForwarder( SmEditAccessible &rAcc );
virtual ~SmViewForwarder();
- 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;
};
@@ -201,57 +201,57 @@ public:
SmTextForwarder( SmEditAccessible& rAcc, SmEditSource & rSource );
virtual ~SmTextForwarder();
- 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 = EditEngineAttribs_All ) 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<sal_Int32>& rList ) const;
-
- 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&, sal_Int32, sal_Int32);
- 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 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 nLine ) 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_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 = EditEngineAttribs_All ) 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<sal_Int32>& rList ) const SAL_OVERRIDE;
+
+ 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&, sal_Int32, sal_Int32) 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 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 nLine ) 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
- 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;
- virtual void CopyText(const SvxTextForwarder& rSource);
+ virtual void CopyText(const SvxTextForwarder& rSource) SAL_OVERRIDE;
};
@@ -268,17 +268,17 @@ public:
SmEditViewForwarder( SmEditAccessible& rAcc );
virtual ~SmEditViewForwarder();
- virtual bool IsValid() const;
+ virtual bool IsValid() const SAL_OVERRIDE;
- 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 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;
- 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;
};
@@ -300,12 +300,12 @@ public:
SmEditSource( SmEditWindow *pWin, SmEditAccessible &rAcc );
virtual ~SmEditSource();
- virtual SvxEditSource* Clone() const;
- virtual SvxTextForwarder* GetTextForwarder();
- virtual SvxViewForwarder* GetViewForwarder();
+ virtual SvxEditSource* Clone() const SAL_OVERRIDE;
+ virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE;
+ virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE;
virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE;
- virtual void UpdateData();
- virtual SfxBroadcaster& GetBroadcaster() const;
+ virtual void UpdateData() SAL_OVERRIDE;
+ virtual SfxBroadcaster& GetBroadcaster() const SAL_OVERRIDE;
};
@@ -350,39 +350,39 @@ public:
EditView * GetEditView() { return pWin ? pWin->GetEditView() : 0; }
// XAccessible
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) 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);
- 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);
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) 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 grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) 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) SAL_OVERRIDE;
+ virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) 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) SAL_OVERRIDE;
+ virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) 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 grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- 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);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) 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) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) 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);
- 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);
+ 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) 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) 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;
};
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 06d143ae98e3..1213d31c7e1a 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -149,8 +149,8 @@ public:
virtual ~SmMathConfig();
// 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;
SmSymbolManager & GetSymbolManager();
void GetSymbols( std::vector< SmSym > &rSymbols ) const;
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index ebb3f813abe0..371bf9877253 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -110,16 +110,16 @@ public:
virtual ~SmXMLExport() {};
// XUnoTunnel
- sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
- void _ExportAutoStyles() {}
- void _ExportMasterStyles() {}
- void _ExportContent();
- sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass);
+ void _ExportAutoStyles() SAL_OVERRIDE {}
+ void _ExportMasterStyles() SAL_OVERRIDE {}
+ void _ExportContent() SAL_OVERRIDE;
+ sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE;
- 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 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;
sal_Bool GetSuccess() {return bSuccess;}
};
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 780f194d1d8d..191cdb2f1de2 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -574,8 +574,8 @@ public:
}
virtual void TCharacters(const OUString & /*rChars*/);
- virtual void Characters(const OUString &rChars);
- virtual SvXMLImportContext *CreateChildContext(sal_uInt16 /*nPrefix*/, const OUString& /*rLocalName*/, const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/);
+ virtual void Characters(const OUString &rChars) SAL_OVERRIDE;
+ virtual SvXMLImportContext *CreateChildContext(sal_uInt16 /*nPrefix*/, const OUString& /*rLocalName*/, const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/) SAL_OVERRIDE;
};
void SmXMLImportContext::TCharacters(const OUString & /*rChars*/)
@@ -780,9 +780,9 @@ public:
const OUString& rLName)
: SmXMLImportContext(rImport,nPrfx,rLName) {}
- virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList);
+ virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList) SAL_OVERRIDE;
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
};
@@ -799,13 +799,13 @@ public:
: SmXMLDocContext_Impl(rImport,nPrefix,rLName)
{ nElementCount = GetSmImport().GetNodeStack().size(); }
- virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList);
+ virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList) SAL_OVERRIDE;
SvXMLImportContext *StrictCreateChildContext(sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > &xAttrList);
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
};
@@ -819,7 +819,7 @@ public:
const OUString& rLName)
: SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
};
void SmXMLEncloseContext_Impl::EndElement()
@@ -843,7 +843,7 @@ public:
const OUString& rLName)
: SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
};
@@ -855,7 +855,7 @@ public:
const OUString& rLName)
: SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
};
@@ -867,7 +867,7 @@ public:
const OUString& rLName)
: SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
};
@@ -883,8 +883,8 @@ public:
const OUString& rLName) : SmXMLRowContext_Impl(rImport,nPrefix,rLName),
aStyleHelper(*this) {}
- void EndElement();
- void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );
+ void EndElement() SAL_OVERRIDE;
+ void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList ) SAL_OVERRIDE;
};
void SmXMLStyleContext_Impl::StartElement(const uno::Reference<
@@ -917,7 +917,7 @@ public:
const OUString& rLName)
: SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
};
void SmXMLPaddedContext_Impl::EndElement()
@@ -941,7 +941,7 @@ public:
const OUString& rLName)
: SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
};
void SmXMLPhantomContext_Impl::EndElement()
@@ -980,8 +980,8 @@ public:
: SmXMLRowContext_Impl(rImport,nPrefix,rLName),
cBegin('('), cEnd(')') {}
- void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList );
- void EndElement();
+ void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ void EndElement() SAL_OVERRIDE;
};
@@ -1071,7 +1071,7 @@ public:
const OUString& rLName)
: SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
};
void SmXMLErrorContext_Impl::EndElement()
@@ -1108,9 +1108,9 @@ public:
aToken.eType = TNUMBER;
}
- virtual void TCharacters(const OUString &rChars);
+ virtual void TCharacters(const OUString &rChars) SAL_OVERRIDE;
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
};
void SmXMLNumberContext_Impl::TCharacters(const OUString &rChars)
@@ -1134,9 +1134,9 @@ public:
const OUString& rLName)
: SmXMLImportContext(rImport,nPrefix,rLName), bIsStarMath(false) {}
- virtual void Characters(const OUString &rChars);
+ virtual void Characters(const OUString &rChars) SAL_OVERRIDE;
- void StartElement(const uno::Reference<xml::sax::XAttributeList > & xAttrList );
+ void StartElement(const uno::Reference<xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
};
void SmXMLAnnotationContext_Impl::StartElement(const uno::Reference<
@@ -1187,9 +1187,9 @@ public:
aToken.eType = TTEXT;
}
- virtual void TCharacters(const OUString &rChars);
+ virtual void TCharacters(const OUString &rChars) SAL_OVERRIDE;
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
};
void SmXMLTextContext_Impl::TCharacters(const OUString &rChars)
@@ -1219,9 +1219,9 @@ public:
aToken.eType = TTEXT;
}
- virtual void TCharacters(const OUString &rChars);
+ virtual void TCharacters(const OUString &rChars) SAL_OVERRIDE;
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
};
void SmXMLStringContext_Impl::TCharacters(const OUString &rChars)
@@ -1262,12 +1262,12 @@ public:
aToken.eType = TIDENT;
}
- void TCharacters(const OUString &rChars);
- void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList )
+ void TCharacters(const OUString &rChars) SAL_OVERRIDE;
+ void StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE
{
aStyleHelper.RetrieveAttrs(xAttrList);
};
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
};
void SmXMLIdentifierContext_Impl::EndElement()
@@ -1326,9 +1326,9 @@ public:
aToken.nLevel = 5;
}
- void TCharacters(const OUString &rChars);
- void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );
- void EndElement();
+ void TCharacters(const OUString &rChars) SAL_OVERRIDE;
+ void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList ) SAL_OVERRIDE;
+ void EndElement() SAL_OVERRIDE;
};
void SmXMLOperatorContext_Impl::TCharacters(const OUString &rChars)
@@ -1385,7 +1385,7 @@ public:
const OUString& rLName)
: SmXMLImportContext(rImport,nPrefix,rLName) {}
- void StartElement(const uno::Reference< xml::sax::XAttributeList >& xAttrList );
+ void StartElement(const uno::Reference< xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE;
};
void SmXMLSpaceContext_Impl::StartElement(
@@ -1414,7 +1414,7 @@ public:
const OUString& rLName)
: SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
- void EndElement()
+ void EndElement() SAL_OVERRIDE
{
GenericEndElement(TRSUB,RSUB);
}
@@ -1456,7 +1456,7 @@ public:
const OUString& rLName)
: SmXMLSubContext_Impl(rImport,nPrefix,rLName) {}
- void EndElement()
+ void EndElement() SAL_OVERRIDE
{
GenericEndElement(TRSUP,RSUP);
}
@@ -1474,7 +1474,7 @@ public:
const OUString& rLName)
: SmXMLRowContext_Impl(rImport,nPrefix,rLName) {}
- void EndElement()
+ void EndElement() SAL_OVERRIDE
{
GenericEndElement(TRSUB,RSUB,RSUP);
}
@@ -1520,8 +1520,8 @@ public:
const OUString& rLName)
: SmXMLSubContext_Impl(rImport,nPrefix,rLName) {}
- void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );
- void EndElement();
+ void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList ) SAL_OVERRIDE;
+ void EndElement() SAL_OVERRIDE;
void HandleAccent();
};
@@ -1585,8 +1585,8 @@ public:
const OUString& rLName)
: SmXMLSubContext_Impl(rImport,nPrefix,rLName), nAttrCount(0) {}
- void EndElement();
- void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList );
+ void EndElement() SAL_OVERRIDE;
+ void StartElement(const uno::Reference< xml::sax::XAttributeList > &xAttrList ) SAL_OVERRIDE;
void HandleAccent();
};
@@ -1640,7 +1640,7 @@ public:
const OUString& rLName)
: SmXMLSubSupContext_Impl(rImport,nPrefix,rLName) {}
- void EndElement()
+ void EndElement() SAL_OVERRIDE
{
GenericEndElement(TCSUB,CSUB,CSUP);
}
@@ -1660,10 +1660,10 @@ public:
SmXMLSubSupContext_Impl(rImport,nPrefix,rLName),
bHasPrescripts(false) {}
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,
const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > &xAttrList);
+ const uno::Reference< xml::sax::XAttributeList > &xAttrList) SAL_OVERRIDE;
};
@@ -1675,7 +1675,7 @@ public:
const OUString& rLName)
: SmXMLImportContext(rImport,nPrefix,rLName) {}
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
};
@@ -1712,7 +1712,7 @@ public:
SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,
const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > &xAttrList);
+ const uno::Reference< xml::sax::XAttributeList > &xAttrList) SAL_OVERRIDE;
};
@@ -1726,10 +1726,10 @@ public:
SmXMLTableRowContext_Impl(rImport,nPrefix,rLName)
{}
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,
const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > &xAttrList);
+ const uno::Reference< xml::sax::XAttributeList > &xAttrList) SAL_OVERRIDE;
};
@@ -1755,7 +1755,7 @@ public:
{}
/*Don't do anything with alignment for now*/
- void EndElement()
+ void EndElement() SAL_OVERRIDE
{
}
};
@@ -1770,7 +1770,7 @@ public:
SmXMLRowContext_Impl(rImport,nPrefix,rLName)
{}
- void EndElement();
+ void EndElement() SAL_OVERRIDE;
};
@@ -1784,7 +1784,7 @@ public:
const OUString& rLName)
: SvXMLImportContext(rImport,nPrfx,rLName) {}
- virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList);
+ virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList) SAL_OVERRIDE;
};
SvXMLImportContext *SmXMLOfficeContext_Impl::CreateChildContext(sal_uInt16 nPrefix,
@@ -1823,7 +1823,7 @@ public:
virtual ~SmXMLFlatDocContext_Impl();
- virtual SvXMLImportContext *CreateChildContext(sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const uno::Reference<xml::sax::XAttributeList>& i_xAttrList);
+ virtual SvXMLImportContext *CreateChildContext(sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) SAL_OVERRIDE;
};
SmXMLFlatDocContext_Impl::SmXMLFlatDocContext_Impl( SmXMLImport& i_rImport,
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index 10f1fcfcd289..5b2d2476ffcf 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -92,17 +92,17 @@ public:
virtual ~SmXMLImport() throw ();
// XUnoTunnel
- sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
void SAL_CALL endDocument(void)
throw( ::com::sun::star::xml::sax::SAXException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
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;
SvXMLImportContext *CreateMathContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
const com::sun::star::uno::Reference <
@@ -256,8 +256,8 @@ public:
SAL_WARN_UNUSED_RESULT OUString GetText() { return aText; }
void SetText(const OUString &rStr) { aText = rStr; }
- 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>& aViewProps);
+ 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>& aViewProps) SAL_OVERRIDE;
};
diff --git a/starmath/source/ooxmlexport.hxx b/starmath/source/ooxmlexport.hxx
index 6e49de845e2d..0721e3fd8284 100644
--- a/starmath/source/ooxmlexport.hxx
+++ b/starmath/source/ooxmlexport.hxx
@@ -24,17 +24,17 @@ public:
SmOoxmlExport( const SmNode* pIn, oox::core::OoxmlVersion version );
bool ConvertFromStarMath( ::sax_fastparser::FSHelperPtr m_pSerializer );
private:
- virtual void HandleVerticalStack( const SmNode* pNode, int nLevel );
- virtual void HandleText( const SmNode* pNode, int nLevel );
- virtual void HandleFractions( const SmNode* pNode, int nLevel, const char* type = NULL );
- virtual void HandleRoot( const SmRootNode* pNode, int nLevel );
- virtual void HandleAttribute( const SmAttributNode* pNode, int nLevel );
- virtual void HandleOperator( const SmOperNode* pNode, int nLevel );
- virtual void HandleSubSupScriptInternal( const SmSubSupNode* pNode, int nLevel, int flags );
- virtual void HandleMatrix( const SmMatrixNode* pNode, int nLevel );
- virtual void HandleBrace( const SmBraceNode* pNode, int nLevel );
- virtual void HandleVerticalBrace( const SmVerticalBraceNode* pNode, int nLevel );
- virtual void HandleBlank();
+ virtual void HandleVerticalStack( const SmNode* pNode, int nLevel ) SAL_OVERRIDE;
+ virtual void HandleText( const SmNode* pNode, int nLevel ) SAL_OVERRIDE;
+ virtual void HandleFractions( const SmNode* pNode, int nLevel, const char* type = NULL ) SAL_OVERRIDE;
+ virtual void HandleRoot( const SmRootNode* pNode, int nLevel ) SAL_OVERRIDE;
+ virtual void HandleAttribute( const SmAttributNode* pNode, int nLevel ) SAL_OVERRIDE;
+ virtual void HandleOperator( const SmOperNode* pNode, int nLevel ) SAL_OVERRIDE;
+ virtual void HandleSubSupScriptInternal( const SmSubSupNode* pNode, int nLevel, int flags ) SAL_OVERRIDE;
+ virtual void HandleMatrix( const SmMatrixNode* pNode, int nLevel ) SAL_OVERRIDE;
+ virtual void HandleBrace( const SmBraceNode* pNode, int nLevel ) SAL_OVERRIDE;
+ virtual void HandleVerticalBrace( const SmVerticalBraceNode* pNode, int nLevel ) SAL_OVERRIDE;
+ virtual void HandleBlank() SAL_OVERRIDE;
::sax_fastparser::FSHelperPtr m_pSerializer;
oox::core::OoxmlVersion version;
};
diff --git a/starmath/source/rtfexport.hxx b/starmath/source/rtfexport.hxx
index 0ffde2ba57ad..0a3b0a100ed3 100644
--- a/starmath/source/rtfexport.hxx
+++ b/starmath/source/rtfexport.hxx
@@ -23,17 +23,17 @@ public:
SmRtfExport(const SmNode* pIn);
bool ConvertFromStarMath(OStringBuffer& rBuffer, rtl_TextEncoding nEncoding);
private:
- virtual void HandleVerticalStack(const SmNode* pNode, int nLevel);
- virtual void HandleText(const SmNode* pNode, int nLevel);
- virtual void HandleFractions(const SmNode* pNode, int nLevel, const char* type = NULL);
- virtual void HandleRoot(const SmRootNode* pNode, int nLevel);
- virtual void HandleAttribute(const SmAttributNode* pNode, int nLevel);
- virtual void HandleOperator(const SmOperNode* pNode, int nLevel);
- virtual void HandleSubSupScriptInternal(const SmSubSupNode* pNode, int nLevel, int flags);
- virtual void HandleMatrix(const SmMatrixNode* pNode, int nLevel);
- virtual void HandleBrace(const SmBraceNode* pNode, int nLevel);
- virtual void HandleVerticalBrace(const SmVerticalBraceNode* pNode, int nLevel);
- virtual void HandleBlank();
+ virtual void HandleVerticalStack(const SmNode* pNode, int nLevel) SAL_OVERRIDE;
+ virtual void HandleText(const SmNode* pNode, int nLevel) SAL_OVERRIDE;
+ virtual void HandleFractions(const SmNode* pNode, int nLevel, const char* type = NULL) SAL_OVERRIDE;
+ virtual void HandleRoot(const SmRootNode* pNode, int nLevel) SAL_OVERRIDE;
+ virtual void HandleAttribute(const SmAttributNode* pNode, int nLevel) SAL_OVERRIDE;
+ virtual void HandleOperator(const SmOperNode* pNode, int nLevel) SAL_OVERRIDE;
+ virtual void HandleSubSupScriptInternal(const SmSubSupNode* pNode, int nLevel, int flags) SAL_OVERRIDE;
+ virtual void HandleMatrix(const SmMatrixNode* pNode, int nLevel) SAL_OVERRIDE;
+ virtual void HandleBrace(const SmBraceNode* pNode, int nLevel) SAL_OVERRIDE;
+ virtual void HandleVerticalBrace(const SmVerticalBraceNode* pNode, int nLevel) SAL_OVERRIDE;
+ virtual void HandleBlank() SAL_OVERRIDE;
OStringBuffer* m_pBuffer;
rtl_TextEncoding m_nEncoding;
diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx
index 7339f4d4d4a4..7c0868b39b35 100644
--- a/starmath/source/smdetect.hxx
+++ b/starmath/source/smdetect.hxx
@@ -62,7 +62,7 @@ public:
// 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