summaryrefslogtreecommitdiff
path: root/editeng/source/outliner
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/source/outliner
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/source/outliner')
-rw-r--r--editeng/source/outliner/outleeng.hxx34
-rw-r--r--editeng/source/outliner/outlundo.hxx20
2 files changed, 27 insertions, 27 deletions
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