summaryrefslogtreecommitdiff
path: root/sw/source/filter
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/source/filter
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/ascii/wrtasc.hxx2
-rw-r--r--sw/source/filter/html/htmlform.cxx12
-rw-r--r--sw/source/filter/html/htmltabw.cxx2
-rw-r--r--sw/source/filter/html/htmlvsh.hxx2
-rw-r--r--sw/source/filter/html/svxcss1.hxx4
-rw-r--r--sw/source/filter/html/swcss1.hxx10
-rw-r--r--sw/source/filter/html/swhtml.hxx12
-rw-r--r--sw/source/filter/html/wrthtml.hxx4
-rw-r--r--sw/source/filter/inc/fltini.hxx12
-rw-r--r--sw/source/filter/inc/fltshell.hxx18
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx2
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx308
-rw-r--r--sw/source/filter/ww8/docxexport.hxx62
-rw-r--r--sw/source/filter/ww8/docxexportfilter.hxx16
-rw-r--r--sw/source/filter/ww8/escher.hxx16
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.hxx282
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx2
-rw-r--r--sw/source/filter/ww8/rtfexport.hxx62
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.hxx8
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.hxx12
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx92
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx282
-rw-r--r--sw/source/filter/ww8/ww8par.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par.hxx42
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx120
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx4
-rw-r--r--sw/source/filter/ww8/ww8toolbar.hxx78
-rw-r--r--sw/source/filter/xml/wrtxml.hxx6
-rw-r--r--sw/source/filter/xml/xmlbrshi.hxx4
-rw-r--r--sw/source/filter/xml/xmlexp.hxx34
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx30
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx8
-rw-r--r--sw/source/filter/xml/xmlimp.hxx26
-rw-r--r--sw/source/filter/xml/xmlitem.hxx2
-rw-r--r--sw/source/filter/xml/xmliteme.cxx4
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx10
-rw-r--r--sw/source/filter/xml/xmltbli.cxx14
-rw-r--r--sw/source/filter/xml/xmltbli.hxx4
-rw-r--r--sw/source/filter/xml/xmltext.cxx4
-rw-r--r--sw/source/filter/xml/xmltexte.hxx8
-rw-r--r--sw/source/filter/xml/xmltexti.hxx30
42 files changed, 828 insertions, 828 deletions
diff --git a/sw/source/filter/ascii/wrtasc.hxx b/sw/source/filter/ascii/wrtasc.hxx
index 4082aade4064..fa58306acf04 100644
--- a/sw/source/filter/ascii/wrtasc.hxx
+++ b/sw/source/filter/ascii/wrtasc.hxx
@@ -30,7 +30,7 @@ class SwASCWriter : public Writer
{
OUString m_sLineEnd;
- virtual sal_uLong WriteStream() SAL_OVERRIDE;
+ virtual sal_uLong WriteStream() override;
public:
SwASCWriter( const OUString& rFilterName );
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 9f413a48dbc1..e6ad7a6fc4d1 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -383,29 +383,29 @@ public:
// XImageConsumer
virtual void SAL_CALL init( sal_Int32 Width, sal_Int32 Height)
- throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL setColorModel(
sal_Int16 BitCount, const uno::Sequence< sal_Int32 >& RGBAPal,
sal_Int32 RedMask, sal_Int32 GreenMask, sal_Int32 BlueMask,
sal_Int32 AlphaMask)
- throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL setPixelsByBytes(
sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height,
const uno::Sequence< sal_Int8 >& ProducerData,
sal_Int32 Offset, sal_Int32 Scansize)
- throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL setPixelsByLongs(
sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height,
const uno::Sequence< sal_Int32 >& ProducerData,
sal_Int32 Offset, sal_Int32 Scansize)
- throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL complete(
sal_Int32 Status,
const uno::Reference< awt::XImageProducer > & Producer)
- throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( uno::RuntimeException, std::exception ) override;
// XEventListener
- virtual void SAL_CALL disposing( const EventObject& Source ) throw ( uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const EventObject& Source ) throw ( uno::RuntimeException, std::exception) override;
};
SwHTMLImageWatcher::SwHTMLImageWatcher(
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 444750581b32..1ab0bf1c38cf 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -75,7 +75,7 @@ class SwHTMLWrtTable : public SwWriteTable
const SvxBrushItem *pBrushItem ) const;
virtual bool ShouldExpandSub( const SwTableBox *pBox,
- bool bExpandedBefore, sal_uInt16 nDepth ) const SAL_OVERRIDE;
+ bool bExpandedBefore, sal_uInt16 nDepth ) const override;
static bool HasTabBackground( const SwTableLine& rLine,
bool bTop, bool bBottom, bool bLeft, bool bRight );
diff --git a/sw/source/filter/html/htmlvsh.hxx b/sw/source/filter/html/htmlvsh.hxx
index da9abc0e7162..9926d2adb493 100644
--- a/sw/source/filter/html/htmlvsh.hxx
+++ b/sw/source/filter/html/htmlvsh.hxx
@@ -26,7 +26,7 @@ class SwViewShell;
class SwHTMLViewShellClient : public SwClient
{
protected:
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
public:
explicit SwHTMLViewShellClient( SwViewShell *pVSh );
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 445363dde790..231fc49236ad 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -232,13 +232,13 @@ protected:
/// the content of the aItemSet will be copied into all recently
/// created Styles.
/// Derived classes should not override this method!
- virtual bool SelectorParsed( CSS1Selector *pSelector, bool bFirst ) SAL_OVERRIDE;
+ virtual bool SelectorParsed( CSS1Selector *pSelector, bool bFirst ) override;
/// Will be called for every parsed Property. Adds the item to the
/// pItemSet.
/// Derived classes should not override this method!
virtual bool DeclarationParsed( const OUString& rProperty,
- const CSS1Expression *pExpr ) SAL_OVERRIDE;
+ const CSS1Expression *pExpr ) override;
public:
diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx
index b7cd01e827c3..abe6ae7acf9d 100644
--- a/sw/source/filter/html/swcss1.hxx
+++ b/sw/source/filter/html/swcss1.hxx
@@ -67,7 +67,7 @@ class SwCSS1Parser : public SvxCSS1Parser
protected:
virtual bool StyleParsed( const CSS1Selector *pSelector,
SfxItemSet& rItemSet,
- SvxCSS1PropertyInfo& rPropInfo ) SAL_OVERRIDE;
+ SvxCSS1PropertyInfo& rPropInfo ) override;
using CSS1Parser::ParseStyleSheet;
@@ -75,13 +75,13 @@ public:
SwCSS1Parser( SwDoc *pDoc, sal_uInt32 aFHeight[7], const OUString& rBaseURL, bool bNewDoc );
virtual ~SwCSS1Parser();
- virtual bool ParseStyleSheet( const OUString& rIn ) SAL_OVERRIDE;
+ virtual bool ParseStyleSheet( const OUString& rIn ) override;
// Die Font-Hoehe fuer eine bestimmte Font-Groesse (0-6) ermitteln
- virtual sal_uInt32 GetFontHeight( sal_uInt16 nSize ) const SAL_OVERRIDE;
+ virtual sal_uInt32 GetFontHeight( sal_uInt16 nSize ) const override;
// Die aktuelle Font-Liste holen (auch 0 ist erlaubt)
- virtual const FontList *GetFontList() const SAL_OVERRIDE;
+ virtual const FontList *GetFontList() const override;
// das Zeichen-Format zu einem Token und einer ggf leeren Klasse
// ermitteln
@@ -157,7 +157,7 @@ public:
inline void SetATagStyles();
inline void SetDelayedStyles();
- virtual void SetDfltEncoding( rtl_TextEncoding eEnc ) SAL_OVERRIDE;
+ virtual void SetDfltEncoding( rtl_TextEncoding eEnc ) override;
};
inline void SwCSS1Parser::AddFirstLetterExt( OUString& rFormatName )
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 1f052ab3b449..17cbadf39a51 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -875,13 +875,13 @@ public: // used in tables
protected:
// Executed for each token recognized by CallParser
- virtual void NextToken( int nToken ) SAL_OVERRIDE;
+ virtual void NextToken( int nToken ) override;
virtual ~SwHTMLParser();
// If the document is removed, remove the parser as well
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
- virtual void AddMetaUserDefined( OUString const & i_rMetaName ) SAL_OVERRIDE;
+ virtual void AddMetaUserDefined( OUString const & i_rMetaName ) override;
public:
@@ -892,16 +892,16 @@ public:
SfxMedium* pMed = 0, bool bReadUTF8 = false,
bool bIgnoreHTMLComments = false );
- virtual SvParserState CallParser() SAL_OVERRIDE;
+ virtual SvParserState CallParser() override;
static sal_uInt16 ToTwips( sal_uInt16 nPixel );
// for reading asynchronously from SvStream
- virtual void Continue( int nToken ) SAL_OVERRIDE;
+ virtual void Continue( int nToken ) override;
virtual bool ParseMetaOptions( const ::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties>&,
- SvKeyValueIterator* ) SAL_OVERRIDE;
+ SvKeyValueIterator* ) override;
};
struct SwPendingStackData
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index ba29190c4362..30ea6cca7711 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -279,8 +279,8 @@ class SwHTMLWriter : public Writer
void CollectLinkTargets();
protected:
- sal_uLong WriteStream() SAL_OVERRIDE;
- void SetupFilterOptions(SfxMedium& rMedium) SAL_OVERRIDE;
+ sal_uLong WriteStream() override;
+ void SetupFilterOptions(SfxMedium& rMedium) override;
public:
std::vector<OUString> aImgMapNames; // geschriebene Image Maps
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index 26a63f81bfef..5cb162fc0fab 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -32,25 +32,25 @@ class SwNodeIndex;
class HTMLReader: public Reader
{
// wir wollen die Streams / Storages nicht geoeffnet haben
- virtual bool SetStrmStgPtr() SAL_OVERRIDE;
- virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE;
- virtual OUString GetTemplateName() const SAL_OVERRIDE;
+ virtual bool SetStrmStgPtr() override;
+ virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) override;
+ virtual OUString GetTemplateName() const override;
public:
HTMLReader();
};
class XMLReader : public Reader
{
- virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE;
+ virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) override;
public:
- virtual int GetReaderType() SAL_OVERRIDE;
+ virtual int GetReaderType() override;
XMLReader();
// read the sections of the document, which is equal to the medium.
// returns the count of it
virtual size_t GetSectionList( SfxMedium& rMedium,
- std::vector<OUString*>& rStrings ) const SAL_OVERRIDE;
+ std::vector<OUString*>& rStrings ) const override;
};
// die speziellen Writer
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 4720707087b4..572baff5eba0 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -202,8 +202,8 @@ public:
virtual ~SwFltAnchor();
// "pure virtual Methoden" vom SfxPoolItem
- virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE;
+ virtual bool operator==(const SfxPoolItem&) const override;
+ virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override;
void SetFrameFormat(SwFrameFormat * _pFrameFormat);
const SwFrameFormat* GetFrameFormat() const { return pFrameFormat;}
SwFrameFormat* GetFrameFormat() { return pFrameFormat;}
@@ -216,7 +216,7 @@ class SwFltAnchorClient : public SwClient
public:
SwFltAnchorClient(SwFltAnchor * pFltAnchor);
- virtual void Modify (const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+ virtual void Modify (const SfxPoolItem *pOld, const SfxPoolItem *pNew) override;
};
class SW_DLLPUBLIC SwFltRedline : public SfxPoolItem
@@ -254,8 +254,8 @@ public:
nAutorNoPrev( rCpy.nAutorNoPrev )
{}
// "pure virtual Methoden" vom SfxPoolItem
- virtual bool operator==(const SfxPoolItem& rItem) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE;
+ virtual bool operator==(const SfxPoolItem& rItem) const override;
+ virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override;
};
class SW_DLLPUBLIC SwFltBookmark : public SfxPoolItem
@@ -275,8 +275,8 @@ public:
SwFltBookmark( const SwFltBookmark& );
// "pure virtual Methoden" vom SfxPoolItem
- virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE;
+ virtual bool operator==(const SfxPoolItem&) const override;
+ virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override;
long GetHandle() const { return mnHandle; }
const OUString& GetName() const { return maName; }
@@ -297,8 +297,8 @@ public:
SwFltTOX(SwTOXBase* pBase, sal_uInt16 _nCols = 0);
SwFltTOX(const SwFltTOX&);
// "pure virtual Methoden" vom SfxPoolItem
- virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE;
- virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE;
+ virtual bool operator==(const SfxPoolItem&) const override;
+ virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override;
SwTOXBase* GetBase() { return pTOXBase; }
void SetHadBreakItem( bool bVal ) { bHadBreakItem = bVal; }
void SetHadPageDescItem( bool bVal ) { bHadPageDescItem = bVal; }
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 021cff725530..429e3f65b20e 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star;
/// Glue class to call RtfImport as an internal filter, needed by copy&paste support.
class SwRTFReader : public Reader
{
- virtual sal_uLong Read(SwDoc&, const OUString& rBaseURL, SwPaM&, const OUString&) SAL_OVERRIDE;
+ virtual sal_uLong Read(SwDoc&, const OUString& rBaseURL, SwPaM&, const OUString&) override;
};
sal_uLong SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& rPam, const OUString&)
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 6bdf73a3388c..07e293aa389f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -142,68 +142,68 @@ class DocxAttributeOutput : public AttributeOutputBase, public oox::vml::VMLText
{
public:
/// Export the state of RTL/CJK.
- virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) SAL_OVERRIDE;
+ virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) override;
/// Start of the paragraph.
- virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo ) SAL_OVERRIDE;
+ virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo ) override;
/// End of the paragraph.
- virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
+ virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) override;
/// Empty paragraph.
- virtual void EmptyParagraph() SAL_OVERRIDE;
+ virtual void EmptyParagraph() override;
/// Called in order to output section breaks.
- virtual void SectionBreaks(const SwNode& rNode) SAL_OVERRIDE;
+ virtual void SectionBreaks(const SwNode& rNode) override;
/// Called before we start outputting the attributes.
- virtual void StartParagraphProperties() SAL_OVERRIDE;
+ virtual void StartParagraphProperties() override;
/// Called after we end outputting the attributes.
- virtual void EndParagraphProperties(const SfxItemSet& rParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted) SAL_OVERRIDE;
+ virtual void EndParagraphProperties(const SfxItemSet& rParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted) override;
/// Start of the text run.
- virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) SAL_OVERRIDE;
+ virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) override;
/// End of the text run.
- virtual void EndRun() SAL_OVERRIDE;
+ virtual void EndRun() override;
/// Called before we start outputting the attributes.
- virtual void StartRunProperties() SAL_OVERRIDE;
+ virtual void StartRunProperties() override;
/// Called after we end outputting the attributes.
- virtual void EndRunProperties( const SwRedlineData* pRedlineData ) SAL_OVERRIDE;
+ virtual void EndRunProperties( const SwRedlineData* pRedlineData ) override;
- virtual void FootnoteEndnoteRefTag() SAL_OVERRIDE;
+ virtual void FootnoteEndnoteRefTag() override;
- virtual void SectFootnoteEndnotePr() SAL_OVERRIDE;
+ virtual void SectFootnoteEndnotePr() override;
- virtual void WritePostitFieldReference() SAL_OVERRIDE;
+ virtual void WritePostitFieldReference() override;
/// Output text (inside a run).
- virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ) SAL_OVERRIDE;
+ virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ) override;
/// Output text (without markup).
- virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) SAL_OVERRIDE;
+ virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) override;
/// Output ruby start.
- virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) SAL_OVERRIDE;
+ virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) override;
/// Output ruby end.
- virtual void EndRuby() SAL_OVERRIDE;
+ virtual void EndRuby() override;
/// Output URL start.
- virtual bool StartURL( const OUString& rUrl, const OUString& rTarget ) SAL_OVERRIDE;
+ virtual bool StartURL( const OUString& rUrl, const OUString& rTarget ) override;
/// Output URL end.
- virtual bool EndURL(bool) SAL_OVERRIDE;
+ virtual bool EndURL(bool) override;
- virtual void FieldVanish( const OUString& rText, ww::eField eType ) SAL_OVERRIDE;
+ virtual void FieldVanish( const OUString& rText, ww::eField eType ) override;
/// Output redlining.
///
/// The common attribute that can be among the run properties.
- virtual void Redline( const SwRedlineData* pRedline ) SAL_OVERRIDE;
+ virtual void Redline( const SwRedlineData* pRedline ) override;
/// Output redlining.
///
@@ -216,41 +216,41 @@ public:
/// End of the tag that encloses the run.
void EndRedline( const SwRedlineData * pRedlineData );
- virtual void SetStateOfFlyFrame( FlyProcessingState nStateOfFlyFrame ) SAL_OVERRIDE;
- virtual void SetAnchorIsLinkedToNode( bool bAnchorLinkedToNode = false ) SAL_OVERRIDE;
- virtual bool IsFlyProcessingPostponed() SAL_OVERRIDE;
- virtual void ResetFlyProcessingFlag() SAL_OVERRIDE;
+ virtual void SetStateOfFlyFrame( FlyProcessingState nStateOfFlyFrame ) override;
+ virtual void SetAnchorIsLinkedToNode( bool bAnchorLinkedToNode = false ) override;
+ virtual bool IsFlyProcessingPostponed() override;
+ virtual void ResetFlyProcessingFlag() override;
- virtual void FormatDrop( const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
+ virtual void FormatDrop( const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) override;
/// Output style.
- virtual void ParagraphStyle( sal_uInt16 nStyle ) SAL_OVERRIDE;
+ virtual void ParagraphStyle( sal_uInt16 nStyle ) override;
- virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
+ virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override;
+ virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override;
+ virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override;
+ virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override;
void TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableRowEnd( sal_uInt32 nDepth = 1 ) SAL_OVERRIDE;
+ virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override;
+ virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override;
+ virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override;
+ virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override;
+ virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override;
+ virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override;
+ virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override;
+ virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) override;
+ virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override;
+ virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override;
+ virtual void TableRowEnd( sal_uInt32 nDepth = 1 ) override;
/// Start of the styles table.
- virtual void StartStyles() SAL_OVERRIDE;
+ virtual void StartStyles() override;
/// End of the styles table.
- virtual void EndStyles( sal_uInt16 nNumberOfStyles ) SAL_OVERRIDE;
+ virtual void EndStyles( sal_uInt16 nNumberOfStyles ) override;
/// Write default style.
- virtual void DefaultStyle( sal_uInt16 nStyle ) SAL_OVERRIDE;
+ virtual void DefaultStyle( sal_uInt16 nStyle ) override;
/// Write Doc Defaults
void DocDefaults( );
@@ -268,55 +268,55 @@ public:
/// Start of a style in the styles table.
virtual void StartStyle( const OUString& rName, StyleType eType,
sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwId, sal_uInt16 nId,
- bool bAutoUpdate ) SAL_OVERRIDE;
+ bool bAutoUpdate ) override;
/// End of a style in the styles table.
- virtual void EndStyle() SAL_OVERRIDE;
+ virtual void EndStyle() override;
/// Start of (paragraph or run) properties of a style.
- virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ) SAL_OVERRIDE;
+ virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ) override;
/// End of (paragraph or run) properties of a style.
- virtual void EndStyleProperties( bool bParProp ) SAL_OVERRIDE;
+ virtual void EndStyleProperties( bool bParProp ) override;
/// Numbering rule and Id.
- virtual void OutlineNumbering(sal_uInt8 nLvl) SAL_OVERRIDE;
+ virtual void OutlineNumbering(sal_uInt8 nLvl) override;
/// Page break
/// As a paragraph property - the paragraph should be on the next page.
- virtual void PageBreakBefore( bool bBreak ) SAL_OVERRIDE;
+ virtual void PageBreakBefore( bool bBreak ) override;
/// Write a section break
/// msword::ColumnBreak or msword::PageBreak
- virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) SAL_OVERRIDE;
+ virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) override;
/// Start of the section properties.
- virtual void StartSection() SAL_OVERRIDE;
+ virtual void StartSection() override;
/// End of the section properties.
- virtual void EndSection() SAL_OVERRIDE;
+ virtual void EndSection() override;
/// Protection of forms.
- virtual void SectionFormProtection( bool bProtected ) SAL_OVERRIDE;
+ virtual void SectionFormProtection( bool bProtected ) override;
/// Numbering of the lines in the document.
- virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ) SAL_OVERRIDE;
+ virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ) override;
/// Has different headers/footers for the title page.
- virtual void SectionTitlePage() SAL_OVERRIDE;
+ virtual void SectionTitlePage() override;
/// Description of the page borders.
- virtual void SectionPageBorders( const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat ) SAL_OVERRIDE;
+ virtual void SectionPageBorders( const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat ) override;
/// Columns populated from right/numbers on the right side?
- virtual void SectionBiDi( bool bBiDi ) SAL_OVERRIDE;
+ virtual void SectionBiDi( bool bBiDi ) override;
/// The style of the page numbers.
///
- virtual void SectionPageNumbering( sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber ) SAL_OVERRIDE;
+ virtual void SectionPageNumbering( sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber ) override;
/// The type of breaking.
- virtual void SectionType( sal_uInt8 nBreakCode ) SAL_OVERRIDE;
+ virtual void SectionType( sal_uInt8 nBreakCode ) override;
/// Start the font.
void StartFont( const OUString& rFamilyName ) const;
@@ -340,13 +340,13 @@ public:
void EmbedFont( const OUString& name, FontFamily family, FontPitch pitch, rtl_TextEncoding encoding );
/// Definition of a numbering instance.
- virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) SAL_OVERRIDE;
+ virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) override;
/// Start of the abstract numbering definition instance.
- virtual void StartAbstractNumbering( sal_uInt16 nId ) SAL_OVERRIDE;
+ virtual void StartAbstractNumbering( sal_uInt16 nId ) override;
/// End of the abstract numbering definition instance.
- virtual void EndAbstractNumbering() SAL_OVERRIDE;
+ virtual void EndAbstractNumbering() override;
/// All the numbering level information.
virtual void NumberingLevel( sal_uInt8 nLevel,
@@ -361,7 +361,7 @@ public:
sal_Int16 nFirstLineIndex,
sal_Int16 nListTabPos,
const OUString &rNumberingString,
- const SvxBrushItem* pBrush = 0 ) SAL_OVERRIDE;
+ const SvxBrushItem* pBrush = 0 ) override;
void WriteField_Impl( const SwField* pField, ww::eField eType, const OUString& rFieldCmd, sal_uInt8 nMode );
void WriteFormData_Impl( const ::sw::mark::IFieldmark& rFieldmark );
@@ -447,235 +447,235 @@ private:
protected:
/// Output frames - the implementation.
- virtual void OutputFlyFrame_Impl( const sw::Frame& rFormat, const Point& rNdTopLeft ) SAL_OVERRIDE;
+ virtual void OutputFlyFrame_Impl( const sw::Frame& rFormat, const Point& rNdTopLeft ) override;
/// Sfx item Sfx item RES_CHRATR_CASEMAP
- virtual void CharCaseMap( const SvxCaseMapItem& rCaseMap ) SAL_OVERRIDE;
+ virtual void CharCaseMap( const SvxCaseMapItem& rCaseMap ) override;
/// Sfx item Sfx item RES_CHRATR_COLOR
- virtual void CharColor( const SvxColorItem& rColor) SAL_OVERRIDE;
+ virtual void CharColor( const SvxColorItem& rColor) override;
/// Sfx item Sfx item RES_CHRATR_CONTOUR
- virtual void CharContour( const SvxContourItem& rContour ) SAL_OVERRIDE;
+ virtual void CharContour( const SvxContourItem& rContour ) override;
/// Sfx item RES_CHRATR_CROSSEDOUT
- virtual void CharCrossedOut( const SvxCrossedOutItem& rCrossedOut ) SAL_OVERRIDE;
+ virtual void CharCrossedOut( const SvxCrossedOutItem& rCrossedOut ) override;
/// Sfx item RES_CHRATR_ESCAPEMENT
- virtual void CharEscapement( const SvxEscapementItem& rEscapement ) SAL_OVERRIDE;
+ virtual void CharEscapement( const SvxEscapementItem& rEscapement ) override;
/// Sfx item RES_CHRATR_FONT
- virtual void CharFont( const SvxFontItem& rFont ) SAL_OVERRIDE;
+ virtual void CharFont( const SvxFontItem& rFont ) override;
/// Sfx item RES_CHRATR_FONTSIZE
- virtual void CharFontSize( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE;
+ virtual void CharFontSize( const SvxFontHeightItem& rFontSize ) override;
/// Sfx item RES_CHRATR_KERNING
- virtual void CharKerning( const SvxKerningItem& rKerning ) SAL_OVERRIDE;
+ virtual void CharKerning( const SvxKerningItem& rKerning ) override;
/// Sfx item RES_CHRATR_LANGUAGE
- virtual void CharLanguage( const SvxLanguageItem& rLanguage ) SAL_OVERRIDE;
+ virtual void CharLanguage( const SvxLanguageItem& rLanguage ) override;
/// Sfx item RES_CHRATR_POSTURE
- virtual void CharPosture( const SvxPostureItem& rPosture ) SAL_OVERRIDE;
+ virtual void CharPosture( const SvxPostureItem& rPosture ) override;
/// Sfx item RES_CHRATR_SHADOWED
- virtual void CharShadow( const SvxShadowedItem& rShadow ) SAL_OVERRIDE;
+ virtual void CharShadow( const SvxShadowedItem& rShadow ) override;
/// Sfx item RES_CHRATR_UNDERLINE
- virtual void CharUnderline( const SvxUnderlineItem& rUnderline ) SAL_OVERRIDE;
+ virtual void CharUnderline( const SvxUnderlineItem& rUnderline ) override;
/// Sfx item RES_CHRATR_WEIGHT
- virtual void CharWeight( const SvxWeightItem& rWeight ) SAL_OVERRIDE;
+ virtual void CharWeight( const SvxWeightItem& rWeight ) override;
/// Sfx item RES_CHRATR_AUTOKERN
- virtual void CharAutoKern( const SvxAutoKernItem& ) SAL_OVERRIDE;
+ virtual void CharAutoKern( const SvxAutoKernItem& ) override;
/// Sfx item RES_CHRATR_BLINK
- virtual void CharAnimatedText( const SvxBlinkItem& rBlink ) SAL_OVERRIDE;
+ virtual void CharAnimatedText( const SvxBlinkItem& rBlink ) override;
/// Sfx item RES_CHRATR_BACKGROUND
- virtual void CharBackground( const SvxBrushItem& rBrush ) SAL_OVERRIDE;
+ virtual void CharBackground( const SvxBrushItem& rBrush ) override;
/// Sfx item RES_CHRATR_CJK_FONT
- virtual void CharFontCJK( const SvxFontItem& rFont ) SAL_OVERRIDE;
+ virtual void CharFontCJK( const SvxFontItem& rFont ) override;
/// Sfx item RES_CHRATR_CJK_FONTSIZE
- virtual void CharFontSizeCJK( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE { CharFontSize( rFontSize ); }
+ virtual void CharFontSizeCJK( const SvxFontHeightItem& rFontSize ) override { CharFontSize( rFontSize ); }
/// Sfx item RES_CHRATR_CJK_LANGUAGE
- virtual void CharLanguageCJK( const SvxLanguageItem& rLanguageItem ) SAL_OVERRIDE { CharLanguage( rLanguageItem ); }
+ virtual void CharLanguageCJK( const SvxLanguageItem& rLanguageItem ) override { CharLanguage( rLanguageItem ); }
/// Sfx item RES_CHRATR_CJK_POSTURE
- virtual void CharPostureCJK( const SvxPostureItem& rPosture ) SAL_OVERRIDE;
+ virtual void CharPostureCJK( const SvxPostureItem& rPosture ) override;
/// Sfx item RES_CHRATR_CJK_WEIGHT
- virtual void CharWeightCJK( const SvxWeightItem& rWeight ) SAL_OVERRIDE;
+ virtual void CharWeightCJK( const SvxWeightItem& rWeight ) override;
/// Sfx item RES_CHRATR_CTL_FONT
- virtual void CharFontCTL( const SvxFontItem& rFont ) SAL_OVERRIDE;
+ virtual void CharFontCTL( const SvxFontItem& rFont ) override;
/// Sfx item RES_CHRATR_CTL_FONTSIZE
- virtual void CharFontSizeCTL( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE { CharFontSize( rFontSize ); }
+ virtual void CharFontSizeCTL( const SvxFontHeightItem& rFontSize ) override { CharFontSize( rFontSize ); }
/// Sfx item RES_CHRATR_CTL_LANGUAGE
- virtual void CharLanguageCTL( const SvxLanguageItem& rLanguageItem ) SAL_OVERRIDE { CharLanguage( rLanguageItem); }
+ virtual void CharLanguageCTL( const SvxLanguageItem& rLanguageItem ) override { CharLanguage( rLanguageItem); }
/// Sfx item RES_CHRATR_CTL_POSTURE
- virtual void CharPostureCTL( const SvxPostureItem& rWeight ) SAL_OVERRIDE;
+ virtual void CharPostureCTL( const SvxPostureItem& rWeight ) override;
/// Sfx item RES_CHRATR_CTL_WEIGHT
- virtual void CharWeightCTL( const SvxWeightItem& rWeight ) SAL_OVERRIDE;
+ virtual void CharWeightCTL( const SvxWeightItem& rWeight ) override;
/// Sfx item RES_CHRATR_BidiRTL
- virtual void CharBidiRTL( const SfxPoolItem& ) SAL_OVERRIDE;
+ virtual void CharBidiRTL( const SfxPoolItem& ) override;
/// Sfx item RES_CHRATR_IdctHint
- virtual void CharIdctHint( const SfxPoolItem& ) SAL_OVERRIDE;
+ virtual void CharIdctHint( const SfxPoolItem& ) override;
/// Sfx item RES_CHRATR_ROTATE
- virtual void CharRotate( const SvxCharRotateItem& rRotate ) SAL_OVERRIDE;
+ virtual void CharRotate( const SvxCharRotateItem& rRotate ) override;
/// Sfx item RES_CHRATR_EMPHASIS_MARK
- virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisMark ) SAL_OVERRIDE;
+ virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisMark ) override;
/// Sfx item RES_CHRATR_TWO_LINES
- virtual void CharTwoLines( const SvxTwoLinesItem& rTwoLines ) SAL_OVERRIDE;
+ virtual void CharTwoLines( const SvxTwoLinesItem& rTwoLines ) override;
/// Sfx item RES_CHRATR_SCALEW
- virtual void CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth ) SAL_OVERRIDE;
+ virtual void CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth ) override;
/// Sfx item RES_CHRATR_RELIEF
- virtual void CharRelief( const SvxCharReliefItem& rRelief) SAL_OVERRIDE;
+ virtual void CharRelief( const SvxCharReliefItem& rRelief) override;
/// Sfx item RES_CHRATR_HIDDEN
- virtual void CharHidden( const SvxCharHiddenItem& rHidden ) SAL_OVERRIDE;
+ virtual void CharHidden( const SvxCharHiddenItem& rHidden ) override;
/// Sfx item RES_CHRATR_BOX
- virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ) SAL_OVERRIDE;
+ virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ) override;
/// Sfx item RES_CHRATR_HIGHLIGHT
- virtual void CharHighlight( const SvxBrushItem& rHighlight ) SAL_OVERRIDE;
+ virtual void CharHighlight( const SvxBrushItem& rHighlight ) override;
/// Sfx item RES_TXTATR_INETFMT
- virtual void TextINetFormat( const SwFormatINetFormat& ) SAL_OVERRIDE;
+ virtual void TextINetFormat( const SwFormatINetFormat& ) override;
/// Sfx item RES_TXTATR_CHARFMT
- virtual void TextCharFormat( const SwFormatCharFormat& ) SAL_OVERRIDE;
+ virtual void TextCharFormat( const SwFormatCharFormat& ) override;
/// Sfx item RES_TXTATR_FTN
- virtual void TextFootnote_Impl( const SwFormatFootnote& ) SAL_OVERRIDE;
+ virtual void TextFootnote_Impl( const SwFormatFootnote& ) override;
/// Output the footnote/endnote reference (if there's one to output).
void FootnoteEndnoteReference();
/// Sfx item RES_PARATR_LINESPACING
- virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) SAL_OVERRIDE;
+ virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) override;
/// Sfx item RES_PARATR_ADJUST
- virtual void ParaAdjust( const SvxAdjustItem& rAdjust ) SAL_OVERRIDE;
+ virtual void ParaAdjust( const SvxAdjustItem& rAdjust ) override;
/// Sfx item RES_PARATR_SPLIT
- virtual void ParaSplit( const SvxFormatSplitItem& rSplit ) SAL_OVERRIDE;
+ virtual void ParaSplit( const SvxFormatSplitItem& rSplit ) override;
/// Sfx item RES_PARATR_WIDOWS
- virtual void ParaWidows( const SvxWidowsItem& rWidows ) SAL_OVERRIDE;
+ virtual void ParaWidows( const SvxWidowsItem& rWidows ) override;
/// Sfx item RES_PARATR_TABSTOP
- virtual void ParaTabStop( const SvxTabStopItem& rTabStop ) SAL_OVERRIDE;
+ virtual void ParaTabStop( const SvxTabStopItem& rTabStop ) override;
/// Sfx item RES_PARATR_HYPHENZONE
- virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) SAL_OVERRIDE;
+ virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) override;
/// Sfx item RES_PARATR_NUMRULE
- virtual void ParaNumRule_Impl( const SwTextNode *pTextNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE;
+ virtual void ParaNumRule_Impl( const SwTextNode *pTextNd, sal_Int32 nLvl, sal_Int32 nNumId ) override;
/// Sfx item RES_PARATR_SCRIPTSPACE
- virtual void ParaScriptSpace( const SfxBoolItem& ) SAL_OVERRIDE;
+ virtual void ParaScriptSpace( const SfxBoolItem& ) override;
/// Sfx item RES_PARATR_HANGINGPUNCTUATION
- virtual void ParaHangingPunctuation( const SfxBoolItem& ) SAL_OVERRIDE;
+ virtual void ParaHangingPunctuation( const SfxBoolItem& ) override;
/// Sfx item RES_PARATR_FORBIDDEN_RULES
- virtual void ParaForbiddenRules( const SfxBoolItem& ) SAL_OVERRIDE;
+ virtual void ParaForbiddenRules( const SfxBoolItem& ) override;
/// Sfx item RES_PARATR_VERTALIGN
- virtual void ParaVerticalAlign( const SvxParaVertAlignItem& rAlign ) SAL_OVERRIDE;
+ virtual void ParaVerticalAlign( const SvxParaVertAlignItem& rAlign ) override;
/// Sfx item RES_PARATR_SNAPTOGRID
- virtual void ParaSnapToGrid( const SvxParaGridItem& ) SAL_OVERRIDE;
+ virtual void ParaSnapToGrid( const SvxParaGridItem& ) override;
/// Sfx item RES_FRM_SIZE
- virtual void FormatFrameSize( const SwFormatFrmSize& ) SAL_OVERRIDE;
+ virtual void FormatFrameSize( const SwFormatFrmSize& ) override;
/// Sfx item RES_PAPER_BIN
- virtual void FormatPaperBin( const SvxPaperBinItem& ) SAL_OVERRIDE;
+ virtual void FormatPaperBin( const SvxPaperBinItem& ) override;
/// Sfx item RES_LR_SPACE
- virtual void FormatLRSpace( const SvxLRSpaceItem& rLRSpace ) SAL_OVERRIDE;
+ virtual void FormatLRSpace( const SvxLRSpaceItem& rLRSpace ) override;
/// Sfx item RES_UL_SPACE
- virtual void FormatULSpace( const SvxULSpaceItem& rULSpace ) SAL_OVERRIDE;
+ virtual void FormatULSpace( const SvxULSpaceItem& rULSpace ) override;
/// Sfx item RES_SURROUND
- virtual void FormatSurround( const SwFormatSurround& ) SAL_OVERRIDE;
+ virtual void FormatSurround( const SwFormatSurround& ) override;
/// Sfx item RES_VERT_ORIENT
- virtual void FormatVertOrientation( const SwFormatVertOrient& ) SAL_OVERRIDE;
+ virtual void FormatVertOrientation( const SwFormatVertOrient& ) override;
/// Sfx item RES_HORI_ORIENT
- virtual void FormatHorizOrientation( const SwFormatHoriOrient& ) SAL_OVERRIDE;
+ virtual void FormatHorizOrientation( const SwFormatHoriOrient& ) override;
/// Sfx item RES_ANCHOR
- virtual void FormatAnchor( const SwFormatAnchor& ) SAL_OVERRIDE;
+ virtual void FormatAnchor( const SwFormatAnchor& ) override;
/// Sfx item RES_BACKGROUND
- virtual void FormatBackground( const SvxBrushItem& ) SAL_OVERRIDE;
+ virtual void FormatBackground( const SvxBrushItem& ) override;
/// Sfx item RES_FILL_STYLE
- virtual void FormatFillStyle( const XFillStyleItem& ) SAL_OVERRIDE;
+ virtual void FormatFillStyle( const XFillStyleItem& ) override;
/// Sfx item RES_FILL_GRADIENT
- virtual void FormatFillGradient( const XFillGradientItem& ) SAL_OVERRIDE;
+ virtual void FormatFillGradient( const XFillGradientItem& ) override;
/// Sfx item RES_BOX
- virtual void FormatBox( const SvxBoxItem& ) SAL_OVERRIDE;
+ virtual void FormatBox( const SvxBoxItem& ) override;
/// Sfx item RES_COL
- virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE;
+ virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol & rCol, bool bEven, SwTwips nPageSize ) override;
/// Sfx item RES_KEEP
- virtual void FormatKeep( const SvxFormatKeepItem& ) SAL_OVERRIDE;
+ virtual void FormatKeep( const SvxFormatKeepItem& ) override;
/// Sfx item RES_TEXTGRID
- virtual void FormatTextGrid( const SwTextGridItem& ) SAL_OVERRIDE;
+ virtual void FormatTextGrid( const SwTextGridItem& ) override;
/// Sfx item RES_LINENUMBER
- virtual void FormatLineNumbering( const SwFormatLineNumber& ) SAL_OVERRIDE;
+ virtual void FormatLineNumbering( const SwFormatLineNumber& ) override;
/// Sfx item RES_FRAMEDIR
- virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) SAL_OVERRIDE;
+ virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) override;
/// Sfx item RES_PARATR_GRABBAG
- virtual void ParaGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE;
+ virtual void ParaGrabBag( const SfxGrabBagItem& ) override;
/// Sfx item RES_CHRATR_GRABBAG
- virtual void CharGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE;
+ virtual void CharGrabBag( const SfxGrabBagItem& ) override;
// Sfx item RES_PARATR_OUTLINELEVEL
- virtual void ParaOutlineLevel( const SfxUInt16Item& ) SAL_OVERRIDE;
+ virtual void ParaOutlineLevel( const SfxUInt16Item& ) override;
/// Write the expanded field
- virtual void WriteExpand( const SwField* pField ) SAL_OVERRIDE;
+ virtual void WriteExpand( const SwField* pField ) override;
- virtual void RefField( const SwField& rField, const OUString& rRef ) SAL_OVERRIDE;
- virtual void HiddenField( const SwField& rField ) SAL_OVERRIDE;
- virtual void SetField( const SwField& rField, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE;
- virtual void PostitField( const SwField* pField ) SAL_OVERRIDE;
- virtual bool DropdownField( const SwField* pField ) SAL_OVERRIDE;
- virtual bool PlaceholderField( const SwField* pField ) SAL_OVERRIDE;
+ virtual void RefField( const SwField& rField, const OUString& rRef ) override;
+ virtual void HiddenField( const SwField& rField ) override;
+ virtual void SetField( const SwField& rField, ww::eField eType, const OUString& rCmd ) override;
+ virtual void PostitField( const SwField* pField ) override;
+ virtual bool DropdownField( const SwField* pField ) override;
+ virtual bool PlaceholderField( const SwField* pField ) override;
- virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ) SAL_OVERRIDE;
+ virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ) override;
/// Reference to the export, where to get the data from
DocxExport &m_rExport;
@@ -934,7 +934,7 @@ public:
virtual ~DocxAttributeOutput();
/// Return the right export class.
- virtual DocxExport& GetExport() SAL_OVERRIDE;
+ virtual DocxExport& GetExport() override;
const DocxExport& GetExport() const { return const_cast< DocxAttributeOutput* >( this )->GetExport(); }
/// For e.g. the output of the styles, we need to switch the serializer to another one.
@@ -959,15 +959,15 @@ public:
void WritePostitFields();
/// VMLTextExport
- virtual void WriteOutliner(const OutlinerParaObject& rParaObj) SAL_OVERRIDE;
- virtual void WriteVMLTextBox(css::uno::Reference<css::drawing::XShape> xShape) SAL_OVERRIDE;
+ virtual void WriteOutliner(const OutlinerParaObject& rParaObj) override;
+ virtual void WriteVMLTextBox(css::uno::Reference<css::drawing::XShape> xShape) override;
/// DMLTextExport
- virtual void WriteTextBox(css::uno::Reference<css::drawing::XShape> xShape) SAL_OVERRIDE;
- virtual OUString FindRelId(BitmapChecksum nChecksum) SAL_OVERRIDE;
- virtual void CacheRelId(BitmapChecksum nChecksum, const OUString& rRelId) SAL_OVERRIDE;
- virtual oox::drawingml::DrawingML& GetDrawingML() SAL_OVERRIDE;
+ virtual void WriteTextBox(css::uno::Reference<css::drawing::XShape> xShape) override;
+ virtual OUString FindRelId(BitmapChecksum nChecksum) override;
+ virtual void CacheRelId(BitmapChecksum nChecksum, const OUString& rRelId) override;
+ virtual oox::drawingml::DrawingML& GetDrawingML() override;
- void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize) SAL_OVERRIDE;
+ void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize) override;
void SetWritingHeaderFooter( bool bWritingHeaderFooter ) { m_bWritingHeaderFooter = bWritingHeaderFooter; }
bool GetWritingHeaderFooter( ) { return m_bWritingHeaderFooter; }
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index 24953b710743..8ce9c1857078 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -108,65 +108,65 @@ public:
const DocxExportFilter& GetFilter() const { return *m_pFilter; };
/// Access to the attribute output class.
- virtual AttributeOutputBase& AttrOutput() const SAL_OVERRIDE;
+ virtual AttributeOutputBase& AttrOutput() const override;
/// Access to the derived attribute output class.
DocxAttributeOutput& DocxAttrOutput() const;
/// Access to the sections/headers/footres.
- virtual MSWordSections& Sections() const SAL_OVERRIDE;
+ virtual MSWordSections& Sections() const override;
- virtual bool SupportsOneColumnBreak() const SAL_OVERRIDE { return true; }
+ virtual bool SupportsOneColumnBreak() const override { return true; }
- virtual bool FieldsQuoted() const SAL_OVERRIDE { return true; }
+ virtual bool FieldsQuoted() const override { return true; }
- virtual bool AddSectionBreaksForTOX() const SAL_OVERRIDE { return true; }
+ virtual bool AddSectionBreaksForTOX() const override { return true; }
- virtual bool ignoreAttributeForStyleDefaults( sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual bool ignoreAttributeForStyleDefaults( sal_uInt16 nWhich ) const override;
- virtual bool PreferPageBreakBefore() const SAL_OVERRIDE { return false; }
+ virtual bool PreferPageBreakBefore() const override { return false; }
/// Guess the script (asian/western).
- virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) SAL_OVERRIDE;
+ virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) override;
- virtual void AppendBookmarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
+ virtual void AppendBookmarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) override;
- virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) SAL_OVERRIDE;
+ virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) override;
- virtual void AppendAnnotationMarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
+ virtual void AppendAnnotationMarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) override;
- virtual void ExportGrfBullet(const SwTextNode&) SAL_OVERRIDE;
+ virtual void ExportGrfBullet(const SwTextNode&) override;
/// Returns the relationd id
OString AddRelation( const OUString& rType, const OUString& rTarget );
- virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/ ) SAL_OVERRIDE { /* FIXME no-op for docx, most probably should not even be in MSWordExportBase */ }
- virtual void WriteChar( sal_Unicode ) SAL_OVERRIDE { /* FIXME */ fprintf( stderr, "HACK! WriteChar() has nothing to do for docx.\n" ); }
+ virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/ ) override { /* FIXME no-op for docx, most probably should not even be in MSWordExportBase */ }
+ virtual void WriteChar( sal_Unicode ) override { /* FIXME */ fprintf( stderr, "HACK! WriteChar() has nothing to do for docx.\n" ); }
/// Return value indicates if an inherited outline numbering is suppressed.
- virtual bool DisallowInheritingOutlineNumbering( const SwFormat &rFormat ) SAL_OVERRIDE;
+ virtual bool DisallowInheritingOutlineNumbering( const SwFormat &rFormat ) override;
/// Output the actual headers and footers.
virtual void WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
- const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, sal_uInt8 nBreakCode ) SAL_OVERRIDE;
+ const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, sal_uInt8 nBreakCode ) override;
/// Write the field
virtual void OutputField( const SwField* pField, ww::eField eFieldType,
- const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) SAL_OVERRIDE;
+ const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) override;
/// Write the data of the form field
- virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE;
- virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE;
+ virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) override;
+ virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) override;
virtual void DoComboBox(const OUString &rName,
const OUString &rHelp,
const OUString &ToolTip,
const OUString &rSelected,
- com::sun::star::uno::Sequence<OUString> &rListItems) SAL_OVERRIDE;
+ com::sun::star::uno::Sequence<OUString> &rListItems) override;
- virtual void DoFormText(const SwInputField * pField) SAL_OVERRIDE;
+ virtual void DoFormText(const SwInputField * pField) override;
- virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) SAL_OVERRIDE;
+ virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) override;
/// Returns the relationd id
OString OutputChart( com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr m_pSerializer );
@@ -180,28 +180,28 @@ public:
protected:
/// Format-dependent part of the actual export.
- virtual void ExportDocument_Impl() SAL_OVERRIDE;
+ virtual void ExportDocument_Impl() override;
/// Output SwEndNode
- virtual void OutputEndNode( const SwEndNode& ) SAL_OVERRIDE;
+ virtual void OutputEndNode( const SwEndNode& ) override;
/// Output SwGrfNode
- virtual void OutputGrfNode( const SwGrfNode& ) SAL_OVERRIDE;
+ virtual void OutputGrfNode( const SwGrfNode& ) override;
/// Output SwOLENode
- virtual void OutputOLENode( const SwOLENode& ) SAL_OVERRIDE;
+ virtual void OutputOLENode( const SwOLENode& ) override;
- virtual void OutputLinkedOLE( const OUString& ) SAL_OVERRIDE;
+ virtual void OutputLinkedOLE( const OUString& ) override;
- virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum ) SAL_OVERRIDE;
+ virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum ) override;
- virtual void SectionBreaksAndFrames( const SwTextNode& /*rNode*/ ) SAL_OVERRIDE {}
+ virtual void SectionBreaksAndFrames( const SwTextNode& /*rNode*/ ) override {}
/// Get ready for a new section.
virtual void PrepareNewPageDesc( const SfxItemSet* pSet,
const SwNode& rNd,
const SwFormatPageDesc* pNewPgDescFormat = 0,
- const SwPageDesc* pNewPgDesc = 0 ) SAL_OVERRIDE;
+ const SwPageDesc* pNewPgDesc = 0 ) override;
private:
/// Setup pStyles and write styles.xml
@@ -214,7 +214,7 @@ private:
void WritePostitFields();
/// Write the numbering table.
- virtual void WriteNumbering() SAL_OVERRIDE;
+ virtual void WriteNumbering() override;
/// Write reference to a header/footer + the actual xml containing the text.
void WriteHeaderFooter( const SwFormat& rFormat, bool bHeader, const char* pType );
diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx
index b688f5c33718..425d2461a93a 100644
--- a/sw/source/filter/ww8/docxexportfilter.hxx
+++ b/sw/source/filter/ww8/docxexportfilter.hxx
@@ -34,19 +34,19 @@ public:
// FIXME these should not even exist for the export-only filter!
// For now, let's just do empty implementations of those.
- virtual bool importDocument() SAL_OVERRIDE { return false; }
- virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE { return NULL; }
- virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE { return NULL; }
- virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE { return NULL; }
- virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE { return ::oox::drawingml::table::TableStyleListPtr(); }
+ virtual bool importDocument() override { return false; }
+ virtual const ::oox::drawingml::Theme* getCurrentTheme() const override { return NULL; }
+ virtual ::oox::vml::Drawing* getVmlDrawing() override { return NULL; }
+ virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override { return NULL; }
+ virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() override { return ::oox::drawingml::table::TableStyleListPtr(); }
// Actual export of the DOCX document
- virtual bool exportDocument() SAL_OVERRIDE;
+ virtual bool exportDocument() override;
private:
- virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
- virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE
+ virtual ::oox::ole::VbaProject* implCreateVbaProject() const override
{
return NULL; // FIXME: implement me !
}
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index e723b81e7f54..88c08beb789a 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -31,7 +31,7 @@ class SwFormatVertOrient;
class WinwordAnchoring : public EscherExClientRecord_Base
{
public:
- void WriteData(EscherEx& rEx) const SAL_OVERRIDE;
+ void WriteData(EscherEx& rEx) const override;
void SetAnchoring(const SwFrameFormat& rFormat);
/** method to perform conversion of positioning attributes with the help
@@ -81,7 +81,7 @@ public:
private:
/** Override to create a new memory stream for picture data. */
- virtual SvStream* ImplQueryPictureStream() SAL_OVERRIDE;
+ virtual SvStream* ImplQueryPictureStream() override;
private:
std::shared_ptr< SvStream > mxPicStrm;
@@ -154,23 +154,23 @@ private:
sal_uInt32 nTextBox, DrawObjPointerVector &rPVec);
void WriteOCXControl(const SwFrameFormat& rFormat,sal_uInt32 nShapeId);
virtual sal_Int32 WriteFlyFrameAttr(const SwFrameFormat& rFormat, MSO_SPT eShapeType,
- EscherPropertyContainer& rPropOpt) SAL_OVERRIDE;
+ EscherPropertyContainer& rPropOpt) override;
virtual sal_uInt32 QueryTextID(
const com::sun::star::uno::Reference<
- com::sun::star::drawing::XShape > &,sal_uInt32) SAL_OVERRIDE;
+ com::sun::star::drawing::XShape > &,sal_uInt32) override;
virtual void SetPicId(const SdrObject &rSdrObj, sal_uInt32 nShapeId,
- EscherPropertyContainer &rPropOpt) SAL_OVERRIDE;
+ EscherPropertyContainer &rPropOpt) override;
public:
SwEscherEx( SvStream* pStrm, WW8Export& rWW8Wrt );
virtual ~SwEscherEx();
void FinishEscher();
- virtual void WritePictures() SAL_OVERRIDE;
+ virtual void WritePictures() override;
- virtual void WriteFrmExtraData(const SwFrameFormat& rFormat) SAL_OVERRIDE;
+ virtual void WriteFrmExtraData(const SwFrameFormat& rFormat) override;
EscherExHostAppData* StartShape(const com::sun::star::uno::Reference<
- com::sun::star::drawing::XShape > &, const Rectangle*) SAL_OVERRIDE {return &aHostData;}
+ com::sun::star::drawing::XShape > &, const Rectangle*) override {return &aHostData;}
private:
SwEscherEx(const SwEscherEx&) = delete;
SwEscherEx &operator=(const SwEscherEx&) = delete;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index abc8e2d63c00..7f249d544db2 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -41,40 +41,40 @@ class RtfAttributeOutput : public AttributeOutputBase
friend class RtfStringBufferValue;
public:
/// Export the state of RTL/CJK.
- virtual void RTLAndCJKState(bool bIsRTL, sal_uInt16 nScript) SAL_OVERRIDE;
+ virtual void RTLAndCJKState(bool bIsRTL, sal_uInt16 nScript) override;
/// Start of the paragraph.
- virtual void StartParagraph(ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo) SAL_OVERRIDE;
+ virtual void StartParagraph(ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo) override;
/// End of the paragraph.
- virtual void EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner) SAL_OVERRIDE;
+ virtual void EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner) override;
/// Empty paragraph.
- virtual void EmptyParagraph() SAL_OVERRIDE;
+ virtual void EmptyParagraph() override;
/// Called in order to output section breaks.
- virtual void SectionBreaks(const SwNode& rNode) SAL_OVERRIDE;
+ virtual void SectionBreaks(const SwNode& rNode) override;
/// Called before we start outputting the attributes.
- virtual void StartParagraphProperties() SAL_OVERRIDE;
+ virtual void StartParagraphProperties() override;
/// Called after we end outputting the attributes.
- virtual void EndParagraphProperties(const SfxItemSet& rParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted) SAL_OVERRIDE;
+ virtual void EndParagraphProperties(const SfxItemSet& rParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted) override;
/// Start of the text run.
- virtual void StartRun(const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false) SAL_OVERRIDE;
+ virtual void StartRun(const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false) override;
/// End of the text run.
- virtual void EndRun() SAL_OVERRIDE;
+ virtual void EndRun() override;
/// Called before we start outputting the attributes.
- virtual void StartRunProperties() SAL_OVERRIDE;
+ virtual void StartRunProperties() override;
/// Called after we end outputting the attributes.
- virtual void EndRunProperties(const SwRedlineData* pRedlineData) SAL_OVERRIDE;
+ virtual void EndRunProperties(const SwRedlineData* pRedlineData) override;
/// Output text (inside a run).
- virtual void RunText(const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8) SAL_OVERRIDE;
+ virtual void RunText(const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8) override;
// Access to (anyway) private buffers, used by the sdr exporter
OStringBuffer& RunText();
@@ -84,118 +84,118 @@ public:
}
/// Output text (without markup).
- virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) SAL_OVERRIDE;
+ virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) override;
/// Output ruby start.
- virtual void StartRuby(const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby) SAL_OVERRIDE;
+ virtual void StartRuby(const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby) override;
/// Output ruby end.
- virtual void EndRuby() SAL_OVERRIDE;
+ virtual void EndRuby() override;
/// Output URL start.
- virtual bool StartURL(const OUString& rUrl, const OUString& rTarget) SAL_OVERRIDE;
+ virtual bool StartURL(const OUString& rUrl, const OUString& rTarget) override;
/// Output URL end.
- virtual bool EndURL(bool isAtEndOfParagraph) SAL_OVERRIDE;
+ virtual bool EndURL(bool isAtEndOfParagraph) override;
- virtual void FieldVanish(const OUString& rText, ww::eField eType) SAL_OVERRIDE;
+ virtual void FieldVanish(const OUString& rText, ww::eField eType) override;
/// Output redlining.
///
/// The common attribute that can be among the run properties.
- virtual void Redline(const SwRedlineData* pRedline) SAL_OVERRIDE;
+ virtual void Redline(const SwRedlineData* pRedline) override;
- virtual void FormatDrop(const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner) SAL_OVERRIDE;
+ virtual void FormatDrop(const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner) override;
/// Output style.
- virtual void ParagraphStyle(sal_uInt16 nStyle) SAL_OVERRIDE;
-
- virtual void TableInfoCell(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
- virtual void TableInfoRow(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
- virtual void TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
- virtual void TableDefaultBorders(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
- virtual void TableBackgrounds(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
- virtual void TableRowRedline(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
- virtual void TableCellRedline(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
- virtual void TableHeight(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
- virtual void TableCanSplit(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
- virtual void TableBidi(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
- virtual void TableVerticalCell(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
- virtual void TableNodeInfoInner(ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner) SAL_OVERRIDE;
- virtual void TableOrientation(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
- virtual void TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
- virtual void TableRowEnd(sal_uInt32 nDepth) SAL_OVERRIDE;
+ virtual void ParagraphStyle(sal_uInt16 nStyle) override;
+
+ virtual void TableInfoCell(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override;
+ virtual void TableInfoRow(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override;
+ virtual void TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override;
+ virtual void TableDefaultBorders(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override;
+ virtual void TableBackgrounds(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override;
+ virtual void TableRowRedline(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override;
+ virtual void TableCellRedline(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override;
+ virtual void TableHeight(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override;
+ virtual void TableCanSplit(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override;
+ virtual void TableBidi(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override;
+ virtual void TableVerticalCell(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override;
+ virtual void TableNodeInfoInner(ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner) override;
+ virtual void TableOrientation(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override;
+ virtual void TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override;
+ virtual void TableRowEnd(sal_uInt32 nDepth) override;
/// Start of the styles table.
- virtual void StartStyles() SAL_OVERRIDE;
+ virtual void StartStyles() override;
/// End of the styles table.
- virtual void EndStyles(sal_uInt16 nNumberOfStyles) SAL_OVERRIDE;
+ virtual void EndStyles(sal_uInt16 nNumberOfStyles) override;
/// Write default style.
- virtual void DefaultStyle(sal_uInt16 nStyle) SAL_OVERRIDE;
+ virtual void DefaultStyle(sal_uInt16 nStyle) override;
/// Start of a style in the styles table.
virtual void StartStyle(const OUString& rName, StyleType eType,
sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwId, sal_uInt16 nId,
- bool bAutoUpdate) SAL_OVERRIDE;
+ bool bAutoUpdate) override;
/// End of a style in the styles table.
- virtual void EndStyle() SAL_OVERRIDE;
+ virtual void EndStyle() override;
/// Start of (paragraph or run) properties of a style.
- virtual void StartStyleProperties(bool bParProp, sal_uInt16 nStyle) SAL_OVERRIDE;
+ virtual void StartStyleProperties(bool bParProp, sal_uInt16 nStyle) override;
/// End of (paragraph or run) properties of a style.
- virtual void EndStyleProperties(bool bParProp) SAL_OVERRIDE;
+ virtual void EndStyleProperties(bool bParProp) override;
/// Numbering rule and Id.
- virtual void OutlineNumbering(sal_uInt8 nLvl) SAL_OVERRIDE;
+ virtual void OutlineNumbering(sal_uInt8 nLvl) override;
/// Page break
/// As a paragraph property - the paragraph should be on the next page.
- virtual void PageBreakBefore(bool bBreak) SAL_OVERRIDE;
+ virtual void PageBreakBefore(bool bBreak) override;
/// Write a section break
/// msword::ColumnBreak or msword::PageBreak
- virtual void SectionBreak(sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL) SAL_OVERRIDE;
+ virtual void SectionBreak(sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL) override;
/// Start of the section properties.
- virtual void StartSection() SAL_OVERRIDE;
+ virtual void StartSection() override;
/// End of the section properties.
- virtual void EndSection() SAL_OVERRIDE;
+ virtual void EndSection() override;
/// Protection of forms.
- virtual void SectionFormProtection(bool bProtected) SAL_OVERRIDE;
+ virtual void SectionFormProtection(bool bProtected) override;
/// Numbering of the lines in the document.
- virtual void SectionLineNumbering(sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo) SAL_OVERRIDE;
+ virtual void SectionLineNumbering(sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo) override;
/// Has different headers/footers for the title page.
- virtual void SectionTitlePage() SAL_OVERRIDE;
+ virtual void SectionTitlePage() override;
/// Description of the page borders.
- virtual void SectionPageBorders(const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat) SAL_OVERRIDE;
+ virtual void SectionPageBorders(const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat) override;
/// Columns populated from right/numbers on the right side?
- virtual void SectionBiDi(bool bBiDi) SAL_OVERRIDE;
+ virtual void SectionBiDi(bool bBiDi) override;
/// The style of the page numbers.
///
- virtual void SectionPageNumbering(sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber) SAL_OVERRIDE;
+ virtual void SectionPageNumbering(sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber) override;
/// The type of breaking.
- virtual void SectionType(sal_uInt8 nBreakCode) SAL_OVERRIDE;
+ virtual void SectionType(sal_uInt8 nBreakCode) override;
/// Definition of a numbering instance.
- virtual void NumberingDefinition(sal_uInt16 nId, const SwNumRule& rRule) SAL_OVERRIDE;
+ virtual void NumberingDefinition(sal_uInt16 nId, const SwNumRule& rRule) override;
/// Start of the abstract numbering definition instance.
- virtual void StartAbstractNumbering(sal_uInt16 nId) SAL_OVERRIDE;
+ virtual void StartAbstractNumbering(sal_uInt16 nId) override;
/// End of the abstract numbering definition instance.
- virtual void EndAbstractNumbering() SAL_OVERRIDE;
+ virtual void EndAbstractNumbering() override;
/// All the numbering level information.
virtual void NumberingLevel(sal_uInt8 nLevel,
@@ -210,7 +210,7 @@ public:
sal_Int16 nFirstLineIndex,
sal_Int16 nListTabPos,
const OUString& rNumberingString,
- const SvxBrushItem* pBrush = 0) SAL_OVERRIDE;//For i120928,to export graphic of bullet
+ const SvxBrushItem* pBrush = 0) override;//For i120928,to export graphic of bullet
void WriteField_Impl(const SwField* pField, ww::eField eType, const OUString& rFieldCmd, sal_uInt8 nMode);
void WriteBookmarks_Impl(std::vector< OUString >& rStarts, std::vector< OUString >& rEnds);
@@ -219,230 +219,230 @@ public:
protected:
/// Output frames - the implementation.
- virtual void OutputFlyFrame_Impl(const sw::Frame& rFormat, const Point& rNdTopLeft) SAL_OVERRIDE;
+ virtual void OutputFlyFrame_Impl(const sw::Frame& rFormat, const Point& rNdTopLeft) override;
/// Sfx item Sfx item RES_CHRATR_CASEMAP
- virtual void CharCaseMap(const SvxCaseMapItem& rCaseMap) SAL_OVERRIDE;
+ virtual void CharCaseMap(const SvxCaseMapItem& rCaseMap) override;
/// Sfx item Sfx item RES_CHRATR_COLOR
- virtual void CharColor(const SvxColorItem& rColor) SAL_OVERRIDE;
+ virtual void CharColor(const SvxColorItem& rColor) override;
/// Sfx item Sfx item RES_CHRATR_CONTOUR
- virtual void CharContour(const SvxContourItem& rContour) SAL_OVERRIDE;
+ virtual void CharContour(const SvxContourItem& rContour) override;
/// Sfx item RES_CHRATR_CROSSEDOUT
- virtual void CharCrossedOut(const SvxCrossedOutItem& rCrossedOut) SAL_OVERRIDE;
+ virtual void CharCrossedOut(const SvxCrossedOutItem& rCrossedOut) override;
/// Sfx item RES_CHRATR_ESCAPEMENT
- virtual void CharEscapement(const SvxEscapementItem& rEscapement) SAL_OVERRIDE;
+ virtual void CharEscapement(const SvxEscapementItem& rEscapement) override;
/// Sfx item RES_CHRATR_FONT
- virtual void CharFont(const SvxFontItem& rFont) SAL_OVERRIDE;
+ virtual void CharFont(const SvxFontItem& rFont) override;
/// Sfx item RES_CHRATR_FONTSIZE
- virtual void CharFontSize(const SvxFontHeightItem& rFontSize) SAL_OVERRIDE;
+ virtual void CharFontSize(const SvxFontHeightItem& rFontSize) override;
/// Sfx item RES_CHRATR_KERNING
- virtual void CharKerning(const SvxKerningItem& rKerning) SAL_OVERRIDE;
+ virtual void CharKerning(const SvxKerningItem& rKerning) override;
/// Sfx item RES_CHRATR_LANGUAGE
- virtual void CharLanguage(const SvxLanguageItem& rLanguage) SAL_OVERRIDE;
+ virtual void CharLanguage(const SvxLanguageItem& rLanguage) override;
/// Sfx item RES_CHRATR_POSTURE
- virtual void CharPosture(const SvxPostureItem& rPosture) SAL_OVERRIDE;
+ virtual void CharPosture(const SvxPostureItem& rPosture) override;
/// Sfx item RES_CHRATR_SHADOWED
- virtual void CharShadow(const SvxShadowedItem& rShadow) SAL_OVERRIDE;
+ virtual void CharShadow(const SvxShadowedItem& rShadow) override;
/// Sfx item RES_CHRATR_UNDERLINE
- virtual void CharUnderline(const SvxUnderlineItem& rUnderline) SAL_OVERRIDE;
+ virtual void CharUnderline(const SvxUnderlineItem& rUnderline) override;
/// Sfx item RES_CHRATR_WEIGHT
- virtual void CharWeight(const SvxWeightItem& rWeight) SAL_OVERRIDE;
+ virtual void CharWeight(const SvxWeightItem& rWeight) override;
/// Sfx item RES_CHRATR_AUTOKERN
- virtual void CharAutoKern(const SvxAutoKernItem&) SAL_OVERRIDE;
+ virtual void CharAutoKern(const SvxAutoKernItem&) override;
/// Sfx item RES_CHRATR_BLINK
- virtual void CharAnimatedText(const SvxBlinkItem& rBlink) SAL_OVERRIDE;
+ virtual void CharAnimatedText(const SvxBlinkItem& rBlink) override;
/// Sfx item RES_CHRATR_BACKGROUND
- virtual void CharBackground(const SvxBrushItem& rBrush) SAL_OVERRIDE;
+ virtual void CharBackground(const SvxBrushItem& rBrush) override;
/// Sfx item RES_CHRATR_CJK_FONT
- virtual void CharFontCJK(const SvxFontItem& rFont) SAL_OVERRIDE;
+ virtual void CharFontCJK(const SvxFontItem& rFont) override;
/// Sfx item RES_CHRATR_CJK_FONTSIZE
- virtual void CharFontSizeCJK(const SvxFontHeightItem& rFontSize) SAL_OVERRIDE;
+ virtual void CharFontSizeCJK(const SvxFontHeightItem& rFontSize) override;
/// Sfx item RES_CHRATR_CJK_LANGUAGE
- virtual void CharLanguageCJK(const SvxLanguageItem& rLanguageItem) SAL_OVERRIDE;
+ virtual void CharLanguageCJK(const SvxLanguageItem& rLanguageItem) override;
/// Sfx item RES_CHRATR_CJK_POSTURE
- virtual void CharPostureCJK(const SvxPostureItem& rPosture) SAL_OVERRIDE;
+ virtual void CharPostureCJK(const SvxPostureItem& rPosture) override;
/// Sfx item RES_CHRATR_CJK_WEIGHT
- virtual void CharWeightCJK(const SvxWeightItem& rWeight) SAL_OVERRIDE;
+ virtual void CharWeightCJK(const SvxWeightItem& rWeight) override;
/// Sfx item RES_CHRATR_CTL_FONT
- virtual void CharFontCTL(const SvxFontItem& rFont) SAL_OVERRIDE;
+ virtual void CharFontCTL(const SvxFontItem& rFont) override;
/// Sfx item RES_CHRATR_CTL_FONTSIZE
- virtual void CharFontSizeCTL(const SvxFontHeightItem& rFontSize) SAL_OVERRIDE;
+ virtual void CharFontSizeCTL(const SvxFontHeightItem& rFontSize) override;
/// Sfx item RES_CHRATR_CTL_LANGUAGE
- virtual void CharLanguageCTL(const SvxLanguageItem& rLanguageItem) SAL_OVERRIDE;
+ virtual void CharLanguageCTL(const SvxLanguageItem& rLanguageItem) override;
/// Sfx item RES_CHRATR_CTL_POSTURE
- virtual void CharPostureCTL(const SvxPostureItem& rWeight) SAL_OVERRIDE;
+ virtual void CharPostureCTL(const SvxPostureItem& rWeight) override;
/// Sfx item RES_CHRATR_CTL_WEIGHT
- virtual void CharWeightCTL(const SvxWeightItem& rWeight) SAL_OVERRIDE;
+ virtual void CharWeightCTL(const SvxWeightItem& rWeight) override;
/// Sfx item RES_CHRATR_BidiRTL
- virtual void CharBidiRTL(const SfxPoolItem&) SAL_OVERRIDE;
+ virtual void CharBidiRTL(const SfxPoolItem&) override;
/// Sfx item RES_CHRATR_IdctHint
- virtual void CharIdctHint(const SfxPoolItem&) SAL_OVERRIDE;
+ virtual void CharIdctHint(const SfxPoolItem&) override;
/// Sfx item RES_CHRATR_ROTATE
- virtual void CharRotate(const SvxCharRotateItem& rRotate) SAL_OVERRIDE;
+ virtual void CharRotate(const SvxCharRotateItem& rRotate) override;
/// Sfx item RES_CHRATR_EMPHASIS_MARK
- virtual void CharEmphasisMark(const SvxEmphasisMarkItem& rEmphasisMark) SAL_OVERRIDE;
+ virtual void CharEmphasisMark(const SvxEmphasisMarkItem& rEmphasisMark) override;
/// Sfx item RES_CHRATR_TWO_LINES
- virtual void CharTwoLines(const SvxTwoLinesItem& rTwoLines) SAL_OVERRIDE;
+ virtual void CharTwoLines(const SvxTwoLinesItem& rTwoLines) override;
/// Sfx item RES_CHRATR_SCALEW
- virtual void CharScaleWidth(const SvxCharScaleWidthItem& rScaleWidth) SAL_OVERRIDE;
+ virtual void CharScaleWidth(const SvxCharScaleWidthItem& rScaleWidth) override;
/// Sfx item RES_CHRATR_RELIEF
- virtual void CharRelief(const SvxCharReliefItem& rRelief) SAL_OVERRIDE;
+ virtual void CharRelief(const SvxCharReliefItem& rRelief) override;
/// Sfx item RES_CHRATR_HIDDEN
- virtual void CharHidden(const SvxCharHiddenItem& rHidden) SAL_OVERRIDE;
+ virtual void CharHidden(const SvxCharHiddenItem& rHidden) override;
/// Sfx item RES_CHRATR_BOX
- virtual void CharBorder(const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow) SAL_OVERRIDE;
+ virtual void CharBorder(const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow) override;
/// Sfx item RES_CHRATR_HIGHLIGHT
- virtual void CharHighlight(const SvxBrushItem&) SAL_OVERRIDE;
+ virtual void CharHighlight(const SvxBrushItem&) override;
/// Sfx item RES_TXTATR_INETFMT
- virtual void TextINetFormat(const SwFormatINetFormat&) SAL_OVERRIDE;
+ virtual void TextINetFormat(const SwFormatINetFormat&) override;
/// Sfx item RES_TXTATR_CHARFMT
- virtual void TextCharFormat(const SwFormatCharFormat&) SAL_OVERRIDE;
+ virtual void TextCharFormat(const SwFormatCharFormat&) override;
/// Sfx item RES_TXTATR_FTN
- virtual void TextFootnote_Impl(const SwFormatFootnote&) SAL_OVERRIDE;
+ virtual void TextFootnote_Impl(const SwFormatFootnote&) override;
/// Sfx item RES_PARATR_LINESPACING
- virtual void ParaLineSpacing_Impl(short nSpace, short nMulti) SAL_OVERRIDE;
+ virtual void ParaLineSpacing_Impl(short nSpace, short nMulti) override;
/// Sfx item RES_PARATR_ADJUST
- virtual void ParaAdjust(const SvxAdjustItem& rAdjust) SAL_OVERRIDE;
+ virtual void ParaAdjust(const SvxAdjustItem& rAdjust) override;
/// Sfx item RES_PARATR_SPLIT
- virtual void ParaSplit(const SvxFormatSplitItem& rSplit) SAL_OVERRIDE;
+ virtual void ParaSplit(const SvxFormatSplitItem& rSplit) override;
/// Sfx item RES_PARATR_WIDOWS
- virtual void ParaWidows(const SvxWidowsItem& rWidows) SAL_OVERRIDE;
+ virtual void ParaWidows(const SvxWidowsItem& rWidows) override;
/// Sfx item RES_PARATR_TABSTOP
- virtual void ParaTabStop(const SvxTabStopItem& rTabStop) SAL_OVERRIDE;
+ virtual void ParaTabStop(const SvxTabStopItem& rTabStop) override;
/// Sfx item RES_PARATR_HYPHENZONE
- virtual void ParaHyphenZone(const SvxHyphenZoneItem&) SAL_OVERRIDE;
+ virtual void ParaHyphenZone(const SvxHyphenZoneItem&) override;
/// Sfx item RES_PARATR_NUMRULE
- virtual void ParaNumRule_Impl(const SwTextNode* pTextNd, sal_Int32 nLvl, sal_Int32 nNumId) SAL_OVERRIDE;
+ virtual void ParaNumRule_Impl(const SwTextNode* pTextNd, sal_Int32 nLvl, sal_Int32 nNumId) override;
/// Sfx item RES_PARATR_SCRIPTSPACE
- virtual void ParaScriptSpace(const SfxBoolItem&) SAL_OVERRIDE;
+ virtual void ParaScriptSpace(const SfxBoolItem&) override;
/// Sfx item RES_PARATR_HANGINGPUNCTUATION
- virtual void ParaHangingPunctuation(const SfxBoolItem&) SAL_OVERRIDE;
+ virtual void ParaHangingPunctuation(const SfxBoolItem&) override;
/// Sfx item RES_PARATR_FORBIDDEN_RULES
- virtual void ParaForbiddenRules(const SfxBoolItem&) SAL_OVERRIDE;
+ virtual void ParaForbiddenRules(const SfxBoolItem&) override;
/// Sfx item RES_PARATR_VERTALIGN
- virtual void ParaVerticalAlign(const SvxParaVertAlignItem& rAlign) SAL_OVERRIDE;
+ virtual void ParaVerticalAlign(const SvxParaVertAlignItem& rAlign) override;
/// Sfx item RES_PARATR_SNAPTOGRID
- virtual void ParaSnapToGrid(const SvxParaGridItem&) SAL_OVERRIDE;
+ virtual void ParaSnapToGrid(const SvxParaGridItem&) override;
/// Sfx item RES_FRM_SIZE
- virtual void FormatFrameSize(const SwFormatFrmSize&) SAL_OVERRIDE;
+ virtual void FormatFrameSize(const SwFormatFrmSize&) override;
/// Sfx item RES_PAPER_BIN
- virtual void FormatPaperBin(const SvxPaperBinItem&) SAL_OVERRIDE;
+ virtual void FormatPaperBin(const SvxPaperBinItem&) override;
/// Sfx item RES_LR_SPACE
- virtual void FormatLRSpace(const SvxLRSpaceItem& rLRSpace) SAL_OVERRIDE;
+ virtual void FormatLRSpace(const SvxLRSpaceItem& rLRSpace) override;
/// Sfx item RES_UL_SPACE
- virtual void FormatULSpace(const SvxULSpaceItem& rULSpace) SAL_OVERRIDE;
+ virtual void FormatULSpace(const SvxULSpaceItem& rULSpace) override;
/// Sfx item RES_SURROUND
- virtual void FormatSurround(const SwFormatSurround&) SAL_OVERRIDE;
+ virtual void FormatSurround(const SwFormatSurround&) override;
/// Sfx item RES_VERT_ORIENT
- virtual void FormatVertOrientation(const SwFormatVertOrient&) SAL_OVERRIDE;
+ virtual void FormatVertOrientation(const SwFormatVertOrient&) override;
/// Sfx item RES_HORI_ORIENT
- virtual void FormatHorizOrientation(const SwFormatHoriOrient&) SAL_OVERRIDE;
+ virtual void FormatHorizOrientation(const SwFormatHoriOrient&) override;
/// Sfx item RES_ANCHOR
- virtual void FormatAnchor(const SwFormatAnchor&) SAL_OVERRIDE;
+ virtual void FormatAnchor(const SwFormatAnchor&) override;
/// Sfx item RES_BACKGROUND
- virtual void FormatBackground(const SvxBrushItem&) SAL_OVERRIDE;
+ virtual void FormatBackground(const SvxBrushItem&) override;
/// Sfx item RES_FILL_STYLE
- virtual void FormatFillStyle(const XFillStyleItem&) SAL_OVERRIDE;
+ virtual void FormatFillStyle(const XFillStyleItem&) override;
/// Sfx item RES_FILL_GRADIENT
- virtual void FormatFillGradient(const XFillGradientItem&) SAL_OVERRIDE;
+ virtual void FormatFillGradient(const XFillGradientItem&) override;
/// Sfx item RES_BOX
- virtual void FormatBox(const SvxBoxItem&) SAL_OVERRIDE;
+ virtual void FormatBox(const SvxBoxItem&) override;
/// Sfx item RES_COL
- virtual void FormatColumns_Impl(sal_uInt16 nCols, const SwFormatCol& rCol, bool bEven, SwTwips nPageSize) SAL_OVERRIDE;
+ virtual void FormatColumns_Impl(sal_uInt16 nCols, const SwFormatCol& rCol, bool bEven, SwTwips nPageSize) override;
/// Sfx item RES_KEEP
- virtual void FormatKeep(const SvxFormatKeepItem&) SAL_OVERRIDE;
+ virtual void FormatKeep(const SvxFormatKeepItem&) override;
/// Sfx item RES_TEXTGRID
- virtual void FormatTextGrid(const SwTextGridItem&) SAL_OVERRIDE;
+ virtual void FormatTextGrid(const SwTextGridItem&) override;
/// Sfx item RES_LINENUMBER
- virtual void FormatLineNumbering(const SwFormatLineNumber&) SAL_OVERRIDE;
+ virtual void FormatLineNumbering(const SwFormatLineNumber&) override;
/// Sfx item RES_FRAMEDIR
- virtual void FormatFrameDirection(const SvxFrameDirectionItem&) SAL_OVERRIDE;
+ virtual void FormatFrameDirection(const SvxFrameDirectionItem&) override;
/// Sfx item RES_PARATR_GRABBAG
- virtual void ParaGrabBag(const SfxGrabBagItem&) SAL_OVERRIDE;
+ virtual void ParaGrabBag(const SfxGrabBagItem&) override;
/// Sfx item RES_CHRATR_GRABBAG
- virtual void CharGrabBag(const SfxGrabBagItem&) SAL_OVERRIDE;
+ virtual void CharGrabBag(const SfxGrabBagItem&) override;
/// Sfx item RES_PARATR_OUTLINELEVEL
- virtual void ParaOutlineLevel(const SfxUInt16Item&) SAL_OVERRIDE;
+ virtual void ParaOutlineLevel(const SfxUInt16Item&) override;
/// Write the expanded field
- virtual void WriteExpand(const SwField* pField) SAL_OVERRIDE;
+ virtual void WriteExpand(const SwField* pField) override;
- virtual void RefField(const SwField& rField, const OUString& rRef) SAL_OVERRIDE;
- virtual void HiddenField(const SwField& rField) SAL_OVERRIDE;
- virtual void SetField(const SwField& rField, ww::eField eType, const OUString& rCmd) SAL_OVERRIDE;
- virtual void PostitField(const SwField* pField) SAL_OVERRIDE;
- virtual bool DropdownField(const SwField* pField) SAL_OVERRIDE;
- virtual bool PlaceholderField(const SwField* pField) SAL_OVERRIDE;
+ virtual void RefField(const SwField& rField, const OUString& rRef) override;
+ virtual void HiddenField(const SwField& rField) override;
+ virtual void SetField(const SwField& rField, ww::eField eType, const OUString& rCmd) override;
+ virtual void PostitField(const SwField* pField) override;
+ virtual bool DropdownField(const SwField* pField) override;
+ virtual bool PlaceholderField(const SwField* pField) override;
/// Reference to the export, where to get the data from
RtfExport& m_rExport;
@@ -604,7 +604,7 @@ public:
virtual ~RtfAttributeOutput();
/// Return the right export class.
- virtual MSWordExportBase& GetExport() SAL_OVERRIDE;
+ virtual MSWordExportBase& GetExport() override;
OStringBuffer m_aTabStop;
@@ -633,7 +633,7 @@ public:
/// Writes binary data as a hex dump.
static OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, SvStream* pStream = 0, sal_uInt32 nLimit = 64);
- void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize) SAL_OVERRIDE;
+ void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize) override;
/// Handles just the {\shptxt ...} part of a shape export.
void writeTextFrame(const sw::Frame& rFrame, bool bTextBox = false);
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 8d79e044e91a..607521cd4e9d 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -1237,7 +1237,7 @@ private:
public:
SwRTFWriter(const OUString& rFilterName, const OUString& rBaseURL);
virtual ~SwRTFWriter();
- virtual sal_uLong WriteStream() SAL_OVERRIDE;
+ virtual sal_uLong WriteStream() override;
};
SwRTFWriter::SwRTFWriter(const OUString& rFltName, const OUString& rBaseURL)
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index e3af02f88c87..f6325137391a 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -50,107 +50,107 @@ class RtfExport : public MSWordExportBase
public:
/// Access to the attribute output class.
- virtual AttributeOutputBase& AttrOutput() const SAL_OVERRIDE;
+ virtual AttributeOutputBase& AttrOutput() const override;
/// Access to the sections/headers/footres.
- virtual MSWordSections& Sections() const SAL_OVERRIDE;
+ virtual MSWordSections& Sections() const override;
/// Access to the Rtf Sdr exporter.
RtfSdrExport& SdrExporter() const;
- virtual bool SupportsOneColumnBreak() const SAL_OVERRIDE
+ virtual bool SupportsOneColumnBreak() const override
{
return false;
}
- virtual bool FieldsQuoted() const SAL_OVERRIDE
+ virtual bool FieldsQuoted() const override
{
return true;
}
- virtual bool AddSectionBreaksForTOX() const SAL_OVERRIDE
+ virtual bool AddSectionBreaksForTOX() const override
{
return false;
}
- virtual bool PreferPageBreakBefore() const SAL_OVERRIDE
+ virtual bool PreferPageBreakBefore() const override
{
return true;
}
/// Guess the script (asian/western).
- virtual bool CollapseScriptsforWordOk(sal_uInt16 nScript, sal_uInt16 nWhich) SAL_OVERRIDE;
+ virtual bool CollapseScriptsforWordOk(sal_uInt16 nScript, sal_uInt16 nWhich) override;
- virtual void AppendBookmarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen) SAL_OVERRIDE;
+ virtual void AppendBookmarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen) override;
- virtual void AppendBookmark(const OUString& rName, bool bSkip = false) SAL_OVERRIDE;
+ virtual void AppendBookmark(const OUString& rName, bool bSkip = false) override;
- virtual void AppendAnnotationMarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen) SAL_OVERRIDE;
+ virtual void AppendAnnotationMarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen) override;
//For i120928,add an interface to export graphic of bullet
- virtual void ExportGrfBullet(const SwTextNode& rNd) SAL_OVERRIDE;
+ virtual void ExportGrfBullet(const SwTextNode& rNd) override;
- virtual void WriteCR(ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/) SAL_OVERRIDE { /* no-op for rtf, most probably should not even be in MSWordExportBase */ }
- virtual void WriteChar(sal_Unicode) SAL_OVERRIDE;
+ virtual void WriteCR(ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/) override { /* no-op for rtf, most probably should not even be in MSWordExportBase */ }
+ virtual void WriteChar(sal_Unicode) override;
/// Write the numbering table.
- virtual void WriteNumbering() SAL_OVERRIDE;
+ virtual void WriteNumbering() override;
/// Write the revision table.
void WriteRevTab();
/// Output the actual headers and footers.
virtual void WriteHeadersFooters(sal_uInt8 nHeadFootFlags,
- const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, sal_uInt8 nBreakCode) SAL_OVERRIDE;
+ const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, sal_uInt8 nBreakCode) override;
/// Write the field
virtual void OutputField(const SwField* pField, ww::eField eFieldType,
- const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL) SAL_OVERRIDE;
+ const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL) override;
/// Write the data of the form field
- virtual void WriteFormData(const ::sw::mark::IFieldmark& rFieldmark) SAL_OVERRIDE;
- virtual void WriteHyperlinkData(const ::sw::mark::IFieldmark& rFieldmark) SAL_OVERRIDE;
+ virtual void WriteFormData(const ::sw::mark::IFieldmark& rFieldmark) override;
+ virtual void WriteHyperlinkData(const ::sw::mark::IFieldmark& rFieldmark) override;
virtual void DoComboBox(const OUString& rName,
const OUString& rHelp,
const OUString& ToolTip,
const OUString& rSelected,
- css::uno::Sequence<OUString>& rListItems) SAL_OVERRIDE;
+ css::uno::Sequence<OUString>& rListItems) override;
- virtual void DoFormText(const SwInputField* pField) SAL_OVERRIDE;
+ virtual void DoFormText(const SwInputField* pField) override;
- virtual sal_uLong ReplaceCr(sal_uInt8 nChar) SAL_OVERRIDE;
+ virtual sal_uLong ReplaceCr(sal_uInt8 nChar) override;
protected:
/// Format-dependent part of the actual export.
- virtual void ExportDocument_Impl() SAL_OVERRIDE;
+ virtual void ExportDocument_Impl() override;
- virtual void SectionBreaksAndFrames(const SwTextNode& /*rNode*/) SAL_OVERRIDE {}
+ virtual void SectionBreaksAndFrames(const SwTextNode& /*rNode*/) override {}
/// Get ready for a new section.
virtual void PrepareNewPageDesc(const SfxItemSet* pSet,
const SwNode& rNd,
const SwFormatPageDesc* pNewPgDescFormat = 0,
- const SwPageDesc* pNewPgDesc = 0) SAL_OVERRIDE;
+ const SwPageDesc* pNewPgDesc = 0) override;
/// Return value indicates if an inherited outline numbering is suppressed.
- virtual bool DisallowInheritingOutlineNumbering(const SwFormat& rFormat) SAL_OVERRIDE;
+ virtual bool DisallowInheritingOutlineNumbering(const SwFormat& rFormat) override;
/// Output SwTextNode is depending on outline export mode
- virtual void OutputTextNode(const SwTextNode&) SAL_OVERRIDE;
+ virtual void OutputTextNode(const SwTextNode&) override;
/// Output SwEndNode
- virtual void OutputEndNode(const SwEndNode&) SAL_OVERRIDE;
+ virtual void OutputEndNode(const SwEndNode&) override;
/// Output SwGrfNode
- virtual void OutputGrfNode(const SwGrfNode&) SAL_OVERRIDE;
+ virtual void OutputGrfNode(const SwGrfNode&) override;
/// Output SwOLENode
- virtual void OutputOLENode(const SwOLENode&) SAL_OVERRIDE;
+ virtual void OutputOLENode(const SwOLENode&) override;
- virtual void OutputLinkedOLE(const OUString&) SAL_OVERRIDE;
+ virtual void OutputLinkedOLE(const OUString&) override;
- virtual void AppendSection(const SwPageDesc* pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum) SAL_OVERRIDE;
+ virtual void AppendSection(const SwPageDesc* pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum) override;
public:
/// Pass the pDocument, pCurrentPam and pOriginalPam to the base class.
diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx
index e41e86ff91f5..ba59f3bb458f 100644
--- a/sw/source/filter/ww8/rtfexportfilter.hxx
+++ b/sw/source/filter/ww8/rtfexportfilter.hxx
@@ -30,7 +30,7 @@
class RtfWriter : public Writer
{
protected:
- sal_uLong WriteStream() SAL_OVERRIDE { return 0; }
+ sal_uLong WriteStream() override { return 0; }
};
/// The physical access to the RTF document (for writing).
@@ -48,12 +48,12 @@ public:
virtual ~RtfExportFilter();
// XFilter
- virtual sal_Bool SAL_CALL filter(const css::uno::Sequence<css::beans::PropertyValue>& aDescriptor) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL filter(const css::uno::Sequence<css::beans::PropertyValue>& aDescriptor) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) override;
// XExporter
virtual void SAL_CALL setSourceDocument(const css::uno::Reference<css::lang::XComponent>& xDoc)
- throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
RtfWriter m_aWriter;
};
diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx
index 139bc9cd0b42..fdb5371c2c95 100644
--- a/sw/source/filter/ww8/rtfsdrexport.hxx
+++ b/sw/source/filter/ww8/rtfsdrexport.hxx
@@ -82,17 +82,17 @@ protected:
using EscherEx::EndShape;
void EndShape(sal_Int32 nShapeElement);
- virtual void Commit(EscherPropertyContainer& rProps, const Rectangle& rRect) SAL_OVERRIDE;
+ virtual void Commit(EscherPropertyContainer& rProps, const Rectangle& rRect) override;
private:
- virtual void OpenContainer(sal_uInt16 nEscherContainer, int nRecInstance = 0) SAL_OVERRIDE;
- virtual void CloseContainer() SAL_OVERRIDE;
+ virtual void OpenContainer(sal_uInt16 nEscherContainer, int nRecInstance = 0) override;
+ virtual void CloseContainer() override;
- virtual sal_uInt32 EnterGroup(const OUString& rShapeName, const Rectangle* pBoundRect = 0) SAL_OVERRIDE;
- virtual void LeaveGroup() SAL_OVERRIDE;
+ virtual sal_uInt32 EnterGroup(const OUString& rShapeName, const Rectangle* pBoundRect = 0) override;
+ virtual void LeaveGroup() override;
- virtual void AddShape(sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0) SAL_OVERRIDE;
+ virtual void AddShape(sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0) override;
private:
/// Add starting and ending point of a line to the m_pShapeAttrList.
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 005138bf00b1..3638e69d25c1 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -249,7 +249,7 @@ public:
explicit WW8_WrPlcSepx( MSWordExportBase& rExport );
virtual ~WW8_WrPlcSepx();
- virtual bool HeaderFooterWritten() SAL_OVERRIDE; // override
+ virtual bool HeaderFooterWritten() override; // override
void AppendSep( WW8_CP nStartCp,
const SwPageDesc* pPd,
@@ -386,8 +386,8 @@ public:
MainTextPlcDrawObj() {}
private:
virtual void RegisterWithFib(WW8Fib &rFib, sal_uInt32 nStart,
- sal_uInt32 nLen) const SAL_OVERRIDE;
- virtual WW8_CP GetCpOffset(const WW8Fib &) const SAL_OVERRIDE;
+ sal_uInt32 nLen) const override;
+ virtual WW8_CP GetCpOffset(const WW8Fib &) const override;
private:
MainTextPlcDrawObj(const MainTextPlcDrawObj&) = delete;
MainTextPlcDrawObj& operator=(const MainTextPlcDrawObj&) = delete;
@@ -399,8 +399,8 @@ public:
HdFtPlcDrawObj() {}
private:
virtual void RegisterWithFib(WW8Fib &rFib, sal_uInt32 nStart,
- sal_uInt32 nLen) const SAL_OVERRIDE;
- virtual WW8_CP GetCpOffset(const WW8Fib &rFib) const SAL_OVERRIDE;
+ sal_uInt32 nLen) const override;
+ virtual WW8_CP GetCpOffset(const WW8Fib &rFib) const override;
private:
HdFtPlcDrawObj(const HdFtPlcDrawObj&) = delete;
HdFtPlcDrawObj& operator=(const HdFtPlcDrawObj&) = delete;
@@ -411,7 +411,7 @@ typedef ::std::pair<OUString, sal_uLong> aBookmarkPair;
class WW8_WrtRedlineAuthor : public sw::util::WrtRedlineAuthor
{
public:
- virtual void Write(Writer &rWrt) SAL_OVERRIDE;
+ virtual void Write(Writer &rWrt) override;
};
/** Structure that is used to save some of the WW8Export/DocxExport data.
@@ -897,8 +897,8 @@ public:
SwWW8Writer(const OUString& rFltName, const OUString& rBaseURL);
virtual ~SwWW8Writer();
- virtual sal_uLong WriteStorage() SAL_OVERRIDE;
- virtual sal_uLong WriteMedium( SfxMedium& ) SAL_OVERRIDE;
+ virtual sal_uLong WriteStorage() override;
+ virtual sal_uLong WriteMedium( SfxMedium& ) override;
// TODO most probably we want to be able to get these in
// MSExportFilterBase
@@ -930,7 +930,7 @@ public:
bool InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec );
using StgWriter::Write;
- virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ) SAL_OVERRIDE;
+ virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ) override;
//Seems not an expected to provide method to access the private member
SfxMedium* GetMedia() { return mpMedium; }
@@ -964,21 +964,21 @@ private:
public:
/// Access to the attribute output class.
- virtual AttributeOutputBase& AttrOutput() const SAL_OVERRIDE;
+ virtual AttributeOutputBase& AttrOutput() const override;
/// Access to the sections/headers/footres.
- virtual MSWordSections& Sections() const SAL_OVERRIDE;
+ virtual MSWordSections& Sections() const override;
- virtual bool PreferPageBreakBefore() const SAL_OVERRIDE { return true; }
+ virtual bool PreferPageBreakBefore() const override { return true; }
- virtual bool SupportsOneColumnBreak() const SAL_OVERRIDE { return false; }
+ virtual bool SupportsOneColumnBreak() const override { return false; }
- virtual bool FieldsQuoted() const SAL_OVERRIDE { return false; }
+ virtual bool FieldsQuoted() const override { return false; }
- virtual bool AddSectionBreaksForTOX() const SAL_OVERRIDE { return false; }
+ virtual bool AddSectionBreaksForTOX() const override { return false; }
private:
/// Format-dependent part of the actual export.
- virtual void ExportDocument_Impl() SAL_OVERRIDE;
+ virtual void ExportDocument_Impl() override;
void PrepareStorage();
void WriteFkpPlcUsw();
@@ -986,7 +986,7 @@ private:
void StoreDoc1();
/// Output the numbering table.
- virtual void WriteNumbering() SAL_OVERRIDE;
+ virtual void WriteNumbering() override;
void OutOverrideListTab();
void OutListNamesTab();
@@ -999,7 +999,7 @@ private:
public:
/// Setup the pA's info.
- virtual void SetupSectionPositions( WW8_PdAttrDesc* pA ) SAL_OVERRIDE;
+ virtual void SetupSectionPositions( WW8_PdAttrDesc* pA ) override;
bool MiserableFormFieldExportHack(const SwFrameFormat& rFrameFormat);
@@ -1025,7 +1025,7 @@ public:
/// Write the field
virtual void OutputField( const SwField* pField, ww::eField eFieldType,
- const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) SAL_OVERRIDE;
+ const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) override;
void StartCommentOutput( const OUString& rName );
void EndCommentOutput( const OUString& rName );
@@ -1033,12 +1033,12 @@ public:
bool TestOleNeedsGraphic(const SwAttrSet& rSet, tools::SvRef<SotStorage> xOleStg,
tools::SvRef<SotStorage> xObjStg, OUString &rStorageName, SwOLENode *pOLENd);
- virtual void AppendBookmarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
- virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) SAL_OVERRIDE;
+ virtual void AppendBookmarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) override;
+ virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) override;
- virtual void AppendAnnotationMarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
+ virtual void AppendAnnotationMarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) override;
- virtual void ExportGrfBullet(const SwTextNode& rNd) SAL_OVERRIDE;
+ virtual void ExportGrfBullet(const SwTextNode& rNd) override;
void OutGrfBullets(const sw::Frame &rFrame);
void MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo);
@@ -1046,10 +1046,10 @@ public:
void WriteAsStringTable(const ::std::vector<OUString>&, sal_Int32& rfcSttbf,
sal_Int32& rlcbSttbf, sal_uInt16 nExtraLen = 0);
- virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) SAL_OVERRIDE;
+ virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) override;
- virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t() ) SAL_OVERRIDE;
- void WriteChar( sal_Unicode c ) SAL_OVERRIDE;
+ virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t() ) override;
+ void WriteChar( sal_Unicode c ) override;
void OutSwString(const OUString&, sal_Int32 nStt, sal_Int32 nLen);
@@ -1060,14 +1060,14 @@ public:
void OutSprmBytes( sal_uInt8* pBytes, sal_uInt16 nSiz )
{ pO->insert( pO->end(), pBytes, pBytes+nSiz ); }
- virtual void SectionBreaksAndFrames( const SwTextNode& rNode ) SAL_OVERRIDE;
+ virtual void SectionBreaksAndFrames( const SwTextNode& rNode ) override;
/// Helper method for OutputSectionBreaks() and OutputFollowPageDesc().
// #i76300#
virtual void PrepareNewPageDesc( const SfxItemSet* pSet,
const SwNode& rNd,
const SwFormatPageDesc* pNewPgDescFormat = 0,
- const SwPageDesc* pNewPgDesc = 0 ) SAL_OVERRIDE;
+ const SwPageDesc* pNewPgDesc = 0 ) override;
static void Out_BorderLine(ww::bytes& rO, const ::editeng::SvxBorderLine* pLine,
sal_uInt16 nDist, sal_uInt16 nSprmNo, sal_uInt16 nSprmNoVer9,
@@ -1082,7 +1082,7 @@ public:
sal_uInt16 nDist, bool bShadow);
// #i77805# - new return value indicates, if an inherited outline numbering is suppressed
- virtual bool DisallowInheritingOutlineNumbering(const SwFormat &rFormat) SAL_OVERRIDE;
+ virtual bool DisallowInheritingOutlineNumbering(const SwFormat &rFormat) override;
unsigned int GetHdFtIndex() const { return m_nHdFtIndex; }
void SetHdFtIndex(unsigned int nHdFtIndex) { m_nHdFtIndex = nHdFtIndex; }
@@ -1092,7 +1092,7 @@ public:
static sal_uInt8 GetNumId( sal_uInt16 eNumType );
/// Guess the script (asian/western).
- virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) SAL_OVERRIDE;
+ virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) override;
SwTwips CurrentPageWidth(SwTwips &rLeft, SwTwips &rRight) const;
@@ -1114,15 +1114,15 @@ public:
const OUString &rHelp,
const OUString &ToolTip,
const OUString &rSelected,
- com::sun::star::uno::Sequence<OUString> &rListItems) SAL_OVERRIDE;
+ com::sun::star::uno::Sequence<OUString> &rListItems) override;
- virtual void DoFormText(const SwInputField * pField) SAL_OVERRIDE;
+ virtual void DoFormText(const SwInputField * pField) override;
void GetCurrentItems(ww::bytes &rItems) const;
/// Write the data of the form field
- virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE;
- virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE;
+ virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) override;
+ virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) override;
/// Fields.
WW8_WrPlcField* CurrentFieldPlc() const;
@@ -1131,26 +1131,26 @@ public:
SvStream& Strm() const { return m_pWriter->Strm(); }
/// Remember some of the memebers so that we can recurse in WriteText().
- virtual void SaveData( sal_uLong nStt, sal_uLong nEnd ) SAL_OVERRIDE;
+ virtual void SaveData( sal_uLong nStt, sal_uLong nEnd ) override;
/// Restore what was saved in SaveData().
- virtual void RestoreData() SAL_OVERRIDE;
+ virtual void RestoreData() override;
/// Output the actual headers and footers.
virtual void WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat,
- sal_uInt8 nBreakCode) SAL_OVERRIDE;
+ sal_uInt8 nBreakCode) override;
protected:
/// Output SwGrfNode
- virtual void OutputGrfNode( const SwGrfNode& ) SAL_OVERRIDE;
+ virtual void OutputGrfNode( const SwGrfNode& ) override;
/// Output SwOLENode
- virtual void OutputOLENode( const SwOLENode& ) SAL_OVERRIDE;
+ virtual void OutputOLENode( const SwOLENode& ) override;
- virtual void OutputLinkedOLE( const OUString& ) SAL_OVERRIDE;
+ virtual void OutputLinkedOLE( const OUString& ) override;
- virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum ) SAL_OVERRIDE;
+ virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum ) override;
private:
WW8Export(const WW8Export&) = delete;
@@ -1232,7 +1232,7 @@ class WW8_WrPlcTextBoxes : public WW8_WrPlcSubDoc // double Plc for Textboxes
private:
sal_uInt8 nTyp;
std::vector<sal_uInt32> aShapeIds; // VARARR of ShapeIds for the SwFrameFormats
- virtual const std::vector<sal_uInt32>* GetShapeIdArr() const SAL_OVERRIDE;
+ virtual const std::vector<sal_uInt32>* GetShapeIdArr() const override;
WW8_WrPlcTextBoxes(const WW8_WrPlcTextBoxes&) = delete;
WW8_WrPlcTextBoxes& operator=(WW8_WrPlcTextBoxes&) = delete;
@@ -1432,8 +1432,8 @@ public:
void NextPos() { if ( nAktSwPos < SAL_MAX_INT32 ) nAktSwPos = SearchNext( nAktSwPos + 1 ); }
void OutAttr( sal_Int32 nSwPos );
- virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const SAL_OVERRIDE;
- virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const override;
+ virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const override;
sal_Int32 WhereNext() const { return nAktSwPos; }
rtl_TextEncoding GetNextCharSet() const;
rtl_TextEncoding GetNodeCharSet() const { return eNdChrSet; }
@@ -1488,8 +1488,8 @@ public:
void NextPos() { if ( nAktSwPos < SAL_MAX_INT32 ) nAktSwPos = SearchNext( nAktSwPos + 1 ); }
void OutAttr( sal_Int32 nSwPos, bool bRuby = false );
- virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const SAL_OVERRIDE;
- virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const override;
+ virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const override;
int OutAttrWithRange(sal_Int32 nPos);
const SwRedlineData* GetParagraphLevelRedline( );
const SwRedlineData* GetRunLevelRedline( sal_Int32 nPos );
diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx
index 25e3308cde75..294686e5bd71 100644
--- a/sw/source/filter/ww8/ww8attributeoutput.hxx
+++ b/sw/source/filter/ww8/ww8attributeoutput.hxx
@@ -27,158 +27,158 @@ class WW8AttributeOutput : public AttributeOutputBase
{
public:
/// Export the state of RTL/CJK.
- virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) SAL_OVERRIDE;
+ virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) override;
/// Start of the paragraph.
- virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/ ) SAL_OVERRIDE {}
+ virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/ ) override {}
/// End of the paragraph.
- virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
+ virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) override;
/// Called in order to output section breaks.
- virtual void SectionBreaks(const SwNode& /*rNode*/) SAL_OVERRIDE {}
+ virtual void SectionBreaks(const SwNode& /*rNode*/) override {}
/// Called before we start outputting the attributes.
- virtual void StartParagraphProperties() SAL_OVERRIDE {}
+ virtual void StartParagraphProperties() override {}
/// Called after we end outputting the attributes.
- virtual void EndParagraphProperties(const SfxItemSet& /*rParagraphMarkerProperties*/, const SwRedlineData* /*pRedlineData*/, const SwRedlineData* /*pRedlineParagraphMarkerDeleted*/, const SwRedlineData* /*pRedlineParagraphMarkerInserted*/) SAL_OVERRIDE {}
+ virtual void EndParagraphProperties(const SfxItemSet& /*rParagraphMarkerProperties*/, const SwRedlineData* /*pRedlineData*/, const SwRedlineData* /*pRedlineParagraphMarkerDeleted*/, const SwRedlineData* /*pRedlineParagraphMarkerInserted*/) override {}
/// Empty paragraph.
- virtual void EmptyParagraph() SAL_OVERRIDE;
+ virtual void EmptyParagraph() override;
/// Start of the text run.
///
- virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) SAL_OVERRIDE;
+ virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) override;
- virtual void OnTOXEnding() SAL_OVERRIDE;
+ virtual void OnTOXEnding() override;
/// End of the text run.
///
/// No-op for binary filters.
- virtual void EndRun() SAL_OVERRIDE {}
+ virtual void EndRun() override {}
/// Before we start outputting the attributes.
- virtual void StartRunProperties() SAL_OVERRIDE;
+ virtual void StartRunProperties() override;
/// After we end outputting the attributes.
- virtual void EndRunProperties( const SwRedlineData* pRedlineData ) SAL_OVERRIDE;
+ virtual void EndRunProperties( const SwRedlineData* pRedlineData ) override;
/// Output text.
- virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet ) SAL_OVERRIDE;
+ virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet ) override;
/// Output text (without markup).
- virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) SAL_OVERRIDE;
+ virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) override;
/// Output ruby start.
- virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) SAL_OVERRIDE;
+ virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) override;
/// Output ruby end.
- virtual void EndRuby() SAL_OVERRIDE;
+ virtual void EndRuby() override;
/// Output URL start.
- virtual bool StartURL( const OUString &rUrl, const OUString &rTarget ) SAL_OVERRIDE;
+ virtual bool StartURL( const OUString &rUrl, const OUString &rTarget ) override;
/// Output URL end.
- virtual bool EndURL(bool) SAL_OVERRIDE;
+ virtual bool EndURL(bool) override;
- virtual void FieldVanish( const OUString& rText, ww::eField eType ) SAL_OVERRIDE;
+ virtual void FieldVanish( const OUString& rText, ww::eField eType ) override;
/// Output redlining.
- virtual void Redline( const SwRedlineData* pRedline ) SAL_OVERRIDE;
+ virtual void Redline( const SwRedlineData* pRedline ) override;
- virtual void FormatDrop( const SwTextNode& rNode, const SwFormatDrop &rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
+ virtual void FormatDrop( const SwTextNode& rNode, const SwFormatDrop &rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) override;
/// Output FKP (Formatted disK Page) - necessary for binary formats only.
/// FIXME having it in AttributeOutputBase is probably a hack, it
/// should be in WW8AttributeOutput only...
- virtual void OutputFKP(bool bForce = false) SAL_OVERRIDE;
+ virtual void OutputFKP(bool bForce = false) override;
/// Output style.
- virtual void ParagraphStyle( sal_uInt16 nStyle ) SAL_OVERRIDE;
-
- virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE;
- virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE;
- virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE;
- virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE;
- virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE;
- virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE;
- virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE;
- virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE;
- virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE;
- virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE;
- virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE;
- virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableRowEnd( sal_uInt32 nDepth = 1 ) SAL_OVERRIDE;
+ virtual void ParagraphStyle( sal_uInt16 nStyle ) override;
+
+ virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override;
+ virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override;
+ virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override;
+ virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override;
+ virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override;
+ virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override;
+ virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override;
+ virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override;
+ virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override;
+ virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override;
+ virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override;
+ virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) override;
+ virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override;
+ virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override;
+ virtual void TableRowEnd( sal_uInt32 nDepth = 1 ) override;
/// Start of the styles table.
- virtual void StartStyles() SAL_OVERRIDE;
+ virtual void StartStyles() override;
/// End of the styles table.
- virtual void EndStyles( sal_uInt16 nNumberOfStyles ) SAL_OVERRIDE;
+ virtual void EndStyles( sal_uInt16 nNumberOfStyles ) override;
/// Write default style.
- virtual void DefaultStyle( sal_uInt16 nStyle ) SAL_OVERRIDE;
+ virtual void DefaultStyle( sal_uInt16 nStyle ) override;
/// Start of a style in the styles table.
virtual void StartStyle( const OUString& rName, StyleType eType,
sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwIdi, sal_uInt16 nId,
- bool bAutoUpdate ) SAL_OVERRIDE;
+ bool bAutoUpdate ) override;
/// End of a style in the styles table.
- virtual void EndStyle() SAL_OVERRIDE;
+ virtual void EndStyle() override;
/// Start of (paragraph or run) properties of a style.
- virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ) SAL_OVERRIDE;
+ virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ) override;
/// End of (paragraph or run) properties of a style.
- virtual void EndStyleProperties( bool bParProp ) SAL_OVERRIDE;
+ virtual void EndStyleProperties( bool bParProp ) override;
/// Numbering rule and Id.
- virtual void OutlineNumbering(sal_uInt8 nLvl) SAL_OVERRIDE;
+ virtual void OutlineNumbering(sal_uInt8 nLvl) override;
/// Page break
/// As a paragraph property - the paragraph should be on the next page.
- virtual void PageBreakBefore( bool bBreak ) SAL_OVERRIDE;
+ virtual void PageBreakBefore( bool bBreak ) override;
/// Write a section break
/// msword::ColumnBreak or msword::PageBreak
- virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) SAL_OVERRIDE;
+ virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) override;
/// Start of the section properties.
- virtual void StartSection() SAL_OVERRIDE;
+ virtual void StartSection() override;
/// End of the section properties.
///
/// No-op for binary filters.
- virtual void EndSection() SAL_OVERRIDE {}
+ virtual void EndSection() override {}
/// Protection of forms.
- virtual void SectionFormProtection( bool bProtected ) SAL_OVERRIDE;
+ virtual void SectionFormProtection( bool bProtected ) override;
/// Numbering of the lines in the document.
- virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ) SAL_OVERRIDE;
+ virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ) override;
/// Has different headers/footers for the title page.
- virtual void SectionTitlePage() SAL_OVERRIDE;
+ virtual void SectionTitlePage() override;
/// Description of the page borders.
- virtual void SectionPageBorders( const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat ) SAL_OVERRIDE;
+ virtual void SectionPageBorders( const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat ) override;
/// Columns populated from right/numbers on the right side?
- virtual void SectionBiDi( bool bBiDi ) SAL_OVERRIDE;
+ virtual void SectionBiDi( bool bBiDi ) override;
/// The style of the page numbers.
///
- virtual void SectionPageNumbering( sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber ) SAL_OVERRIDE;
+ virtual void SectionPageNumbering( sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber ) override;
/// The type of breaking.
- virtual void SectionType( sal_uInt8 nBreakCode ) SAL_OVERRIDE;
+ virtual void SectionType( sal_uInt8 nBreakCode ) override;
/// Definition of a numbering instance.
- virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) SAL_OVERRIDE;
+ virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) override;
/// All the numbering level information.
virtual void NumberingLevel( sal_uInt8 nLevel,
@@ -193,236 +193,236 @@ public:
sal_Int16 nFirstLineIndex,
sal_Int16 nListTabPos,
const OUString &rNumberingString,
- const SvxBrushItem* pBrush = 0) SAL_OVERRIDE; //For i120928,transfer graphic of bullet
+ const SvxBrushItem* pBrush = 0) override; //For i120928,transfer graphic of bullet
protected:
/// Output frames - the implementation.
- void OutputFlyFrame_Impl( const sw::Frame& rFormat, const Point& rNdTopLeft ) SAL_OVERRIDE;
+ void OutputFlyFrame_Impl( const sw::Frame& rFormat, const Point& rNdTopLeft ) override;
/// Sfx item Sfx item RES_CHRATR_CASEMAP
- virtual void CharCaseMap( const SvxCaseMapItem& ) SAL_OVERRIDE;
+ virtual void CharCaseMap( const SvxCaseMapItem& ) override;
/// Sfx item Sfx item RES_CHRATR_COLOR
- virtual void CharColor( const SvxColorItem& ) SAL_OVERRIDE;
+ virtual void CharColor( const SvxColorItem& ) override;
/// Sfx item Sfx item RES_CHRATR_CONTOUR
- virtual void CharContour( const SvxContourItem& ) SAL_OVERRIDE;
+ virtual void CharContour( const SvxContourItem& ) override;
/// Sfx item RES_CHRATR_CROSSEDOUT
- virtual void CharCrossedOut( const SvxCrossedOutItem& rHt ) SAL_OVERRIDE;
+ virtual void CharCrossedOut( const SvxCrossedOutItem& rHt ) override;
/// Sfx item RES_CHRATR_ESCAPEMENT
- virtual void CharEscapement( const SvxEscapementItem& ) SAL_OVERRIDE;
+ virtual void CharEscapement( const SvxEscapementItem& ) override;
/// Sfx item RES_CHRATR_FONT
- virtual void CharFont( const SvxFontItem& ) SAL_OVERRIDE;
+ virtual void CharFont( const SvxFontItem& ) override;
/// Sfx item RES_CHRATR_FONTSIZE
- virtual void CharFontSize( const SvxFontHeightItem& ) SAL_OVERRIDE;
+ virtual void CharFontSize( const SvxFontHeightItem& ) override;
/// Sfx item RES_CHRATR_KERNING
- virtual void CharKerning( const SvxKerningItem& ) SAL_OVERRIDE;
+ virtual void CharKerning( const SvxKerningItem& ) override;
/// Sfx item RES_CHRATR_LANGUAGE
- virtual void CharLanguage( const SvxLanguageItem& ) SAL_OVERRIDE;
+ virtual void CharLanguage( const SvxLanguageItem& ) override;
/// Sfx item RES_CHRATR_POSTURE
- virtual void CharPosture( const SvxPostureItem& ) SAL_OVERRIDE;
+ virtual void CharPosture( const SvxPostureItem& ) override;
/// Sfx item RES_CHRATR_SHADOWED
- virtual void CharShadow( const SvxShadowedItem& ) SAL_OVERRIDE;
+ virtual void CharShadow( const SvxShadowedItem& ) override;
/// Sfx item RES_CHRATR_UNDERLINE
- virtual void CharUnderline( const SvxUnderlineItem& ) SAL_OVERRIDE;
+ virtual void CharUnderline( const SvxUnderlineItem& ) override;
/// Sfx item RES_CHRATR_WEIGHT
- virtual void CharWeight( const SvxWeightItem& ) SAL_OVERRIDE;
+ virtual void CharWeight( const SvxWeightItem& ) override;
/// Sfx item RES_CHRATR_AUTOKERN
- virtual void CharAutoKern( const SvxAutoKernItem& ) SAL_OVERRIDE;
+ virtual void CharAutoKern( const SvxAutoKernItem& ) override;
/// Sfx item RES_CHRATR_BLINK
- virtual void CharAnimatedText( const SvxBlinkItem& ) SAL_OVERRIDE;
+ virtual void CharAnimatedText( const SvxBlinkItem& ) override;
/// Sfx item RES_CHRATR_BACKGROUND
- virtual void CharBackground( const SvxBrushItem& ) SAL_OVERRIDE;
+ virtual void CharBackground( const SvxBrushItem& ) override;
/// Sfx item RES_CHRATR_CJK_FONT
- virtual void CharFontCJK( const SvxFontItem& ) SAL_OVERRIDE;
+ virtual void CharFontCJK( const SvxFontItem& ) override;
/// Sfx item RES_CHRATR_CJK_FONTSIZE
- virtual void CharFontSizeCJK( const SvxFontHeightItem& rHt ) SAL_OVERRIDE { CharFontSize( rHt ); }
+ virtual void CharFontSizeCJK( const SvxFontHeightItem& rHt ) override { CharFontSize( rHt ); }
/// Sfx item RES_CHRATR_CJK_LANGUAGE
- virtual void CharLanguageCJK( const SvxLanguageItem& rHt ) SAL_OVERRIDE { CharLanguage( rHt ); }
+ virtual void CharLanguageCJK( const SvxLanguageItem& rHt ) override { CharLanguage( rHt ); }
/// Sfx item RES_CHRATR_CJK_POSTURE
- virtual void CharPostureCJK( const SvxPostureItem& rHt ) SAL_OVERRIDE { CharPosture( rHt ); }
+ virtual void CharPostureCJK( const SvxPostureItem& rHt ) override { CharPosture( rHt ); }
/// Sfx item RES_CHRATR_CJK_WEIGHT
- virtual void CharWeightCJK( const SvxWeightItem& rHt ) SAL_OVERRIDE { CharWeight( rHt ); }
+ virtual void CharWeightCJK( const SvxWeightItem& rHt ) override { CharWeight( rHt ); }
/// Sfx item RES_CHRATR_CTL_FONT
- virtual void CharFontCTL( const SvxFontItem& ) SAL_OVERRIDE;
+ virtual void CharFontCTL( const SvxFontItem& ) override;
/// Sfx item RES_CHRATR_CTL_FONTSIZE
- virtual void CharFontSizeCTL( const SvxFontHeightItem& rHt ) SAL_OVERRIDE { CharFontSize( rHt ); }
+ virtual void CharFontSizeCTL( const SvxFontHeightItem& rHt ) override { CharFontSize( rHt ); }
/// Sfx item RES_CHRATR_CTL_LANGUAGE
- virtual void CharLanguageCTL( const SvxLanguageItem& rHt ) SAL_OVERRIDE { CharLanguage( rHt ); }
+ virtual void CharLanguageCTL( const SvxLanguageItem& rHt ) override { CharLanguage( rHt ); }
/// Sfx item RES_CHRATR_CTL_POSTURE
- virtual void CharPostureCTL( const SvxPostureItem& ) SAL_OVERRIDE;
+ virtual void CharPostureCTL( const SvxPostureItem& ) override;
/// Sfx item RES_CHRATR_CTL_WEIGHT
- virtual void CharWeightCTL( const SvxWeightItem& ) SAL_OVERRIDE;
+ virtual void CharWeightCTL( const SvxWeightItem& ) override;
/// Sfx item RES_CHRATR_BidiRTL
- virtual void CharBidiRTL( const SfxPoolItem& rHt ) SAL_OVERRIDE;
+ virtual void CharBidiRTL( const SfxPoolItem& rHt ) override;
/// Sfx item RES_CHRATR_IdctHint
- virtual void CharIdctHint( const SfxPoolItem& rHt ) SAL_OVERRIDE;
+ virtual void CharIdctHint( const SfxPoolItem& rHt ) override;
/// Sfx item RES_CHRATR_ROTATE
- virtual void CharRotate( const SvxCharRotateItem& ) SAL_OVERRIDE;
+ virtual void CharRotate( const SvxCharRotateItem& ) override;
/// Sfx item RES_CHRATR_EMPHASIS_MARK
- virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rHt ) SAL_OVERRIDE;
+ virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rHt ) override;
/// Sfx item RES_CHRATR_TWO_LINES
- virtual void CharTwoLines( const SvxTwoLinesItem& ) SAL_OVERRIDE;
+ virtual void CharTwoLines( const SvxTwoLinesItem& ) override;
/// Sfx item RES_CHRATR_SCALEW
- virtual void CharScaleWidth( const SvxCharScaleWidthItem& ) SAL_OVERRIDE;
+ virtual void CharScaleWidth( const SvxCharScaleWidthItem& ) override;
/// Sfx item RES_CHRATR_RELIEF
- virtual void CharRelief( const SvxCharReliefItem& ) SAL_OVERRIDE;
+ virtual void CharRelief( const SvxCharReliefItem& ) override;
/// Sfx item RES_CHRATR_HIDDEN
- virtual void CharHidden( const SvxCharHiddenItem& ) SAL_OVERRIDE;
+ virtual void CharHidden( const SvxCharHiddenItem& ) override;
/// Sfx item RES_CHRATR_BOX
- virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ) SAL_OVERRIDE;
+ virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ) override;
/// Sfx item RES_CHRATR_HIGHLIGHT
- virtual void CharHighlight( const SvxBrushItem& ) SAL_OVERRIDE;
+ virtual void CharHighlight( const SvxBrushItem& ) override;
/// Sfx item RES_TXTATR_INETFMT
- virtual void TextINetFormat( const SwFormatINetFormat& ) SAL_OVERRIDE;
+ virtual void TextINetFormat( const SwFormatINetFormat& ) override;
/// Sfx item RES_TXTATR_CHARFMT
- virtual void TextCharFormat( const SwFormatCharFormat& ) SAL_OVERRIDE;
+ virtual void TextCharFormat( const SwFormatCharFormat& ) override;
/// Sfx item RES_TXTATR_FTN
- virtual void TextFootnote_Impl( const SwFormatFootnote& ) SAL_OVERRIDE;
+ virtual void TextFootnote_Impl( const SwFormatFootnote& ) override;
/// Sfx item RES_PARATR_LINESPACING
- virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) SAL_OVERRIDE;
+ virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) override;
/// Sfx item RES_PARATR_ADJUST
- virtual void ParaAdjust( const SvxAdjustItem& rHt ) SAL_OVERRIDE;
+ virtual void ParaAdjust( const SvxAdjustItem& rHt ) override;
/// Sfx item RES_PARATR_SPLIT
- virtual void ParaSplit( const SvxFormatSplitItem& ) SAL_OVERRIDE;
+ virtual void ParaSplit( const SvxFormatSplitItem& ) override;
/// Sfx item RES_PARATR_WIDOWS
- virtual void ParaWidows( const SvxWidowsItem& rHt ) SAL_OVERRIDE;
+ virtual void ParaWidows( const SvxWidowsItem& rHt ) override;
/// Sfx item RES_PARATR_TABSTOP
- virtual void ParaTabStop( const SvxTabStopItem& rHt ) SAL_OVERRIDE;
+ virtual void ParaTabStop( const SvxTabStopItem& rHt ) override;
/// Sfx item RES_PARATR_HYPHENZONE
- virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) SAL_OVERRIDE;
+ virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) override;
/// Sfx item RES_PARATR_NUMRULE
- virtual void ParaNumRule_Impl( const SwTextNode *pTextNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE;
+ virtual void ParaNumRule_Impl( const SwTextNode *pTextNd, sal_Int32 nLvl, sal_Int32 nNumId ) override;
/// Sfx item RES_PARATR_SCRIPTSPACE
- virtual void ParaScriptSpace( const SfxBoolItem& ) SAL_OVERRIDE;
+ virtual void ParaScriptSpace( const SfxBoolItem& ) override;
/// Sfx item RES_PARATR_HANGINGPUNCTUATION
- virtual void ParaHangingPunctuation( const SfxBoolItem& ) SAL_OVERRIDE;
+ virtual void ParaHangingPunctuation( const SfxBoolItem& ) override;
/// Sfx item RES_PARATR_FORBIDDEN_RULES
- virtual void ParaForbiddenRules( const SfxBoolItem& ) SAL_OVERRIDE;
+ virtual void ParaForbiddenRules( const SfxBoolItem& ) override;
/// Sfx item RES_PARATR_VERTALIGN
- virtual void ParaVerticalAlign( const SvxParaVertAlignItem& ) SAL_OVERRIDE;
+ virtual void ParaVerticalAlign( const SvxParaVertAlignItem& ) override;
/// Sfx item RES_PARATR_SNAPTOGRID
- virtual void ParaSnapToGrid( const SvxParaGridItem& ) SAL_OVERRIDE;
+ virtual void ParaSnapToGrid( const SvxParaGridItem& ) override;
/// Sfx item RES_FRM_SIZE
- virtual void FormatFrameSize( const SwFormatFrmSize& ) SAL_OVERRIDE;
+ virtual void FormatFrameSize( const SwFormatFrmSize& ) override;
/// Sfx item RES_PAPER_BIN
- virtual void FormatPaperBin( const SvxPaperBinItem& ) SAL_OVERRIDE;
+ virtual void FormatPaperBin( const SvxPaperBinItem& ) override;
/// Sfx item RES_LR_SPACE
- virtual void FormatLRSpace( const SvxLRSpaceItem& ) SAL_OVERRIDE;
+ virtual void FormatLRSpace( const SvxLRSpaceItem& ) override;
/// Sfx item RES_UL_SPACE
- virtual void FormatULSpace( const SvxULSpaceItem& rHt ) SAL_OVERRIDE;
+ virtual void FormatULSpace( const SvxULSpaceItem& rHt ) override;
/// Sfx item RES_SURROUND
- virtual void FormatSurround( const SwFormatSurround& ) SAL_OVERRIDE;
+ virtual void FormatSurround( const SwFormatSurround& ) override;
/// Sfx item RES_VERT_ORIENT
- virtual void FormatVertOrientation( const SwFormatVertOrient& ) SAL_OVERRIDE;
+ virtual void FormatVertOrientation( const SwFormatVertOrient& ) override;
/// Sfx item RES_HORI_ORIENT
- virtual void FormatHorizOrientation( const SwFormatHoriOrient& ) SAL_OVERRIDE;
+ virtual void FormatHorizOrientation( const SwFormatHoriOrient& ) override;
/// Sfx item RES_ANCHOR
- virtual void FormatAnchor( const SwFormatAnchor& ) SAL_OVERRIDE;
+ virtual void FormatAnchor( const SwFormatAnchor& ) override;
/// Sfx item RES_BACKGROUND
- virtual void FormatBackground( const SvxBrushItem& ) SAL_OVERRIDE;
+ virtual void FormatBackground( const SvxBrushItem& ) override;
/// Sfx item RES_FILL_STYLE
- virtual void FormatFillStyle( const XFillStyleItem& ) SAL_OVERRIDE;
+ virtual void FormatFillStyle( const XFillStyleItem& ) override;
/// Sfx item RES_FILL_GRADIENT
- virtual void FormatFillGradient( const XFillGradientItem& ) SAL_OVERRIDE;
+ virtual void FormatFillGradient( const XFillGradientItem& ) override;
/// Sfx item RES_BOX
- virtual void FormatBox( const SvxBoxItem& ) SAL_OVERRIDE;
+ virtual void FormatBox( const SvxBoxItem& ) override;
/// Sfx item RES_COL
- virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE;
+ virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol & rCol, bool bEven, SwTwips nPageSize ) override;
/// Sfx item RES_KEEP
- virtual void FormatKeep( const SvxFormatKeepItem& ) SAL_OVERRIDE;
+ virtual void FormatKeep( const SvxFormatKeepItem& ) override;
/// Sfx item RES_TEXTGRID
- virtual void FormatTextGrid( const SwTextGridItem& ) SAL_OVERRIDE;
+ virtual void FormatTextGrid( const SwTextGridItem& ) override;
/// Sfx item RES_LINENUMBER
- virtual void FormatLineNumbering( const SwFormatLineNumber& ) SAL_OVERRIDE;
+ virtual void FormatLineNumbering( const SwFormatLineNumber& ) override;
/// Sfx item RES_FRAMEDIR
- virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) SAL_OVERRIDE;
+ virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) override;
/// Sfx item RES_PARATR_GRABBAG
- virtual void ParaGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE;
+ virtual void ParaGrabBag( const SfxGrabBagItem& ) override;
/// Sfx item RES_TXTATR_GRABBAG
- virtual void CharGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE;
+ virtual void CharGrabBag( const SfxGrabBagItem& ) override;
// Sfx item RES_PARATR_OUTLINELEVEL
- virtual void ParaOutlineLevel( const SfxUInt16Item& ) SAL_OVERRIDE;
+ virtual void ParaOutlineLevel( const SfxUInt16Item& ) override;
/// Write the expanded field
- virtual void WriteExpand( const SwField* pField ) SAL_OVERRIDE;
+ virtual void WriteExpand( const SwField* pField ) override;
- virtual void RefField ( const SwField& rField, const OUString& rRef ) SAL_OVERRIDE;
- virtual void HiddenField( const SwField& rField ) SAL_OVERRIDE;
- virtual void SetField( const SwField& rField, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE;
- virtual void PostitField( const SwField* pField ) SAL_OVERRIDE;
- virtual bool DropdownField( const SwField* pField ) SAL_OVERRIDE;
- virtual bool PlaceholderField( const SwField* pField ) SAL_OVERRIDE;
+ virtual void RefField ( const SwField& rField, const OUString& rRef ) override;
+ virtual void HiddenField( const SwField& rField ) override;
+ virtual void SetField( const SwField& rField, ww::eField eType, const OUString& rCmd ) override;
+ virtual void PostitField( const SwField* pField ) override;
+ virtual bool DropdownField( const SwField* pField ) override;
+ virtual bool PlaceholderField( const SwField* pField ) override;
- virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ) SAL_OVERRIDE;
+ virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ) override;
/// Reference to the export, where to get the data from
WW8Export &m_rWW8Export;
@@ -469,7 +469,7 @@ public:
virtual ~WW8AttributeOutput() {}
/// Return the right export class.
- virtual WW8Export& GetExport() SAL_OVERRIDE { return m_rWW8Export; }
+ virtual WW8Export& GetExport() override { return m_rWW8Export; }
protected:
/// Output the bold etc. attributes
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index ef9dd9bb8f3e..9dd445e1a609 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -454,9 +454,9 @@ struct SBBItem
public:
Sttb();
virtual ~Sttb();
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* fp ) SAL_OVERRIDE;
+ virtual void Print( FILE* fp ) override;
#endif
OUString getStringAtIndex( sal_uInt32 );
};
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index d520c1204eab..64fb6cce03fe 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -131,13 +131,13 @@ struct WW8LFOInfo;
class WW8Reader : public StgReader
{
- virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE;
+ virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) override;
sal_uLong OpenMainStream( tools::SvRef<SotStorageStream>& rRef, sal_uInt16& rBuffSize );
public:
- virtual int GetReaderType() SAL_OVERRIDE;
+ virtual int GetReaderType() override;
- virtual bool HasGlossaries() const SAL_OVERRIDE;
- virtual bool ReadGlossaries( SwTextBlocks&, bool bSaveRelFiles ) const SAL_OVERRIDE;
+ virtual bool HasGlossaries() const override;
+ virtual bool ReadGlossaries( SwTextBlocks&, bool bSaveRelFiles ) const override;
};
class SwWW8ImplReader;
@@ -371,13 +371,13 @@ private:
const SwTextNode &rTextNode);
protected:
virtual void SetAttrInDoc(const SwPosition& rTmpPos,
- SwFltStackEntry& rEntry) SAL_OVERRIDE;
+ SwFltStackEntry& rEntry) override;
- virtual sal_Int32 GetCurrAttrCP() const SAL_OVERRIDE;
- virtual bool IsParaEndInCPs(sal_Int32 nStart,sal_Int32 nEnd,bool bSdOD=true) const SAL_OVERRIDE;
+ virtual sal_Int32 GetCurrAttrCP() const override;
+ virtual bool IsParaEndInCPs(sal_Int32 nStart,sal_Int32 nEnd,bool bSdOD=true) const override;
//Clear the para end position recorded in reader intermittently for the least impact on loading performance
- virtual void ClearParaEndPosition() SAL_OVERRIDE;
- virtual bool CheckSdOD(sal_Int32 nStart,sal_Int32 nEnd) SAL_OVERRIDE;
+ virtual void ClearParaEndPosition() override;
+ virtual bool CheckSdOD(sal_Int32 nStart,sal_Int32 nEnd) override;
public:
SwWW8FltControlStack(SwDoc* pDo, sal_uLong nFieldFl, SwWW8ImplReader& rReader_ )
@@ -387,7 +387,7 @@ public:
void NewAttr(const SwPosition& rPos, const SfxPoolItem& rAttr);
- virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, bool bTstEnde=true, long nHand=LONG_MAX, bool consumedByField=false) SAL_OVERRIDE;
+ virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, bool bTstEnde=true, long nHand=LONG_MAX, bool consumedByField=false) override;
void SetToggleAttr(sal_uInt8 nId, bool bOn)
{
@@ -477,7 +477,7 @@ public:
std::set<OUString, SwWW8::ltstr> aReferencedTOCBookmarks;
protected:
virtual void SetAttrInDoc( const SwPosition& rTmpPos,
- SwFltStackEntry& rEntry ) SAL_OVERRIDE;
+ SwFltStackEntry& rEntry ) override;
};
class SwWW8FltRefStack : public SwFltEndStack
@@ -496,7 +496,7 @@ public:
protected:
SwFltStackEntry *RefToVar(const SwField* pField,SwFltStackEntry& rEntry);
virtual void SetAttrInDoc(const SwPosition& rTmpPos,
- SwFltStackEntry& rEntry) SAL_OVERRIDE;
+ SwFltStackEntry& rEntry) override;
private:
SwWW8FltRefStack(const SwWW8FltRefStack&) = delete;
SwWW8FltRefStack& operator=(const SwWW8FltRefStack&) = delete;
@@ -520,7 +520,7 @@ public:
SwMacroInfo();
virtual ~SwMacroInfo();
- virtual SdrObjUserData* Clone( SdrObject* pObj ) const SAL_OVERRIDE;
+ virtual SdrObjUserData* Clone( SdrObject* pObj ) const override;
void SetHlink( const OUString& rHlink ) { maHlink = rHlink; }
const OUString& GetHlink() const { return maHlink; }
@@ -707,7 +707,7 @@ public:
com::sun::star::lang::XMultiServiceFactory> &rServiceFactory,
com::sun::star::uno::Reference <
com::sun::star::form::XFormComponent> &rFComp,
- com::sun::star::awt::Size &rSz) SAL_OVERRIDE;
+ com::sun::star::awt::Size &rSz) override;
};
class WW8FormulaListBox : public WW8FormulaControl
@@ -723,7 +723,7 @@ public:
com::sun::star::lang::XMultiServiceFactory> &rServiceFactory,
com::sun::star::uno::Reference <
com::sun::star::form::XFormComponent> &rFComp,
- com::sun::star::awt::Size &rSz) SAL_OVERRIDE;
+ com::sun::star::awt::Size &rSz) override;
};
class WW8FormulaEditBox : public WW8FormulaControl
@@ -738,7 +738,7 @@ public:
com::sun::star::lang::XMultiServiceFactory> & /* rServiceFactory */,
com::sun::star::uno::Reference <
com::sun::star::form::XFormComponent> & /* rFComp */,
- com::sun::star::awt::Size & /* rSz */) SAL_OVERRIDE { return false; }
+ com::sun::star::awt::Size & /* rSz */) override { return false; }
};
class SwMSConvertControls: public oox::ole::MSConvertOCXControls
@@ -750,7 +750,7 @@ public:
com::sun::star::form::XFormComponent >& rFComp,
const ::com::sun::star::awt::Size& rSize,
com::sun::star::uno::Reference <
- com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl) SAL_OVERRIDE;
+ com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl) override;
bool ExportControl(WW8Export &rWrt, const SdrUnoObj& rFormObj);
bool ReadOCXStream( tools::SvRef<SotStorage>& rSrc1,
com::sun::star::uno::Reference<
@@ -770,8 +770,8 @@ private:
std::map<sal_uInt32,OString> aOldEscherBlipCache;
virtual bool GetOLEStorageName( long nOLEId, OUString& rStorageName,
- tools::SvRef<SotStorage>& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const SAL_OVERRIDE;
- virtual bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos ) const SAL_OVERRIDE;
+ tools::SvRef<SotStorage>& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const override;
+ virtual bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos ) const override;
// #i32596# - new parameter <_nCalledByGroup>, which
// indicates, if the OLE object is imported inside a group object
virtual SdrObject* ImportOLE( long nOLEId,
@@ -779,7 +779,7 @@ private:
const Rectangle& rBoundRect,
const Rectangle& rVisArea,
const int _nCalledByGroup,
- sal_Int64 nAspect ) const SAL_OVERRIDE;
+ sal_Int64 nAspect ) const override;
SwMSDffManager(const SwMSDffManager&) = delete;
SwMSDffManager& operator=(const SwMSDffManager&) = delete;
@@ -791,7 +791,7 @@ public:
void DisableFallbackStream();
void EnableFallbackStream();
protected:
- virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) SAL_OVERRIDE;
+ virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) override;
};
class wwSection
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 4712bca7228e..c4ca1d6f3d5b 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -424,12 +424,12 @@ private:
public:
WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, WW8PLCFx_PCD* pPLCFx_PCD,
const WW8ScannerBase* pBase );
- virtual sal_uInt32 GetIdx() const SAL_OVERRIDE;
- virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE;
- virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE;
- virtual WW8_FC Where() SAL_OVERRIDE;
- virtual void GetSprms( WW8PLCFxDesc* p ) SAL_OVERRIDE;
- virtual void advance() SAL_OVERRIDE;
+ virtual sal_uInt32 GetIdx() const override;
+ virtual void SetIdx( sal_uLong nI ) override;
+ virtual bool SeekPos(WW8_CP nCpPos) override;
+ virtual WW8_FC Where() override;
+ virtual void GetSprms( WW8PLCFxDesc* p ) override;
+ virtual void advance() override;
WW8PLCFpcd_Iter* GetIter() const { return pPcdI; }
};
@@ -449,12 +449,12 @@ public:
WW8_CP nStartCp, bool bVer67P);
virtual ~WW8PLCFx_PCD();
sal_uLong GetIMax() const;
- virtual sal_uInt32 GetIdx() const SAL_OVERRIDE;
- virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE;
- virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE;
- virtual WW8_FC Where() SAL_OVERRIDE;
- virtual long GetNoSprms( WW8_CP& rStart, WW8_CP&, sal_Int32& rLen ) SAL_OVERRIDE;
- virtual void advance() SAL_OVERRIDE;
+ virtual sal_uInt32 GetIdx() const override;
+ virtual void SetIdx( sal_uLong nI ) override;
+ virtual bool SeekPos(WW8_CP nCpPos) override;
+ virtual WW8_FC Where() override;
+ virtual long GetNoSprms( WW8_CP& rStart, WW8_CP&, sal_Int32& rLen ) override;
+ virtual void advance() override;
WW8_CP AktPieceStartFc2Cp( WW8_FC nStartPos );
WW8_FC AktPieceStartCp2Fc( WW8_CP nCp );
static void AktPieceFc2Cp(WW8_CP& rStartPos, WW8_CP& rEndPos,
@@ -585,13 +585,13 @@ public:
WW8PLCFx_Fc_FKP( SvStream* pSt, SvStream* pTableSt, SvStream* pDataSt,
const WW8Fib& rFib, ePLCFT ePl, WW8_FC nStartFcL );
virtual ~WW8PLCFx_Fc_FKP();
- virtual sal_uInt32 GetIdx() const SAL_OVERRIDE;
- virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE;
- virtual bool SeekPos(WW8_FC nFcPos) SAL_OVERRIDE;
- virtual WW8_FC Where() SAL_OVERRIDE;
+ virtual sal_uInt32 GetIdx() const override;
+ virtual void SetIdx( sal_uLong nIdx ) override;
+ virtual bool SeekPos(WW8_FC nFcPos) override;
+ virtual WW8_FC Where() override;
sal_uInt8* GetSprmsAndPos( WW8_FC& rStart, WW8_FC& rEnd, sal_Int32& rLen );
- virtual void advance() SAL_OVERRIDE;
- virtual sal_uInt16 GetIstd() const SAL_OVERRIDE;
+ virtual void advance() override;
+ virtual sal_uInt16 GetIstd() const override;
void GetPCDSprms( WW8PLCFxDesc& rDesc );
const sal_uInt8* HasSprm( sal_uInt16 nId );
bool HasSprm(sal_uInt16 nId, std::vector<const sal_uInt8 *> &rResult);
@@ -620,14 +620,14 @@ public:
sal_uLong GetPCDIMax() const;
sal_uLong GetPCDIdx() const;
void SetPCDIdx( sal_uLong nIdx );
- virtual sal_uLong GetIdx2() const SAL_OVERRIDE;
- virtual void SetIdx2( sal_uLong nIdx ) SAL_OVERRIDE;
- virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE;
- virtual WW8_CP Where() SAL_OVERRIDE;
- virtual void GetSprms( WW8PLCFxDesc* p ) SAL_OVERRIDE;
- virtual void advance() SAL_OVERRIDE;
- virtual void Save( WW8PLCFxSave1& rSave ) const SAL_OVERRIDE;
- virtual void Restore( const WW8PLCFxSave1& rSave ) SAL_OVERRIDE;
+ virtual sal_uLong GetIdx2() const override;
+ virtual void SetIdx2( sal_uLong nIdx ) override;
+ virtual bool SeekPos(WW8_CP nCpPos) override;
+ virtual WW8_CP Where() override;
+ virtual void GetSprms( WW8PLCFxDesc* p ) override;
+ virtual void advance() override;
+ virtual void Save( WW8PLCFxSave1& rSave ) const override;
+ virtual void Restore( const WW8PLCFxSave1& rSave ) override;
};
/// Iterator for Piece Table Exceptions of Sepx
@@ -648,12 +648,12 @@ public:
WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTablexySt, const WW8Fib& rFib,
WW8_CP nStartCp );
virtual ~WW8PLCFx_SEPX();
- virtual sal_uInt32 GetIdx() const SAL_OVERRIDE;
- virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE;
- virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE;
- virtual WW8_FC Where() SAL_OVERRIDE;
- virtual void GetSprms( WW8PLCFxDesc* p ) SAL_OVERRIDE;
- virtual void advance() SAL_OVERRIDE;
+ virtual sal_uInt32 GetIdx() const override;
+ virtual void SetIdx( sal_uLong nIdx ) override;
+ virtual bool SeekPos(WW8_CP nCpPos) override;
+ virtual WW8_FC Where() override;
+ virtual void GetSprms( WW8PLCFxDesc* p ) override;
+ virtual void advance() override;
const sal_uInt8* HasSprm( sal_uInt16 nId ) const;
const sal_uInt8* HasSprm( sal_uInt16 nId, sal_uInt8 n2nd ) const;
const sal_uInt8* HasSprm( sal_uInt16 nId, const sal_uInt8* pOtherSprms,
@@ -676,10 +676,10 @@ public:
WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp,
long nFcRef, long nLenRef, long nFcText, long nLenText, long nStruc = 0);
virtual ~WW8PLCFx_SubDoc();
- virtual sal_uInt32 GetIdx() const SAL_OVERRIDE;
- virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE;
- virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE;
- virtual WW8_FC Where() SAL_OVERRIDE;
+ virtual sal_uInt32 GetIdx() const override;
+ virtual void SetIdx( sal_uLong nIdx ) override;
+ virtual bool SeekPos(WW8_CP nCpPos) override;
+ virtual WW8_FC Where() override;
// returns reference descriptors
const void* GetData( long nIdx = -1 ) const
@@ -687,8 +687,8 @@ public:
return pRef ? pRef->GetData( -1L == nIdx ? pRef->GetIdx() : nIdx ) : 0;
}
- virtual void GetSprms(WW8PLCFxDesc* p) SAL_OVERRIDE;
- virtual void advance() SAL_OVERRIDE;
+ virtual void GetSprms(WW8PLCFxDesc* p) override;
+ virtual void advance() override;
long Count() const { return ( pRef ) ? pRef->GetIMax() : 0; }
};
@@ -704,12 +704,12 @@ private:
public:
WW8PLCFx_FLD(SvStream* pSt, const WW8Fib& rMyFib, short nType);
virtual ~WW8PLCFx_FLD();
- virtual sal_uInt32 GetIdx() const SAL_OVERRIDE;
- virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE;
- virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE;
- virtual WW8_FC Where() SAL_OVERRIDE;
- virtual void GetSprms(WW8PLCFxDesc* p) SAL_OVERRIDE;
- virtual void advance() SAL_OVERRIDE;
+ virtual sal_uInt32 GetIdx() const override;
+ virtual void SetIdx( sal_uLong nIdx ) override;
+ virtual bool SeekPos(WW8_CP nCpPos) override;
+ virtual WW8_FC Where() override;
+ virtual void GetSprms(WW8PLCFxDesc* p) override;
+ virtual void advance() override;
bool StartPosIsFieldStart();
bool EndPosIsFieldEnd(WW8_CP&);
bool GetPara(long nIdx, WW8FieldDesc& rF);
@@ -735,14 +735,14 @@ public:
WW8PLCFx_Book(SvStream* pTableSt,const WW8Fib& rFib);
virtual ~WW8PLCFx_Book();
long GetIMax() const { return nIMax; }
- virtual sal_uInt32 GetIdx() const SAL_OVERRIDE;
- virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE;
- virtual sal_uLong GetIdx2() const SAL_OVERRIDE;
- virtual void SetIdx2( sal_uLong nIdx ) SAL_OVERRIDE;
- virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE;
- virtual WW8_FC Where() SAL_OVERRIDE;
- virtual long GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen ) SAL_OVERRIDE;
- virtual void advance() SAL_OVERRIDE;
+ virtual sal_uInt32 GetIdx() const override;
+ virtual void SetIdx( sal_uLong nI ) override;
+ virtual sal_uLong GetIdx2() const override;
+ virtual void SetIdx2( sal_uLong nIdx ) override;
+ virtual bool SeekPos(WW8_CP nCpPos) override;
+ virtual WW8_FC Where() override;
+ virtual long GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen ) override;
+ virtual void advance() override;
const OUString* GetName() const;
WW8_CP GetStartPos() const
{ return ( nIsEnd ) ? WW8_CP_MAX : pBook[0]->Where(); }
@@ -772,14 +772,14 @@ private:
public:
WW8PLCFx_AtnBook(SvStream* pTableSt,const WW8Fib& rFib);
virtual ~WW8PLCFx_AtnBook();
- virtual sal_uInt32 GetIdx() const SAL_OVERRIDE;
- virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE;
- virtual sal_uLong GetIdx2() const SAL_OVERRIDE;
- virtual void SetIdx2( sal_uLong nIdx ) SAL_OVERRIDE;
- virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE;
- virtual WW8_FC Where() SAL_OVERRIDE;
- virtual long GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen ) SAL_OVERRIDE;
- virtual void advance() SAL_OVERRIDE;
+ virtual sal_uInt32 GetIdx() const override;
+ virtual void SetIdx( sal_uLong nI ) override;
+ virtual sal_uLong GetIdx2() const override;
+ virtual void SetIdx2( sal_uLong nIdx ) override;
+ virtual bool SeekPos(WW8_CP nCpPos) override;
+ virtual WW8_FC Where() override;
+ virtual long GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen ) override;
+ virtual void advance() override;
/// Handle is the unique ID of an annotation mark.
long getHandle() const;
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 1e35c6c864bb..7f833e4256ad 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -40,8 +40,8 @@ class MSOWordCommandConvertor : public MSOCommandConvertor
public:
MSOWordCommandConvertor();
- virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ) SAL_OVERRIDE;
- virtual OUString MSOTCIDToOOCommand( sal_Int16 key ) SAL_OVERRIDE;
+ virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ) override;
+ virtual OUString MSOTCIDToOOCommand( sal_Int16 key ) override;
};
MSOWordCommandConvertor::MSOWordCommandConvertor()
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index 7c4b7d7d96c0..0f84cf35bb6c 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -17,10 +17,10 @@ class Xst : public TBBase
public:
Xst(){}
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
OUString getString() { return sString; }
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* fp ) SAL_OVERRIDE;
+ virtual void Print( FILE* fp ) override;
#endif
};
@@ -35,9 +35,9 @@ class SwTBC : public TBBase
public:
SwTBC();
virtual ~SwTBC();
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* ) SAL_OVERRIDE;
+ virtual void Print( FILE* ) override;
#endif
bool ImportToolBarControl( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, bool );
OUString GetCustomText();
@@ -61,9 +61,9 @@ class SwCTB : public TBBase
public:
SwCTB();
virtual ~SwCTB();
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* fp ) SAL_OVERRIDE;
+ virtual void Print( FILE* fp ) override;
#endif
bool IsMenuToolbar();
bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& );
@@ -85,9 +85,9 @@ class TBDelta : public TBBase
public:
TBDelta();
virtual ~TBDelta(){}
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* ) SAL_OVERRIDE;
+ virtual void Print( FILE* ) override;
#endif
bool ControlIsInserted();
bool ControlDropsToolBar();
@@ -110,7 +110,7 @@ public:
explicit Tcg255SubStruct( bool bReadId );
virtual ~Tcg255SubStruct(){}
sal_uInt8 id() const { return ch; }
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
};
class SwCTBWrapper;
@@ -130,11 +130,11 @@ class Customization : public TBBase
public:
explicit Customization( SwCTBWrapper* rapper );
virtual ~Customization();
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& );
bool ImportMenu( SwCTBWrapper&, CustomToolBarImportHelper& );
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* ) SAL_OVERRIDE;
+ virtual void Print( FILE* ) override;
#endif
sal_Int32 GetTBIDForTB(){ return tbidForTBD; }
SwCTB* GetCustomizationData() { return customizationDataCTB.get(); };
@@ -166,13 +166,13 @@ public:
virtual ~SwCTBWrapper();
void InsertDropIndex( sal_Int32 aIndex ) { dropDownMenuIndices.push_back( aIndex ); }
SwTBC* GetTBCAtOffset( sal_uInt32 nStreamOffset );
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
bool ImportCustomToolBar( SfxObjectShell& rDocSh );
Customization* GetCustomizaton( sal_Int16 index );
SwCTB* GetCustomizationData( const OUString& name );
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* ) SAL_OVERRIDE;
+ virtual void Print( FILE* ) override;
#endif
};
@@ -192,9 +192,9 @@ public:
MCD();
MCD(const MCD&);
MCD& operator = ( const MCD&);
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* ) SAL_OVERRIDE;
+ virtual void Print( FILE* ) override;
#endif
};
@@ -207,9 +207,9 @@ class PlfMcd : public Tcg255SubStruct
public:
explicit PlfMcd( bool bReadId = true );
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* ) SAL_OVERRIDE;
+ virtual void Print( FILE* ) override;
#endif
};
@@ -223,9 +223,9 @@ class Acd : public TBBase
public:
Acd();
virtual ~Acd(){}
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* ) SAL_OVERRIDE;
+ virtual void Print( FILE* ) override;
#endif
};
@@ -239,9 +239,9 @@ class PlfAcd: public Tcg255SubStruct
public:
explicit PlfAcd( bool bReadId = true );
virtual ~PlfAcd();
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print(FILE*) SAL_OVERRIDE;
+ virtual void Print(FILE*) override;
#endif
};
@@ -260,9 +260,9 @@ class Kme : public TBBase
public:
Kme();
virtual ~Kme();
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* ) SAL_OVERRIDE;
+ virtual void Print( FILE* ) override;
#endif
};
@@ -276,9 +276,9 @@ class PlfKme : public Tcg255SubStruct
public:
explicit PlfKme( bool bReadId = true );
virtual ~PlfKme();
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* ) SAL_OVERRIDE;
+ virtual void Print( FILE* ) override;
#endif
};
@@ -302,9 +302,9 @@ class TcgSttbfCore : public TBBase
public:
TcgSttbfCore();
virtual ~TcgSttbfCore();
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* fp ) SAL_OVERRIDE;
+ virtual void Print( FILE* fp ) override;
#endif
};
@@ -317,9 +317,9 @@ class TcgSttbf : public Tcg255SubStruct
public:
explicit TcgSttbf( bool bReadId = true );
virtual ~TcgSttbf(){}
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* fp ) SAL_OVERRIDE;
+ virtual void Print( FILE* fp ) override;
#endif
};
@@ -334,9 +334,9 @@ class Xstz : public TBBase
public:
Xstz();
virtual ~Xstz(){}
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* fp ) SAL_OVERRIDE;
+ virtual void Print( FILE* fp ) override;
#endif
};
@@ -350,9 +350,9 @@ class MacroName : public TBBase
public:
MacroName();
virtual ~MacroName(){}
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* ) SAL_OVERRIDE;
+ virtual void Print( FILE* ) override;
#endif
};
@@ -367,9 +367,9 @@ class MacroNames : public Tcg255SubStruct
public:
explicit MacroNames( bool bReadId = true );
virtual ~MacroNames();
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* ) SAL_OVERRIDE;
+ virtual void Print( FILE* ) override;
#endif
};
@@ -383,9 +383,9 @@ class Tcg255 : public TBBase
public:
Tcg255();
virtual ~Tcg255();
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* ) SAL_OVERRIDE;
+ virtual void Print( FILE* ) override;
#endif
bool ImportCustomToolBar( SfxObjectShell& rDocSh );
};
@@ -400,10 +400,10 @@ class Tcg: public TBBase
public:
Tcg();
virtual ~Tcg(){}
- bool Read(SvStream &rS) SAL_OVERRIDE;
+ bool Read(SvStream &rS) override;
bool ImportCustomToolBar( SfxObjectShell& rDocSh );
#if OSL_DEBUG_LEVEL > 1
- virtual void Print( FILE* ) SAL_OVERRIDE;
+ virtual void Print( FILE* ) override;
#endif
};
diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx
index c24f8d3471e5..eedd9d83ff76 100644
--- a/sw/source/filter/xml/wrtxml.hxx
+++ b/sw/source/filter/xml/wrtxml.hxx
@@ -43,15 +43,15 @@ class SwXMLWriter : public StgWriter
using StgWriter::Write;
protected:
- virtual sal_uLong WriteStorage() SAL_OVERRIDE;
- virtual sal_uLong WriteMedium( SfxMedium& aTargetMedium ) SAL_OVERRIDE;
+ virtual sal_uLong WriteStorage() override;
+ virtual sal_uLong WriteMedium( SfxMedium& aTargetMedium ) override;
public:
SwXMLWriter( const OUString& rBaseURL );
virtual ~SwXMLWriter();
- virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ) SAL_OVERRIDE;
+ virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ) override;
private:
diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx
index ddf1140fff67..3edbb4fe07e6 100644
--- a/sw/source/filter/xml/xmlbrshi.hxx
+++ b/sw/source/filter/xml/xmlbrshi.hxx
@@ -69,9 +69,9 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
const SvxBrushItem& GetItem() const { return *pItem; }
};
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 5deea5bd7d07..165aa1e55f87 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -87,16 +87,16 @@ class SwXMLExport : public SvXMLExport
SwXMLTableInfo_Impl& rTableInfo,
sal_uInt32 nHeaderRows = 0 );
- virtual void _ExportMeta() SAL_OVERRIDE;
- virtual void _ExportFontDecls() SAL_OVERRIDE;
- virtual void _ExportStyles( bool bUsed ) SAL_OVERRIDE;
- virtual void _ExportAutoStyles() SAL_OVERRIDE;
- virtual void _ExportMasterStyles() SAL_OVERRIDE;
- virtual void SetBodyAttributes() SAL_OVERRIDE;
- virtual void _ExportContent() SAL_OVERRIDE;
- 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;
- virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ) SAL_OVERRIDE;
+ virtual void _ExportMeta() override;
+ virtual void _ExportFontDecls() override;
+ virtual void _ExportStyles( bool bUsed ) override;
+ virtual void _ExportAutoStyles() override;
+ virtual void _ExportMasterStyles() override;
+ virtual void SetBodyAttributes() override;
+ virtual void _ExportContent() override;
+ virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override;
+ virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override;
+ virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ) override;
// string constants for table cell export
const OUString sNumberFormat;
@@ -108,11 +108,11 @@ private:
void DeleteTableLines();
protected:
- virtual XMLTextParagraphExport* CreateTextParagraphExport() SAL_OVERRIDE;
- virtual SvXMLAutoStylePoolP* CreateAutoStylePool() SAL_OVERRIDE;
- virtual XMLPageExport* CreatePageExport() SAL_OVERRIDE;
- virtual XMLShapeExport* CreateShapeExport() SAL_OVERRIDE;
- virtual XMLFontAutoStylePool* CreateFontAutoStylePool() SAL_OVERRIDE;
+ virtual XMLTextParagraphExport* CreateTextParagraphExport() override;
+ virtual SvXMLAutoStylePoolP* CreateAutoStylePool() override;
+ virtual XMLPageExport* CreatePageExport() override;
+ virtual XMLShapeExport* CreateShapeExport() override;
+ virtual XMLFontAutoStylePool* CreateFontAutoStylePool() override;
public:
SwXMLExport(
@@ -121,7 +121,7 @@ public:
virtual ~SwXMLExport();
- virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) SAL_OVERRIDE;
+ virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override;
inline const SvXMLUnitConverter& GetTwipUnitConverter() const;
@@ -136,7 +136,7 @@ public:
// XUnoTunnel
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
const SwDoc* getDoc() const;
SwDoc* getDoc();
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 51f0869b020f..e4ecd3e4ef41 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -263,7 +263,7 @@ class SwXMLTextStyleContext_Impl : public XMLTextStyleContext
protected:
- virtual uno::Reference < style::XStyle > Create() SAL_OVERRIDE;
+ virtual uno::Reference < style::XStyle > Create() override;
public:
@@ -279,9 +279,9 @@ public:
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override;
- virtual void Finish( bool bOverwrite ) SAL_OVERRIDE;
+ virtual void Finish( bool bOverwrite ) override;
};
TYPEINIT1( SwXMLTextStyleContext_Impl, XMLTextStyleContext );
@@ -437,7 +437,7 @@ protected:
virtual void SetAttribute( sal_uInt16 nPrefixKey,
const OUString& rLocalName,
- const OUString& rValue ) SAL_OVERRIDE;
+ const OUString& rValue ) override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
@@ -453,12 +453,12 @@ public:
sal_uInt16 nFamily);
virtual ~SwXMLItemSetStyleContext_Impl();
- virtual void CreateAndInsert( bool bOverwrite ) SAL_OVERRIDE;
+ virtual void CreateAndInsert( bool bOverwrite ) override;
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override;
// The item set may be empty!
SfxItemSet *GetItemSet() { return pItemSet; }
@@ -715,17 +715,17 @@ protected:
virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily,
sal_uInt16 nPrefix, const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override;
virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext(
sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override;
// HACK
virtual rtl::Reference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
- sal_uInt16 nFamily ) const SAL_OVERRIDE;
+ sal_uInt16 nFamily ) const override;
virtual uno::Reference < container::XNameContainer >
- GetStylesContainer( sal_uInt16 nFamily ) const SAL_OVERRIDE;
- virtual OUString GetServiceName( sal_uInt16 nFamily ) const SAL_OVERRIDE;
+ GetStylesContainer( sal_uInt16 nFamily ) const override;
+ virtual OUString GetServiceName( sal_uInt16 nFamily ) const override;
// HACK
public:
@@ -739,9 +739,9 @@ public:
bool bAuto );
virtual ~SwXMLStylesContext_Impl();
- virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE;
+ virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override;
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
};
TYPEINIT1( SwXMLStylesContext_Impl, SvXMLStylesContext );
@@ -904,7 +904,7 @@ void SwXMLStylesContext_Impl::EndElement()
class SwXMLMasterStylesContext_Impl : public XMLTextMasterStylesContext
{
protected:
- virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE;
+ virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
const SwXMLImport& GetSwImport() const
@@ -919,7 +919,7 @@ public:
const OUString& rLName ,
const uno::Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~SwXMLMasterStylesContext_Impl();
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
};
TYPEINIT1( SwXMLMasterStylesContext_Impl, XMLTextMasterStylesContext );
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index e03657095d1b..b5df169bdfef 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -262,7 +262,7 @@ protected:
const SvXMLExportPropertyMapper& rPropExp
, const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap
- ) const SAL_OVERRIDE;
+ ) const override;
public:
explicit SwXMLAutoStylePoolP( SvXMLExport& rExport );
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index b7e771a61b0b..99d4c7a86937 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -130,7 +130,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
};
SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport,
@@ -175,7 +175,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
};
SwXMLDocContext_Impl::SwXMLDocContext_Impl( SwXMLImport& rImport,
@@ -266,7 +266,7 @@ public:
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
};
SwXMLOfficeDocContext_Impl::SwXMLOfficeDocContext_Impl(
@@ -327,7 +327,7 @@ public:
TYPEINFO_OVERRIDE();
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
};
SwXMLDocStylesContext_Impl::SwXMLDocStylesContext_Impl(
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index a95134420d72..1309e1f3fc46 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -100,11 +100,11 @@ protected:
virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
- virtual XMLTextImportHelper* CreateTextImport() SAL_OVERRIDE;
+ virtual XMLTextImportHelper* CreateTextImport() override;
- virtual XMLShapeImportHelper* CreateShapeImport() SAL_OVERRIDE;
+ virtual XMLShapeImportHelper* CreateShapeImport() override;
public:
SwXMLImport(
@@ -117,16 +117,16 @@ public:
virtual void SAL_CALL startDocument()
throw (::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException,
- std::exception) SAL_OVERRIDE;
+ std::exception) override;
virtual void SAL_CALL endDocument()
- throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
// XUnoTunnel
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
// XInitialization
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
void InsertStyles( bool bAuto );
void FinishStyles();
@@ -176,21 +176,21 @@ public:
OUString *pParent=0 ) const;
virtual void SetStatistics(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) SAL_OVERRIDE;
- 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>& aConfigProps) SAL_OVERRIDE;
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) override;
+ virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) override;
+ virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) override;
virtual void SetDocumentSpecificSettings(const OUString& _rSettingsGroupName,
- const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings) SAL_OVERRIDE;
+ const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings) override;
// initialize XForms
- virtual void initXForms() SAL_OVERRIDE;
+ virtual void initXForms() override;
// get the document properties, but only if they actually need importing
::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties>
GetDocumentProperties() const;
- virtual void NotifyEmbeddedFontRead() SAL_OVERRIDE;
+ virtual void NotifyEmbeddedFontRead() override;
const SwDoc* getDoc() const;
SwDoc* getDoc();
diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx
index c5f7651c347d..8984fe6184e6 100644
--- a/sw/source/filter/xml/xmlitem.hxx
+++ b/sw/source/filter/xml/xmlitem.hxx
@@ -50,7 +50,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE;
+ const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
// This method is called from this instance implementation of
// CreateChildContext if the element matches an entry in the
diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx
index 536dc949e43e..2b28b352f7df 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -75,7 +75,7 @@ public:
const SfxPoolItem& rItem,
const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap,
- const SfxItemSet *pSet = NULL ) const SAL_OVERRIDE;
+ const SfxItemSet *pSet = NULL ) const override;
virtual void handleElementItem(
SvXMLExport& rExport,
@@ -83,7 +83,7 @@ public:
const SfxPoolItem& rItem,
const SvXMLUnitConverter& rUnitConverter,
const SfxItemSet& rSet,
- SvXmlExportFlags nFlags ) const SAL_OVERRIDE;
+ SvXmlExportFlags nFlags ) const override;
inline void SetAbsWidth( sal_uInt32 nAbs );
};
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index ec7f0351f054..ddecdccc0c35 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -70,19 +70,19 @@ public:
SfxItemSet& rSet,
const OUString& rValue,
const SvXMLUnitConverter& rUnitConverter,
- const SvXMLNamespaceMap& rNamespaceMap ) SAL_OVERRIDE;
+ const SvXMLNamespaceMap& rNamespaceMap ) override;
virtual bool
handleNoItem(SvXMLItemMapEntry const& rEntry,
SfxItemSet & rSet,
OUString const& rValue,
SvXMLUnitConverter const& rUnitConverter,
- SvXMLNamespaceMap const& rNamespaceMap) SAL_OVERRIDE;
+ SvXMLNamespaceMap const& rNamespaceMap) override;
virtual void finished(SfxItemSet & rSet,
- SvXMLUnitConverter const& rUnitConverter) const SAL_OVERRIDE;
+ SvXMLUnitConverter const& rUnitConverter) const override;
- virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ) SAL_OVERRIDE;
+ virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ) override;
private:
void Reset();
@@ -261,7 +261,7 @@ public:
const ::uno::Reference< xml::sax::XAttributeList > & xAttrList,
SfxItemSet& rItemSet,
const SvXMLItemMapEntry& rEntry,
- const SvXMLUnitConverter& rUnitConv ) SAL_OVERRIDE;
+ const SvXMLUnitConverter& rUnitConv ) override;
};
SwXMLItemSetContext_Impl::SwXMLItemSetContext_Impl(
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 93d12a5811d7..189aa79645cc 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -430,8 +430,8 @@ public:
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
- virtual void EndElement() SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
+ virtual void EndElement() override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
};
@@ -836,7 +836,7 @@ public:
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
};
@@ -893,9 +893,9 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
};
@@ -1014,7 +1014,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
};
@@ -1074,7 +1074,7 @@ public:
virtual ~SwXMLDDETableContext_Impl();
virtual void StartElement(
- const Reference<xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE;
+ const Reference<xml::sax::XAttributeList> & xAttrList) override;
OUString& GetConnectionName() { return sConnectionName; }
OUString& GetDDEApplication() { return sDDEApplication; }
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index 7c743bc74527..f9c781f3d885 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -146,7 +146,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
@@ -183,7 +183,7 @@ public:
const SwStartNode *InsertTableSection(const SwStartNode *pPrevSttNd = 0,
OUString const* pStringValueStyleName = 0);
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
void SetHasSubTables( bool bNew ) { bHasSubTables = bNew; }
};
diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx
index f5e1e35561a9..debc85c5fd6e 100644
--- a/sw/source/filter/xml/xmltext.cxx
+++ b/sw/source/filter/xml/xmltext.cxx
@@ -36,11 +36,11 @@ public:
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
// The body element's text:global attribute can be ignored, because
// we must have the correct object shell already.
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
};
SwXMLBodyContentContext_Impl::SwXMLBodyContentContext_Impl( SwXMLImport& rImport,
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index 0131f1d414b1..d64d7b14f72a 100644
--- a/sw/source/filter/xml/xmltexte.hxx
+++ b/sw/source/filter/xml/xmltexte.hxx
@@ -48,21 +48,21 @@ class SwXMLTextParagraphExport : public XMLTextParagraphExport
protected:
virtual void exportStyleContent(
const ::com::sun::star::uno::Reference<
- ::com::sun::star::style::XStyle > & rStyle ) SAL_OVERRIDE;
+ ::com::sun::star::style::XStyle > & rStyle ) override;
virtual void _collectTextEmbeddedAutoStyles(
const ::com::sun::star::uno::Reference <
- ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE;
+ ::com::sun::star::beans::XPropertySet > & rPropSet ) override;
virtual void _exportTextEmbedded(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & rPropSet,
const ::com::sun::star::uno::Reference <
- ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ) SAL_OVERRIDE;
+ ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ) override;
virtual void exportTable(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
- bool bAutoStyles, bool bProgress ) SAL_OVERRIDE;
+ bool bAutoStyles, bool bProgress ) override;
public:
SwXMLTextParagraphExport(
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index 23e4051eab23..f753c44f33d8 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.hxx
@@ -33,7 +33,7 @@ protected:
SvXMLImport& rImport,
sal_uInt16 nPrefix, const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
public:
SwXMLTextImportHelper(
@@ -53,14 +53,14 @@ public:
const OUString& rHRef,
const OUString& rStyleName,
const OUString& rTableName,
- sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
+ sal_Int32 nWidth, sal_Int32 nHeight ) override;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
createAndInsertOOoLink( SvXMLImport& rImport,
const OUString& rHRef,
const OUString& rStyleName,
const OUString& rTableName,
- sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
+ sal_Int32 nWidth, sal_Int32 nHeight ) override;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
createAndInsertApplet(
@@ -68,14 +68,14 @@ public:
const OUString &rCode,
bool bMayScript,
const OUString& rHRef,
- sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
+ sal_Int32 nWidth, sal_Int32 nHeight ) override;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
createAndInsertPlugin(
const OUString &rMimeType,
const OUString& rHRef,
- sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
+ sal_Int32 nWidth, sal_Int32 nHeight ) override;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
@@ -83,13 +83,13 @@ public:
const OUString &rName,
const OUString &rHRef,
const OUString &rStyleName,
- sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
+ sal_Int32 nWidth, sal_Int32 nHeight ) override;
virtual void endAppletOrPlugin(
const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &rPropSet,
- ::std::map < const OUString, OUString > &rParamMap) SAL_OVERRIDE;
+ ::std::map < const OUString, OUString > &rParamMap) override;
- virtual bool IsInHeaderFooter() const SAL_OVERRIDE;
+ virtual bool IsInHeaderFooter() const override;
// redlining helper methods
// (here is the real implementation)
@@ -99,21 +99,21 @@ public:
const OUString& rAuthor, /// name of the author
const OUString& rComment, /// redline comment
const ::com::sun::star::util::DateTime& rDateTime, /// date+time
- bool bMergeLastPara) SAL_OVERRIDE; /// merge last paragraph
+ bool bMergeLastPara) override; /// merge last paragraph
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCursor> RedlineCreateText(
::com::sun::star::uno::Reference< /// needed to get the document
::com::sun::star::text::XTextCursor> & rOldCursor,
- const OUString& rId) SAL_OVERRIDE; /// ID used to RedlineAdd() call
+ const OUString& rId) override; /// ID used to RedlineAdd() call
virtual void RedlineSetCursor(
const OUString& rId, /// ID used to RedlineAdd() call
bool bStart, /// start or end Cursor
- bool bIsOutsideOfParagraph) SAL_OVERRIDE;
- virtual void RedlineAdjustStartNodeCursor( bool bStart) SAL_OVERRIDE;
- virtual void SetShowChanges( bool bShowChanges ) SAL_OVERRIDE;
- virtual void SetRecordChanges( bool bRecordChanges ) SAL_OVERRIDE;
+ bool bIsOutsideOfParagraph) override;
+ virtual void RedlineAdjustStartNodeCursor( bool bStart) override;
+ virtual void SetShowChanges( bool bShowChanges ) override;
+ virtual void SetRecordChanges( bool bRecordChanges ) override;
virtual void SetChangesProtectionKey(
- const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ) SAL_OVERRIDE;
+ const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ) override;
};
#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTI_HXX