summaryrefslogtreecommitdiff
path: root/sw/inc/ndtxt.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 /sw/inc/ndtxt.hxx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/inc/ndtxt.hxx')
-rw-r--r--sw/inc/ndtxt.hxx46
1 files changed, 23 insertions, 23 deletions
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index ba56bb5d6359..b80ffc1c4556 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -136,7 +136,7 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable
SAL_DLLPRIVATE void MoveTextAttr_To_AttrSet(); // Called by SplitNode.
/// Create the specific AttrSet.
- SAL_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE;
+ SAL_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& ) override;
/// Optimization: Asking for information about hidden characters at SwScriptInfo
/// updates these flags.
@@ -210,8 +210,8 @@ public:
protected:
/// for hanging TextFormatCollections somewhere else (Outline-Numbering!)
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
- virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override;
+ virtual void SwClientNotify( const SwModify&, const SfxHint& ) override;
public:
using SwContentNode::GetAttr;
@@ -231,18 +231,18 @@ public:
virtual ~SwTextNode();
- virtual sal_Int32 Len() const SAL_OVERRIDE;
+ virtual sal_Int32 Len() const override;
/// Is in itratr.
void GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMax, sal_uLong &rAbs,
OutputDevice* pOut = 0 ) const;
/// overriding to handle change of certain paragraph attributes
- virtual bool SetAttr( const SfxPoolItem& ) SAL_OVERRIDE;
- virtual bool SetAttr( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE;
- virtual bool ResetAttr( const std::vector<sal_uInt16>& rWhichArr ) SAL_OVERRIDE;
- virtual sal_uInt16 ResetAllAttr() SAL_OVERRIDE;
+ virtual bool SetAttr( const SfxPoolItem& ) override;
+ virtual bool SetAttr( const SfxItemSet& rSet ) override;
+ virtual bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) override;
+ virtual bool ResetAttr( const std::vector<sal_uInt16>& rWhichArr ) override;
+ virtual sal_uInt16 ResetAllAttr() override;
/// insert text content
/// @param rStr text to insert; in case it does not fit into the capacity
@@ -353,10 +353,10 @@ public:
const ::com::sun::star::uno::Sequence<sal_Int32>& rOffsets );
/// Virtual methods from ContentNode.
- virtual SwContentFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
- virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE;
- virtual SwContentNode *JoinNext() SAL_OVERRIDE;
- virtual SwContentNode *JoinPrev() SAL_OVERRIDE;
+ virtual SwContentFrm *MakeFrm( SwFrm* ) override;
+ virtual SwContentNode *SplitContentNode( const SwPosition & ) override;
+ virtual SwContentNode *JoinNext() override;
+ virtual SwContentNode *JoinPrev() override;
SwContentNode *AppendNode( const SwPosition & );
@@ -412,7 +412,7 @@ public:
bool Convert( SwConversionArgs & );
inline SwTextFormatColl *GetTextColl() const;
- virtual SwFormatColl *ChgFormatColl( SwFormatColl* ) SAL_OVERRIDE;
+ virtual SwFormatColl *ChgFormatColl( SwFormatColl* ) override;
void _ChgTextCollUpdateNum( const SwTextFormatColl* pOld,
const SwTextFormatColl* pNew );
@@ -673,7 +673,7 @@ public:
/// in ndcopy.cxx
bool IsSymbol( const sal_Int32 nBegin ) const; // In itratr.cxx.
- virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
+ virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const override;
/// Interactive hyphenation: we find TextFrm and call its CalcHyph.
bool Hyphenate( SwInterHyphInfo &rHyphInf );
@@ -745,7 +745,7 @@ public:
SwIndex const & rPos,
const sal_Int32 nChangeLen,
const bool bNegative = false,
- const bool bDelete = false ) SAL_OVERRIDE;
+ const bool bDelete = false ) override;
/// change text to Upper/Lower/Hiragana/Katagana/...
void TransliterateText( utl::TransliterationWrapper& rTrans,
@@ -789,16 +789,16 @@ public:
{ m_wXParagraph = xParagraph; }
/// sfx2::Metadatable
- virtual ::sfx2::IXmlIdRegistry& GetRegistry() SAL_OVERRIDE;
- virtual bool IsInClipboard() const SAL_OVERRIDE;
- virtual bool IsInUndo() const SAL_OVERRIDE;
- virtual bool IsInContent() const SAL_OVERRIDE;
+ virtual ::sfx2::IXmlIdRegistry& GetRegistry() override;
+ virtual bool IsInClipboard() const override;
+ virtual bool IsInUndo() const override;
+ virtual bool IsInContent() const override;
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE;
+ ::com::sun::star::rdf::XMetadatable > MakeUnoObject() override;
bool IsCollapse() const;
- virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
sal_uInt32 GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const;
sal_uInt32 GetParRsid() const;
@@ -810,7 +810,7 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwTextNode)
//UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
- virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const SAL_OVERRIDE;
+ virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const override;
/// In MS Word, the font underline setting of the paragraph end position wont affect the formatting of numbering, so we ignore it
static bool IsIgnoredCharFormatForNumbering(const sal_uInt16 nWhich);