summaryrefslogtreecommitdiff
path: root/include/editeng/flditem.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /include/editeng/flditem.hxx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/editeng/flditem.hxx')
-rw-r--r--include/editeng/flditem.hxx76
1 files changed, 38 insertions, 38 deletions
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index 9096590f0e6d..88bb8009b31b 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -81,10 +81,10 @@ public:
SvxFieldItem( const SvxFieldItem& rItem );
virtual ~SvxFieldItem();
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVer ) const SAL_OVERRIDE;
- virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVer ) const override;
+ virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override;
const SvxFieldData* GetField() const { return pField; }
static SvClassManager& GetClassManager();
@@ -135,10 +135,10 @@ public:
OUString GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const;
static OUString GetFormatted( Date& rDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage );
- virtual SvxFieldData* Clone() const SAL_OVERRIDE;
- virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE;
+ virtual SvxFieldData* Clone() const override;
+ virtual bool operator==( const SvxFieldData& ) const override;
- virtual MetaAction* createBeginComment() const SAL_OVERRIDE;
+ virtual MetaAction* createBeginComment() const override;
};
@@ -173,10 +173,10 @@ public:
SvxURLFormat GetFormat() const { return eFormat; }
void SetFormat( SvxURLFormat eFmt ) { eFormat = eFmt; }
- virtual SvxFieldData* Clone() const SAL_OVERRIDE;
- virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE;
+ virtual SvxFieldData* Clone() const override;
+ virtual bool operator==( const SvxFieldData& ) const override;
- virtual MetaAction* createBeginComment() const SAL_OVERRIDE;
+ virtual MetaAction* createBeginComment() const override;
};
class EDITENG_DLLPUBLIC SvxPageField : public SvxFieldData
@@ -185,10 +185,10 @@ public:
SV_DECL_PERSIST1( SvxPageField, SvxFieldData, com::sun::star::text::textfield::Type::PAGE )
SvxPageField();
- virtual SvxFieldData* Clone() const SAL_OVERRIDE;
- virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE;
+ virtual SvxFieldData* Clone() const override;
+ virtual bool operator==( const SvxFieldData& ) const override;
- virtual MetaAction* createBeginComment() const SAL_OVERRIDE;
+ virtual MetaAction* createBeginComment() const override;
};
class EDITENG_DLLPUBLIC SvxPageTitleField : public SvxFieldData
@@ -197,10 +197,10 @@ public:
SV_DECL_PERSIST1( SvxPageTitleField, SvxFieldData, com::sun::star::text::textfield::Type::PAGE_NAME )
SvxPageTitleField();
- virtual SvxFieldData* Clone() const SAL_OVERRIDE;
- virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE;
+ virtual SvxFieldData* Clone() const override;
+ virtual bool operator==( const SvxFieldData& ) const override;
- virtual MetaAction* createBeginComment() const SAL_OVERRIDE;
+ virtual MetaAction* createBeginComment() const override;
};
class EDITENG_DLLPUBLIC SvxPagesField : public SvxFieldData
@@ -209,8 +209,8 @@ public:
SV_DECL_PERSIST1( SvxPagesField, SvxFieldData, com::sun::star::text::textfield::Type::PAGES )
SvxPagesField();
- virtual SvxFieldData* Clone() const SAL_OVERRIDE;
- virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE;
+ virtual SvxFieldData* Clone() const override;
+ virtual bool operator==( const SvxFieldData& ) const override;
};
class EDITENG_DLLPUBLIC SvxTimeField : public SvxFieldData
@@ -219,10 +219,10 @@ public:
SV_DECL_PERSIST1( SvxTimeField, SvxFieldData, com::sun::star::text::textfield::Type::TIME )
SvxTimeField();
- virtual SvxFieldData* Clone() const SAL_OVERRIDE;
- virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE;
+ virtual SvxFieldData* Clone() const override;
+ virtual bool operator==( const SvxFieldData& ) const override;
- virtual MetaAction* createBeginComment() const SAL_OVERRIDE;
+ virtual MetaAction* createBeginComment() const override;
};
class EDITENG_DLLPUBLIC SvxFileField : public SvxFieldData
@@ -231,8 +231,8 @@ public:
SV_DECL_PERSIST1( SvxFileField, SvxFieldData, com::sun::star::text::textfield::Type::DOCINFO_TITLE )
SvxFileField();
- virtual SvxFieldData* Clone() const SAL_OVERRIDE;
- virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE;
+ virtual SvxFieldData* Clone() const override;
+ virtual bool operator==( const SvxFieldData& ) const override;
};
class EDITENG_DLLPUBLIC SvxTableField : public SvxFieldData
@@ -246,8 +246,8 @@ public:
void SetTab(int nTab);
int GetTab() const { return mnTab;}
- virtual SvxFieldData* Clone() const SAL_OVERRIDE;
- virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE;
+ virtual SvxFieldData* Clone() const override;
+ virtual bool operator==( const SvxFieldData& ) const override;
};
@@ -294,10 +294,10 @@ public:
OUString GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const;
static OUString GetFormatted( tools::Time& rTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage );
- virtual SvxFieldData* Clone() const SAL_OVERRIDE;
- virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE;
+ virtual SvxFieldData* Clone() const override;
+ virtual bool operator==( const SvxFieldData& ) const override;
- virtual MetaAction* createBeginComment() const SAL_OVERRIDE;
+ virtual MetaAction* createBeginComment() const override;
};
@@ -335,8 +335,8 @@ public:
OUString GetFormatted() const;
- virtual SvxFieldData* Clone() const SAL_OVERRIDE;
- virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE;
+ virtual SvxFieldData* Clone() const override;
+ virtual bool operator==( const SvxFieldData& ) const override;
};
@@ -374,8 +374,8 @@ public:
OUString GetFormatted() const;
- virtual SvxFieldData* Clone() const SAL_OVERRIDE;
- virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE;
+ virtual SvxFieldData* Clone() const override;
+ virtual bool operator==( const SvxFieldData& ) const override;
};
/** this field is used as a placeholder for a header&footer in impress. The actual
@@ -386,8 +386,8 @@ public:
SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData, com::sun::star::text::textfield::Type::PRESENTATION_HEADER )
SvxHeaderField();
- virtual SvxFieldData* Clone() const SAL_OVERRIDE;
- virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE;
+ virtual SvxFieldData* Clone() const override;
+ virtual bool operator==( const SvxFieldData& ) const override;
};
/** this field is used as a placeholder for a header&footer in impress. The actual
@@ -397,8 +397,8 @@ class EDITENG_DLLPUBLIC SvxFooterField : public SvxFieldData
public:
SV_DECL_PERSIST1( SvxFooterField, SvxFieldData, com::sun::star::text::textfield::Type::PRESENTATION_FOOTER )
SvxFooterField();
- virtual SvxFieldData* Clone() const SAL_OVERRIDE;
- virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE;
+ virtual SvxFieldData* Clone() const override;
+ virtual bool operator==( const SvxFieldData& ) const override;
};
/** this field is used as a placeholder for a header&footer in impress. The actual
@@ -411,8 +411,8 @@ public:
static OUString GetFormatted( Date& rDate, tools::Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage );
- virtual SvxFieldData* Clone() const SAL_OVERRIDE;
- virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE;
+ virtual SvxFieldData* Clone() const override;
+ virtual bool operator==( const SvxFieldData& ) const override;
};