summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
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.hxx2
-rw-r--r--sw/source/filter/inc/fltini.hxx14
-rw-r--r--sw/source/filter/inc/fltshell.hxx78
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx2
-rw-r--r--sw/source/filter/ww1/w1class.hxx76
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx292
-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.hxx278
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx2
-rw-r--r--sw/source/filter/ww8/rtfexport.hxx58
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.hxx8
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx94
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx286
-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.hxx104
-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.hxx24
-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.hxx6
-rw-r--r--sw/source/filter/xml/xmltext.cxx4
-rw-r--r--sw/source/filter/xml/xmltexte.hxx10
-rw-r--r--sw/source/filter/xml/xmltexti.hxx30
42 files changed, 874 insertions, 874 deletions
diff --git a/sw/source/filter/ascii/wrtasc.hxx b/sw/source/filter/ascii/wrtasc.hxx
index 5a76ef7eb1bc..4082aade4064 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();
+ virtual sal_uLong WriteStream() SAL_OVERRIDE;
public:
SwASCWriter( const OUString& rFilterName );
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index b67db8c9c772..90b5dcd7096a 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -382,29 +382,29 @@ public:
// XImageConsumer
virtual void SAL_CALL init( sal_Int32 Width, sal_Int32 Height)
- throw( uno::RuntimeException, std::exception );
+ throw( uno::RuntimeException, std::exception ) SAL_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 );
+ throw( uno::RuntimeException, std::exception ) SAL_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 );
+ throw( uno::RuntimeException, std::exception ) SAL_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 );
+ throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL complete(
sal_Int32 Status,
const uno::Reference< awt::XImageProducer > & Producer)
- throw( uno::RuntimeException, std::exception );
+ throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEventListener
- virtual void SAL_CALL disposing( const EventObject& Source ) throw ( uno::RuntimeException, std::exception);
+ virtual void SAL_CALL disposing( const EventObject& Source ) throw ( uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
SwHTMLImageWatcher::SwHTMLImageWatcher(
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 84833c9e71f0..93d1bd13025d 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -74,7 +74,7 @@ class SwHTMLWrtTable : public SwWriteTable
const SvxBrushItem *pBrushItem ) const;
virtual sal_Bool ShouldExpandSub( const SwTableBox *pBox,
- sal_Bool bExpandedBefore, sal_uInt16 nDepth ) const;
+ sal_Bool bExpandedBefore, sal_uInt16 nDepth ) const SAL_OVERRIDE;
static sal_Bool HasTabBackground( const SwTableLine& rLine,
sal_Bool bTop, sal_Bool bBottom, sal_Bool bLeft, sal_Bool bRight );
diff --git a/sw/source/filter/html/htmlvsh.hxx b/sw/source/filter/html/htmlvsh.hxx
index 0db12f9f6ede..a8f1363fc028 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 );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
public:
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 1ba92df1f8f9..adfc1eea08bd 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -251,13 +251,13 @@ protected:
// zuletzt angelegten Styles kopiert.
// Diese Methode sollte in abgleiteten Parsern nicht mehr
// ueberladen werden!
- virtual bool SelectorParsed( CSS1Selector *pSelector, bool bFirst );
+ virtual bool SelectorParsed( CSS1Selector *pSelector, bool bFirst ) SAL_OVERRIDE;
// Diese Methode wird fuer jede geparste Property aufgerufen
// sie fuegt das Item in den ItemSet 'pItemSet' ein
// Sie sollte in abgeleiteten Parsern nicht mehr ueberladen werden!
virtual sal_Bool DeclarationParsed( const OUString& rProperty,
- const CSS1Expression *pExpr );
+ const CSS1Expression *pExpr ) SAL_OVERRIDE;
public:
diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx
index cdf24be7f927..63a0e58db1db 100644
--- a/sw/source/filter/html/swcss1.hxx
+++ b/sw/source/filter/html/swcss1.hxx
@@ -70,7 +70,7 @@ class SwCSS1Parser : public SvxCSS1Parser
protected:
virtual sal_Bool StyleParsed( const CSS1Selector *pSelector,
SfxItemSet& rItemSet,
- SvxCSS1PropertyInfo& rPropInfo );
+ SvxCSS1PropertyInfo& rPropInfo ) SAL_OVERRIDE;
using CSS1Parser::ParseStyleSheet;
@@ -78,13 +78,13 @@ public:
SwCSS1Parser( SwDoc *pDoc, sal_uInt32 aFHeight[7], const OUString& rBaseURL, sal_Bool bNewDoc );
virtual ~SwCSS1Parser();
- virtual sal_Bool ParseStyleSheet( const OUString& rIn );
+ virtual sal_Bool ParseStyleSheet( const OUString& rIn ) SAL_OVERRIDE;
// Die Font-Hoehe fuer eine bestimmte Font-Groesse (0-6) ermitteln
- virtual sal_uInt32 GetFontHeight( sal_uInt16 nSize ) const;
+ virtual sal_uInt32 GetFontHeight( sal_uInt16 nSize ) const SAL_OVERRIDE;
// Die aktuelle Font-Liste holen (auch 0 ist erlaubt)
- virtual const FontList *GetFontList() const;
+ virtual const FontList *GetFontList() const SAL_OVERRIDE;
// das Zeichen-Format zu einem Token und einer ggf leeren Klasse
// ermitteln
@@ -160,7 +160,7 @@ public:
inline void SetATagStyles();
inline void SetDelayedStyles();
- virtual void SetDfltEncoding( rtl_TextEncoding eEnc );
+ virtual void SetDfltEncoding( rtl_TextEncoding eEnc ) SAL_OVERRIDE;
};
inline void SwCSS1Parser::AddFirstLetterExt( OUString& rFmtName )
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index e7d75e976762..70648b7aef81 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -879,13 +879,13 @@ public: // used in tables
protected:
// Executed for each token recognized by CallParser
- virtual void NextToken( int nToken );
+ virtual void NextToken( int nToken ) SAL_OVERRIDE;
virtual ~SwHTMLParser();
// If the document is removed, remove the parser as well
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
+ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
- virtual void AddMetaUserDefined( OUString const & i_rMetaName );
+ virtual void AddMetaUserDefined( OUString const & i_rMetaName ) SAL_OVERRIDE;
public:
@@ -896,16 +896,16 @@ public:
SfxMedium* pMed = 0, sal_Bool bReadUTF8 = sal_False,
sal_Bool bIgnoreHTMLComments = sal_False );
- virtual SvParserState CallParser();
+ virtual SvParserState CallParser() SAL_OVERRIDE;
sal_uInt16 ToTwips( sal_uInt16 nPixel ) const;
// for reading asynchronously from SvStream
- virtual void Continue( int nToken );
+ virtual void Continue( int nToken ) SAL_OVERRIDE;
virtual bool ParseMetaOptions( const ::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties>&,
- SvKeyValueIterator* );
+ SvKeyValueIterator* ) SAL_OVERRIDE;
};
struct SwPendingStackData
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 3c294edae53b..5ec54e40d116 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -277,7 +277,7 @@ class SwHTMLWriter : public Writer
void CollectLinkTargets();
protected:
- sal_uLong WriteStream();
+ sal_uLong WriteStream() SAL_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 1b9d1cac031b..c77864c6b122 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -32,30 +32,30 @@ class SwNodeIndex;
class HTMLReader: public Reader
{
// wir wollen die Streams / Storages nicht geoeffnet haben
- virtual int SetStrmStgPtr();
- virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &);
- virtual OUString GetTemplateName() const;
+ virtual int SetStrmStgPtr() SAL_OVERRIDE;
+ virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE;
+ virtual OUString GetTemplateName() const SAL_OVERRIDE;
public:
HTMLReader();
};
class WW1Reader : public Reader
{
- virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &);
+ virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE;
};
class XMLReader : public Reader
{
- virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &);
+ virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE;
public:
- virtual int GetReaderType();
+ virtual int GetReaderType() SAL_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;
+ std::vector<OUString*>& rStrings ) const SAL_OVERRIDE;
};
// die speziellen Writer
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 8222c9f7572d..479f0998199d 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -211,8 +211,8 @@ public:
virtual ~SwFltAnchor();
// "pure virtual Methoden" vom SfxPoolItem
- virtual bool operator==(const SfxPoolItem&) const;
- virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
+ virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE;
void SetFrmFmt(SwFrmFmt * _pFrmFmt);
const SwFrmFmt* GetFrmFmt() const;
SwFrmFmt* GetFrmFmt();
@@ -225,7 +225,7 @@ class SwFltAnchorClient : public SwClient
public:
SwFltAnchorClient(SwFltAnchor * pFltAnchor);
- virtual void Modify (const SfxPoolItem *pOld, const SfxPoolItem *pNew);
+ virtual void Modify (const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
};
class SW_DLLPUBLIC SwFltRedline : public SfxPoolItem
@@ -263,8 +263,8 @@ public:
nAutorNoPrev( rCpy.nAutorNoPrev )
{}
// "pure virtual Methoden" vom SfxPoolItem
- virtual bool operator==(const SfxPoolItem& rItem) const;
- virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
+ virtual bool operator==(const SfxPoolItem& rItem) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE;
};
class SW_DLLPUBLIC SwFltBookmark : public SfxPoolItem
@@ -285,8 +285,8 @@ public:
SwFltBookmark( const SwFltBookmark& );
// "pure virtual Methoden" vom SfxPoolItem
- virtual bool operator==(const SfxPoolItem&) const;
- virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
+ virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE;
long GetHandle() const { return mnHandle; }
const OUString& GetName() const { return maName; }
@@ -307,8 +307,8 @@ public:
SwFltTOX(SwTOXBase* pBase, sal_uInt16 _nCols = 0);
SwFltTOX(const SwFltTOX&);
// "pure virtual Methoden" vom SfxPoolItem
- virtual bool operator==(const SfxPoolItem&) const;
- virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
+ virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE;
SwTOXBase* GetBase() { return pTOXBase; }
sal_uInt16 GetCols() const { return nCols; }
void SetHadBreakItem( sal_Bool bVal ) { bHadBreakItem = bVal; }
@@ -325,8 +325,8 @@ public:
SwFltSection( SwSectionData *const pSect );
SwFltSection( const SwFltSection& );
// "pure virtual Methoden" vom SfxPoolItem
- virtual bool operator==(const SfxPoolItem&) const;
- virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
+ virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE;
SwSectionData * GetSectionData() { return m_pSection; }
};
// Der WWEndStack verhaelt sich wie der WWControlStck, nur dass die Attribute
@@ -421,32 +421,32 @@ public:
void SetReadNoTable() { bReadNoTbl = sal_True; }
sal_Bool IsTableWidthSet() const { return 0 != nTableWidth; }
- virtual SwFltOutBase& operator << (const SfxPoolItem& rItem);
+ virtual SwFltOutBase& operator << (const SfxPoolItem& rItem) SAL_OVERRIDE;
- virtual const SfxPoolItem& GetAttr(sal_uInt16 nWhich);
- virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich);
+ virtual const SfxPoolItem& GetAttr(sal_uInt16 nWhich) SAL_OVERRIDE;
+ virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich) SAL_OVERRIDE;
sal_Bool IsInTable();
- virtual const SfxPoolItem& GetCellAttr(sal_uInt16 nWhich);
- virtual bool BeginTable();
- virtual void NextTableCell();
- virtual void NextTableRow();
- virtual void SetTableWidth(SwTwips nW);
- virtual void SetTableOrient(sal_Int16 eOri);
- virtual void SetCellWidth(SwTwips nWidth, sal_uInt16 nCell);
- virtual void SetCellHeight(SwTwips nH);
- virtual void SetCellBorder(const SvxBoxItem& rFmtBox, sal_uInt16 nCell);
- virtual void SetCellSpace(sal_uInt16 nSp);
- virtual void DeleteCell(sal_uInt16 nCell);
- virtual void EndTable();
+ virtual const SfxPoolItem& GetCellAttr(sal_uInt16 nWhich) SAL_OVERRIDE;
+ virtual bool BeginTable() SAL_OVERRIDE;
+ virtual void NextTableCell() SAL_OVERRIDE;
+ virtual void NextTableRow() SAL_OVERRIDE;
+ virtual void SetTableWidth(SwTwips nW) SAL_OVERRIDE;
+ virtual void SetTableOrient(sal_Int16 eOri) SAL_OVERRIDE;
+ virtual void SetCellWidth(SwTwips nWidth, sal_uInt16 nCell) SAL_OVERRIDE;
+ virtual void SetCellHeight(SwTwips nH) SAL_OVERRIDE;
+ virtual void SetCellBorder(const SvxBoxItem& rFmtBox, sal_uInt16 nCell) SAL_OVERRIDE;
+ virtual void SetCellSpace(sal_uInt16 nSp) SAL_OVERRIDE;
+ virtual void DeleteCell(sal_uInt16 nCell) SAL_OVERRIDE;
+ virtual void EndTable() SAL_OVERRIDE;
SwFrmFmt* MakeFly( RndStdIds eAnchor, SfxItemSet* pSet );
- virtual bool IsInFly();
- virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr);
- virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich);
+ virtual bool IsInFly() SAL_OVERRIDE;
+ virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr) SAL_OVERRIDE;
+ virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich) SAL_OVERRIDE;
virtual bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
- const SfxItemSet* pMoreAttrs = 0 );
- virtual void EndFly();
+ const SfxItemSet* pMoreAttrs = 0 ) SAL_OVERRIDE;
+ virtual void EndFly() SAL_OVERRIDE;
};
class SwFltFormatCollection : public SwFltOutBase
@@ -473,17 +473,17 @@ public:
void SetHasFly() { bHasFly = true; }
SfxItemSet* GetpFlyAttrs() { return pFlyAttrs; }
- virtual SwFltOutBase& operator << (const SfxPoolItem& rItem);
- virtual const SfxPoolItem& GetAttr(sal_uInt16 nWhich);
- virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich);
+ virtual SwFltOutBase& operator << (const SfxPoolItem& rItem) SAL_OVERRIDE;
+ virtual const SfxPoolItem& GetAttr(sal_uInt16 nWhich) SAL_OVERRIDE;
+ virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich) SAL_OVERRIDE;
- virtual bool IsInFly();
- virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr);
- virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich);
+ virtual bool IsInFly() SAL_OVERRIDE;
+ virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr) SAL_OVERRIDE;
+ virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich) SAL_OVERRIDE;
virtual bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
- const SfxItemSet* pMoreAttrs = 0 );
+ const SfxItemSet* pMoreAttrs = 0 ) SAL_OVERRIDE;
bool BeginStyleFly( SwFltOutDoc* pOutDoc );
- virtual void EndFly();
+ virtual void EndFly() SAL_OVERRIDE;
};
// dies nun ist die zauberhafteklasse: intention: alle eins nach dem
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index aad6a8d4e142..2948833c6530 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -42,7 +42,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 &);
+ virtual sal_uLong Read( SwDoc &, const OUString& rBaseURL, SwPaM &,const OUString &) SAL_OVERRIDE;
};
sal_uLong SwRTFReader::Read( SwDoc &rDoc, const OUString& /*rBaseURL*/, SwPaM& rPam, const OUString &)
diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx
index 7dadb105907e..a83c1e55be03 100644
--- a/sw/source/filter/ww1/w1class.hxx
+++ b/sw/source/filter/ww1/w1class.hxx
@@ -343,7 +343,7 @@ public:
class Ww1SingleSprmByteSized : public Ww1SingleSprm {
public:
- sal_uInt16 Size(sal_uInt8*);
+ sal_uInt16 Size(sal_uInt8*) SAL_OVERRIDE;
Ww1SingleSprmByteSized(sal_uInt16 nBytes, sal_Char* sName = 0) :
Ww1SingleSprm(nBytes, sName) {
}
@@ -351,7 +351,7 @@ public:
class Ww1SingleSprmWordSized : public Ww1SingleSprm {
public:
- sal_uInt16 Size(sal_uInt8*);
+ sal_uInt16 Size(sal_uInt8*) SAL_OVERRIDE;
Ww1SingleSprmWordSized(sal_uInt16 nBytes, sal_Char* sName = 0) :
Ww1SingleSprm(nBytes, sName) {
}
@@ -399,7 +399,7 @@ public:
class Ww1SingleSprmTab : public Ww1SingleSprm {
public:
std::ostream& Dump(std::ostream&, sal_uInt8*, sal_uInt16);
- sal_uInt16 Size(sal_uInt8*);
+ sal_uInt16 Size(sal_uInt8*) SAL_OVERRIDE;
Ww1SingleSprmTab(sal_uInt16 nBytes, sal_Char* sName = 0) :
Ww1SingleSprm(nBytes, sName) {
}
@@ -410,8 +410,8 @@ public:
Ww1SingleSprmPJc(sal_Char* sName) :
Ww1SingleSprmByte(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
- void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
+ void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPDxa : public Ww1SingleSprmWord {
@@ -419,7 +419,7 @@ public:
Ww1SingleSprmPDxa(sal_Char* sName) :
Ww1SingleSprmWord(sName) {
}
- void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPDxaRight : public Ww1SingleSprmPDxa {
@@ -427,7 +427,7 @@ public:
Ww1SingleSprmPDxaRight(sal_Char* sName) :
Ww1SingleSprmPDxa(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPDxaLeft : public Ww1SingleSprmPDxa {
@@ -435,7 +435,7 @@ public:
Ww1SingleSprmPDxaLeft(sal_Char* sName) :
Ww1SingleSprmPDxa(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPDxaLeft1 : public Ww1SingleSprmPDxa {
@@ -443,7 +443,7 @@ public:
Ww1SingleSprmPDxaLeft1(sal_Char* sName) :
Ww1SingleSprmPDxa(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPFKeep : public Ww1SingleSprmBool {
@@ -451,8 +451,8 @@ public:
Ww1SingleSprmPFKeep(sal_Char* sName) :
Ww1SingleSprmBool(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
- void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
+ void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPFKeepFollow : public Ww1SingleSprmBool {
@@ -460,8 +460,8 @@ public:
Ww1SingleSprmPFKeepFollow(sal_Char* sName) :
Ww1SingleSprmBool(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
- void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
+ void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPPageBreakBefore : public Ww1SingleSprmBool {
@@ -469,8 +469,8 @@ public:
Ww1SingleSprmPPageBreakBefore(sal_Char* sName) :
Ww1SingleSprmBool(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
- void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
+ void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPBrc : public Ww1SingleSprmWord {
@@ -486,7 +486,7 @@ public:
Ww1SingleSprmPBrc(sal_Char* sName) :
Ww1SingleSprmWord(sName) {
}
- void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
// SetBorder() is needed for tables, too. That's why it's public
static editeng::SvxBorderLine* SetBorder(editeng::SvxBorderLine*, W1_BRC10*);
};
@@ -510,21 +510,21 @@ public:
Ww1SingleSprmPBrc10(sal_uInt16 nL, sal_Char* sName)
: Ww1SingleSprmPBrc(sName), nLine(nL) {}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmParaSpace : public Ww1SingleSprmWord {
public:
Ww1SingleSprmParaSpace(sal_Char* sName)
: Ww1SingleSprmWord(sName) {}
- void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPDyaBefore : public Ww1SingleSprmParaSpace {
public:
Ww1SingleSprmPDyaBefore(sal_Char* sName)
: Ww1SingleSprmParaSpace(sName) {}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPDyaAfter : public Ww1SingleSprmParaSpace {
@@ -532,7 +532,7 @@ public:
Ww1SingleSprmPDyaAfter(sal_Char* sName) :
Ww1SingleSprmParaSpace(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPDyaLine : public Ww1SingleSprmWord {
@@ -540,8 +540,8 @@ public:
Ww1SingleSprmPDyaLine(sal_Char* sName) :
Ww1SingleSprmWord(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
- void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
+ void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPChgTabsPapx : public Ww1SingleSprmByteSized {
@@ -550,8 +550,8 @@ public:
Ww1SingleSprmByteSized(0, sName) {
}
// Size() is not yet activated!
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
- void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
+ void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmSGprfIhdt : public Ww1SingleSprmByte {
@@ -559,7 +559,7 @@ public:
Ww1SingleSprmSGprfIhdt(sal_Char* sName) :
Ww1SingleSprmByte(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmSColumns : public Ww1SingleSprmWord {
@@ -567,7 +567,7 @@ public:
Ww1SingleSprmSColumns(sal_Char* sName) :
Ww1SingleSprmWord(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPFInTable : public Ww1SingleSprmBool {
@@ -575,8 +575,8 @@ public:
Ww1SingleSprmPFInTable(sal_Char* sName) :
Ww1SingleSprmBool(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
- void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
+ void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPTtp : public Ww1SingleSprmBool {
@@ -584,8 +584,8 @@ public:
Ww1SingleSprmPTtp(sal_Char* sName) :
Ww1SingleSprmBool(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
- void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
+ void Stop(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmTJc : public Ww1SingleSprmWord {
@@ -599,7 +599,7 @@ public:
Ww1SingleSprmTDxaGapHalf(sal_Char* sName) :
Ww1SingleSprmWord(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmTDefTable10 : public Ww1SingleSprmWordSized {
@@ -607,7 +607,7 @@ public:
Ww1SingleSprmTDefTable10(sal_Char* sName) :
Ww1SingleSprmWordSized(0, sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmTDyaRowHeight : public Ww1SingleSprmWord {
@@ -615,7 +615,7 @@ public:
Ww1SingleSprmTDyaRowHeight(sal_Char* sName) :
Ww1SingleSprmWord(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
// Class definitions for table fastsave attributes
@@ -628,7 +628,7 @@ public:
Ww1SingleSprmPpc(sal_Char* sName) :
Ww1SingleSprmByte(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPDxaAbs : public Ww1SingleSprmWord {
@@ -636,7 +636,7 @@ public:
Ww1SingleSprmPDxaAbs(sal_Char* sName) :
Ww1SingleSprmWord(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPDyaAbs : public Ww1SingleSprmWord {
@@ -644,7 +644,7 @@ public:
Ww1SingleSprmPDyaAbs(sal_Char* sName) :
Ww1SingleSprmWord(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPDxaWidth : public Ww1SingleSprmWord {
@@ -652,7 +652,7 @@ public:
Ww1SingleSprmPDxaWidth(sal_Char* sName) :
Ww1SingleSprmWord(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
class Ww1SingleSprmPFromText : public Ww1SingleSprmWord {
@@ -660,7 +660,7 @@ public:
Ww1SingleSprmPFromText(sal_Char* sName) :
Ww1SingleSprmWord(sName) {
}
- void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&);
+ void Start(Ww1Shell&, sal_uInt8, sal_uInt8*, sal_uInt16, Ww1Manager&) SAL_OVERRIDE;
};
// The data type Sprm actually appearing in the file
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 308cce8ccd5e..8deff4fe8400 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -134,68 +134,68 @@ class DocxAttributeOutput : public AttributeOutputBase, public oox::vml::VMLText
{
public:
/// Export the state of RTL/CJK.
- virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript );
+ virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) SAL_OVERRIDE;
/// Start of the paragraph.
- virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo );
+ virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo ) SAL_OVERRIDE;
/// End of the paragraph.
- virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner );
+ virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
/// Empty paragraph.
- virtual void EmptyParagraph();
+ virtual void EmptyParagraph() SAL_OVERRIDE;
/// Called in order to output section breaks.
- virtual void SectionBreaks(const SwTxtNode& rNode);
+ virtual void SectionBreaks(const SwTxtNode& rNode) SAL_OVERRIDE;
/// Called before we start outputting the attributes.
- virtual void StartParagraphProperties();
+ virtual void StartParagraphProperties() SAL_OVERRIDE;
/// Called after we end outputting the attributes.
- virtual void EndParagraphProperties( const SfxItemSet* pParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted);
+ virtual void EndParagraphProperties( const SfxItemSet* pParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted) SAL_OVERRIDE;
/// Start of the text run.
- virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false );
+ virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) SAL_OVERRIDE;
/// End of the text run.
- virtual void EndRun();
+ virtual void EndRun() SAL_OVERRIDE;
/// Called before we start outputting the attributes.
- virtual void StartRunProperties();
+ virtual void StartRunProperties() SAL_OVERRIDE;
/// Called after we end outputting the attributes.
- virtual void EndRunProperties( const SwRedlineData* pRedlineData );
+ virtual void EndRunProperties( const SwRedlineData* pRedlineData ) SAL_OVERRIDE;
- virtual void FootnoteEndnoteRefTag();
+ virtual void FootnoteEndnoteRefTag() SAL_OVERRIDE;
- virtual void SectFootnoteEndnotePr();
+ virtual void SectFootnoteEndnotePr() SAL_OVERRIDE;
- virtual void WritePostitFieldReference();
+ virtual void WritePostitFieldReference() SAL_OVERRIDE;
/// Output text (inside a run).
- virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 );
+ virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ) SAL_OVERRIDE;
/// Output text (without markup).
- virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet );
+ virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ) SAL_OVERRIDE;
/// Output ruby start.
- virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby );
+ virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby ) SAL_OVERRIDE;
/// Output ruby end.
- virtual void EndRuby();
+ virtual void EndRuby() SAL_OVERRIDE;
/// Output URL start.
- virtual bool StartURL( const OUString& rUrl, const OUString& rTarget );
+ virtual bool StartURL( const OUString& rUrl, const OUString& rTarget ) SAL_OVERRIDE;
/// Output URL end.
- virtual bool EndURL();
+ virtual bool EndURL() SAL_OVERRIDE;
- virtual void FieldVanish( const OUString& rTxt, ww::eField eType );
+ virtual void FieldVanish( const OUString& rTxt, ww::eField eType ) SAL_OVERRIDE;
/// Output redlining.
///
/// The common attribute that can be among the run properties.
- virtual void Redline( const SwRedlineData* pRedline );
+ virtual void Redline( const SwRedlineData* pRedline ) SAL_OVERRIDE;
/// Output redlining.
///
@@ -208,37 +208,37 @@ public:
/// End of the tag that encloses the run.
void EndRedline( const SwRedlineData * pRedlineData );
- virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop& rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner );
+ virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop& rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
/// Output style.
- virtual void ParagraphStyle( sal_uInt16 nStyle );
+ virtual void ParagraphStyle( sal_uInt16 nStyle ) SAL_OVERRIDE;
- virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
+ 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 TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo );
- virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner );
- virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableRowEnd( sal_uInt32 nDepth = 1 );
+ 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 TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo ) 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;
/// Start of the styles table.
- virtual void StartStyles();
+ virtual void StartStyles() SAL_OVERRIDE;
/// End of the styles table.
- virtual void EndStyles( sal_uInt16 nNumberOfStyles );
+ virtual void EndStyles( sal_uInt16 nNumberOfStyles ) SAL_OVERRIDE;
/// Write default style.
- virtual void DefaultStyle( sal_uInt16 nStyle );
+ virtual void DefaultStyle( sal_uInt16 nStyle ) SAL_OVERRIDE;
/// Write Doc Defaults
void DocDefaults( );
@@ -256,55 +256,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 );
+ bool bAutoUpdate ) SAL_OVERRIDE;
/// End of a style in the styles table.
- virtual void EndStyle();
+ virtual void EndStyle() SAL_OVERRIDE;
/// Start of (paragraph or run) properties of a style.
- virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle );
+ virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ) SAL_OVERRIDE;
/// End of (paragraph or run) properties of a style.
- virtual void EndStyleProperties( bool bParProp );
+ virtual void EndStyleProperties( bool bParProp ) SAL_OVERRIDE;
/// Numbering rule and Id.
- virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt );
+ virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt ) SAL_OVERRIDE;
/// Page break
/// As a paragraph property - the paragraph should be on the next page.
- virtual void PageBreakBefore( bool bBreak );
+ virtual void PageBreakBefore( bool bBreak ) SAL_OVERRIDE;
/// Write a section break
/// msword::ColumnBreak or msword::PageBreak
- virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL );
+ virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) SAL_OVERRIDE;
/// Start of the section properties.
- virtual void StartSection();
+ virtual void StartSection() SAL_OVERRIDE;
/// End of the section properties.
- virtual void EndSection();
+ virtual void EndSection() SAL_OVERRIDE;
/// Protection of forms.
- virtual void SectionFormProtection( bool bProtected );
+ virtual void SectionFormProtection( bool bProtected ) SAL_OVERRIDE;
/// Numbering of the lines in the document.
- virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo );
+ virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ) SAL_OVERRIDE;
/// Has different headers/footers for the title page.
- virtual void SectionTitlePage();
+ virtual void SectionTitlePage() SAL_OVERRIDE;
/// Description of the page borders.
- virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt );
+ virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt ) SAL_OVERRIDE;
/// Columns populated from right/numbers on the right side?
- virtual void SectionBiDi( bool bBiDi );
+ virtual void SectionBiDi( bool bBiDi ) SAL_OVERRIDE;
/// The style of the page numbers.
///
- virtual void SectionPageNumbering( sal_uInt16 nNumType, ::boost::optional<sal_uInt16> oPageRestartNumber );
+ virtual void SectionPageNumbering( sal_uInt16 nNumType, ::boost::optional<sal_uInt16> oPageRestartNumber ) SAL_OVERRIDE;
/// The type of breaking.
- virtual void SectionType( sal_uInt8 nBreakCode );
+ virtual void SectionType( sal_uInt8 nBreakCode ) SAL_OVERRIDE;
/// Start the font.
void StartFont( const OUString& rFamilyName ) const;
@@ -328,13 +328,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 );
+ virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) SAL_OVERRIDE;
/// Start of the abstract numbering definition instance.
- virtual void StartAbstractNumbering( sal_uInt16 nId );
+ virtual void StartAbstractNumbering( sal_uInt16 nId ) SAL_OVERRIDE;
/// End of the abstract numbering definition instance.
- virtual void EndAbstractNumbering();
+ virtual void EndAbstractNumbering() SAL_OVERRIDE;
/// All the numbering level information.
virtual void NumberingLevel( sal_uInt8 nLevel,
@@ -349,7 +349,7 @@ public:
sal_Int16 nFirstLineIndex,
sal_Int16 nListTabPos,
const OUString &rNumberingString,
- const SvxBrushItem* pBrush = 0 );
+ const SvxBrushItem* pBrush = 0 ) SAL_OVERRIDE;
void WriteField_Impl( const SwField* pFld, ww::eField eType, const OUString& rFldCmd, sal_uInt8 nMode );
void WriteFormData_Impl( const ::sw::mark::IFieldmark& rFieldmark );
@@ -430,235 +430,235 @@ private:
protected:
/// Output frames - the implementation.
- virtual void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft );
+ virtual void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft ) SAL_OVERRIDE;
/// Sfx item Sfx item RES_CHRATR_CASEMAP
- virtual void CharCaseMap( const SvxCaseMapItem& rCaseMap );
+ virtual void CharCaseMap( const SvxCaseMapItem& rCaseMap ) SAL_OVERRIDE;
/// Sfx item Sfx item RES_CHRATR_COLOR
- virtual void CharColor( const SvxColorItem& rColor);
+ virtual void CharColor( const SvxColorItem& rColor) SAL_OVERRIDE;
/// Sfx item Sfx item RES_CHRATR_CONTOUR
- virtual void CharContour( const SvxContourItem& rContour );
+ virtual void CharContour( const SvxContourItem& rContour ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CROSSEDOUT
- virtual void CharCrossedOut( const SvxCrossedOutItem& rCrossedOut );
+ virtual void CharCrossedOut( const SvxCrossedOutItem& rCrossedOut ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_ESCAPEMENT
- virtual void CharEscapement( const SvxEscapementItem& rEscapement );
+ virtual void CharEscapement( const SvxEscapementItem& rEscapement ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_FONT
- virtual void CharFont( const SvxFontItem& rFont );
+ virtual void CharFont( const SvxFontItem& rFont ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_FONTSIZE
- virtual void CharFontSize( const SvxFontHeightItem& rFontSize );
+ virtual void CharFontSize( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_KERNING
- virtual void CharKerning( const SvxKerningItem& rKerning );
+ virtual void CharKerning( const SvxKerningItem& rKerning ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_LANGUAGE
- virtual void CharLanguage( const SvxLanguageItem& rLanguage );
+ virtual void CharLanguage( const SvxLanguageItem& rLanguage ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_POSTURE
- virtual void CharPosture( const SvxPostureItem& rPosture );
+ virtual void CharPosture( const SvxPostureItem& rPosture ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_SHADOWED
- virtual void CharShadow( const SvxShadowedItem& rShadow );
+ virtual void CharShadow( const SvxShadowedItem& rShadow ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_UNDERLINE
- virtual void CharUnderline( const SvxUnderlineItem& rUnderline );
+ virtual void CharUnderline( const SvxUnderlineItem& rUnderline ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_WEIGHT
- virtual void CharWeight( const SvxWeightItem& rWeight );
+ virtual void CharWeight( const SvxWeightItem& rWeight ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_AUTOKERN
- virtual void CharAutoKern( const SvxAutoKernItem& );
+ virtual void CharAutoKern( const SvxAutoKernItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_BLINK
- virtual void CharAnimatedText( const SvxBlinkItem& rBlink );
+ virtual void CharAnimatedText( const SvxBlinkItem& rBlink ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_BACKGROUND
- virtual void CharBackground( const SvxBrushItem& rBrush );
+ virtual void CharBackground( const SvxBrushItem& rBrush ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CJK_FONT
- virtual void CharFontCJK( const SvxFontItem& rFont );
+ virtual void CharFontCJK( const SvxFontItem& rFont ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CJK_FONTSIZE
- virtual void CharFontSizeCJK( const SvxFontHeightItem& rFontSize ) { CharFontSize( rFontSize ); }
+ virtual void CharFontSizeCJK( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE { CharFontSize( rFontSize ); }
/// Sfx item RES_CHRATR_CJK_LANGUAGE
- virtual void CharLanguageCJK( const SvxLanguageItem& rLanguageItem ) { CharLanguage( rLanguageItem ); }
+ virtual void CharLanguageCJK( const SvxLanguageItem& rLanguageItem ) SAL_OVERRIDE { CharLanguage( rLanguageItem ); }
/// Sfx item RES_CHRATR_CJK_POSTURE
- virtual void CharPostureCJK( const SvxPostureItem& rPosture );
+ virtual void CharPostureCJK( const SvxPostureItem& rPosture ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CJK_WEIGHT
- virtual void CharWeightCJK( const SvxWeightItem& rWeight );
+ virtual void CharWeightCJK( const SvxWeightItem& rWeight ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CTL_FONT
- virtual void CharFontCTL( const SvxFontItem& rFont );
+ virtual void CharFontCTL( const SvxFontItem& rFont ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CTL_FONTSIZE
- virtual void CharFontSizeCTL( const SvxFontHeightItem& rFontSize ) { CharFontSize( rFontSize ); }
+ virtual void CharFontSizeCTL( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE { CharFontSize( rFontSize ); }
/// Sfx item RES_CHRATR_CTL_LANGUAGE
- virtual void CharLanguageCTL( const SvxLanguageItem& rLanguageItem ) { CharLanguage( rLanguageItem); }
+ virtual void CharLanguageCTL( const SvxLanguageItem& rLanguageItem ) SAL_OVERRIDE { CharLanguage( rLanguageItem); }
/// Sfx item RES_CHRATR_CTL_POSTURE
- virtual void CharPostureCTL( const SvxPostureItem& rWeight );
+ virtual void CharPostureCTL( const SvxPostureItem& rWeight ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CTL_WEIGHT
- virtual void CharWeightCTL( const SvxWeightItem& rWeight );
+ virtual void CharWeightCTL( const SvxWeightItem& rWeight ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_BidiRTL
- virtual void CharBidiRTL( const SfxPoolItem& );
+ virtual void CharBidiRTL( const SfxPoolItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_IdctHint
- virtual void CharIdctHint( const SfxPoolItem& );
+ virtual void CharIdctHint( const SfxPoolItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_ROTATE
- virtual void CharRotate( const SvxCharRotateItem& rRotate );
+ virtual void CharRotate( const SvxCharRotateItem& rRotate ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_EMPHASIS_MARK
- virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisMark );
+ virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisMark ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_TWO_LINES
- virtual void CharTwoLines( const SvxTwoLinesItem& rTwoLines );
+ virtual void CharTwoLines( const SvxTwoLinesItem& rTwoLines ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_SCALEW
- virtual void CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth );
+ virtual void CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_RELIEF
- virtual void CharRelief( const SvxCharReliefItem& rRelief);
+ virtual void CharRelief( const SvxCharReliefItem& rRelief) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_HIDDEN
- virtual void CharHidden( const SvxCharHiddenItem& rHidden );
+ virtual void CharHidden( const SvxCharHiddenItem& rHidden ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_BOX
- virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow );
+ virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_HIGHLIGHT
- virtual void CharHighlight( const SvxBrushItem& rHighlight );
+ virtual void CharHighlight( const SvxBrushItem& rHighlight ) SAL_OVERRIDE;
/// Sfx item RES_TXTATR_INETFMT
- virtual void TextINetFormat( const SwFmtINetFmt& );
+ virtual void TextINetFormat( const SwFmtINetFmt& ) SAL_OVERRIDE;
/// Sfx item RES_TXTATR_CHARFMT
- virtual void TextCharFormat( const SwFmtCharFmt& );
+ virtual void TextCharFormat( const SwFmtCharFmt& ) SAL_OVERRIDE;
/// Sfx item RES_TXTATR_FTN
- virtual void TextFootnote_Impl( const SwFmtFtn& );
+ virtual void TextFootnote_Impl( const SwFmtFtn& ) SAL_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 );
+ virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_ADJUST
- virtual void ParaAdjust( const SvxAdjustItem& rAdjust );
+ virtual void ParaAdjust( const SvxAdjustItem& rAdjust ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_SPLIT
- virtual void ParaSplit( const SvxFmtSplitItem& rSplit );
+ virtual void ParaSplit( const SvxFmtSplitItem& rSplit ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_WIDOWS
- virtual void ParaWidows( const SvxWidowsItem& rWidows );
+ virtual void ParaWidows( const SvxWidowsItem& rWidows ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_TABSTOP
- virtual void ParaTabStop( const SvxTabStopItem& rTabStop );
+ virtual void ParaTabStop( const SvxTabStopItem& rTabStop ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_HYPHENZONE
- virtual void ParaHyphenZone( const SvxHyphenZoneItem& );
+ virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_NUMRULE
- virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId );
+ virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_SCRIPTSPACE
- virtual void ParaScriptSpace( const SfxBoolItem& );
+ virtual void ParaScriptSpace( const SfxBoolItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_HANGINGPUNCTUATION
- virtual void ParaHangingPunctuation( const SfxBoolItem& );
+ virtual void ParaHangingPunctuation( const SfxBoolItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_FORBIDDEN_RULES
- virtual void ParaForbiddenRules( const SfxBoolItem& );
+ virtual void ParaForbiddenRules( const SfxBoolItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_VERTALIGN
- virtual void ParaVerticalAlign( const SvxParaVertAlignItem& rAlign );
+ virtual void ParaVerticalAlign( const SvxParaVertAlignItem& rAlign ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_SNAPTOGRID
- virtual void ParaSnapToGrid( const SvxParaGridItem& );
+ virtual void ParaSnapToGrid( const SvxParaGridItem& ) SAL_OVERRIDE;
/// Sfx item RES_FRM_SIZE
- virtual void FormatFrameSize( const SwFmtFrmSize& );
+ virtual void FormatFrameSize( const SwFmtFrmSize& ) SAL_OVERRIDE;
/// Sfx item RES_PAPER_BIN
- virtual void FormatPaperBin( const SvxPaperBinItem& );
+ virtual void FormatPaperBin( const SvxPaperBinItem& ) SAL_OVERRIDE;
/// Sfx item RES_LR_SPACE
- virtual void FormatLRSpace( const SvxLRSpaceItem& rLRSpace );
+ virtual void FormatLRSpace( const SvxLRSpaceItem& rLRSpace ) SAL_OVERRIDE;
/// Sfx item RES_UL_SPACE
- virtual void FormatULSpace( const SvxULSpaceItem& rULSpace );
+ virtual void FormatULSpace( const SvxULSpaceItem& rULSpace ) SAL_OVERRIDE;
/// Sfx item RES_SURROUND
- virtual void FormatSurround( const SwFmtSurround& );
+ virtual void FormatSurround( const SwFmtSurround& ) SAL_OVERRIDE;
/// Sfx item RES_VERT_ORIENT
- virtual void FormatVertOrientation( const SwFmtVertOrient& );
+ virtual void FormatVertOrientation( const SwFmtVertOrient& ) SAL_OVERRIDE;
/// Sfx item RES_HORI_ORIENT
- virtual void FormatHorizOrientation( const SwFmtHoriOrient& );
+ virtual void FormatHorizOrientation( const SwFmtHoriOrient& ) SAL_OVERRIDE;
/// Sfx item RES_ANCHOR
- virtual void FormatAnchor( const SwFmtAnchor& );
+ virtual void FormatAnchor( const SwFmtAnchor& ) SAL_OVERRIDE;
/// Sfx item RES_BACKGROUND
- virtual void FormatBackground( const SvxBrushItem& );
+ virtual void FormatBackground( const SvxBrushItem& ) SAL_OVERRIDE;
/// Sfx item RES_FILL_STYLE
- virtual void FormatFillStyle( const XFillStyleItem& );
+ virtual void FormatFillStyle( const XFillStyleItem& ) SAL_OVERRIDE;
/// Sfx item RES_FILL_GRADIENT
- virtual void FormatFillGradient( const XFillGradientItem& );
+ virtual void FormatFillGradient( const XFillGradientItem& ) SAL_OVERRIDE;
/// Sfx item RES_BOX
- virtual void FormatBox( const SvxBoxItem& );
+ virtual void FormatBox( const SvxBoxItem& ) SAL_OVERRIDE;
/// Sfx item RES_COL
- virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize );
+ virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE;
/// Sfx item RES_KEEP
- virtual void FormatKeep( const SvxFmtKeepItem& );
+ virtual void FormatKeep( const SvxFmtKeepItem& ) SAL_OVERRIDE;
/// Sfx item RES_TEXTGRID
- virtual void FormatTextGrid( const SwTextGridItem& );
+ virtual void FormatTextGrid( const SwTextGridItem& ) SAL_OVERRIDE;
/// Sfx item RES_LINENUMBER
- virtual void FormatLineNumbering( const SwFmtLineNumber& );
+ virtual void FormatLineNumbering( const SwFmtLineNumber& ) SAL_OVERRIDE;
/// Sfx item RES_FRAMEDIR
- virtual void FormatFrameDirection( const SvxFrameDirectionItem& );
+ virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_GRABBAG
- virtual void ParaGrabBag( const SfxGrabBagItem& );
+ virtual void ParaGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_GRABBAG
- virtual void CharGrabBag( const SfxGrabBagItem& );
+ virtual void CharGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE;
// Sfx item RES_PARATR_OUTLINELEVEL
- virtual void ParaOutlineLevel( const SfxUInt16Item& );
+ virtual void ParaOutlineLevel( const SfxUInt16Item& ) SAL_OVERRIDE;
/// Write the expanded field
- virtual void WriteExpand( const SwField* pFld );
+ virtual void WriteExpand( const SwField* pFld ) SAL_OVERRIDE;
- virtual void RefField( const SwField& rFld, const OUString& rRef );
- virtual void HiddenField( const SwField& rFld );
- virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd );
- virtual void PostitField( const SwField* pFld );
- virtual bool DropdownField( const SwField* pFld );
- virtual bool PlaceholderField( const SwField* pFld );
+ virtual void RefField( const SwField& rFld, const OUString& rRef ) SAL_OVERRIDE;
+ virtual void HiddenField( const SwField& rFld ) SAL_OVERRIDE;
+ virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE;
+ virtual void PostitField( const SwField* pFld ) SAL_OVERRIDE;
+ virtual bool DropdownField( const SwField* pFld ) SAL_OVERRIDE;
+ virtual bool PlaceholderField( const SwField* pFld ) SAL_OVERRIDE;
- virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark );
+ virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ) SAL_OVERRIDE;
/// Reference to the export, where to get the data from
DocxExport &m_rExport;
@@ -874,7 +874,7 @@ public:
virtual ~DocxAttributeOutput();
/// Return the right export class.
- virtual DocxExport& GetExport();
+ virtual DocxExport& GetExport() SAL_OVERRIDE;
const DocxExport& GetExport() const { return const_cast< DocxAttributeOutput* >( this )->GetExport(); }
/// For eg. the output of the styles, we need to switch the serializer to an other one.
@@ -899,8 +899,8 @@ public:
void WritePostitFields();
/// VMLTextExport
- virtual void WriteOutliner(const OutlinerParaObject& rParaObj);
- virtual oox::drawingml::DrawingML& GetDrawingML();
+ virtual void WriteOutliner(const OutlinerParaObject& rParaObj) SAL_OVERRIDE;
+ virtual oox::drawingml::DrawingML& GetDrawingML() SAL_OVERRIDE;
virtual void switchHeaderFooter(bool isHeaderFooter, sal_Int32 index);
void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize) SAL_OVERRIDE;
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index c4d5a77a80fe..2c55b2b3e0e7 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -108,63 +108,63 @@ public:
const DocxExportFilter& GetFilter() const { return *m_pFilter; };
/// Access to the attribute output class.
- virtual AttributeOutputBase& AttrOutput() const;
+ virtual AttributeOutputBase& AttrOutput() const SAL_OVERRIDE;
/// Access to the sections/headers/footres.
- virtual MSWordSections& Sections() const;
+ virtual MSWordSections& Sections() const SAL_OVERRIDE;
/// Determines if the format is expected to support unicode.
- virtual bool SupportsUnicode() const { return true; }
+ virtual bool SupportsUnicode() const SAL_OVERRIDE { return true; }
- virtual bool SupportsOneColumnBreak() const { return true; }
+ virtual bool SupportsOneColumnBreak() const SAL_OVERRIDE { return true; }
- virtual bool FieldsQuoted() const { return true; }
+ virtual bool FieldsQuoted() const SAL_OVERRIDE { return true; }
- virtual bool AddSectionBreaksForTOX() const { return true; }
+ virtual bool AddSectionBreaksForTOX() const SAL_OVERRIDE { return true; }
- virtual bool ignoreAttributeForStyles( sal_uInt16 nWhich ) const;
+ virtual bool ignoreAttributeForStyles( sal_uInt16 nWhich ) const SAL_OVERRIDE;
/// Guess the script (asian/western).
- virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich );
+ virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) SAL_OVERRIDE;
- virtual void AppendBookmarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen );
+ virtual void AppendBookmarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
- virtual void AppendBookmark( const OUString& rName, bool bSkip = false );
+ virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) SAL_OVERRIDE;
- virtual void AppendAnnotationMarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen );
+ virtual void AppendAnnotationMarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
- virtual void ExportGrfBullet(const SwTxtNode&);
+ virtual void ExportGrfBullet(const SwTxtNode&) SAL_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()*/ ) { /* FIXME no-op for docx, most probably should not even be in MSWordExportBase */ }
- virtual void WriteChar( sal_Unicode ) { /* FIXME */ fprintf( stderr, "HACK! WriteChar() has nothing to do for docx.\n" ); }
+ 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" ); }
/// Return value indicates if an inherited outline numbering is suppressed.
- virtual bool DisallowInheritingOutlineNumbering( const SwFmt &rFmt );
+ virtual bool DisallowInheritingOutlineNumbering( const SwFmt &rFmt ) SAL_OVERRIDE;
/// Output the actual headers and footers.
virtual void WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
- const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, sal_uInt8 nBreakCode );
+ const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, sal_uInt8 nBreakCode ) SAL_OVERRIDE;
/// Write the field
virtual void OutputField( const SwField* pFld, ww::eField eFldType,
- const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL );
+ const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) SAL_OVERRIDE;
/// Write the data of the form field
- virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark );
- virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark );
+ virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE;
+ virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE;
virtual void DoComboBox(const OUString &rName,
const OUString &rHelp,
const OUString &ToolTip,
const OUString &rSelected,
- com::sun::star::uno::Sequence<OUString> &rListItems);
+ com::sun::star::uno::Sequence<OUString> &rListItems) SAL_OVERRIDE;
- virtual void DoFormText(const SwInputField * pFld);
+ virtual void DoFormText(const SwInputField * pFld) SAL_OVERRIDE;
- virtual sal_uLong ReplaceCr( sal_uInt8 nChar );
+ virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) SAL_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 );
@@ -178,34 +178,34 @@ public:
protected:
/// Format-dependent part of the actual export.
- virtual void ExportDocument_Impl();
+ virtual void ExportDocument_Impl() SAL_OVERRIDE;
/// Output page/section breaks
virtual void OutputPageSectionBreaks( const SwTxtNode& );
/// Output SwEndNode
- virtual void OutputEndNode( const SwEndNode& );
+ virtual void OutputEndNode( const SwEndNode& ) SAL_OVERRIDE;
/// Output SwTableNode
virtual void OutputTableNode( const SwTableNode& );
/// Output SwGrfNode
- virtual void OutputGrfNode( const SwGrfNode& );
+ virtual void OutputGrfNode( const SwGrfNode& ) SAL_OVERRIDE;
/// Output SwOLENode
- virtual void OutputOLENode( const SwOLENode& );
+ virtual void OutputOLENode( const SwOLENode& ) SAL_OVERRIDE;
- virtual void OutputLinkedOLE( const OUString& );
+ virtual void OutputLinkedOLE( const OUString& ) SAL_OVERRIDE;
- virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum );
+ virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) SAL_OVERRIDE;
- virtual void SectionBreaksAndFrames( const SwTxtNode& /*rNode*/ ) {}
+ virtual void SectionBreaksAndFrames( const SwTxtNode& /*rNode*/ ) SAL_OVERRIDE {}
/// Get ready for a new section.
virtual void PrepareNewPageDesc( const SfxItemSet* pSet,
const SwNode& rNd,
const SwFmtPageDesc* pNewPgDescFmt = 0,
- const SwPageDesc* pNewPgDesc = 0 );
+ const SwPageDesc* pNewPgDesc = 0 ) SAL_OVERRIDE;
private:
/// Setup pStyles and write styles.xml
@@ -218,7 +218,7 @@ private:
void WritePostitFields();
/// Write the numbering table.
- virtual void WriteNumbering();
+ virtual void WriteNumbering() SAL_OVERRIDE;
/// Write reference to a header/foorter + the actual xml containing the text.
void WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* pType );
diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx
index c1a86da85e12..582903a60412 100644
--- a/sw/source/filter/ww8/docxexportfilter.hxx
+++ b/sw/source/filter/ww8/docxexportfilter.hxx
@@ -34,22 +34,22 @@ 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() { return false; }
- virtual const ::oox::drawingml::Theme* getCurrentTheme() const { return NULL; }
+ virtual bool importDocument() SAL_OVERRIDE { return false; }
+ virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE { return NULL; }
virtual sal_Int32 getSchemeClr( sal_Int32 ) const { return 0; }
- virtual ::oox::vml::Drawing* getVmlDrawing() { return NULL; }
- virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() { return NULL; }
- virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() { return ::oox::drawingml::table::TableStyleListPtr(); }
+ 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(); }
// Actual export of the DOCX document
- virtual bool exportDocument();
+ virtual bool exportDocument() SAL_OVERRIDE;
private:
/// Implementatio of the filter abstract method.
- virtual OUString implGetImplementationName() const;
+ virtual OUString implGetImplementationName() const SAL_OVERRIDE;
- virtual ::oox::ole::VbaProject* implCreateVbaProject() const
+ virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE
{
return NULL; // FIXME: implement me !
}
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index f42c4e5cdffa..a03ff22cdfe9 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -31,7 +31,7 @@ class SwFmtVertOrient;
class WinwordAnchoring : public EscherExClientRecord_Base
{
public:
- void WriteData(EscherEx& rEx) const;
+ void WriteData(EscherEx& rEx) const SAL_OVERRIDE;
void SetAnchoring(const SwFrmFmt& rFmt);
/** method to perform conversion of positioning attributes with the help
@@ -81,7 +81,7 @@ public:
private:
/** Overloaded to create a new memory stream for picture data. */
- virtual SvStream* ImplQueryPictureStream();
+ virtual SvStream* ImplQueryPictureStream() SAL_OVERRIDE;
private:
boost::shared_ptr< SvStream > mxPicStrm;
@@ -155,23 +155,23 @@ private:
sal_uInt32 nTxtBox, DrawObjPointerVector &rPVec);
void WriteOCXControl(const SwFrmFmt& rFmt,sal_uInt32 nShapeId);
virtual sal_Int32 WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType,
- EscherPropertyContainer& rPropOpt);
+ EscherPropertyContainer& rPropOpt) SAL_OVERRIDE;
virtual sal_uInt32 QueryTextID(
const com::sun::star::uno::Reference<
- com::sun::star::drawing::XShape > &,sal_uInt32);
+ com::sun::star::drawing::XShape > &,sal_uInt32) SAL_OVERRIDE;
virtual void SetPicId(const SdrObject &rSdrObj, sal_uInt32 nShapeId,
- EscherPropertyContainer &rPropOpt);
+ EscherPropertyContainer &rPropOpt) SAL_OVERRIDE;
public:
SwEscherEx( SvStream* pStrm, WW8Export& rWW8Wrt );
virtual ~SwEscherEx();
void FinishEscher();
- virtual void WritePictures();
+ virtual void WritePictures() SAL_OVERRIDE;
- virtual void WriteFrmExtraData(const SwFrmFmt& rFmt);
+ virtual void WriteFrmExtraData(const SwFrmFmt& rFmt) SAL_OVERRIDE;
EscherExHostAppData* StartShape(const com::sun::star::uno::Reference<
- com::sun::star::drawing::XShape > &, const Rectangle*) {return &aHostData;}
+ com::sun::star::drawing::XShape > &, const Rectangle*) SAL_OVERRIDE {return &aHostData;}
private:
//No copying
SwEscherEx(const SwEscherEx&);
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index c64b8e03a2c9..0d00506b2ede 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -39,153 +39,153 @@ class RtfAttributeOutput : public AttributeOutputBase
friend class RtfStringBufferValue;
public:
/// Export the state of RTL/CJK.
- virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript );
+ virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) SAL_OVERRIDE;
/// Start of the paragraph.
- virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo );
+ virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo ) SAL_OVERRIDE;
/// End of the paragraph.
- virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner );
+ virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
/// Empty paragraph.
- virtual void EmptyParagraph();
+ virtual void EmptyParagraph() SAL_OVERRIDE;
/// Called in order to output section breaks.
- virtual void SectionBreaks(const SwTxtNode& rNode);
+ virtual void SectionBreaks(const SwTxtNode& rNode) SAL_OVERRIDE;
/// Called before we start outputting the attributes.
- virtual void StartParagraphProperties();
+ virtual void StartParagraphProperties() SAL_OVERRIDE;
/// Called after we end outputting the attributes.
- virtual void EndParagraphProperties( const SfxItemSet* pParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted );
+ virtual void EndParagraphProperties( const SfxItemSet* pParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted ) SAL_OVERRIDE;
/// Start of the text run.
- virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false );
+ virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) SAL_OVERRIDE;
/// End of the text run.
- virtual void EndRun();
+ virtual void EndRun() SAL_OVERRIDE;
/// Called before we start outputting the attributes.
- virtual void StartRunProperties();
+ virtual void StartRunProperties() SAL_OVERRIDE;
/// Called after we end outputting the attributes.
- virtual void EndRunProperties( const SwRedlineData* pRedlineData );
+ virtual void EndRunProperties( const SwRedlineData* pRedlineData ) SAL_OVERRIDE;
/// Output text (inside a run).
- virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 );
+ virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ) SAL_OVERRIDE;
// Access to (anyway) private buffers, used by the sdr exporter
OStringBuffer& RunText();
OStringBuffer& Styles();
/// Output text (without markup).
- virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet );
+ virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ) SAL_OVERRIDE;
/// Output ruby start.
- virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby );
+ virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby ) SAL_OVERRIDE;
/// Output ruby end.
- virtual void EndRuby();
+ virtual void EndRuby() SAL_OVERRIDE;
/// Output URL start.
- virtual bool StartURL( const OUString& rUrl, const OUString& rTarget );
+ virtual bool StartURL( const OUString& rUrl, const OUString& rTarget ) SAL_OVERRIDE;
/// Output URL end.
- virtual bool EndURL();
+ virtual bool EndURL() SAL_OVERRIDE;
- virtual void FieldVanish( const OUString& rTxt, ww::eField eType );
+ virtual void FieldVanish( const OUString& rTxt, ww::eField eType ) SAL_OVERRIDE;
/// Output redlining.
///
/// The common attribute that can be among the run properties.
- virtual void Redline( const SwRedlineData* pRedline );
+ virtual void Redline( const SwRedlineData* pRedline ) SAL_OVERRIDE;
- virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop& rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner );
+ virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop& rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
/// Output style.
- virtual void ParagraphStyle( sal_uInt16 nStyle );
-
- virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo );
- virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner );
- virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableRowEnd( sal_uInt32 nDepth );
+ 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 TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo ) 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;
/// Start of the styles table.
- virtual void StartStyles();
+ virtual void StartStyles() SAL_OVERRIDE;
/// End of the styles table.
- virtual void EndStyles( sal_uInt16 nNumberOfStyles );
+ virtual void EndStyles( sal_uInt16 nNumberOfStyles ) SAL_OVERRIDE;
/// Write default style.
- virtual void DefaultStyle( sal_uInt16 nStyle );
+ virtual void DefaultStyle( sal_uInt16 nStyle ) SAL_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 );
+ bool bAutoUpdate ) SAL_OVERRIDE;
/// End of a style in the styles table.
- virtual void EndStyle();
+ virtual void EndStyle() SAL_OVERRIDE;
/// Start of (paragraph or run) properties of a style.
- virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle );
+ virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ) SAL_OVERRIDE;
/// End of (paragraph or run) properties of a style.
- virtual void EndStyleProperties( bool bParProp );
+ virtual void EndStyleProperties( bool bParProp ) SAL_OVERRIDE;
/// Numbering rule and Id.
- virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt );
+ virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt ) SAL_OVERRIDE;
/// Page break
/// As a paragraph property - the paragraph should be on the next page.
- virtual void PageBreakBefore( bool bBreak );
+ virtual void PageBreakBefore( bool bBreak ) SAL_OVERRIDE;
/// Write a section break
/// msword::ColumnBreak or msword::PageBreak
- virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL );
+ virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) SAL_OVERRIDE;
/// Start of the section properties.
- virtual void StartSection();
+ virtual void StartSection() SAL_OVERRIDE;
/// End of the section properties.
- virtual void EndSection();
+ virtual void EndSection() SAL_OVERRIDE;
/// Protection of forms.
- virtual void SectionFormProtection( bool bProtected );
+ virtual void SectionFormProtection( bool bProtected ) SAL_OVERRIDE;
/// Numbering of the lines in the document.
- virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo );
+ virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ) SAL_OVERRIDE;
/// Has different headers/footers for the title page.
- virtual void SectionTitlePage();
+ virtual void SectionTitlePage() SAL_OVERRIDE;
/// Description of the page borders.
- virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt );
+ virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt ) SAL_OVERRIDE;
/// Columns populated from right/numbers on the right side?
- virtual void SectionBiDi( bool bBiDi );
+ virtual void SectionBiDi( bool bBiDi ) SAL_OVERRIDE;
/// The style of the page numbers.
///
- virtual void SectionPageNumbering( sal_uInt16 nNumType, ::boost::optional<sal_uInt16> oPageRestartNumber );
+ virtual void SectionPageNumbering( sal_uInt16 nNumType, ::boost::optional<sal_uInt16> oPageRestartNumber ) SAL_OVERRIDE;
/// The type of breaking.
- virtual void SectionType( sal_uInt8 nBreakCode );
+ virtual void SectionType( sal_uInt8 nBreakCode ) SAL_OVERRIDE;
/// Definition of a numbering instance.
- virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule );
+ virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) SAL_OVERRIDE;
/// Start of the abstract numbering definition instance.
virtual void StartAbstractNumbering( sal_uInt16 nId ) SAL_OVERRIDE;
@@ -206,7 +206,7 @@ public:
sal_Int16 nFirstLineIndex,
sal_Int16 nListTabPos,
const OUString &rNumberingString,
- const SvxBrushItem* pBrush = 0);//For i120928,to export graphic of bullet
+ const SvxBrushItem* pBrush = 0) SAL_OVERRIDE;//For i120928,to export graphic of bullet
void WriteField_Impl( const SwField* pFld, ww::eField eType, const OUString& rFldCmd, sal_uInt8 nMode );
void WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds );
@@ -215,230 +215,230 @@ public:
protected:
/// Output frames - the implementation.
- virtual void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft );
+ virtual void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft ) SAL_OVERRIDE;
/// Sfx item Sfx item RES_CHRATR_CASEMAP
- virtual void CharCaseMap( const SvxCaseMapItem& rCaseMap );
+ virtual void CharCaseMap( const SvxCaseMapItem& rCaseMap ) SAL_OVERRIDE;
/// Sfx item Sfx item RES_CHRATR_COLOR
- virtual void CharColor( const SvxColorItem& rColor);
+ virtual void CharColor( const SvxColorItem& rColor) SAL_OVERRIDE;
/// Sfx item Sfx item RES_CHRATR_CONTOUR
- virtual void CharContour( const SvxContourItem& rContour );
+ virtual void CharContour( const SvxContourItem& rContour ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CROSSEDOUT
- virtual void CharCrossedOut( const SvxCrossedOutItem& rCrossedOut );
+ virtual void CharCrossedOut( const SvxCrossedOutItem& rCrossedOut ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_ESCAPEMENT
- virtual void CharEscapement( const SvxEscapementItem& rEscapement );
+ virtual void CharEscapement( const SvxEscapementItem& rEscapement ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_FONT
- virtual void CharFont( const SvxFontItem& rFont );
+ virtual void CharFont( const SvxFontItem& rFont ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_FONTSIZE
- virtual void CharFontSize( const SvxFontHeightItem& rFontSize );
+ virtual void CharFontSize( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_KERNING
- virtual void CharKerning( const SvxKerningItem& rKerning );
+ virtual void CharKerning( const SvxKerningItem& rKerning ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_LANGUAGE
- virtual void CharLanguage( const SvxLanguageItem& rLanguage );
+ virtual void CharLanguage( const SvxLanguageItem& rLanguage ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_POSTURE
- virtual void CharPosture( const SvxPostureItem& rPosture );
+ virtual void CharPosture( const SvxPostureItem& rPosture ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_SHADOWED
- virtual void CharShadow( const SvxShadowedItem& rShadow );
+ virtual void CharShadow( const SvxShadowedItem& rShadow ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_UNDERLINE
- virtual void CharUnderline( const SvxUnderlineItem& rUnderline );
+ virtual void CharUnderline( const SvxUnderlineItem& rUnderline ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_WEIGHT
- virtual void CharWeight( const SvxWeightItem& rWeight );
+ virtual void CharWeight( const SvxWeightItem& rWeight ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_AUTOKERN
- virtual void CharAutoKern( const SvxAutoKernItem& );
+ virtual void CharAutoKern( const SvxAutoKernItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_BLINK
- virtual void CharAnimatedText( const SvxBlinkItem& rBlink );
+ virtual void CharAnimatedText( const SvxBlinkItem& rBlink ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_BACKGROUND
- virtual void CharBackground( const SvxBrushItem& rBrush );
+ virtual void CharBackground( const SvxBrushItem& rBrush ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CJK_FONT
- virtual void CharFontCJK( const SvxFontItem& rFont );
+ virtual void CharFontCJK( const SvxFontItem& rFont ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CJK_FONTSIZE
- virtual void CharFontSizeCJK( const SvxFontHeightItem& rFontSize );
+ virtual void CharFontSizeCJK( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CJK_LANGUAGE
- virtual void CharLanguageCJK( const SvxLanguageItem& rLanguageItem );
+ virtual void CharLanguageCJK( const SvxLanguageItem& rLanguageItem ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CJK_POSTURE
- virtual void CharPostureCJK( const SvxPostureItem& rPosture );
+ virtual void CharPostureCJK( const SvxPostureItem& rPosture ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CJK_WEIGHT
- virtual void CharWeightCJK( const SvxWeightItem& rWeight );
+ virtual void CharWeightCJK( const SvxWeightItem& rWeight ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CTL_FONT
- virtual void CharFontCTL( const SvxFontItem& rFont );
+ virtual void CharFontCTL( const SvxFontItem& rFont ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CTL_FONTSIZE
- virtual void CharFontSizeCTL( const SvxFontHeightItem& rFontSize );
+ virtual void CharFontSizeCTL( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CTL_LANGUAGE
- virtual void CharLanguageCTL( const SvxLanguageItem& rLanguageItem );
+ virtual void CharLanguageCTL( const SvxLanguageItem& rLanguageItem ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CTL_POSTURE
- virtual void CharPostureCTL( const SvxPostureItem& rWeight );
+ virtual void CharPostureCTL( const SvxPostureItem& rWeight ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CTL_WEIGHT
- virtual void CharWeightCTL( const SvxWeightItem& rWeight );
+ virtual void CharWeightCTL( const SvxWeightItem& rWeight ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_BidiRTL
- virtual void CharBidiRTL( const SfxPoolItem& );
+ virtual void CharBidiRTL( const SfxPoolItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_IdctHint
- virtual void CharIdctHint( const SfxPoolItem& );
+ virtual void CharIdctHint( const SfxPoolItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_ROTATE
- virtual void CharRotate( const SvxCharRotateItem& rRotate );
+ virtual void CharRotate( const SvxCharRotateItem& rRotate ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_EMPHASIS_MARK
- virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisMark );
+ virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisMark ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_TWO_LINES
- virtual void CharTwoLines( const SvxTwoLinesItem& rTwoLines );
+ virtual void CharTwoLines( const SvxTwoLinesItem& rTwoLines ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_SCALEW
- virtual void CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth );
+ virtual void CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_RELIEF
- virtual void CharRelief( const SvxCharReliefItem& rRelief);
+ virtual void CharRelief( const SvxCharReliefItem& rRelief) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_HIDDEN
- virtual void CharHidden( const SvxCharHiddenItem& rHidden );
+ virtual void CharHidden( const SvxCharHiddenItem& rHidden ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_BOX
- virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow );
+ virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_HIGHLIGHT
- virtual void CharHighlight( const SvxBrushItem& ){};
+ virtual void CharHighlight( const SvxBrushItem& ) SAL_OVERRIDE {};
/// Sfx item RES_TXTATR_INETFMT
- virtual void TextINetFormat( const SwFmtINetFmt& );
+ virtual void TextINetFormat( const SwFmtINetFmt& ) SAL_OVERRIDE;
/// Sfx item RES_TXTATR_CHARFMT
- virtual void TextCharFormat( const SwFmtCharFmt& );
+ virtual void TextCharFormat( const SwFmtCharFmt& ) SAL_OVERRIDE;
/// Sfx item RES_TXTATR_FTN
- virtual void TextFootnote_Impl( const SwFmtFtn& );
+ virtual void TextFootnote_Impl( const SwFmtFtn& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_LINESPACING
- virtual void ParaLineSpacing_Impl( short nSpace, short nMulti );
+ virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_ADJUST
- virtual void ParaAdjust( const SvxAdjustItem& rAdjust );
+ virtual void ParaAdjust( const SvxAdjustItem& rAdjust ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_SPLIT
- virtual void ParaSplit( const SvxFmtSplitItem& rSplit );
+ virtual void ParaSplit( const SvxFmtSplitItem& rSplit ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_WIDOWS
- virtual void ParaWidows( const SvxWidowsItem& rWidows );
+ virtual void ParaWidows( const SvxWidowsItem& rWidows ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_TABSTOP
- virtual void ParaTabStop( const SvxTabStopItem& rTabStop );
+ virtual void ParaTabStop( const SvxTabStopItem& rTabStop ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_HYPHENZONE
- virtual void ParaHyphenZone( const SvxHyphenZoneItem& );
+ virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_NUMRULE
- virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId );
+ virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_SCRIPTSPACE
- virtual void ParaScriptSpace( const SfxBoolItem& );
+ virtual void ParaScriptSpace( const SfxBoolItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_HANGINGPUNCTUATION
- virtual void ParaHangingPunctuation( const SfxBoolItem& );
+ virtual void ParaHangingPunctuation( const SfxBoolItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_FORBIDDEN_RULES
- virtual void ParaForbiddenRules( const SfxBoolItem& );
+ virtual void ParaForbiddenRules( const SfxBoolItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_VERTALIGN
- virtual void ParaVerticalAlign( const SvxParaVertAlignItem& rAlign );
+ virtual void ParaVerticalAlign( const SvxParaVertAlignItem& rAlign ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_SNAPTOGRID
- virtual void ParaSnapToGrid( const SvxParaGridItem& );
+ virtual void ParaSnapToGrid( const SvxParaGridItem& ) SAL_OVERRIDE;
/// Sfx item RES_FRM_SIZE
- virtual void FormatFrameSize( const SwFmtFrmSize& );
+ virtual void FormatFrameSize( const SwFmtFrmSize& ) SAL_OVERRIDE;
/// Sfx item RES_PAPER_BIN
- virtual void FormatPaperBin( const SvxPaperBinItem& );
+ virtual void FormatPaperBin( const SvxPaperBinItem& ) SAL_OVERRIDE;
/// Sfx item RES_LR_SPACE
- virtual void FormatLRSpace( const SvxLRSpaceItem& rLRSpace );
+ virtual void FormatLRSpace( const SvxLRSpaceItem& rLRSpace ) SAL_OVERRIDE;
/// Sfx item RES_UL_SPACE
- virtual void FormatULSpace( const SvxULSpaceItem& rULSpace );
+ virtual void FormatULSpace( const SvxULSpaceItem& rULSpace ) SAL_OVERRIDE;
/// Sfx item RES_SURROUND
- virtual void FormatSurround( const SwFmtSurround& );
+ virtual void FormatSurround( const SwFmtSurround& ) SAL_OVERRIDE;
/// Sfx item RES_VERT_ORIENT
- virtual void FormatVertOrientation( const SwFmtVertOrient& );
+ virtual void FormatVertOrientation( const SwFmtVertOrient& ) SAL_OVERRIDE;
/// Sfx item RES_HORI_ORIENT
- virtual void FormatHorizOrientation( const SwFmtHoriOrient& );
+ virtual void FormatHorizOrientation( const SwFmtHoriOrient& ) SAL_OVERRIDE;
/// Sfx item RES_ANCHOR
- virtual void FormatAnchor( const SwFmtAnchor& );
+ virtual void FormatAnchor( const SwFmtAnchor& ) SAL_OVERRIDE;
/// Sfx item RES_BACKGROUND
- virtual void FormatBackground( const SvxBrushItem& );
+ virtual void FormatBackground( const SvxBrushItem& ) SAL_OVERRIDE;
/// Sfx item RES_FILL_STYLE
- virtual void FormatFillStyle( const XFillStyleItem& );
+ virtual void FormatFillStyle( const XFillStyleItem& ) SAL_OVERRIDE;
/// Sfx item RES_FILL_GRADIENT
- virtual void FormatFillGradient( const XFillGradientItem& );
+ virtual void FormatFillGradient( const XFillGradientItem& ) SAL_OVERRIDE;
/// Sfx item RES_BOX
- virtual void FormatBox( const SvxBoxItem& );
+ virtual void FormatBox( const SvxBoxItem& ) SAL_OVERRIDE;
/// Sfx item RES_COL
- virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize );
+ virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE;
/// Sfx item RES_KEEP
- virtual void FormatKeep( const SvxFmtKeepItem& );
+ virtual void FormatKeep( const SvxFmtKeepItem& ) SAL_OVERRIDE;
/// Sfx item RES_TEXTGRID
- virtual void FormatTextGrid( const SwTextGridItem& );
+ virtual void FormatTextGrid( const SwTextGridItem& ) SAL_OVERRIDE;
/// Sfx item RES_LINENUMBER
- virtual void FormatLineNumbering( const SwFmtLineNumber& );
+ virtual void FormatLineNumbering( const SwFmtLineNumber& ) SAL_OVERRIDE;
/// Sfx item RES_FRAMEDIR
- virtual void FormatFrameDirection( const SvxFrameDirectionItem& );
+ virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_GRABBAG
- virtual void ParaGrabBag( const SfxGrabBagItem& );
+ virtual void ParaGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_GRABBAG
- virtual void CharGrabBag( const SfxGrabBagItem& );
+ virtual void CharGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_OUTLINELEVEL
- virtual void ParaOutlineLevel( const SfxUInt16Item& );
+ virtual void ParaOutlineLevel( const SfxUInt16Item& ) SAL_OVERRIDE;
/// Write the expanded field
- virtual void WriteExpand( const SwField* pFld );
+ virtual void WriteExpand( const SwField* pFld ) SAL_OVERRIDE;
- virtual void RefField( const SwField& rFld, const OUString& rRef );
- virtual void HiddenField( const SwField& rFld );
- virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd );
- virtual void PostitField( const SwField* pFld );
- virtual bool DropdownField( const SwField* pFld );
- virtual bool PlaceholderField( const SwField* pFld );
+ virtual void RefField( const SwField& rFld, const OUString& rRef ) SAL_OVERRIDE;
+ virtual void HiddenField( const SwField& rFld ) SAL_OVERRIDE;
+ virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE;
+ virtual void PostitField( const SwField* pFld ) SAL_OVERRIDE;
+ virtual bool DropdownField( const SwField* pFld ) SAL_OVERRIDE;
+ virtual bool PlaceholderField( const SwField* pFld ) SAL_OVERRIDE;
/// Reference to the export, where to get the data from
RtfExport &m_rExport;
@@ -602,7 +602,7 @@ public:
virtual ~RtfAttributeOutput();
/// Return the right export class.
- virtual MSWordExportBase& GetExport();
+ virtual MSWordExportBase& GetExport() SAL_OVERRIDE;
OStringBuffer m_aTabStop;
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 10b99b0f0621..306b086dacda 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -1210,7 +1210,7 @@ class SwRTFWriter : public Writer
public:
SwRTFWriter( const OUString& rFilterName, const OUString& rBaseURL );
virtual ~SwRTFWriter();
- virtual sal_uLong WriteStream();
+ virtual sal_uLong WriteStream() SAL_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 c23bff0754eb..103429fd5d55 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -51,93 +51,93 @@ class RtfExport : public MSWordExportBase
public:
/// Access to the attribute output class.
- virtual AttributeOutputBase& AttrOutput() const;
+ virtual AttributeOutputBase& AttrOutput() const SAL_OVERRIDE;
/// Access to the sections/headers/footres.
- virtual MSWordSections& Sections() const;
+ virtual MSWordSections& Sections() const SAL_OVERRIDE;
/// Access to the Rtf Sdr exporter.
virtual RtfSdrExport& SdrExporter() const;
/// Determines if the format is expected to support unicode.
- virtual bool SupportsUnicode() const { return true; }
+ virtual bool SupportsUnicode() const SAL_OVERRIDE { return true; }
- virtual bool SupportsOneColumnBreak() const { return false; }
+ virtual bool SupportsOneColumnBreak() const SAL_OVERRIDE { return false; }
- virtual bool FieldsQuoted() const { return true; }
+ virtual bool FieldsQuoted() const SAL_OVERRIDE { return true; }
- virtual bool AddSectionBreaksForTOX() const { return false; }
+ virtual bool AddSectionBreaksForTOX() const SAL_OVERRIDE { return false; }
/// Guess the script (asian/western).
- virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich );
+ virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) SAL_OVERRIDE;
- virtual void AppendBookmarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen );
+ virtual void AppendBookmarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
- virtual void AppendBookmark( const OUString& rName, bool bSkip = false );
+ virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) SAL_OVERRIDE;
- virtual void AppendAnnotationMarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen );
+ virtual void AppendAnnotationMarks( const SwTxtNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
//For i120928,add an interface to export graphic of bullet
- virtual void ExportGrfBullet(const SwTxtNode& rNd);
+ virtual void ExportGrfBullet(const SwTxtNode& rNd) SAL_OVERRIDE;
- virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/ ) { /* no-op for rtf, most probably should not even be in MSWordExportBase */ }
- virtual void WriteChar( sal_Unicode );
+ 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;
/// Write the numbering table.
- virtual void WriteNumbering();
+ virtual void WriteNumbering() SAL_OVERRIDE;
/// Write the revision table.
virtual void WriteRevTab();
/// Output the actual headers and footers.
virtual void WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
- const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, sal_uInt8 nBreakCode );
+ const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, sal_uInt8 nBreakCode ) SAL_OVERRIDE;
/// Write the field
virtual void OutputField( const SwField* pFld, ww::eField eFldType,
- const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL );
+ const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) SAL_OVERRIDE;
/// Write the data of the form field
- virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark );
- virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark );
+ virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE;
+ virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE;
virtual void DoComboBox(const OUString &rName,
const OUString &rHelp,
const OUString &ToolTip,
const OUString &rSelected,
- com::sun::star::uno::Sequence<OUString> &rListItems);
+ com::sun::star::uno::Sequence<OUString> &rListItems) SAL_OVERRIDE;
- virtual void DoFormText(const SwInputField * pFld);
+ virtual void DoFormText(const SwInputField * pFld) SAL_OVERRIDE;
- virtual sal_uLong ReplaceCr( sal_uInt8 nChar );
+ virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) SAL_OVERRIDE;
protected:
/// Format-dependent part of the actual export.
- virtual void ExportDocument_Impl();
+ virtual void ExportDocument_Impl() SAL_OVERRIDE;
- virtual void SectionBreaksAndFrames( const SwTxtNode& /*rNode*/ ) {}
+ virtual void SectionBreaksAndFrames( const SwTxtNode& /*rNode*/ ) SAL_OVERRIDE {}
/// Get ready for a new section.
virtual void PrepareNewPageDesc( const SfxItemSet* pSet,
const SwNode& rNd,
const SwFmtPageDesc* pNewPgDescFmt = 0,
- const SwPageDesc* pNewPgDesc = 0 );
+ const SwPageDesc* pNewPgDesc = 0 ) SAL_OVERRIDE;
/// Return value indicates if an inherited outline numbering is suppressed.
- virtual bool DisallowInheritingOutlineNumbering(const SwFmt &rFmt);
+ virtual bool DisallowInheritingOutlineNumbering(const SwFmt &rFmt) SAL_OVERRIDE;
/// Output SwTxtNode is depending on outline export mode
virtual void OutputTextNode( const SwTxtNode& ) SAL_OVERRIDE;
/// Output SwGrfNode
- virtual void OutputGrfNode( const SwGrfNode& );
+ virtual void OutputGrfNode( const SwGrfNode& ) SAL_OVERRIDE;
/// Output SwOLENode
- virtual void OutputOLENode( const SwOLENode& );
+ virtual void OutputOLENode( const SwOLENode& ) SAL_OVERRIDE;
- virtual void OutputLinkedOLE(const OUString&);
+ virtual void OutputLinkedOLE(const OUString&) SAL_OVERRIDE;
- virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum );
+ virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) SAL_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 9c9cdb703088..e275e583762b 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() { return 0; }
+ sal_uLong WriteStream() SAL_OVERRIDE { return 0; }
};
/// The physical access to the RTF document (for writing).
@@ -49,13 +49,13 @@ public:
// XFilter
virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL cancel( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XExporter
virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
RtfWriter m_aWriter;
};
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 21101e9c5b45..2dc14f9b3aa2 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -234,7 +234,7 @@ public:
WW8_WrPlcSepx( MSWordExportBase& rExport );
~WW8_WrPlcSepx();
- virtual bool HeaderFooterWritten(); // override
+ virtual bool HeaderFooterWritten() SAL_OVERRIDE; // override
void AppendSep( WW8_CP nStartCp,
const SwPageDesc* pPd,
@@ -378,8 +378,8 @@ public:
MainTxtPlcDrawObj() {}
private:
virtual void RegisterWithFib(WW8Fib &rFib, sal_uInt32 nStart,
- sal_uInt32 nLen) const;
- virtual WW8_CP GetCpOffset(const WW8Fib &) const;
+ sal_uInt32 nLen) const SAL_OVERRIDE;
+ virtual WW8_CP GetCpOffset(const WW8Fib &) const SAL_OVERRIDE;
private:
//No copying
MainTxtPlcDrawObj(const MainTxtPlcDrawObj&);
@@ -392,8 +392,8 @@ public:
HdFtPlcDrawObj() {}
private:
virtual void RegisterWithFib(WW8Fib &rFib, sal_uInt32 nStart,
- sal_uInt32 nLen) const;
- virtual WW8_CP GetCpOffset(const WW8Fib &rFib) const;
+ sal_uInt32 nLen) const SAL_OVERRIDE;
+ virtual WW8_CP GetCpOffset(const WW8Fib &rFib) const SAL_OVERRIDE;
private:
//No copying
HdFtPlcDrawObj(const HdFtPlcDrawObj&);
@@ -407,7 +407,7 @@ typedef std::vector<aBookmarkPair>::iterator SwImplBookmarksIter;
class WW8_WrtRedlineAuthor : public sw::util::WrtRedlineAuthor
{
public:
- virtual void Write(Writer &rWrt);
+ virtual void Write(Writer &rWrt) SAL_OVERRIDE;
};
/** Structure that is used to save some of the WW8Export/DocxExport data.
@@ -885,8 +885,8 @@ public:
SwWW8Writer(const OUString& rFltName, const OUString& rBaseURL);
virtual ~SwWW8Writer();
- virtual sal_uLong WriteStorage();
- virtual sal_uLong WriteMedium( SfxMedium& );
+ virtual sal_uLong WriteStorage() SAL_OVERRIDE;
+ virtual sal_uLong WriteMedium( SfxMedium& ) SAL_OVERRIDE;
// TODO most probably we want to be able to get these in
// MSExportFilterBase
@@ -918,7 +918,7 @@ public:
bool InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec );
using StgWriter::Write;
- virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 );
+ virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ) SAL_OVERRIDE;
//Seems not an expected to provide method to access the private member
SfxMedium* GetMedia() { return mpMedium; }
@@ -955,22 +955,22 @@ private:
public:
/// Access to the attribute output class.
- virtual AttributeOutputBase& AttrOutput() const;
+ virtual AttributeOutputBase& AttrOutput() const SAL_OVERRIDE;
/// Access to the sections/headers/footres.
- virtual MSWordSections& Sections() const;
+ virtual MSWordSections& Sections() const SAL_OVERRIDE;
/// False for WW6, true for WW8.
- virtual bool SupportsUnicode() const { return bWrtWW8; }
+ virtual bool SupportsUnicode() const SAL_OVERRIDE { return bWrtWW8; }
- virtual bool SupportsOneColumnBreak() const { return false; }
+ virtual bool SupportsOneColumnBreak() const SAL_OVERRIDE { return false; }
- virtual bool FieldsQuoted() const { return false; }
+ virtual bool FieldsQuoted() const SAL_OVERRIDE { return false; }
- virtual bool AddSectionBreaksForTOX() const { return false; }
+ virtual bool AddSectionBreaksForTOX() const SAL_OVERRIDE { return false; }
private:
/// Format-dependent part of the actual export.
- virtual void ExportDocument_Impl();
+ virtual void ExportDocument_Impl() SAL_OVERRIDE;
void PrepareStorage();
void WriteFkpPlcUsw();
@@ -983,7 +983,7 @@ private:
const SwNumRule& rRul, const SwNumFmt& rFmt, sal_uInt8 nSwLevel );
/// Output the numbering table.
- virtual void WriteNumbering();
+ virtual void WriteNumbering() SAL_OVERRIDE;
void OutOverrideListTab();
void OutListNamesTab();
@@ -996,10 +996,10 @@ private:
void DoCheckBox(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet);
public:
- virtual void OutputOlst( const SwNumRule& rRule );
+ virtual void OutputOlst( const SwNumRule& rRule ) SAL_OVERRIDE;
/// Setup the pA's info.
- virtual void SetupSectionPositions( WW8_PdAttrDesc* pA );
+ virtual void SetupSectionPositions( WW8_PdAttrDesc* pA ) SAL_OVERRIDE;
void Out_SwNumLvl( sal_uInt8 nSwLevel );
void Out_NumRuleAnld( const SwNumRule& rRul, const SwNumFmt& rFmt,
@@ -1034,7 +1034,7 @@ public:
/// Write the field
virtual void OutputField( const SwField* pFld, ww::eField eFldType,
- const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL );
+ const OUString& rFldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) SAL_OVERRIDE;
void StartCommentOutput( const OUString& rName );
void EndCommentOutput( const OUString& rName );
@@ -1042,12 +1042,12 @@ public:
bool TestOleNeedsGraphic(const SwAttrSet& rSet, SvStorageRef xOleStg,
SvStorageRef xObjStg, OUString &rStorageName, SwOLENode *pOLENd);
- virtual void AppendBookmarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen );
- virtual void AppendBookmark( const OUString& rName, bool bSkip = false );
+ virtual void AppendBookmarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
+ virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) SAL_OVERRIDE;
- virtual void AppendAnnotationMarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen );
+ virtual void AppendAnnotationMarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
- virtual void ExportGrfBullet(const SwTxtNode& rNd);
+ virtual void ExportGrfBullet(const SwTxtNode& rNd) SAL_OVERRIDE;
void OutGrfBullets(const sw::Frame &rFrame);
void MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo);
@@ -1055,10 +1055,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 );
+ virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) SAL_OVERRIDE;
- virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t() );
- void WriteChar( sal_Unicode c );
+ virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t() ) SAL_OVERRIDE;
+ void WriteChar( sal_Unicode c ) SAL_OVERRIDE;
void OutSwString(const OUString&, sal_Int32 nStt, sal_Int32 nLen,
bool bUnicode, rtl_TextEncoding eChrSet);
@@ -1072,14 +1072,14 @@ public:
inline bool IsUnicode() const { return pPiece->IsUnicode(); }
- virtual void SectionBreaksAndFrames( const SwTxtNode& rNode );
+ virtual void SectionBreaksAndFrames( const SwTxtNode& rNode ) SAL_OVERRIDE;
/// Helper method for OutputSectionBreaks() and OutputFollowPageDesc().
// #i76300#
virtual void PrepareNewPageDesc( const SfxItemSet* pSet,
const SwNode& rNd,
const SwFmtPageDesc* pNewPgDescFmt = 0,
- const SwPageDesc* pNewPgDesc = 0 );
+ const SwPageDesc* pNewPgDesc = 0 ) SAL_OVERRIDE;
void Out_BorderLine(ww::bytes& rO, const ::editeng::SvxBorderLine* pLine,
sal_uInt16 nDist, sal_uInt16 nSprmNo, sal_uInt16 nSprmNoVer9,
@@ -1093,7 +1093,7 @@ public:
sal_uInt16 nDist, bool bShadow);
// #i77805# - new return value indicates, if an inherited outline numbering is suppressed
- virtual bool DisallowInheritingOutlineNumbering(const SwFmt &rFmt);
+ virtual bool DisallowInheritingOutlineNumbering(const SwFmt &rFmt) SAL_OVERRIDE;
unsigned int GetHdFtIndex() const { return mnHdFtIndex; }
void SetHdFtIndex(unsigned int nHdFtIndex) { mnHdFtIndex = nHdFtIndex; }
@@ -1105,7 +1105,7 @@ public:
static sal_uInt8 GetNumId( sal_uInt16 eNumType );
/// Guess the script (asian/western).
- virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich );
+ virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) SAL_OVERRIDE;
sal_uInt16 DupNumRuleWithLvlStart(const SwNumRule *pRule,sal_uInt8 nLvl,sal_uInt16 nVal);
@@ -1133,15 +1133,15 @@ public:
const OUString &rHelp,
const OUString &ToolTip,
const OUString &rSelected,
- com::sun::star::uno::Sequence<OUString> &rListItems);
+ com::sun::star::uno::Sequence<OUString> &rListItems) SAL_OVERRIDE;
- virtual void DoFormText(const SwInputField * pFld);
+ virtual void DoFormText(const SwInputField * pFld) SAL_OVERRIDE;
void GetCurrentItems(ww::bytes &rItems) const;
/// Write the data of the form field
- virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark );
- virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark );
+ virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE;
+ virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE;
/// Fields.
WW8_WrPlcFld* CurrentFieldPlc() const;
@@ -1150,26 +1150,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 );
+ virtual void SaveData( sal_uLong nStt, sal_uLong nEnd ) SAL_OVERRIDE;
/// Restore what was saved in SaveData().
- virtual void RestoreData();
+ virtual void RestoreData() SAL_OVERRIDE;
/// Output the actual headers and footers.
virtual void WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt,
- sal_uInt8 nBreakCode);
+ sal_uInt8 nBreakCode) SAL_OVERRIDE;
protected:
/// Output SwGrfNode
- virtual void OutputGrfNode( const SwGrfNode& );
+ virtual void OutputGrfNode( const SwGrfNode& ) SAL_OVERRIDE;
/// Output SwOLENode
- virtual void OutputOLENode( const SwOLENode& );
+ virtual void OutputOLENode( const SwOLENode& ) SAL_OVERRIDE;
- virtual void OutputLinkedOLE( const OUString& );
+ virtual void OutputLinkedOLE( const OUString& ) SAL_OVERRIDE;
- virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum );
+ virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) SAL_OVERRIDE;
private:
/// No copying.
@@ -1256,7 +1256,7 @@ class WW8_WrPlcTxtBoxes : public WW8_WrPlcSubDoc // double Plc for Textboxes
private:
sal_uInt8 nTyp;
std::vector<sal_uInt32> aShapeIds; // VARARR of ShapeIds for the SwFrmFmts
- virtual const std::vector<sal_uInt32>* GetShapeIdArr() const;
+ virtual const std::vector<sal_uInt32>* GetShapeIdArr() const SAL_OVERRIDE;
//No copying
WW8_WrPlcTxtBoxes(const WW8_WrPlcTxtBoxes&);
@@ -1465,8 +1465,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;
- virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const;
+ virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const SAL_OVERRIDE;
bool OutAttrWithRange(sal_Int32 nPos);
sal_Int32 WhereNext() const { return nAktSwPos; }
rtl_TextEncoding GetNextCharSet() const;
@@ -1525,8 +1525,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;
- virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const;
+ virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const SAL_OVERRIDE;
+ virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const SAL_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 8fc38db312b3..0078a84cbe9b 100644
--- a/sw/source/filter/ww8/ww8attributeoutput.hxx
+++ b/sw/source/filter/ww8/ww8attributeoutput.hxx
@@ -27,162 +27,162 @@ class WW8AttributeOutput : public AttributeOutputBase
{
public:
/// Export the state of RTL/CJK.
- virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript );
+ virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) SAL_OVERRIDE;
/// Start of the paragraph.
- virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/ ) {}
+ virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/ ) SAL_OVERRIDE {}
/// End of the paragraph.
- virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner );
+ virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE;
/// Called in order to output section breaks.
- virtual void SectionBreaks(const SwTxtNode& /*rNode*/) {}
+ virtual void SectionBreaks(const SwTxtNode& /*rNode*/) SAL_OVERRIDE {}
/// Called before we start outputting the attributes.
- virtual void StartParagraphProperties() {}
+ virtual void StartParagraphProperties() SAL_OVERRIDE {}
/// Called after we end outputting the attributes.
- virtual void EndParagraphProperties( const SfxItemSet* /*pParagraphMarkerProperties*/, const SwRedlineData* /*pRedlineData*/, const SwRedlineData* /*pRedlineParagraphMarkerDeleted*/, const SwRedlineData* /*pRedlineParagraphMarkerInserted*/) {}
+ virtual void EndParagraphProperties( const SfxItemSet* /*pParagraphMarkerProperties*/, const SwRedlineData* /*pRedlineData*/, const SwRedlineData* /*pRedlineParagraphMarkerDeleted*/, const SwRedlineData* /*pRedlineParagraphMarkerInserted*/) SAL_OVERRIDE {}
/// Empty paragraph.
- virtual void EmptyParagraph();
+ virtual void EmptyParagraph() SAL_OVERRIDE;
/// Start of the text run.
///
- virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false );
+ virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) SAL_OVERRIDE;
- virtual void OnTOXEnding();
+ virtual void OnTOXEnding() SAL_OVERRIDE;
/// End of the text run.
///
/// No-op for binary filters.
- virtual void EndRun() {}
+ virtual void EndRun() SAL_OVERRIDE {}
/// Before we start outputting the attributes.
- virtual void StartRunProperties();
+ virtual void StartRunProperties() SAL_OVERRIDE;
/// After we end outputting the attributes.
- virtual void EndRunProperties( const SwRedlineData* pRedlineData );
+ virtual void EndRunProperties( const SwRedlineData* pRedlineData ) SAL_OVERRIDE;
/// Output text.
- virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet );
+ virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet ) SAL_OVERRIDE;
/// Output text (without markup).
- virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet );
+ virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ) SAL_OVERRIDE;
/// Output ruby start.
- virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby );
+ virtual void StartRuby( const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby ) SAL_OVERRIDE;
/// Output ruby end.
- virtual void EndRuby();
+ virtual void EndRuby() SAL_OVERRIDE;
/// Output URL start.
- virtual bool StartURL( const OUString &rUrl, const OUString &rTarget );
+ virtual bool StartURL( const OUString &rUrl, const OUString &rTarget ) SAL_OVERRIDE;
/// Output URL end.
- virtual bool EndURL();
+ virtual bool EndURL() SAL_OVERRIDE;
- virtual void FieldVanish( const OUString& rTxt, ww::eField eType );
+ virtual void FieldVanish( const OUString& rTxt, ww::eField eType ) SAL_OVERRIDE;
/// Output redlining.
- virtual void Redline( const SwRedlineData* pRedline );
+ virtual void Redline( const SwRedlineData* pRedline ) SAL_OVERRIDE;
- virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner );
+ virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_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();
+ virtual void OutputFKP() SAL_OVERRIDE;
/// Output style.
- virtual void ParagraphStyle( sal_uInt16 nStyle );
-
- virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo );
- virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo );
- virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo );
- virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo );
- virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo );
- virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo );
- virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo );
- virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo );
- virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo );
- virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo );
- virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo );
- virtual void TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo );
- virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner );
- virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
- virtual void TableRowEnd( sal_uInt32 nDepth = 1 );
+ 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 TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo ) 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;
/// Start of the styles table.
- virtual void StartStyles();
+ virtual void StartStyles() SAL_OVERRIDE;
/// End of the styles table.
- virtual void EndStyles( sal_uInt16 nNumberOfStyles );
+ virtual void EndStyles( sal_uInt16 nNumberOfStyles ) SAL_OVERRIDE;
/// Write default style.
- virtual void DefaultStyle( sal_uInt16 nStyle );
+ virtual void DefaultStyle( sal_uInt16 nStyle ) SAL_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 );
+ bool bAutoUpdate ) SAL_OVERRIDE;
/// End of a style in the styles table.
- virtual void EndStyle();
+ virtual void EndStyle() SAL_OVERRIDE;
/// Start of (paragraph or run) properties of a style.
- virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle );
+ virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ) SAL_OVERRIDE;
/// End of (paragraph or run) properties of a style.
- virtual void EndStyleProperties( bool bParProp );
+ virtual void EndStyleProperties( bool bParProp ) SAL_OVERRIDE;
/// Numbering rule and Id.
- virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt );
+ virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt ) SAL_OVERRIDE;
/// Page break
/// As a paragraph property - the paragraph should be on the next page.
- virtual void PageBreakBefore( bool bBreak );
+ virtual void PageBreakBefore( bool bBreak ) SAL_OVERRIDE;
/// Write a section break
/// msword::ColumnBreak or msword::PageBreak
- virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL );
+ virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) SAL_OVERRIDE;
/// Start of the section properties.
- virtual void StartSection();
+ virtual void StartSection() SAL_OVERRIDE;
/// End of the section properties.
///
/// No-op for binary filters.
- virtual void EndSection() {}
+ virtual void EndSection() SAL_OVERRIDE {}
/// Protection of forms.
- virtual void SectionFormProtection( bool bProtected );
+ virtual void SectionFormProtection( bool bProtected ) SAL_OVERRIDE;
/// Numbering of the lines in the document.
- virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo );
+ virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ) SAL_OVERRIDE;
/// Has different headers/footers for the title page.
- virtual void SectionTitlePage();
+ virtual void SectionTitlePage() SAL_OVERRIDE;
/// Description of the page borders.
- virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt );
+ virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt ) SAL_OVERRIDE;
/// Columns populated from right/numbers on the right side?
- virtual void SectionBiDi( bool bBiDi );
+ virtual void SectionBiDi( bool bBiDi ) SAL_OVERRIDE;
/// The style of the page numbers.
///
- virtual void SectionPageNumbering( sal_uInt16 nNumType, ::boost::optional<sal_uInt16> oPageRestartNumber );
+ virtual void SectionPageNumbering( sal_uInt16 nNumType, ::boost::optional<sal_uInt16> oPageRestartNumber ) SAL_OVERRIDE;
/// The type of breaking.
- virtual void SectionType( sal_uInt8 nBreakCode );
+ virtual void SectionType( sal_uInt8 nBreakCode ) SAL_OVERRIDE;
/// Special header/footer flags, needed for old versions only.
- virtual void SectionWW6HeaderFooterFlags( sal_uInt8 nHeadFootFlags );
+ virtual void SectionWW6HeaderFooterFlags( sal_uInt8 nHeadFootFlags ) SAL_OVERRIDE;
/// Definition of a numbering instance.
- virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule );
+ virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) SAL_OVERRIDE;
/// All the numbering level information.
virtual void NumberingLevel( sal_uInt8 nLevel,
@@ -197,236 +197,236 @@ public:
sal_Int16 nFirstLineIndex,
sal_Int16 nListTabPos,
const OUString &rNumberingString,
- const SvxBrushItem* pBrush = 0); //For i120928,transfer graphic of bullet
+ const SvxBrushItem* pBrush = 0) SAL_OVERRIDE; //For i120928,transfer graphic of bullet
protected:
/// Output frames - the implementation.
- void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft );
+ void OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point& rNdTopLeft ) SAL_OVERRIDE;
/// Sfx item Sfx item RES_CHRATR_CASEMAP
- virtual void CharCaseMap( const SvxCaseMapItem& );
+ virtual void CharCaseMap( const SvxCaseMapItem& ) SAL_OVERRIDE;
/// Sfx item Sfx item RES_CHRATR_COLOR
- virtual void CharColor( const SvxColorItem& );
+ virtual void CharColor( const SvxColorItem& ) SAL_OVERRIDE;
/// Sfx item Sfx item RES_CHRATR_CONTOUR
- virtual void CharContour( const SvxContourItem& );
+ virtual void CharContour( const SvxContourItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CROSSEDOUT
- virtual void CharCrossedOut( const SvxCrossedOutItem& rHt );
+ virtual void CharCrossedOut( const SvxCrossedOutItem& rHt ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_ESCAPEMENT
- virtual void CharEscapement( const SvxEscapementItem& );
+ virtual void CharEscapement( const SvxEscapementItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_FONT
- virtual void CharFont( const SvxFontItem& );
+ virtual void CharFont( const SvxFontItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_FONTSIZE
- virtual void CharFontSize( const SvxFontHeightItem& );
+ virtual void CharFontSize( const SvxFontHeightItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_KERNING
- virtual void CharKerning( const SvxKerningItem& );
+ virtual void CharKerning( const SvxKerningItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_LANGUAGE
- virtual void CharLanguage( const SvxLanguageItem& );
+ virtual void CharLanguage( const SvxLanguageItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_POSTURE
- virtual void CharPosture( const SvxPostureItem& );
+ virtual void CharPosture( const SvxPostureItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_SHADOWED
- virtual void CharShadow( const SvxShadowedItem& );
+ virtual void CharShadow( const SvxShadowedItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_UNDERLINE
- virtual void CharUnderline( const SvxUnderlineItem& );
+ virtual void CharUnderline( const SvxUnderlineItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_WEIGHT
- virtual void CharWeight( const SvxWeightItem& );
+ virtual void CharWeight( const SvxWeightItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_AUTOKERN
- virtual void CharAutoKern( const SvxAutoKernItem& );
+ virtual void CharAutoKern( const SvxAutoKernItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_BLINK
- virtual void CharAnimatedText( const SvxBlinkItem& );
+ virtual void CharAnimatedText( const SvxBlinkItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_BACKGROUND
- virtual void CharBackground( const SvxBrushItem& );
+ virtual void CharBackground( const SvxBrushItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CJK_FONT
- virtual void CharFontCJK( const SvxFontItem& );
+ virtual void CharFontCJK( const SvxFontItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CJK_FONTSIZE
- virtual void CharFontSizeCJK( const SvxFontHeightItem& rHt ) { CharFontSize( rHt ); }
+ virtual void CharFontSizeCJK( const SvxFontHeightItem& rHt ) SAL_OVERRIDE { CharFontSize( rHt ); }
/// Sfx item RES_CHRATR_CJK_LANGUAGE
- virtual void CharLanguageCJK( const SvxLanguageItem& rHt ) { CharLanguage( rHt ); }
+ virtual void CharLanguageCJK( const SvxLanguageItem& rHt ) SAL_OVERRIDE { CharLanguage( rHt ); }
/// Sfx item RES_CHRATR_CJK_POSTURE
- virtual void CharPostureCJK( const SvxPostureItem& rHt ) { CharPosture( rHt ); }
+ virtual void CharPostureCJK( const SvxPostureItem& rHt ) SAL_OVERRIDE { CharPosture( rHt ); }
/// Sfx item RES_CHRATR_CJK_WEIGHT
- virtual void CharWeightCJK( const SvxWeightItem& rHt ) { CharWeight( rHt ); }
+ virtual void CharWeightCJK( const SvxWeightItem& rHt ) SAL_OVERRIDE { CharWeight( rHt ); }
/// Sfx item RES_CHRATR_CTL_FONT
- virtual void CharFontCTL( const SvxFontItem& );
+ virtual void CharFontCTL( const SvxFontItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CTL_FONTSIZE
- virtual void CharFontSizeCTL( const SvxFontHeightItem& rHt ) { CharFontSize( rHt ); }
+ virtual void CharFontSizeCTL( const SvxFontHeightItem& rHt ) SAL_OVERRIDE { CharFontSize( rHt ); }
/// Sfx item RES_CHRATR_CTL_LANGUAGE
- virtual void CharLanguageCTL( const SvxLanguageItem& rHt ) { CharLanguage( rHt ); }
+ virtual void CharLanguageCTL( const SvxLanguageItem& rHt ) SAL_OVERRIDE { CharLanguage( rHt ); }
/// Sfx item RES_CHRATR_CTL_POSTURE
- virtual void CharPostureCTL( const SvxPostureItem& );
+ virtual void CharPostureCTL( const SvxPostureItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_CTL_WEIGHT
- virtual void CharWeightCTL( const SvxWeightItem& );
+ virtual void CharWeightCTL( const SvxWeightItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_BidiRTL
- virtual void CharBidiRTL( const SfxPoolItem& rHt );
+ virtual void CharBidiRTL( const SfxPoolItem& rHt ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_IdctHint
- virtual void CharIdctHint( const SfxPoolItem& rHt );
+ virtual void CharIdctHint( const SfxPoolItem& rHt ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_ROTATE
- virtual void CharRotate( const SvxCharRotateItem& );
+ virtual void CharRotate( const SvxCharRotateItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_EMPHASIS_MARK
- virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rHt );
+ virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rHt ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_TWO_LINES
- virtual void CharTwoLines( const SvxTwoLinesItem& );
+ virtual void CharTwoLines( const SvxTwoLinesItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_SCALEW
- virtual void CharScaleWidth( const SvxCharScaleWidthItem& );
+ virtual void CharScaleWidth( const SvxCharScaleWidthItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_RELIEF
- virtual void CharRelief( const SvxCharReliefItem& );
+ virtual void CharRelief( const SvxCharReliefItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_HIDDEN
- virtual void CharHidden( const SvxCharHiddenItem& );
+ virtual void CharHidden( const SvxCharHiddenItem& ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_BOX
- virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow );
+ virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ) SAL_OVERRIDE;
/// Sfx item RES_CHRATR_HIGHLIGHT
- virtual void CharHighlight( const SvxBrushItem& ){};
+ virtual void CharHighlight( const SvxBrushItem& ) SAL_OVERRIDE {};
/// Sfx item RES_TXTATR_INETFMT
- virtual void TextINetFormat( const SwFmtINetFmt& );
+ virtual void TextINetFormat( const SwFmtINetFmt& ) SAL_OVERRIDE;
/// Sfx item RES_TXTATR_CHARFMT
- virtual void TextCharFormat( const SwFmtCharFmt& );
+ virtual void TextCharFormat( const SwFmtCharFmt& ) SAL_OVERRIDE;
/// Sfx item RES_TXTATR_FTN
- virtual void TextFootnote_Impl( const SwFmtFtn& );
+ virtual void TextFootnote_Impl( const SwFmtFtn& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_LINESPACING
- virtual void ParaLineSpacing_Impl( short nSpace, short nMulti );
+ virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_ADJUST
- virtual void ParaAdjust( const SvxAdjustItem& rHt );
+ virtual void ParaAdjust( const SvxAdjustItem& rHt ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_SPLIT
- virtual void ParaSplit( const SvxFmtSplitItem& );
+ virtual void ParaSplit( const SvxFmtSplitItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_WIDOWS
- virtual void ParaWidows( const SvxWidowsItem& rHt );
+ virtual void ParaWidows( const SvxWidowsItem& rHt ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_TABSTOP
- virtual void ParaTabStop( const SvxTabStopItem& rHt );
+ virtual void ParaTabStop( const SvxTabStopItem& rHt ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_HYPHENZONE
- virtual void ParaHyphenZone( const SvxHyphenZoneItem& );
+ virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_NUMRULE
- virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId );
+ virtual void ParaNumRule_Impl( const SwTxtNode *pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_SCRIPTSPACE
- virtual void ParaScriptSpace( const SfxBoolItem& );
+ virtual void ParaScriptSpace( const SfxBoolItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_HANGINGPUNCTUATION
- virtual void ParaHangingPunctuation( const SfxBoolItem& );
+ virtual void ParaHangingPunctuation( const SfxBoolItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_FORBIDDEN_RULES
- virtual void ParaForbiddenRules( const SfxBoolItem& );
+ virtual void ParaForbiddenRules( const SfxBoolItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_VERTALIGN
- virtual void ParaVerticalAlign( const SvxParaVertAlignItem& );
+ virtual void ParaVerticalAlign( const SvxParaVertAlignItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_SNAPTOGRID
- virtual void ParaSnapToGrid( const SvxParaGridItem& );
+ virtual void ParaSnapToGrid( const SvxParaGridItem& ) SAL_OVERRIDE;
/// Sfx item RES_FRM_SIZE
- virtual void FormatFrameSize( const SwFmtFrmSize& );
+ virtual void FormatFrameSize( const SwFmtFrmSize& ) SAL_OVERRIDE;
/// Sfx item RES_PAPER_BIN
- virtual void FormatPaperBin( const SvxPaperBinItem& );
+ virtual void FormatPaperBin( const SvxPaperBinItem& ) SAL_OVERRIDE;
/// Sfx item RES_LR_SPACE
- virtual void FormatLRSpace( const SvxLRSpaceItem& );
+ virtual void FormatLRSpace( const SvxLRSpaceItem& ) SAL_OVERRIDE;
/// Sfx item RES_UL_SPACE
- virtual void FormatULSpace( const SvxULSpaceItem& rHt );
+ virtual void FormatULSpace( const SvxULSpaceItem& rHt ) SAL_OVERRIDE;
/// Sfx item RES_SURROUND
- virtual void FormatSurround( const SwFmtSurround& );
+ virtual void FormatSurround( const SwFmtSurround& ) SAL_OVERRIDE;
/// Sfx item RES_VERT_ORIENT
- virtual void FormatVertOrientation( const SwFmtVertOrient& );
+ virtual void FormatVertOrientation( const SwFmtVertOrient& ) SAL_OVERRIDE;
/// Sfx item RES_HORI_ORIENT
- virtual void FormatHorizOrientation( const SwFmtHoriOrient& );
+ virtual void FormatHorizOrientation( const SwFmtHoriOrient& ) SAL_OVERRIDE;
/// Sfx item RES_ANCHOR
- virtual void FormatAnchor( const SwFmtAnchor& );
+ virtual void FormatAnchor( const SwFmtAnchor& ) SAL_OVERRIDE;
/// Sfx item RES_BACKGROUND
- virtual void FormatBackground( const SvxBrushItem& );
+ virtual void FormatBackground( const SvxBrushItem& ) SAL_OVERRIDE;
/// Sfx item RES_FILL_STYLE
- virtual void FormatFillStyle( const XFillStyleItem& );
+ virtual void FormatFillStyle( const XFillStyleItem& ) SAL_OVERRIDE;
/// Sfx item RES_FILL_GRADIENT
- virtual void FormatFillGradient( const XFillGradientItem& );
+ virtual void FormatFillGradient( const XFillGradientItem& ) SAL_OVERRIDE;
/// Sfx item RES_BOX
- virtual void FormatBox( const SvxBoxItem& );
+ virtual void FormatBox( const SvxBoxItem& ) SAL_OVERRIDE;
/// Sfx item RES_COL
- virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize );
+ virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE;
/// Sfx item RES_KEEP
- virtual void FormatKeep( const SvxFmtKeepItem& );
+ virtual void FormatKeep( const SvxFmtKeepItem& ) SAL_OVERRIDE;
/// Sfx item RES_TEXTGRID
- virtual void FormatTextGrid( const SwTextGridItem& );
+ virtual void FormatTextGrid( const SwTextGridItem& ) SAL_OVERRIDE;
/// Sfx item RES_LINENUMBER
- virtual void FormatLineNumbering( const SwFmtLineNumber& );
+ virtual void FormatLineNumbering( const SwFmtLineNumber& ) SAL_OVERRIDE;
/// Sfx item RES_FRAMEDIR
- virtual void FormatFrameDirection( const SvxFrameDirectionItem& );
+ virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) SAL_OVERRIDE;
/// Sfx item RES_PARATR_GRABBAG
- virtual void ParaGrabBag( const SfxGrabBagItem& );
+ virtual void ParaGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE;
/// Sfx item RES_TXTATR_GRABBAG
- virtual void CharGrabBag( const SfxGrabBagItem& );
+ virtual void CharGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE;
// Sfx item RES_PARATR_OUTLINELEVEL
- virtual void ParaOutlineLevel( const SfxUInt16Item& );
+ virtual void ParaOutlineLevel( const SfxUInt16Item& ) SAL_OVERRIDE;
/// Write the expanded field
- virtual void WriteExpand( const SwField* pFld );
+ virtual void WriteExpand( const SwField* pFld ) SAL_OVERRIDE;
- virtual void RefField ( const SwField& rFld, const OUString& rRef );
- virtual void HiddenField( const SwField& rFld );
- virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd );
- virtual void PostitField( const SwField* pFld );
- virtual bool DropdownField( const SwField* pFld );
- virtual bool PlaceholderField( const SwField* pFld );
+ virtual void RefField ( const SwField& rFld, const OUString& rRef ) SAL_OVERRIDE;
+ virtual void HiddenField( const SwField& rFld ) SAL_OVERRIDE;
+ virtual void SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE;
+ virtual void PostitField( const SwField* pFld ) SAL_OVERRIDE;
+ virtual bool DropdownField( const SwField* pFld ) SAL_OVERRIDE;
+ virtual bool PlaceholderField( const SwField* pFld ) SAL_OVERRIDE;
- virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark );
+ virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ) SAL_OVERRIDE;
/// Reference to the export, where to get the data from
WW8Export &m_rWW8Export;
@@ -461,7 +461,7 @@ public:
virtual ~WW8AttributeOutput() {}
/// Return the right export class.
- virtual WW8Export& GetExport() { return m_rWW8Export; }
+ virtual WW8Export& GetExport() SAL_OVERRIDE { return m_rWW8Export; }
const WW8Export& GetExport() const { return m_rWW8Export; }
protected:
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index ed003a22ef19..79b748be2ce2 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -441,8 +441,8 @@ struct SBBItem
public:
Sttb();
~Sttb();
- bool Read(SvStream &rS);
- void Print( FILE* fp );
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print( FILE* fp ) SAL_OVERRIDE;
OUString getStringAtIndex( sal_uInt32 );
};
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index a07f083f74da..bc8ff1362e88 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -140,13 +140,13 @@ struct WW8LFOInfo;
class WW8Reader : public StgReader
{
- virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &);
+ virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE;
sal_uLong OpenMainStream( SvStorageStreamRef& rRef, sal_uInt16& rBuffSize );
public:
- virtual int GetReaderType();
+ virtual int GetReaderType() SAL_OVERRIDE;
- virtual sal_Bool HasGlossaries() const;
- virtual sal_Bool ReadGlossaries( SwTextBlocks&, sal_Bool bSaveRelFiles ) const;
+ virtual sal_Bool HasGlossaries() const SAL_OVERRIDE;
+ virtual sal_Bool ReadGlossaries( SwTextBlocks&, sal_Bool bSaveRelFiles ) const SAL_OVERRIDE;
};
class SwWW8ImplReader;
@@ -333,13 +333,13 @@ private:
const SwTxtNode &rTxtNode);
protected:
virtual void SetAttrInDoc(const SwPosition& rTmpPos,
- SwFltStackEntry& rEntry);
+ SwFltStackEntry& rEntry) SAL_OVERRIDE;
- virtual sal_Int32 GetCurrAttrCP() const;
- virtual bool IsParaEndInCPs(sal_Int32 nStart,sal_Int32 nEnd,bool bSdOD=true) const;
+ virtual sal_Int32 GetCurrAttrCP() const SAL_OVERRIDE;
+ virtual bool IsParaEndInCPs(sal_Int32 nStart,sal_Int32 nEnd,bool bSdOD=true) const SAL_OVERRIDE;
//Clear the para end position recorded in reader intermittently for the least impact on loading performance
- virtual void ClearParaEndPosition();
- virtual bool CheckSdOD(sal_Int32 nStart,sal_Int32 nEnd);
+ virtual void ClearParaEndPosition() SAL_OVERRIDE;
+ virtual bool CheckSdOD(sal_Int32 nStart,sal_Int32 nEnd) SAL_OVERRIDE;
public:
SwWW8FltControlStack(SwDoc* pDo, sal_uLong nFieldFl, SwWW8ImplReader& rReader_ )
@@ -349,7 +349,7 @@ public:
void NewAttr(const SwPosition& rPos, const SfxPoolItem& rAttr);
- virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, sal_Bool bTstEnde=sal_True, long nHand=LONG_MAX, sal_Bool consumedByField=sal_False);
+ virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, sal_Bool bTstEnde=sal_True, long nHand=LONG_MAX, sal_Bool consumedByField=sal_False) SAL_OVERRIDE;
void SetToggleAttr(sal_uInt8 nId, bool bOn)
{
@@ -433,7 +433,7 @@ public:
std::set<OUString, SwWW8::ltstr> aReferencedTOCBookmarks;
protected:
virtual void SetAttrInDoc( const SwPosition& rTmpPos,
- SwFltStackEntry& rEntry );
+ SwFltStackEntry& rEntry ) SAL_OVERRIDE;
};
class SwWW8FltRefStack : public SwFltEndStack
@@ -452,7 +452,7 @@ public:
protected:
SwFltStackEntry *RefToVar(const SwField* pFld,SwFltStackEntry& rEntry);
virtual void SetAttrInDoc(const SwPosition& rTmpPos,
- SwFltStackEntry& rEntry);
+ SwFltStackEntry& rEntry) SAL_OVERRIDE;
private:
//No copying
SwWW8FltRefStack(const SwWW8FltRefStack&);
@@ -477,7 +477,7 @@ public:
SwMacroInfo();
virtual ~SwMacroInfo();
- virtual SdrObjUserData* Clone( SdrObject* pObj ) const;
+ virtual SdrObjUserData* Clone( SdrObject* pObj ) const SAL_OVERRIDE;
void SetHlink( const OUString& rHlink ) { maHlink = rHlink; }
const OUString& GetHlink() const { return maHlink; }
@@ -663,7 +663,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);
+ com::sun::star::awt::Size &rSz) SAL_OVERRIDE;
};
class WW8FormulaListBox : public WW8FormulaControl
@@ -680,7 +680,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);
+ com::sun::star::awt::Size &rSz) SAL_OVERRIDE;
};
class WW8FormulaEditBox : public WW8FormulaControl
@@ -696,7 +696,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 */) { return sal_False; }
+ com::sun::star::awt::Size & /* rSz */) SAL_OVERRIDE { return sal_False; }
};
class SwMSConvertControls: public oox::ole::MSConvertOCXControls
@@ -708,7 +708,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);
+ com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl) SAL_OVERRIDE;
bool ExportControl(WW8Export &rWrt, const SdrObject *pObj);
virtual sal_Bool ReadOCXStream( SotStorageRef& rSrc1,
com::sun::star::uno::Reference<
@@ -728,8 +728,8 @@ private:
std::map<sal_uInt32,OString> aOldEscherBlipCache;
virtual sal_Bool GetOLEStorageName( long nOLEId, OUString& rStorageName,
- SvStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const;
- virtual sal_Bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos ) const;
+ SvStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const SAL_OVERRIDE;
+ virtual sal_Bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos ) const SAL_OVERRIDE;
// #i32596# - new parameter <_nCalledByGroup>, which
// indicates, if the OLE object is imported inside a group object
virtual SdrObject* ImportOLE( long nOLEId,
@@ -737,7 +737,7 @@ private:
const Rectangle& rBoundRect,
const Rectangle& rVisArea,
const int _nCalledByGroup,
- sal_Int64 nAspect ) const;
+ sal_Int64 nAspect ) const SAL_OVERRIDE;
//No copying
SwMSDffManager(const SwMSDffManager&);
@@ -750,7 +750,7 @@ public:
void DisableFallbackStream();
void EnableFallbackStream();
protected:
- virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pObj );
+ virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) SAL_OVERRIDE;
};
class wwSection
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index aecadb718195..d4f2b08cffc8 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -410,12 +410,12 @@ private:
public:
WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, WW8PLCFx_PCD* pPLCFx_PCD,
const WW8ScannerBase* pBase );
- virtual sal_uLong GetIdx() const;
- virtual void SetIdx( sal_uLong nI );
- virtual bool SeekPos(WW8_CP nCpPos);
- virtual WW8_FC Where();
- virtual void GetSprms( WW8PLCFxDesc* p );
- virtual void advance();
+ virtual sal_uLong 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;
WW8PLCFpcd_Iter* GetIter() const { return pPcdI; }
};
@@ -436,12 +436,12 @@ public:
WW8_CP nStartCp, bool bVer67P);
virtual ~WW8PLCFx_PCD();
virtual sal_uLong GetIMax() const;
- virtual sal_uLong GetIdx() const;
- virtual void SetIdx( sal_uLong nI );
- virtual bool SeekPos(WW8_CP nCpPos);
- virtual WW8_FC Where();
- virtual long GetNoSprms( WW8_CP& rStart, WW8_CP&, sal_Int32& rLen );
- virtual void advance();
+ virtual sal_uLong 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;
WW8_CP AktPieceStartFc2Cp( WW8_FC nStartPos );
WW8_FC AktPieceStartCp2Fc( WW8_CP nCp );
void AktPieceFc2Cp(WW8_CP& rStartPos, WW8_CP& rEndPos,
@@ -573,13 +573,13 @@ public:
WW8PLCFx_Fc_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt,
const WW8Fib& rFib, ePLCFT ePl, WW8_FC nStartFcL );
virtual ~WW8PLCFx_Fc_FKP();
- virtual sal_uLong GetIdx() const;
- virtual void SetIdx( sal_uLong nIdx );
- virtual bool SeekPos(WW8_FC nFcPos);
- virtual WW8_FC Where();
+ virtual sal_uLong 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;
sal_uInt8* GetSprmsAndPos( WW8_FC& rStart, WW8_FC& rEnd, sal_Int32& rLen );
- virtual void advance();
- virtual sal_uInt16 GetIstd() const;
+ virtual void advance() SAL_OVERRIDE;
+ virtual sal_uInt16 GetIstd() const SAL_OVERRIDE;
void GetPCDSprms( WW8PLCFxDesc& rDesc );
const sal_uInt8* HasSprm( sal_uInt16 nId );
bool HasSprm(sal_uInt16 nId, std::vector<const sal_uInt8 *> &rResult);
@@ -609,14 +609,14 @@ public:
sal_uLong GetPCDIMax() const;
sal_uLong GetPCDIdx() const;
void SetPCDIdx( sal_uLong nIdx );
- virtual sal_uLong GetIdx2() const;
- virtual void SetIdx2( sal_uLong nIdx );
- virtual bool SeekPos(WW8_CP nCpPos);
- virtual WW8_CP Where();
- virtual void GetSprms( WW8PLCFxDesc* p );
- virtual void advance();
- virtual void Save( WW8PLCFxSave1& rSave ) const;
- virtual void Restore( const WW8PLCFxSave1& rSave );
+ 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;
};
/// Iterator for Piece Table Exceptions of Sepx
@@ -638,13 +638,13 @@ public:
WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTblxySt, const WW8Fib& rFib,
WW8_CP nStartCp );
virtual ~WW8PLCFx_SEPX();
- virtual sal_uLong GetIdx() const;
- virtual void SetIdx( sal_uLong nIdx );
+ virtual sal_uLong GetIdx() const SAL_OVERRIDE;
+ virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE;
long GetIMax() const { return ( pPLCF ) ? pPLCF->GetIMax() : 0; }
- virtual bool SeekPos(WW8_CP nCpPos);
- virtual WW8_FC Where();
- virtual void GetSprms( WW8PLCFxDesc* p );
- virtual void advance();
+ 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;
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,
@@ -668,10 +668,10 @@ public:
WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp,
long nFcRef, long nLenRef, long nFcTxt, long nLenTxt, long nStruc = 0);
virtual ~WW8PLCFx_SubDoc();
- virtual sal_uLong GetIdx() const;
- virtual void SetIdx( sal_uLong nIdx );
- virtual bool SeekPos(WW8_CP nCpPos);
- virtual WW8_FC Where();
+ virtual sal_uLong 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;
// liefert Reference Descriptoren
const void* GetData( long nIdx = -1 ) const
@@ -681,8 +681,8 @@ public:
//liefert Angabe, wo Kopf und Fusszeilen-Text zu finden ist
bool Get(long& rStart, void*& rpValue) const;
- virtual void GetSprms(WW8PLCFxDesc* p);
- virtual void advance();
+ virtual void GetSprms(WW8PLCFxDesc* p) SAL_OVERRIDE;
+ virtual void advance() SAL_OVERRIDE;
long Count() const { return ( pRef ) ? pRef->GetIMax() : 0; }
};
@@ -699,12 +699,12 @@ private:
public:
WW8PLCFx_FLD(SvStream* pSt, const WW8Fib& rMyFib, short nType);
virtual ~WW8PLCFx_FLD();
- virtual sal_uLong GetIdx() const;
- virtual void SetIdx( sal_uLong nIdx );
- virtual bool SeekPos(WW8_CP nCpPos);
- virtual WW8_FC Where();
- virtual void GetSprms(WW8PLCFxDesc* p);
- virtual void advance();
+ virtual sal_uLong 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;
bool StartPosIsFieldStart();
bool EndPosIsFieldEnd(WW8_CP&);
bool GetPara(long nIdx, WW8FieldDesc& rF);
@@ -731,14 +731,14 @@ public:
WW8PLCFx_Book(SvStream* pTblSt,const WW8Fib& rFib);
virtual ~WW8PLCFx_Book();
long GetIMax() const { return nIMax; }
- virtual sal_uLong GetIdx() const;
- virtual void SetIdx( sal_uLong nI );
- virtual sal_uLong GetIdx2() const;
- virtual void SetIdx2( sal_uLong nIdx );
- virtual bool SeekPos(WW8_CP nCpPos);
- virtual WW8_FC Where();
- virtual long GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen );
- virtual void advance();
+ virtual sal_uLong 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;
const OUString* GetName() const;
WW8_CP GetStartPos() const
{ return ( nIsEnd ) ? WW8_CP_MAX : pBook[0]->Where(); }
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index c6cfa0eb8c82..f4298dac1767 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -39,8 +39,8 @@ class MSOWordCommandConvertor : public MSOCommandConvertor
public:
MSOWordCommandConvertor();
- virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd );
- virtual OUString MSOTCIDToOOCommand( sal_Int16 key );
+ virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ) SAL_OVERRIDE;
+ virtual OUString MSOTCIDToOOCommand( sal_Int16 key ) SAL_OVERRIDE;
};
MSOWordCommandConvertor::MSOWordCommandConvertor()
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index d0482e95e49a..7b4bb2e26059 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -17,9 +17,9 @@ class Xst : public TBBase
public:
Xst(){}
- bool Read(SvStream &rS);
+ bool Read(SvStream &rS) SAL_OVERRIDE;
OUString getString() { return sString; }
- void Print( FILE* fp );
+ void Print( FILE* fp ) SAL_OVERRIDE;
};
class SwCTBWrapper;
@@ -33,8 +33,8 @@ class SwTBC : public TBBase
public:
SwTBC();
~SwTBC();
- bool Read(SvStream &rS);
- void Print( FILE* );
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print( FILE* ) SAL_OVERRIDE;
bool ImportToolBarControl( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, bool );
OUString GetCustomText();
};
@@ -57,8 +57,8 @@ class SwCTB : public TBBase
public:
SwCTB();
~SwCTB();
- bool Read(SvStream &rS);
- void Print( FILE* fp );
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print( FILE* fp ) SAL_OVERRIDE;
bool IsMenuToolbar();
bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& );
bool ImportMenuTB( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
@@ -79,8 +79,8 @@ class TBDelta : public TBBase
public:
TBDelta();
~TBDelta(){}
- bool Read(SvStream &rS);
- void Print( FILE* );
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print( FILE* ) SAL_OVERRIDE;
bool ControlIsModified();
bool ControlIsInserted();
bool ControlIsChanged();
@@ -105,7 +105,7 @@ public:
Tcg255SubStruct( bool bReadId );
~Tcg255SubStruct(){}
virtual sal_uInt8 id() const { return ch; }
- bool Read(SvStream &rS);
+ bool Read(SvStream &rS) SAL_OVERRIDE;
};
class SwCTBWrapper;
@@ -126,10 +126,10 @@ class Customization : public TBBase
public:
Customization( SwCTBWrapper* rapper );
~Customization();
- bool Read(SvStream &rS);
+ bool Read(SvStream &rS) SAL_OVERRIDE;
bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& );
bool ImportMenu( SwCTBWrapper&, CustomToolBarImportHelper& );
- void Print( FILE* );
+ void Print( FILE* ) SAL_OVERRIDE;
sal_Int32 GetTBIDForTB(){ return tbidForTBD; }
SwCTB* GetCustomizationData() { return customizationDataCTB.get(); };
};
@@ -160,12 +160,12 @@ public:
~SwCTBWrapper();
void InsertDropIndex( sal_Int32 aIndex ) { dropDownMenuIndices.push_back( aIndex ); }
SwTBC* GetTBCAtOffset( sal_uInt32 nStreamOffset );
- bool Read(SvStream &rS);
+ bool Read(SvStream &rS) SAL_OVERRIDE;
bool ImportCustomToolBar( SfxObjectShell& rDocSh );
Customization* GetCustomizaton( sal_Int16 index );
SwCTB* GetCustomizationData( const OUString& name );
- void Print( FILE* );
+ void Print( FILE* ) SAL_OVERRIDE;
};
class MCD : public TBBase
@@ -184,8 +184,8 @@ public:
MCD();
MCD(const MCD&);
MCD& operator = ( const MCD&);
- bool Read(SvStream &rS);
- void Print( FILE* );
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print( FILE* ) SAL_OVERRIDE;
};
class PlfMcd : public Tcg255SubStruct
@@ -197,8 +197,8 @@ class PlfMcd : public Tcg255SubStruct
public:
PlfMcd( bool bReadId = true );
- bool Read(SvStream &rS);
- void Print( FILE* );
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print( FILE* ) SAL_OVERRIDE;
};
class Acd : public TBBase
@@ -211,8 +211,8 @@ class Acd : public TBBase
public:
Acd();
~Acd(){}
- bool Read(SvStream &rS);
- void Print( FILE* );
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print( FILE* ) SAL_OVERRIDE;
};
class PlfAcd: public Tcg255SubStruct
@@ -225,8 +225,8 @@ class PlfAcd: public Tcg255SubStruct
public:
PlfAcd( bool bReadId = true );
~PlfAcd();
- bool Read(SvStream &rS);
- void Print(FILE*);
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print(FILE*) SAL_OVERRIDE;
};
class Kme : public TBBase
@@ -244,8 +244,8 @@ class Kme : public TBBase
public:
Kme();
~Kme();
- bool Read(SvStream &rS);
- void Print( FILE* );
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print( FILE* ) SAL_OVERRIDE;
};
class PlfKme : public Tcg255SubStruct
@@ -258,8 +258,8 @@ class PlfKme : public Tcg255SubStruct
public:
PlfKme( bool bReadId = true );
~PlfKme();
- bool Read(SvStream &rS);
- void Print( FILE* );
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print( FILE* ) SAL_OVERRIDE;
};
class TcgSttbfCore : public TBBase
@@ -282,8 +282,8 @@ class TcgSttbfCore : public TBBase
public:
TcgSttbfCore();
~TcgSttbfCore();
- bool Read(SvStream &rS);
- void Print( FILE* fp );
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print( FILE* fp ) SAL_OVERRIDE;
};
class TcgSttbf : public Tcg255SubStruct
@@ -295,8 +295,8 @@ class TcgSttbf : public Tcg255SubStruct
public:
TcgSttbf( bool bReadId = true );
~TcgSttbf(){}
- bool Read(SvStream &rS);
- void Print( FILE* fp );
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print( FILE* fp ) SAL_OVERRIDE;
};
class Xstz : public TBBase
@@ -310,8 +310,8 @@ class Xstz : public TBBase
public:
Xstz();
~Xstz(){}
- bool Read(SvStream &rS);
- void Print( FILE* fp );
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print( FILE* fp ) SAL_OVERRIDE;
};
class MacroName : public TBBase
@@ -324,8 +324,8 @@ class MacroName : public TBBase
public:
MacroName();
~MacroName(){}
- bool Read(SvStream &rS);
- void Print( FILE* );
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print( FILE* ) SAL_OVERRIDE;
};
class MacroNames : public Tcg255SubStruct
@@ -339,8 +339,8 @@ class MacroNames : public Tcg255SubStruct
public:
MacroNames( bool bReadId = true );
~MacroNames();
- bool Read(SvStream &rS);
- void Print( FILE* );
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print( FILE* ) SAL_OVERRIDE;
};
class Tcg255 : public TBBase
@@ -353,8 +353,8 @@ class Tcg255 : public TBBase
public:
Tcg255();
~Tcg255();
- bool Read(SvStream &rS);
- void Print( FILE* );
+ bool Read(SvStream &rS) SAL_OVERRIDE;
+ void Print( FILE* ) SAL_OVERRIDE;
bool ImportCustomToolBar( SfxObjectShell& rDocSh );
};
@@ -368,9 +368,9 @@ class Tcg: public TBBase
public:
Tcg();
~Tcg(){}
- bool Read(SvStream &rS);
+ bool Read(SvStream &rS) SAL_OVERRIDE;
bool ImportCustomToolBar( SfxObjectShell& rDocSh );
- void Print( FILE* );
+ void Print( FILE* ) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx
index bfba14f14ae3..2ec718bb533f 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();
- virtual sal_uLong WriteMedium( SfxMedium& aTargetMedium );
+ virtual sal_uLong WriteStorage() SAL_OVERRIDE;
+ virtual sal_uLong WriteMedium( SfxMedium& aTargetMedium ) SAL_OVERRIDE;
public:
SwXMLWriter( const OUString& rBaseURL );
virtual ~SwXMLWriter();
- virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 );
+ virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ) SAL_OVERRIDE;
private:
diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx
index 8264496fdd11..ddf1140fff67 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 );
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
- virtual void EndElement();
+ virtual void EndElement() SAL_OVERRIDE;
const SvxBrushItem& GetItem() const { return *pItem; }
};
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 0414747767a9..c69263e81437 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -88,16 +88,16 @@ class SwXMLExport : public SvXMLExport
SwXMLTableInfo_Impl& rTblInfo,
sal_uInt16 nHeaderRows = 0 );
- virtual void _ExportMeta();
- virtual void _ExportFontDecls();
- virtual void _ExportStyles( bool bUsed );
- virtual void _ExportAutoStyles();
- virtual void _ExportMasterStyles();
- virtual void SetBodyAttributes();
- virtual void _ExportContent();
- virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps);
- virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps);
- virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings );
+ 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;
// string constants for table cell export
const OUString sNumberFormat;
@@ -109,11 +109,11 @@ private:
void DeleteTableLines();
protected:
- virtual XMLTextParagraphExport* CreateTextParagraphExport();
- virtual SvXMLAutoStylePoolP* CreateAutoStylePool();
- virtual XMLPageExport* CreatePageExport();
- virtual XMLShapeExport* CreateShapeExport();
- virtual XMLFontAutoStylePool* CreateFontAutoStylePool();
+ 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;
public:
SwXMLExport(
@@ -122,7 +122,7 @@ public:
virtual ~SwXMLExport();
- virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID );
+ virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) SAL_OVERRIDE;
inline const SvXMLUnitConverter& GetTwipUnitConverter() const;
@@ -141,7 +141,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);
+ 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;
const SwDoc* getDoc() const;
SwDoc* getDoc();
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 98a2f5501b86..da2aab803750 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -264,7 +264,7 @@ class SwXMLTextStyleContext_Impl : public XMLTextStyleContext
protected:
- virtual uno::Reference < style::XStyle > Create();
+ virtual uno::Reference < style::XStyle > Create() SAL_OVERRIDE;
public:
@@ -280,9 +280,9 @@ public:
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & xAttrList );
+ const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
- virtual void Finish( bool bOverwrite );
+ virtual void Finish( bool bOverwrite ) SAL_OVERRIDE;
};
TYPEINIT1( SwXMLTextStyleContext_Impl, XMLTextStyleContext );
@@ -440,7 +440,7 @@ protected:
virtual void SetAttribute( sal_uInt16 nPrefixKey,
const OUString& rLocalName,
- const OUString& rValue );
+ const OUString& rValue ) SAL_OVERRIDE;
const SwXMLImport& GetSwImport() const
{ return (const SwXMLImport&)GetImport(); }
@@ -458,11 +458,11 @@ public:
sal_uInt16 nFamily);
virtual ~SwXMLItemSetStyleContext_Impl();
- virtual void CreateAndInsert( sal_Bool bOverwrite );
+ virtual void CreateAndInsert( sal_Bool bOverwrite ) SAL_OVERRIDE;
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & xAttrList );
+ const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
// The item set may be empty!
SfxItemSet *GetItemSet() { return pItemSet; }
@@ -722,17 +722,17 @@ protected:
virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily,
sal_uInt16 nPrefix, const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & xAttrList );
+ const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext(
sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & xAttrList );
+ const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
// HACK
virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
- sal_uInt16 nFamily ) const;
+ sal_uInt16 nFamily ) const SAL_OVERRIDE;
virtual uno::Reference < container::XNameContainer >
- GetStylesContainer( sal_uInt16 nFamily ) const;
- virtual OUString GetServiceName( sal_uInt16 nFamily ) const;
+ GetStylesContainer( sal_uInt16 nFamily ) const SAL_OVERRIDE;
+ virtual OUString GetServiceName( sal_uInt16 nFamily ) const SAL_OVERRIDE;
// HACK
public:
@@ -746,9 +746,9 @@ public:
sal_Bool bAuto );
virtual ~SwXMLStylesContext_Impl();
- virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const;
+ virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE;
- virtual void EndElement();
+ virtual void EndElement() SAL_OVERRIDE;
};
TYPEINIT1( SwXMLStylesContext_Impl, SvXMLStylesContext );
@@ -920,7 +920,7 @@ void SwXMLStylesContext_Impl::EndElement()
class SwXMLMasterStylesContext_Impl : public XMLTextMasterStylesContext
{
protected:
- virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const;
+ virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE;
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
const SwXMLImport& GetSwImport() const
@@ -935,7 +935,7 @@ public:
const OUString& rLName ,
const uno::Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~SwXMLMasterStylesContext_Impl();
- virtual void EndElement();
+ virtual void EndElement() SAL_OVERRIDE;
};
TYPEINIT1( SwXMLMasterStylesContext_Impl, XMLTextMasterStylesContext );
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 03e7b9c5a00d..008ffc21e289 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -263,7 +263,7 @@ protected:
const SvXMLExportPropertyMapper& rPropExp
, const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap
- ) const;
+ ) const SAL_OVERRIDE;
public:
SwXMLAutoStylePoolP( SvXMLExport& rExport );
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 2f3d39ecd43a..60d7be7aea03 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -122,7 +122,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList );
+ const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
};
SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport,
@@ -169,7 +169,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList );
+ const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
};
SwXMLDocContext_Impl::SwXMLDocContext_Impl( SwXMLImport& rImport,
@@ -260,7 +260,7 @@ public:
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList );
+ const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
};
SwXMLOfficeDocContext_Impl::SwXMLOfficeDocContext_Impl(
@@ -321,7 +321,7 @@ public:
TYPEINFO_OVERRIDE();
- virtual void EndElement();
+ virtual void EndElement() SAL_OVERRIDE;
};
SwXMLDocStylesContext_Impl::SwXMLDocStylesContext_Impl(
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 3f1a920ca728..1369894ff601 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 );
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
- virtual XMLTextImportHelper* CreateTextImport();
+ virtual XMLTextImportHelper* CreateTextImport() SAL_OVERRIDE;
- virtual XMLShapeImportHelper* CreateShapeImport();
+ virtual XMLShapeImportHelper* CreateShapeImport() SAL_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);
+ std::exception) SAL_OVERRIDE;
virtual void SAL_CALL endDocument(void)
- throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_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);
+ 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;
// 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);
+ 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;
void InsertStyles( sal_Bool bAuto );
void FinishStyles();
@@ -176,18 +176,18 @@ public:
OUString *pParent=0 ) const;
virtual void SetStatistics(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats);
- virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps);
- virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps);
+ 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;
virtual void SetDocumentSpecificSettings(const OUString& _rSettingsGroupName,
- const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings);
+ const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings) SAL_OVERRIDE;
SvStorage *GetPackage() { return &xPackage; }
void SetProgressValue( sal_Int32 nValue );
// initialize XForms
- virtual void initXForms();
+ virtual void initXForms() SAL_OVERRIDE;
// get the document properties, but only if they actually need importing
::com::sun::star::uno::Reference<
diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx
index 4e2ccdc55bad..c5f7651c347d 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 );
+ const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_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 538412e1fa0f..cb1976b5de20 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -76,7 +76,7 @@ public:
const SfxPoolItem& rItem,
const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap,
- const SfxItemSet *pSet = NULL ) const;
+ const SfxItemSet *pSet = NULL ) const SAL_OVERRIDE;
virtual void handleElementItem(
SvXMLExport& rExport,
@@ -84,7 +84,7 @@ public:
const SfxPoolItem& rItem,
const SvXMLUnitConverter& rUnitConverter,
const SfxItemSet& rSet,
- sal_uInt16 nFlags ) const;
+ sal_uInt16 nFlags ) const SAL_OVERRIDE;
inline void SetAbsWidth( sal_uInt32 nAbs );
};
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index dec2c5c33a14..d3a425fe6fe6 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 );
+ const SvXMLNamespaceMap& rNamespaceMap ) SAL_OVERRIDE;
virtual bool
handleNoItem(SvXMLItemMapEntry const& rEntry,
SfxItemSet & rSet,
OUString const& rValue,
SvXMLUnitConverter const& rUnitConverter,
- SvXMLNamespaceMap const& rNamespaceMap);
+ SvXMLNamespaceMap const& rNamespaceMap) SAL_OVERRIDE;
virtual void finished(SfxItemSet & rSet,
- SvXMLUnitConverter const& rUnitConverter) const;
+ SvXMLUnitConverter const& rUnitConverter) const SAL_OVERRIDE;
- virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries );
+ virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ) SAL_OVERRIDE;
private:
void Reset();
@@ -261,7 +261,7 @@ public:
const ::uno::Reference< xml::sax::XAttributeList > & xAttrList,
SfxItemSet& rItemSet,
const SvXMLItemMapEntry& rEntry,
- const SvXMLUnitConverter& rUnitConv );
+ const SvXMLUnitConverter& rUnitConv ) SAL_OVERRIDE;
};
SwXMLItemSetContext_Impl::SwXMLItemSetContext_Impl(
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index c72031d7a01f..289725d56fe7 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -436,8 +436,8 @@ public:
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList );
- virtual void EndElement();
+ const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ virtual void EndElement() SAL_OVERRIDE;
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
};
@@ -844,7 +844,7 @@ public:
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList );
+ const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
};
@@ -901,9 +901,9 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList );
+ const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
- virtual void EndElement();
+ virtual void EndElement() SAL_OVERRIDE;
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
};
@@ -1022,7 +1022,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList );
+ const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
};
@@ -1082,7 +1082,7 @@ public:
~SwXMLDDETableContext_Impl();
virtual void StartElement(
- const Reference<xml::sax::XAttributeList> & xAttrList);
+ const Reference<xml::sax::XAttributeList> & xAttrList) SAL_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 28d6725056b4..874dac575686 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -150,7 +150,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
@@ -187,10 +187,10 @@ public:
const SwStartNode *InsertTableSection(const SwStartNode *pPrevSttNd = 0,
OUString const* pStringValueStyleName = 0);
- virtual void EndElement();
+ virtual void EndElement() SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference <
- ::com::sun::star::text::XTextContent > GetXTextContent() const;
+ ::com::sun::star::text::XTextContent > GetXTextContent() const SAL_OVERRIDE;
void SetHasSubTables( bool bNew ) { bHasSubTables = bNew; }
};
diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx
index d04345bba744..4c2785be5045 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 );
+ const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
// The body element's text:global attribute can be ignored, because
// we must have the correct object shell already.
- virtual void EndElement();
+ virtual void EndElement() SAL_OVERRIDE;
};
SwXMLBodyContentContext_Impl::SwXMLBodyContentContext_Impl( SwXMLImport& rImport,
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index 109c089dc872..99ff8608e618 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 );
+ ::com::sun::star::style::XStyle > & rStyle ) SAL_OVERRIDE;
virtual void _collectTextEmbeddedAutoStyles(
const ::com::sun::star::uno::Reference <
- ::com::sun::star::beans::XPropertySet > & rPropSet );
+ ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_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 );
+ ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ) SAL_OVERRIDE;
virtual void exportTable(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
- sal_Bool bAutoStyles, sal_Bool bProgress );
+ sal_Bool bAutoStyles, sal_Bool bProgress ) SAL_OVERRIDE;
public:
SwXMLTextParagraphExport(
@@ -73,7 +73,7 @@ public:
virtual void setTextEmbeddedGraphicURL(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet >& rPropSet,
- OUString& rStreamName ) const;
+ OUString& rStreamName ) const SAL_OVERRIDE;
};
#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTE_HXX
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index 4210cc1e6c87..1cd0357ce7d4 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 );
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
public:
SwXMLTextImportHelper(
@@ -53,14 +53,14 @@ public:
const OUString& rHRef,
const OUString& rStyleName,
const OUString& rTblName,
- sal_Int32 nWidth, sal_Int32 nHeight );
+ sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
createAndInsertOOoLink( SvXMLImport& rImport,
const OUString& rHRef,
const OUString& rStyleName,
const OUString& rTblName,
- sal_Int32 nWidth, sal_Int32 nHeight );
+ sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
createAndInsertApplet(
@@ -68,14 +68,14 @@ public:
const OUString &rCode,
sal_Bool bMayScript,
const OUString& rHRef,
- sal_Int32 nWidth, sal_Int32 nHeight );
+ sal_Int32 nWidth, sal_Int32 nHeight ) SAL_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_Int32 nWidth, sal_Int32 nHeight ) SAL_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_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
virtual void endAppletOrPlugin(
const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &rPropSet,
- ::std::map < const OUString, OUString > &rParamMap);
+ ::std::map < const OUString, OUString > &rParamMap) SAL_OVERRIDE;
- virtual sal_Bool IsInHeaderFooter() const;
+ virtual sal_Bool IsInHeaderFooter() const SAL_OVERRIDE;
// redlining helper methods
// (here is the real implementation)
@@ -99,22 +99,22 @@ public:
const OUString& rAuthor, /// name of the author
const OUString& rComment, /// redline comment
const ::com::sun::star::util::DateTime& rDateTime, /// date+time
- sal_Bool bMergeLastPara); /// merge last paragraph
+ sal_Bool bMergeLastPara) SAL_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); /// ID used to RedlineAdd() call
+ const OUString& rId) SAL_OVERRIDE; /// ID used to RedlineAdd() call
virtual void RedlineSetCursor(
const OUString& rId, /// ID used to RedlineAdd() call
sal_Bool bStart, /// start or end Cursor
- sal_Bool bIsOutsideOfParagraph);
+ sal_Bool bIsOutsideOfParagraph) SAL_OVERRIDE;
virtual void RedlineAdjustStartNodeCursor(
- sal_Bool bStart);
- virtual void SetShowChanges( sal_Bool bShowChanges );
- virtual void SetRecordChanges( sal_Bool bRecordChanges );
+ sal_Bool bStart) SAL_OVERRIDE;
+ virtual void SetShowChanges( sal_Bool bShowChanges ) SAL_OVERRIDE;
+ virtual void SetRecordChanges( sal_Bool bRecordChanges ) SAL_OVERRIDE;
virtual void SetChangesProtectionKey(
- const ::com::sun::star::uno::Sequence<sal_Int8> & rKey );
+ const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ) SAL_OVERRIDE;
};
#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTI_HXX