summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 16:37:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 16:39:26 +0100
commit70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch)
treea70f4957c454b443520cbf91250c41d9eea80017 /editeng
parent8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff)
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
Diffstat (limited to 'editeng')
-rw-r--r--editeng/qa/unit/core-test.cxx20
-rw-r--r--editeng/source/accessibility/AccessibleHyperlink.hxx18
-rw-r--r--editeng/source/editeng/editattr.hxx44
-rw-r--r--editeng/source/editeng/editdoc.hxx2
-rw-r--r--editeng/source/editeng/editsel.hxx14
-rw-r--r--editeng/source/editeng/editundo.hxx50
-rw-r--r--editeng/source/editeng/edtspell.hxx36
-rw-r--r--editeng/source/editeng/eehtml.hxx2
-rw-r--r--editeng/source/editeng/eeobj.hxx12
-rw-r--r--editeng/source/editeng/eertfpar.hxx32
-rw-r--r--editeng/source/editeng/impedit.hxx14
-rw-r--r--editeng/source/editeng/textconv.hxx8
-rw-r--r--editeng/source/items/svxfont.cxx8
-rw-r--r--editeng/source/misc/SvXMLAutoCorrectExport.hxx16
-rw-r--r--editeng/source/misc/SvXMLAutoCorrectImport.hxx8
-rw-r--r--editeng/source/misc/unolingu.cxx28
-rw-r--r--editeng/source/outliner/outleeng.hxx34
-rw-r--r--editeng/source/outliner/outlundo.hxx20
-rw-r--r--editeng/source/uno/unonrule.cxx2
-rw-r--r--editeng/source/xml/editsource.hxx6
-rw-r--r--editeng/source/xml/xmltxtexp.cxx44
-rw-r--r--editeng/source/xml/xmltxtimp.cxx2
22 files changed, 210 insertions, 210 deletions
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 87dfd7839780..fb3d354e7b5d 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -39,8 +39,8 @@ class Test : public test::BootstrapFixture
public:
Test();
- virtual void setUp();
- virtual void tearDown();
+ virtual void setUp() SAL_OVERRIDE;
+ virtual void tearDown() SAL_OVERRIDE;
void testConstruction();
@@ -234,47 +234,47 @@ public:
private:
OUString & m_rText;
LanguageType m_eLang;
- virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd )
+ virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ) SAL_OVERRIDE
{
//fprintf(stderr, "TestAutoCorrDoc::Delete\n");
m_rText = m_rText.replaceAt(nStt, nEnd-nStt, "");
return true;
}
- virtual bool Insert( sal_Int32 nPos, const OUString& rTxt )
+ virtual bool Insert( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE
{
//fprintf(stderr, "TestAutoCorrDoc::Insert\n");
m_rText = m_rText.replaceAt(nPos, 0, rTxt);
return true;
}
- virtual bool Replace( sal_Int32 nPos, const OUString& rTxt )
+ virtual bool Replace( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE
{
//fprintf(stderr, "TestAutoCorrDoc::Replace\n");
return ReplaceRange( nPos, rTxt.getLength(), rTxt );
}
- virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt )
+ virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt ) SAL_OVERRIDE
{
//fprintf(stderr, "TestAutoCorrDoc::ReplaceRange %d %d %s\n", nPos, nLen, OUStringToOString(rTxt, RTL_TEXTENCODING_UTF8).getStr());
m_rText = m_rText.replaceAt(nPos, nLen, rTxt);
return true;
}
- virtual bool SetAttr( sal_Int32, sal_Int32, sal_uInt16, SfxPoolItem& )
+ virtual bool SetAttr( sal_Int32, sal_Int32, sal_uInt16, SfxPoolItem& ) SAL_OVERRIDE
{
//fprintf(stderr, "TestAutoCorrDoc::SetAttr\n");
return true;
}
- virtual bool SetINetAttr( sal_Int32, sal_Int32, const OUString& )
+ virtual bool SetINetAttr( sal_Int32, sal_Int32, const OUString& ) SAL_OVERRIDE
{
//fprintf(stderr, "TestAutoCorrDoc::SetINetAttr\n");
return true;
}
- virtual OUString const* GetPrevPara(bool)
+ virtual OUString const* GetPrevPara(bool) SAL_OVERRIDE
{
//fprintf(stderr, "TestAutoCorrDoc::GetPrevPara\n");
return 0;
}
virtual bool ChgAutoCorrWord( sal_Int32& rSttPos,
sal_Int32 nEndPos, SvxAutoCorrect& rACorrect,
- OUString* pPara )
+ OUString* pPara ) SAL_OVERRIDE
{
//fprintf(stderr, "TestAutoCorrDoc::ChgAutoCorrWord\n");
diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx b/editeng/source/accessibility/AccessibleHyperlink.hxx
index 28bdc2f1e4f0..e3cd8a3bb5ea 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.hxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.hxx
@@ -51,17 +51,17 @@ namespace accessibility
~AccessibleHyperlink();
// XAccessibleAction
- virtual sal_Int32 SAL_CALL getAccessibleActionCount() throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Int32 SAL_CALL getAccessibleActionCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) 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::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleHyperlink
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getStartIndex() throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getEndIndex() throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL isValid() throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getStartIndex() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getEndIndex() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL isValid() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
} // end of namespace accessibility
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index baae4592aec8..f958b9008a7a 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -152,7 +152,7 @@ class EditCharAttribFont: public EditCharAttrib
public:
EditCharAttribFont( const SvxFontItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -163,7 +163,7 @@ class EditCharAttribWeight : public EditCharAttrib
public:
EditCharAttribWeight( const SvxWeightItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
// class EditCharAttribItalic
@@ -173,7 +173,7 @@ class EditCharAttribItalic : public EditCharAttrib
public:
EditCharAttribItalic( const SvxPostureItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -184,7 +184,7 @@ class EditCharAttribShadow : public EditCharAttrib
public:
EditCharAttribShadow( const SvxShadowedItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -195,7 +195,7 @@ class EditCharAttribEscapement : public EditCharAttrib
public:
EditCharAttribEscapement( const SvxEscapementItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -206,7 +206,7 @@ class EditCharAttribOutline : public EditCharAttrib
public:
EditCharAttribOutline( const SvxContourItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -217,7 +217,7 @@ class EditCharAttribStrikeout : public EditCharAttrib
public:
EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -228,7 +228,7 @@ class EditCharAttribCaseMap : public EditCharAttrib
public:
EditCharAttribCaseMap( const SvxCaseMapItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -239,7 +239,7 @@ class EditCharAttribUnderline : public EditCharAttrib
public:
EditCharAttribUnderline( const SvxUnderlineItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -250,7 +250,7 @@ class EditCharAttribOverline : public EditCharAttrib
public:
EditCharAttribOverline( const SvxOverlineItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -261,7 +261,7 @@ class EditCharAttribEmphasisMark : public EditCharAttrib
public:
EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -272,7 +272,7 @@ class EditCharAttribRelief : public EditCharAttrib
public:
EditCharAttribRelief( const SvxCharReliefItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -283,7 +283,7 @@ class EditCharAttribFontHeight : public EditCharAttrib
public:
EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -294,7 +294,7 @@ class EditCharAttribFontWidth : public EditCharAttrib
public:
EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -305,7 +305,7 @@ class EditCharAttribColor : public EditCharAttrib
public:
EditCharAttribColor( const SvxColorItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -316,7 +316,7 @@ class EditCharAttribLanguage : public EditCharAttrib
public:
EditCharAttribLanguage( const SvxLanguageItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -327,7 +327,7 @@ class EditCharAttribTab : public EditCharAttrib
public:
EditCharAttribTab( const SfxVoidItem& rAttr, sal_uInt16 nPos );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -338,7 +338,7 @@ class EditCharAttribLineBreak : public EditCharAttrib
public:
EditCharAttribLineBreak( const SfxVoidItem& rAttr, sal_uInt16 nPos );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -361,7 +361,7 @@ public:
bool operator != ( const EditCharAttribField& rAttr ) const
{ return !(operator == ( rAttr ) ); }
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
Color*& GetTxtColor() { return pTxtColor; }
Color*& GetFldColor() { return pFldColor; }
@@ -379,7 +379,7 @@ class EditCharAttribPairKerning : public EditCharAttrib
public:
EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -390,7 +390,7 @@ class EditCharAttribKerning : public EditCharAttrib
public:
EditCharAttribKerning( const SvxKerningItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
@@ -401,7 +401,7 @@ class EditCharAttribWordLineMode: public EditCharAttrib
public:
EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
- virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
+ virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
};
// class EditCharAttribGrabBag
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 4dc702b3ff6e..bf5ba05357a9 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -852,7 +852,7 @@ protected:
virtual ~EditEngineItemPool();
public:
- virtual SvStream& Store( SvStream& rStream ) const;
+ virtual SvStream& Store( SvStream& rStream ) const SAL_OVERRIDE;
};
#endif // INCLUDED_EDITENG_SOURCE_EDITENG_EDITDOC_HXX
diff --git a/editeng/source/editeng/editsel.hxx b/editeng/source/editeng/editsel.hxx
index 3000b82f8515..ee785817e4a1 100644
--- a/editeng/source/editeng/editsel.hxx
+++ b/editeng/source/editeng/editsel.hxx
@@ -32,16 +32,16 @@ private:
public:
EditSelFunctionSet();
- virtual void BeginDrag();
+ virtual void BeginDrag() SAL_OVERRIDE;
- virtual void CreateAnchor();
- virtual void DestroyAnchor();
+ virtual void CreateAnchor() SAL_OVERRIDE;
+ virtual void DestroyAnchor() SAL_OVERRIDE;
- virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false );
+ virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ) SAL_OVERRIDE;
- virtual bool IsSelectionAtPoint( const Point& rPointPixel );
- virtual void DeselectAtPoint( const Point& rPointPixel );
- virtual void DeselectAll();
+ virtual bool IsSelectionAtPoint( const Point& rPointPixel ) SAL_OVERRIDE;
+ virtual void DeselectAtPoint( const Point& rPointPixel ) SAL_OVERRIDE;
+ virtual void DeselectAll() SAL_OVERRIDE;
void SetCurView( EditView* pView ) { pCurView = pView; }
};
diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx
index 1541878b4282..9152b5d60b0e 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -42,8 +42,8 @@ public:
EditUndoDelContent(EditEngine* pEE, ContentNode* pNode, sal_Int32 nPortion);
virtual ~EditUndoDelContent();
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
};
@@ -71,8 +71,8 @@ public:
const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, bool bBackward);
virtual ~EditUndoConnectParas();
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
};
@@ -88,8 +88,8 @@ public:
EditUndoSplitPara(EditEngine* pEE, sal_Int32 nNode, sal_uInt16 nSepPos);
~EditUndoSplitPara();
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
};
@@ -107,10 +107,10 @@ public:
const EPaM& GetEPaM() { return aEPaM; }
OUString GetStr() const { return aText; }
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
- virtual bool Merge( SfxUndoAction *pNextAction );
+ virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE;
};
@@ -128,8 +128,8 @@ public:
const EPaM& GetEPaM() { return aEPaM; }
OUString GetStr() const { return aText; }
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
};
@@ -145,8 +145,8 @@ public:
EditUndoInsertFeature(EditEngine* pEE, const EPaM& rEPaM, const SfxPoolItem& rFeature);
virtual ~EditUndoInsertFeature();
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
};
@@ -162,8 +162,8 @@ public:
EditUndoMoveParagraphs(EditEngine* pEE, const Range& rParas, sal_Int32 nDest);
virtual ~EditUndoMoveParagraphs();
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
};
@@ -186,8 +186,8 @@ public:
const SfxItemSet& rPrevParaAttribs);
virtual ~EditUndoSetStyleSheet();
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
};
@@ -204,8 +204,8 @@ public:
EditUndoSetParaAttribs(EditEngine* pEE, sal_Int32 nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems);
virtual ~EditUndoSetParaAttribs();
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
};
@@ -239,8 +239,8 @@ public:
void SetRemoveParaAttribs( sal_Bool b ) { bRemoveParaAttribs = b; }
void SetRemoveWhich( sal_uInt16 n ) { nRemoveWhich = n; }
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
void AppendContentInfo(ContentAttribsInfo* pNew);
};
@@ -266,8 +266,8 @@ public:
void SetText( EditTextObject* pObj ) { pTxtObj = pObj; }
void SetNewSelection( const ESelection& rSel ) { aNewESel = rSel; }
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
};
@@ -282,8 +282,8 @@ public:
EditUndoMarkSelection(EditEngine* pEE, const ESelection& rSel);
virtual ~EditUndoMarkSelection();
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
};
diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx
index 8d47f8c0d067..5e30f9986bdc 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -45,16 +45,16 @@ private:
void CheckSpellTo();
protected:
- virtual void SpellStart( SvxSpellArea eArea );
- virtual bool SpellContinue(); // Check area
- virtual void ReplaceAll( const OUString &rNewText, sal_Int16 nLanguage );
- virtual void SpellEnd();
- virtual bool SpellMore();
- virtual bool HasOtherCnt();
- virtual void ScrollArea();
- virtual void ChangeWord( const OUString& rNewWord, const sal_uInt16 nLang );
- virtual void ChangeThesWord( const OUString& rNewWord );
- virtual void AutoCorrect( const OUString& rOldWord, const OUString& rNewWord );
+ virtual void SpellStart( SvxSpellArea eArea ) SAL_OVERRIDE;
+ virtual bool SpellContinue() SAL_OVERRIDE; // Check area
+ virtual void ReplaceAll( const OUString &rNewText, sal_Int16 nLanguage ) SAL_OVERRIDE;
+ virtual void SpellEnd() SAL_OVERRIDE;
+ virtual bool SpellMore() SAL_OVERRIDE;
+ virtual bool HasOtherCnt() SAL_OVERRIDE;
+ virtual void ScrollArea() SAL_OVERRIDE;
+ virtual void ChangeWord( const OUString& rNewWord, const sal_uInt16 nLang ) SAL_OVERRIDE;
+ virtual void ChangeThesWord( const OUString& rNewWord ) SAL_OVERRIDE;
+ virtual void AutoCorrect( const OUString& rOldWord, const OUString& rNewWord ) SAL_OVERRIDE;
public:
EditSpellWrapper( Window* pWin,
@@ -139,20 +139,20 @@ public:
EdtAutoCorrDoc(EditEngine* pE, ContentNode* pCurNode, sal_uInt16 nCrsr, sal_Unicode cIns);
~EdtAutoCorrDoc();
- virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd );
- virtual bool Insert( sal_Int32 nPos, const OUString& rTxt );
- virtual bool Replace( sal_Int32 nPos, const OUString& rTxt );
- virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt );
+ virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ) SAL_OVERRIDE;
+ virtual bool Insert( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE;
+ virtual bool Replace( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE;
+ virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt ) SAL_OVERRIDE;
- virtual bool SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId, SfxPoolItem& );
- virtual bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL );
+ virtual bool SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId, SfxPoolItem& ) SAL_OVERRIDE;
+ virtual bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ) SAL_OVERRIDE;
virtual OUString const* GetPrevPara(bool bAtNormalPos) SAL_OVERRIDE;
virtual bool ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
- SvxAutoCorrect& rACorrect, OUString* pPara );
+ SvxAutoCorrect& rACorrect, OUString* pPara ) SAL_OVERRIDE;
- virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara = false ) const;
+ virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara = false ) const SAL_OVERRIDE;
sal_uInt16 GetCursor() const { return nCursor; }
diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx
index 589be36c0b0e..1ea44e8c73d3 100644
--- a/editeng/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -66,7 +66,7 @@ private:
void ImpSetStyleSheet( sal_uInt16 nHeadingLevel );
protected:
- virtual void NextToken( int nToken );
+ virtual void NextToken( int nToken ) SAL_OVERRIDE;
public:
EditHTMLParser(SvStream& rIn, const OUString& rBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs);
diff --git a/editeng/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx
index 19ab97e8dd0a..bee1397c584c 100644
--- a/editeng/source/editeng/eeobj.hxx
+++ b/editeng/source/editeng/eeobj.hxx
@@ -47,14 +47,14 @@ public:
// ::com::sun::star::uno::XInterface
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
- void SAL_CALL release() throw() { OWeakObject::release(); }
+ ::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;
+ void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); }
+ void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); }
// ::com::sun::star::datatransfer::XTransferable
- ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
- ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif // INCLUDED_EDITENG_SOURCE_EDITENG_EEOBJ_HXX
diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index df7d7d791338..ebca3e6aefeb 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -35,8 +35,8 @@ private:
public:
EditNodeIdx(EditEngine* pEE, ContentNode* pNd = NULL);
- virtual sal_Int32 GetIdx() const;
- virtual SvxNodeIdx* Clone() const;
+ virtual sal_Int32 GetIdx() const SAL_OVERRIDE;
+ virtual SvxNodeIdx* Clone() const SAL_OVERRIDE;
ContentNode* GetNode() { return mpNode; }
};
@@ -49,14 +49,14 @@ private:
public:
EditPosition(EditEngine* pIEE, EditSelection* pSel);
- virtual sal_Int32 GetNodeIdx() const;
- virtual sal_Int32 GetCntIdx() const;
+ virtual sal_Int32 GetNodeIdx() const SAL_OVERRIDE;
+ virtual sal_Int32 GetCntIdx() const SAL_OVERRIDE;
// clone
- virtual SvxPosition* Clone() const;
+ virtual SvxPosition* Clone() const SAL_OVERRIDE;
// clone NodeIndex
- virtual SvxNodeIdx* MakeNodeIdx() const;
+ virtual SvxNodeIdx* MakeNodeIdx() const SAL_OVERRIDE;
};
#define ACTION_INSERTTEXT 1
@@ -77,17 +77,17 @@ private:
sal_uInt8 nLastAction;
protected:
- virtual void InsertPara();
- virtual void InsertText();
- virtual void MovePos( int bForward = sal_True );
+ virtual void InsertPara() SAL_OVERRIDE;
+ virtual void InsertText() SAL_OVERRIDE;
+ virtual void MovePos( int bForward = sal_True ) SAL_OVERRIDE;
virtual void SetEndPrevPara( SvxNodeIdx*& rpNodePos,
- sal_Int32& rCntPos );
+ sal_Int32& rCntPos ) SAL_OVERRIDE;
- virtual void UnknownAttrToken( int nToken, SfxItemSet* pSet );
- virtual void NextToken( int nToken );
- virtual void SetAttrInDoc( SvxRTFItemStackType &rSet );
- virtual bool IsEndPara( SvxNodeIdx* pNd, sal_Int32 nCnt ) const;
- virtual void CalcValue();
+ virtual void UnknownAttrToken( int nToken, SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual void NextToken( int nToken ) SAL_OVERRIDE;
+ virtual void SetAttrInDoc( SvxRTFItemStackType &rSet ) SAL_OVERRIDE;
+ virtual bool IsEndPara( SvxNodeIdx* pNd, sal_Int32 nCnt ) const SAL_OVERRIDE;
+ virtual void CalcValue() SAL_OVERRIDE;
void CreateStyleSheets();
SfxStyleSheet* CreateStyleSheet( SvxRTFStyleType* pRTFStyle );
SvxRTFStyleType* FindStyleSheet( const OUString& rName );
@@ -99,7 +99,7 @@ public:
EditRTFParser(SvStream& rIn, EditSelection aCurSel, SfxItemPool& rAttrPool, EditEngine* pEditEngine);
~EditRTFParser();
- virtual SvParserState CallParser();
+ virtual SvParserState CallParser() SAL_OVERRIDE;
void SetDestCharSet( rtl_TextEncoding eCharSet ) { eDestCharSet = eCharSet; }
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 6c98f3e18773..16362d0afa6e 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -247,18 +247,18 @@ protected:
// DragAndDropClient
void dragGestureRecognized(const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge)
throw (::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde )
throw (::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
void drop(const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde)
throw (::com::sun::star::uno::RuntimeException,
- std::exception);
- void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ std::exception) SAL_OVERRIDE;
+ void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void dragOver(const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde)
throw (::com::sun::star::uno::RuntimeException,
- std::exception);
+ std::exception) SAL_OVERRIDE;
void ShowDDCursor( const Rectangle& rRect );
void HideDDCursor();
@@ -684,7 +684,7 @@ private:
ParaPortionList& GetParaPortions() { return aParaPortionList; }
protected:
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
public:
~ImpEditEngine();
diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx
index db7841cc9c0d..a3afc6063722 100644
--- a/editeng/source/editeng/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -75,18 +75,18 @@ class TextConvWrapper : public editeng::HangulHanjaConversion
protected:
virtual void GetNextPortion( OUString& /* [out] */ rNextPortion,
LanguageType& /* [out] */ rLangOfPortion,
- bool /* [in] */ _bAllowImplicitChangesForNotConvertibleText );
+ bool /* [in] */ _bAllowImplicitChangesForNotConvertibleText ) SAL_OVERRIDE;
virtual void HandleNewUnit( const sal_Int32 nUnitStart,
- const sal_Int32 nUnitEnd );
+ const sal_Int32 nUnitEnd ) SAL_OVERRIDE;
virtual void ReplaceUnit(
const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd,
const OUString& rOrigText,
const OUString& rReplaceWith,
const ::com::sun::star::uno::Sequence< sal_Int32 > &rOffsets,
ReplacementAction eAction,
- LanguageType *pNewUnitLanguage );
+ LanguageType *pNewUnitLanguage ) SAL_OVERRIDE;
- virtual bool HasRubySupport() const;
+ virtual bool HasRubySupport() const SAL_OVERRIDE;
void SetLanguageAndFont( const ESelection &rESel,
LanguageType nLang, sal_uInt16 nLangWhichId,
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 5c1c91339cbd..ec69a0dd4e1e 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -600,7 +600,7 @@ public:
virtual ~SvxDoGetCapitalSize() {}
virtual void Do( const OUString &rTxt, const sal_Int32 nIdx,
- const sal_Int32 nLen, const sal_Bool bUpper );
+ const sal_Int32 nLen, const sal_Bool bUpper ) SAL_OVERRIDE;
const Size &GetSize() const { return aTxtSize; };
};
@@ -663,10 +663,10 @@ public:
aSpacePos( rPos ),
nKern( nKrn )
{ }
- virtual void DoSpace( const sal_Bool bDraw );
- virtual void SetSpace();
+ virtual void DoSpace( const sal_Bool bDraw ) SAL_OVERRIDE;
+ virtual void SetSpace() SAL_OVERRIDE;
virtual void Do( const OUString &rTxt, const sal_Int32 nIdx,
- const sal_Int32 nLen, const sal_Bool bUpper );
+ const sal_Int32 nLen, const sal_Bool bUpper ) SAL_OVERRIDE;
};
void SvxDoDrawCapital::DoSpace( const sal_Bool bDraw )
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
index a286e784a837..62ce537b1e6d 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
@@ -37,10 +37,10 @@ public:
com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler);
virtual ~SvXMLAutoCorrectExport ( void ) {}
- sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass);
- void _ExportAutoStyles() {}
- void _ExportMasterStyles () {}
- void _ExportContent() {}
+ sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE;
+ void _ExportAutoStyles() SAL_OVERRIDE {}
+ void _ExportMasterStyles () SAL_OVERRIDE {}
+ void _ExportContent() SAL_OVERRIDE {}
};
class SvStringsISortDtor;
@@ -57,10 +57,10 @@ public:
com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler);
virtual ~SvXMLExceptionListExport ( void ) {}
- sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass);
- void _ExportAutoStyles() {}
- void _ExportMasterStyles () {}
- void _ExportContent() {}
+ sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE;
+ void _ExportAutoStyles() SAL_OVERRIDE {}
+ void _ExportMasterStyles () SAL_OVERRIDE {}
+ void _ExportContent() SAL_OVERRIDE {}
};
#endif
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
index 4bc7589063e6..ac88beec89de 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
@@ -35,7 +35,7 @@ protected:
virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
public:
SvxAutocorrWordList *pAutocorr_List;
SvxAutoCorrect &rAutoCorrect;
@@ -63,7 +63,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
~SvXMLWordListContext ( void );
};
@@ -90,7 +90,7 @@ protected:
virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
public:
SvStringsISortDtor &rList;
@@ -114,7 +114,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
~SvXMLExceptionListContext ( void );
};
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 5746459817b0..f2c8c48ed6d3 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -90,10 +90,10 @@ public:
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::lang::Locale > SAL_CALL
getLocales()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL
hasLocale( const ::com::sun::star::lang::Locale& rLocale )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XThesaurus
virtual ::com::sun::star::uno::Sequence<
@@ -103,7 +103,7 @@ public:
const ::com::sun::star::lang::Locale& rLocale,
const ::com::sun::star::beans::PropertyValues& rProperties )
throw(::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -216,23 +216,23 @@ public:
// XSupportedLanguages (for XSpellChecker1)
virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL
getLanguages()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL
hasLanguage( sal_Int16 nLanguage )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XSpellChecker1 (same as XSpellChecker but sal_Int16 for language)
virtual sal_Bool SAL_CALL
isValid( const OUString& rWord, sal_Int16 nLanguage,
const ::com::sun::star::beans::PropertyValues& rProperties )
throw(::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL
spell( const OUString& rWord, sal_Int16 nLanguage,
const ::com::sun::star::beans::PropertyValues& rProperties )
throw(::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -314,10 +314,10 @@ public:
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::lang::Locale > SAL_CALL
getLocales()
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL
hasLocale( const ::com::sun::star::lang::Locale& rLocale )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XHyphenator
virtual ::com::sun::star::uno::Reference<
@@ -327,7 +327,7 @@ public:
sal_Int16 nMaxLeading,
const ::com::sun::star::beans::PropertyValues& rProperties )
throw(::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL
queryAlternativeSpelling( const OUString& rWord,
@@ -335,7 +335,7 @@ public:
sal_Int16 nIndex,
const ::com::sun::star::beans::PropertyValues& rProperties )
throw(::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL
createPossibleHyphens(
@@ -343,7 +343,7 @@ public:
const ::com::sun::star::lang::Locale& rLocale,
const ::com::sun::star::beans::PropertyValues& rProperties )
throw(::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -447,7 +447,7 @@ public:
// lang::XEventListener
virtual void SAL_CALL disposing(const EventObject& rSource)
- throw( RuntimeException, std::exception );
+ throw( RuntimeException, std::exception ) SAL_OVERRIDE;
};
LinguMgrAppExitLstnr::LinguMgrAppExitLstnr()
@@ -485,7 +485,7 @@ void LinguMgrAppExitLstnr::disposing(const EventObject& rSource)
class LinguMgrExitLstnr : public LinguMgrAppExitLstnr
{
public:
- virtual void AtExit();
+ virtual void AtExit() SAL_OVERRIDE;
};
void LinguMgrExitLstnr::AtExit()
diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx
index 5798e8e657c1..6785881acb3f 100644
--- a/editeng/source/outliner/outleeng.hxx
+++ b/editeng/source/outliner/outleeng.hxx
@@ -32,17 +32,17 @@ protected:
// derived from EditEngine. Allows Outliner objetcs to provide
// bullet access to the EditEngine.
- virtual const SvxNumberFormat* GetNumberFormat( sal_Int32 nPara ) const;
+ virtual const SvxNumberFormat* GetNumberFormat( sal_Int32 nPara ) const SAL_OVERRIDE;
public:
OutlinerEditEng( Outliner* pOwner, SfxItemPool* pPool );
~OutlinerEditEng();
- virtual void PaintingFirstLine( sal_Int32 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
+ virtual void PaintingFirstLine( sal_Int32 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev ) SAL_OVERRIDE;
- virtual void ParagraphInserted( sal_Int32 nNewParagraph );
- virtual void ParagraphDeleted( sal_Int32 nDeletedParagraph );
- virtual void ParagraphConnected( sal_Int32 nLeftParagraph, sal_Int32 nRightParagraph );
+ virtual void ParagraphInserted( sal_Int32 nNewParagraph ) SAL_OVERRIDE;
+ virtual void ParagraphDeleted( sal_Int32 nDeletedParagraph ) SAL_OVERRIDE;
+ virtual void ParagraphConnected( sal_Int32 nLeftParagraph, sal_Int32 nRightParagraph ) SAL_OVERRIDE;
virtual void DrawingText(
const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, const sal_Int32* pDXArray, const SvxFont& rFont,
@@ -54,7 +54,7 @@ public:
bool bEndOfBullet,
const ::com::sun::star::lang::Locale* pLocale,
const Color& rOverlineColor,
- const Color& rTextLineColor);
+ const Color& rTextLineColor) SAL_OVERRIDE;
virtual void DrawingTab(
const Point& rStartPos, long nWidth, const OUString& rChar,
@@ -62,23 +62,23 @@ public:
bool bEndOfLine,
bool bEndOfParagraph,
const Color& rOverlineColor,
- const Color& rTextLineColor);
+ const Color& rTextLineColor) SAL_OVERRIDE;
- virtual void StyleSheetChanged( SfxStyleSheet* pStyle );
- virtual void ParaAttribsChanged( sal_Int32 nPara );
- virtual bool SpellNextDocument();
- virtual OUString GetUndoComment( sal_uInt16 nUndoId ) const;
+ virtual void StyleSheetChanged( SfxStyleSheet* pStyle ) SAL_OVERRIDE;
+ virtual void ParaAttribsChanged( sal_Int32 nPara ) SAL_OVERRIDE;
+ virtual bool SpellNextDocument() SAL_OVERRIDE;
+ virtual OUString GetUndoComment( sal_uInt16 nUndoId ) const SAL_OVERRIDE;
// for text conversion
- virtual bool ConvertNextDocument();
+ virtual bool ConvertNextDocument() SAL_OVERRIDE;
- virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
- virtual 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 );
+ virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) SAL_OVERRIDE;
+ virtual void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) SAL_OVERRIDE;
+ virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ) SAL_OVERRIDE;
- virtual Rectangle GetBulletArea( sal_Int32 nPara );
+ virtual Rectangle GetBulletArea( sal_Int32 nPara ) SAL_OVERRIDE;
- virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet );
+ virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE;
// belongs into class Outliner, move there before incompatible update!
Link aOutlinerNotifyHdl;
diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx
index 70952bfa84e1..ca622f03ef59 100644
--- a/editeng/source/outliner/outlundo.hxx
+++ b/editeng/source/outliner/outlundo.hxx
@@ -47,8 +47,8 @@ private:
public:
OutlinerUndoChangeParaFlags( Outliner* pOutliner, sal_Int32 nPara, sal_uInt16 nOldDepth, sal_uInt16 nNewDepth );
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
};
class OutlinerUndoChangeParaNumberingRestart : public OutlinerUndoBase
@@ -71,8 +71,8 @@ public:
sal_Int16 nOldNumberingStartValue, sal_Int16 mnNewNumberingStartValue,
sal_Bool nOldbParaIsNumberingRestart, sal_Bool nbNewParaIsNumberingRestart );
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
};
class OutlinerUndoChangeDepth : public OutlinerUndoBase
@@ -86,8 +86,8 @@ private:
public:
OutlinerUndoChangeDepth( Outliner* pOutliner, sal_Int32 nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth );
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
virtual void Repeat();
};
@@ -103,8 +103,8 @@ private:
public:
OutlinerUndoCheckPara( Outliner* pOutliner, sal_Int32 nPara );
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
virtual void Repeat();
};
@@ -120,8 +120,8 @@ class OLUndoExpand : public EditUndo
public:
OLUndoExpand( Outliner* pOut, sal_uInt16 nId );
~OLUndoExpand();
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
virtual void Repeat();
sal_uInt16* pParas; // 0 == nCount contains paragraph number
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 8a1f27dc62dd..2898d914b6c8 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -494,7 +494,7 @@ com::sun::star::uno::Reference< com::sun::star::container::XIndexReplace > SvxCr
class SvxUnoNumberingRulesCompare : public ::cppu::WeakAggImplHelper1< XAnyCompare >
{
public:
- virtual sal_Int16 SAL_CALL compare( const Any& Any1, const Any& Any2 ) throw(RuntimeException, std::exception);
+ virtual sal_Int16 SAL_CALL compare( const Any& Any1, const Any& Any2 ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
};
sal_Int16 SAL_CALL SvxUnoNumberingRulesCompare::compare( const Any& Any1, const Any& Any2 ) throw(RuntimeException, std::exception)
diff --git a/editeng/source/xml/editsource.hxx b/editeng/source/xml/editsource.hxx
index 990e46234901..bc5f12f5abd3 100644
--- a/editeng/source/xml/editsource.hxx
+++ b/editeng/source/xml/editsource.hxx
@@ -31,9 +31,9 @@ public:
SvxEditEngineSource( EditEngine* pEditEngine );
virtual ~SvxEditEngineSource();
- virtual SvxEditSource* Clone() const;
- virtual SvxTextForwarder* GetTextForwarder();
- virtual void UpdateData();
+ virtual SvxEditSource* Clone() const SAL_OVERRIDE;
+ virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE;
+ virtual void UpdateData() SAL_OVERRIDE;
private:
SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl );
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 91a1a86c4cae..94f91c6aec13 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -184,33 +184,33 @@ public:
// XMultiServiceFactory
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XStyleFamiliesSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAnyCompareFactory
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XModel
- virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL lockControllers( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL unlockControllers( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL hasControllersLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL getCurrentController( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setCurrentController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getCurrentSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL lockControllers( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL unlockControllers( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL hasControllersLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL getCurrentController( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setCurrentController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getCurrentSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent
- virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -355,9 +355,9 @@ public:
~SvxXMLTextExportComponent();
// methods without content:
- virtual void _ExportAutoStyles();
- virtual void _ExportMasterStyles();
- virtual void _ExportContent();
+ virtual void _ExportAutoStyles() SAL_OVERRIDE;
+ virtual void _ExportMasterStyles() SAL_OVERRIDE;
+ virtual void _ExportContent() SAL_OVERRIDE;
private:
com::sun::star::uno::Reference< com::sun::star::text::XText > mxText;
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index bfa422ab70c3..0761c6e26d72 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -60,7 +60,7 @@ public:
SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, const uno::Reference< XText >& xText );
virtual ~SvxXMLTextImportContext();
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList );
+ virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) SAL_OVERRIDE;
// SvxXMLXTableImport& getImport() const { return *(SvxXMLXTableImport*)&GetImport(); }