summaryrefslogtreecommitdiff
path: root/lotuswordpro
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
commit567ef6d5782cdb729b49005caf6005610ce03e22 (patch)
tree7e3be1da41382e555d9091914ef7e064852a4fd4 /lotuswordpro
parentc36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff)
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'lotuswordpro')
-rw-r--r--lotuswordpro/source/filter/LotusWordProImportFilter.hxx16
-rw-r--r--lotuswordpro/source/filter/bento.hxx16
-rw-r--r--lotuswordpro/source/filter/lwpbackgroundoverride.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpbreaksoverride.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpcelllayout.hxx36
-rw-r--r--lotuswordpro/source/filter/lwpcharacterstyle.hxx6
-rw-r--r--lotuswordpro/source/filter/lwpcharborderoverride.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpcontent.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpdivinfo.hxx2
-rw-r--r--lotuswordpro/source/filter/lwpdivopts.hxx2
-rw-r--r--lotuswordpro/source/filter/lwpdlvlist.hxx6
-rw-r--r--lotuswordpro/source/filter/lwpdoc.hxx12
-rw-r--r--lotuswordpro/source/filter/lwpdocdata.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpdrawobj.hxx88
-rw-r--r--lotuswordpro/source/filter/lwpfilter.hxx18
-rw-r--r--lotuswordpro/source/filter/lwpfnlayout.hxx62
-rw-r--r--lotuswordpro/source/filter/lwpfootnote.hxx14
-rw-r--r--lotuswordpro/source/filter/lwpframelayout.hxx44
-rw-r--r--lotuswordpro/source/filter/lwpfribbreaks.hxx2
-rw-r--r--lotuswordpro/source/filter/lwpfribframe.hxx8
-rw-r--r--lotuswordpro/source/filter/lwpfribmark.hxx14
-rw-r--r--lotuswordpro/source/filter/lwpfribsection.hxx2
-rw-r--r--lotuswordpro/source/filter/lwpfribtable.hxx2
-rw-r--r--lotuswordpro/source/filter/lwpfribtext.hxx12
-rw-r--r--lotuswordpro/source/filter/lwpgrfobj.hxx8
-rw-r--r--lotuswordpro/source/filter/lwpholder.hxx8
-rw-r--r--lotuswordpro/source/filter/lwplayout.hxx66
-rw-r--r--lotuswordpro/source/filter/lwplaypiece.hxx44
-rw-r--r--lotuswordpro/source/filter/lwpmarker.hxx12
-rw-r--r--lotuswordpro/source/filter/lwpnotes.hxx34
-rw-r--r--lotuswordpro/source/filter/lwpnumberingoverride.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpnumericfmt.hxx2
-rw-r--r--lotuswordpro/source/filter/lwpoleobject.hxx12
-rw-r--r--lotuswordpro/source/filter/lwpoverride.hxx36
-rw-r--r--lotuswordpro/source/filter/lwppagehint.hxx4
-rw-r--r--lotuswordpro/source/filter/lwppagelayout.hxx22
-rw-r--r--lotuswordpro/source/filter/lwppara.hxx8
-rw-r--r--lotuswordpro/source/filter/lwpparaborderoverride.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpparaproperty.hxx18
-rw-r--r--lotuswordpro/source/filter/lwpparastyle.hxx4
-rw-r--r--lotuswordpro/source/filter/lwppiece.hxx2
-rw-r--r--lotuswordpro/source/filter/lwpproplist.hxx2
-rw-r--r--lotuswordpro/source/filter/lwprowlayout.hxx10
-rw-r--r--lotuswordpro/source/filter/lwpsection.hxx8
-rw-r--r--lotuswordpro/source/filter/lwpsilverbullet.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpstory.hxx8
-rw-r--r--lotuswordpro/source/filter/lwptable.hxx20
-rw-r--r--lotuswordpro/source/filter/lwptablelayout.hxx34
-rw-r--r--lotuswordpro/source/filter/lwptaboverride.hxx4
-rw-r--r--lotuswordpro/source/filter/lwptabrack.hxx2
-rw-r--r--lotuswordpro/source/filter/lwptblcell.hxx28
-rw-r--r--lotuswordpro/source/filter/lwptblformula.hxx22
-rw-r--r--lotuswordpro/source/filter/lwptoc.hxx16
-rw-r--r--lotuswordpro/source/filter/lwpverdocument.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpvpointer.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfannotation.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfbgimage.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfbookmark.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfbreaks.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcell.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcellstyle.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfchange.hxx14
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcolstyle.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcolumns.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcontent.hxx8
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcrossref.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdate.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdatestyle.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdocfield.hxx46
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawline.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawobj.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawpath.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawpolygon.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawrect.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdropcap.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfendnote.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfentry.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xffloatframe.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xffooter.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xffootnote.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfframe.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfframestyle.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfheader.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfhyperlink.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfimage.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfimagestyle.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfindex.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfinputlist.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xflinebreak.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xflist.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xflistitem.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfliststyle.hxx10
-rw-r--r--lotuswordpro/source/filter/xfilter/xfmargins.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfmasterpage.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfnumfmt.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfofficemeta.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfpadding.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfpagecount.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfpagemaster.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfpagenumber.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfparagraph.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfparastyle.hxx10
-rw-r--r--lotuswordpro/source/filter/xfilter/xfplaceholder.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfrow.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfrowstyle.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfruby.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfrubystyle.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfsaxstream.hxx12
-rw-r--r--lotuswordpro/source/filter/xfilter/xfsection.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfshadow.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfstyle.hxx14
-rw-r--r--lotuswordpro/source/filter/xfilter/xfstylecont.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xftable.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xftablestyle.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xftabstop.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xftabstyle.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xftextcontent.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xftextspan.hxx8
-rw-r--r--lotuswordpro/source/filter/xfilter/xftextstyle.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xftimestyle.hxx6
135 files changed, 592 insertions, 592 deletions
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
index b0f23e2ae4fd..3da1db34879b 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
@@ -62,29 +62,29 @@ 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;
// XImporter
virtual void SAL_CALL setTargetDocument( 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;
//XExtendedFilterDetection
virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
- throw( com::sun::star::uno::RuntimeException, std::exception );
+ 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);
+ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index 90e173bfaa1a..b27f95713fef 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -188,11 +188,11 @@ public: // Overridden methods
sal_uLong GetSize() { return m_ulValueLength; };
protected: // Overridden methods
- virtual sal_uLong GetData( void* pData, sal_uLong nSize );
- virtual sal_uLong PutData( const void* pData, sal_uLong nSize );
- virtual sal_uLong SeekPos( sal_uLong nPos );
- virtual void SetSize( sal_uLong nSize );
- virtual void FlushData();
+ virtual sal_uLong GetData( void* pData, sal_uLong nSize ) SAL_OVERRIDE;
+ virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) SAL_OVERRIDE;
+ virtual sal_uLong SeekPos( sal_uLong nPos ) SAL_OVERRIDE;
+ virtual void SetSize( sal_uLong nSize ) SAL_OVERRIDE;
+ virtual void FlushData() SAL_OVERRIDE;
private: // Data
pCBenValue cpValue;
@@ -398,7 +398,7 @@ inline pLtcBenContainer CBenValue::GetContainer()
class CBenNamedObject : public CBenObject
{
public: // Methods
- virtual bool IsNamedObject();
+ virtual bool IsNamedObject() SAL_OVERRIDE;
virtual bool IsPropertyName();
virtual bool IsTypeName();
@@ -429,7 +429,7 @@ public: // Internal methods
pCBenNamedObjectListElmt pPrevNamedObjectListElmt) :
CBenNamedObject(pContainer, ObjectID, pPrevObject, sName,
pPrevNamedObjectListElmt) { ; }
- virtual bool IsPropertyName();
+ virtual bool IsPropertyName() SAL_OVERRIDE;
};
class CBenTypeName : public CBenNamedObject
@@ -440,7 +440,7 @@ public: // Internal methods
pCBenNamedObjectListElmt pPrevNamedObjectListElmt) :
CBenNamedObject(pContainer, ObjectID, pPrevObject, sName,
pPrevNamedObjectListElmt) { ; }
- virtual bool IsTypeName();
+ virtual bool IsTypeName() SAL_OVERRIDE;
};
} // end namespace OpenStormBento
diff --git a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx
index 6d984dfb9faa..27efa386d20f 100644
--- a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx
+++ b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx
@@ -67,10 +67,10 @@ public:
LwpBackgroundOverride(){}
virtual ~LwpBackgroundOverride(){}
- virtual LwpBackgroundOverride* clone() const;
+ virtual LwpBackgroundOverride* clone() const SAL_OVERRIDE;
public:
- virtual void Read(LwpObjectStream *pStrm)
+ virtual void Read(LwpObjectStream *pStrm) SAL_OVERRIDE
{
if (pStrm->QuickReadBool())
{
diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.hxx b/lotuswordpro/source/filter/lwpbreaksoverride.hxx
index 2de0887413d2..f2f2b27309fc 100644
--- a/lotuswordpro/source/filter/lwpbreaksoverride.hxx
+++ b/lotuswordpro/source/filter/lwpbreaksoverride.hxx
@@ -71,7 +71,7 @@ public:
LwpBreaksOverride();
virtual ~LwpBreaksOverride();
- virtual LwpBreaksOverride* clone() const;
+ virtual LwpBreaksOverride* clone() const SAL_OVERRIDE;
enum
{
@@ -86,7 +86,7 @@ public:
BO_NEXTSTYLE = 0x100 // next style name
};
public:
- virtual void Read(LwpObjectStream *pStrm);
+ virtual void Read(LwpObjectStream *pStrm) SAL_OVERRIDE;
//add by , 01/28/2005
void Override(LwpBreaksOverride* pOther);
diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx
index b432d49194df..3046e966589a 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.hxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.hxx
@@ -91,20 +91,20 @@ class LwpCellLayout : public LwpMiddleLayout
public:
LwpCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpCellLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_CELL_LAYOUT;}
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_CELL_LAYOUT;}
virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol);
sal_uInt16 GetRowID(){return crowid;}
sal_uInt8 GetColID(){return ccolid;}
- void RegisterStyle();
+ void RegisterStyle() SAL_OVERRIDE;
LwpObjectID * GetNumericsObject() {return &cLayNumerics;}
LwpObjectID * GetPreviousCellStory();
- virtual LwpPara* GetLastParaOfPreviousStory();
+ virtual LwpPara* GetLastParaOfPreviousStory() SAL_OVERRIDE;
LwpTableLayout * GetTableLayout();
virtual void SetCellMap(void);
double GetActualWidth();
OUString GetNumfmtName(){return m_NumfmtName;}
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
LwpTable * GetTable();
void ApplyPadding(XFCellStyle* pCellStyle);
void ApplyBorders(XFCellStyle* pCellStyle);
@@ -150,13 +150,13 @@ class LwpHiddenCellLayout : public LwpCellLayout
public:
LwpHiddenCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpHiddenCellLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_HIDDEN_CELL_LAYOUT;}
- virtual void Parse(IXFStream* pOutputStream);
- virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol);
- void RegisterStyle(){}
- virtual void SetCellMap(void);
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_HIDDEN_CELL_LAYOUT;}
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+ virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) SAL_OVERRIDE;
+ void RegisterStyle() SAL_OVERRIDE {}
+ virtual void SetCellMap(void) SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
LwpObjectID cconnectedlayout;
};
@@ -169,18 +169,18 @@ class LwpConnectedCellLayout : public LwpCellLayout
public:
LwpConnectedCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpConnectedCellLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_CONNECTED_CELL_LAYOUT;}
- virtual void Parse(IXFStream* pOutputStream);
- virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol);
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_CONNECTED_CELL_LAYOUT;}
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+ virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) SAL_OVERRIDE;
sal_uInt16 GetNumrows(){return m_nRealrowspan;}
sal_uInt8 GetNumcols(){return m_nRealcolspan;}
- virtual void SetCellMap(void);
+ virtual void SetCellMap(void) SAL_OVERRIDE;
void SetNumrows(sal_uInt16 nVal){m_nRealrowspan = nVal;}
void SetNumcols(sal_uInt8 nVal){m_nRealcolspan = nVal;}
protected:
- void Read();
- virtual sal_uInt16 GetBelowRowID(sal_uInt16 nRow){return nRow + m_nRealrowspan; };
- virtual LwpCellBorderType GetCellBorderType(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout);
+ void Read() SAL_OVERRIDE;
+ virtual sal_uInt16 GetBelowRowID(sal_uInt16 nRow) SAL_OVERRIDE {return nRow + m_nRealrowspan; };
+ virtual LwpCellBorderType GetCellBorderType(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout) SAL_OVERRIDE;
sal_uInt16 cnumrows;
sal_uInt8 cnumcols;
// sal_Bool m_bSplitFlag;
@@ -198,7 +198,7 @@ public:
LwpParallelColumnsBlock(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpParallelColumnsBlock();
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.hxx b/lotuswordpro/source/filter/lwpcharacterstyle.hxx
index 1ddd39baf73e..2698008c81ee 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.hxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.hxx
@@ -82,11 +82,11 @@ public:
inline sal_uInt32 GetFinalFontID() const;
- virtual void RegisterStyle();
+ virtual void RegisterStyle() SAL_OVERRIDE;
protected:
void ReadCommon();
- void Read();
+ void Read() SAL_OVERRIDE;
protected:
@@ -128,7 +128,7 @@ class LwpCharacterStyle : public LwpTextStyle
public:
LwpCharacterStyle(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
- void Read();
+ void Read() SAL_OVERRIDE;
private:
diff --git a/lotuswordpro/source/filter/lwpcharborderoverride.hxx b/lotuswordpro/source/filter/lwpcharborderoverride.hxx
index 4e08e4300ec8..4c4a42534764 100644
--- a/lotuswordpro/source/filter/lwpcharborderoverride.hxx
+++ b/lotuswordpro/source/filter/lwpcharborderoverride.hxx
@@ -76,9 +76,9 @@ public:
virtual ~LwpCharacterBorderOverride();
- virtual LwpCharacterBorderOverride* clone() const;
+ virtual LwpCharacterBorderOverride* clone() const SAL_OVERRIDE;
- void Read(LwpObjectStream* pStrm);
+ void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
inline LwpBorderStuff* GetBorderStuff();
inline LwpMargins* GetMargins();
diff --git a/lotuswordpro/source/filter/lwpcontent.hxx b/lotuswordpro/source/filter/lwpcontent.hxx
index 61f07569dae6..78f3489eda45 100644
--- a/lotuswordpro/source/filter/lwpcontent.hxx
+++ b/lotuswordpro/source/filter/lwpcontent.hxx
@@ -107,7 +107,7 @@ protected:
CF_COPYMASK = (CF_MODIFIED | CF_PRIVATE)
};
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
public:
inline LwpAssociatedLayouts* GetLayoutsWithMe();
LwpVirtualLayout* GetLayout(LwpVirtualLayout* pStartLayout);
@@ -153,7 +153,7 @@ public:
LwpHeadContent(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpHeadContent(){}
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
#endif
diff --git a/lotuswordpro/source/filter/lwpdivinfo.hxx b/lotuswordpro/source/filter/lwpdivinfo.hxx
index 4622e9f7eb24..9a24f3fbdb37 100644
--- a/lotuswordpro/source/filter/lwpdivinfo.hxx
+++ b/lotuswordpro/source/filter/lwpdivinfo.hxx
@@ -95,7 +95,7 @@ public:
sal_uInt16 GetMaxNumberOfPages();
LwpAtomHolder* GetExternalName(){return &m_ExternalName;}
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
private:
LwpObjectID m_ParentID;
LwpAtomHolder m_Name;
diff --git a/lotuswordpro/source/filter/lwpdivopts.hxx b/lotuswordpro/source/filter/lwpdivopts.hxx
index a1bdeb172d38..314e4451e232 100644
--- a/lotuswordpro/source/filter/lwpdivopts.hxx
+++ b/lotuswordpro/source/filter/lwpdivopts.hxx
@@ -110,7 +110,7 @@ public:
LwpDivisionOptions(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
~LwpDivisionOptions();
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
private:
LwpHyphenOptions m_HyphOpts;
sal_uInt16 m_nOptionFlag;
diff --git a/lotuswordpro/source/filter/lwpdlvlist.hxx b/lotuswordpro/source/filter/lwpdlvlist.hxx
index 174d3a928b64..74ed42406110 100644
--- a/lotuswordpro/source/filter/lwpdlvlist.hxx
+++ b/lotuswordpro/source/filter/lwpdlvlist.hxx
@@ -79,7 +79,7 @@ protected:
LwpObjectID m_ListPrevious;
LwpObjectID m_ListNext;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
public:
inline LwpObjectID* GetNext();
inline LwpObjectID* GetPrevious();
@@ -106,7 +106,7 @@ protected:
LwpObjectID m_Parent;
LwpAtomHolder m_Name;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
void ReadName(LwpObjectStream* pObjStrm);
public:
// 01/17/2005
@@ -150,7 +150,7 @@ protected:
sal_Bool m_bHasProperties;
LwpPropList* m_pPropList;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
void ReadPropertyList(LwpObjectStream* pObjStrm);
public:
inline LwpPropList* GetPropList();
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx b/lotuswordpro/source/filter/lwpdoc.hxx
index 1d87fa9aff01..9308e54060df 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -119,7 +119,7 @@ private:
LwpObjectID m_STXInfo;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
void ReadPlug();
void ParseDocContent(IXFStream* pOutputStream);
void RegisterTextStyles();
@@ -133,8 +133,8 @@ protected:
void RegisterDefaultParaStyles();
public:
- void Parse(IXFStream* pOutputStream);
- void RegisterStyle();
+ void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+ void RegisterStyle() SAL_OVERRIDE;
inline sal_Bool IsChildDoc();
inline sal_Bool HonorProtection();
@@ -230,10 +230,10 @@ public:
private:
LwpObjectID m_Doc;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
public:
- void RegisterStyle();
- void Parse(IXFStream* pOutputStream);
+ void RegisterStyle() SAL_OVERRIDE;
+ void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
};
#endif
diff --git a/lotuswordpro/source/filter/lwpdocdata.hxx b/lotuswordpro/source/filter/lwpdocdata.hxx
index acf33a51d5bd..955be99181e6 100644
--- a/lotuswordpro/source/filter/lwpdocdata.hxx
+++ b/lotuswordpro/source/filter/lwpdocdata.hxx
@@ -179,8 +179,8 @@ private:
OUString TimeToOUString(LtTm& dt);
public:
- void Read();
- void Parse(IXFStream *pOutputStream);
+ void Read() SAL_OVERRIDE;
+ void Parse(IXFStream *pOutputStream) SAL_OVERRIDE;
};
#endif
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx
index cdf8b1df8873..d28614e2344d 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.hxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.hxx
@@ -154,13 +154,13 @@ public:
virtual ~LwpDrawGroup() {}
protected:
- virtual void Read() {}
- virtual OUString RegisterStyle()
+ virtual void Read() SAL_OVERRIDE {}
+ virtual OUString RegisterStyle() SAL_OVERRIDE
{
return OUString();
}
- virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) { return NULL; }
- virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) { return NULL; }
+ virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) SAL_OVERRIDE { return NULL; }
+ virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) SAL_OVERRIDE { return NULL; }
};
/**
@@ -177,10 +177,10 @@ public:
virtual ~LwpDrawLine() {}
protected:
- virtual void Read();
- virtual OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
+ virtual void Read() SAL_OVERRIDE;
+ virtual OUString RegisterStyle() SAL_OVERRIDE;
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
};
/**
@@ -198,10 +198,10 @@ public:
virtual ~LwpDrawPolyLine();
protected:
- virtual void Read();
- virtual OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
+ virtual void Read() SAL_OVERRIDE;
+ virtual OUString RegisterStyle() SAL_OVERRIDE;
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
};
/**
@@ -219,10 +219,10 @@ public:
virtual ~LwpDrawPolygon();
protected:
- virtual void Read();
- virtual OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
+ virtual void Read() SAL_OVERRIDE;
+ virtual OUString RegisterStyle() SAL_OVERRIDE;
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
};
/**
@@ -239,10 +239,10 @@ public:
virtual ~LwpDrawRectangle(){}
protected:
- virtual void Read();
- virtual OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
+ virtual void Read() SAL_OVERRIDE;
+ virtual OUString RegisterStyle() SAL_OVERRIDE;
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
private:
XFFrame* CreateRoundedRect(const OUString& rStyleName);
@@ -262,10 +262,10 @@ public:
virtual ~LwpDrawEllipse(){}
protected:
- virtual void Read();
- virtual OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
+ virtual void Read() SAL_OVERRIDE;
+ virtual OUString RegisterStyle() SAL_OVERRIDE;
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
};
/**
@@ -283,10 +283,10 @@ public:
virtual ~LwpDrawArc() {}
protected:
- virtual void Read();
- virtual OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
+ virtual void Read() SAL_OVERRIDE;
+ virtual OUString RegisterStyle() SAL_OVERRIDE;
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
};
/**
@@ -306,10 +306,10 @@ public:
static void SetFontStyle(XFFont* pFont, SdwTextBoxRecord* pRec);
protected:
- virtual void Read();
- virtual OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
+ virtual void Read() SAL_OVERRIDE;
+ virtual OUString RegisterStyle() SAL_OVERRIDE;
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
};
/**
@@ -331,10 +331,10 @@ public:
virtual ~LwpDrawTextArt();
protected:
- virtual void Read();
- virtual OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
+ virtual void Read() SAL_OVERRIDE;
+ virtual OUString RegisterStyle() SAL_OVERRIDE;
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
};
/**
@@ -348,13 +348,13 @@ public:
virtual ~LwpDrawMetafile() {}
protected:
- virtual void Read();
- virtual OUString RegisterStyle()
+ virtual void Read() SAL_OVERRIDE;
+ virtual OUString RegisterStyle() SAL_OVERRIDE
{
return OUString();
}
- virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/){return NULL;}
- virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/){return NULL;}
+ virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) SAL_OVERRIDE {return NULL;}
+ virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) SAL_OVERRIDE {return NULL;}
};
/**
@@ -371,10 +371,10 @@ public:
virtual ~LwpDrawBitmap();
protected:
- virtual void Read();
- virtual OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
+ virtual void Read() SAL_OVERRIDE;
+ virtual OUString RegisterStyle() SAL_OVERRIDE;
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) SAL_OVERRIDE;
};
#endif
diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx
index cbd904c3d251..1574e9892e7b 100644
--- a/lotuswordpro/source/filter/lwpfilter.hxx
+++ b/lotuswordpro/source/filter/lwpfilter.hxx
@@ -104,12 +104,12 @@ public:
* get which file to import.
*/
virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor )
- throw( RuntimeException, std::exception );
+ throw( RuntimeException, std::exception ) SAL_OVERRIDE;
/**
* @descr stop loading the file.
*/
- virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/**
* @descr get the XDocumentHandler interface.
@@ -139,29 +139,29 @@ public:
* @descr see LWPFilterReader::filter.
*/
virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor )
- throw( RuntimeException, std::exception );
+ throw( RuntimeException, std::exception ) SAL_OVERRIDE;
/**
* @descr see LWPFilterReader::cancel.
*/
- virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XImporter
virtual void SAL_CALL setTargetDocument( const uno::Reference< XComponent >& xDoc)
- throw( IllegalArgumentException, RuntimeException, std::exception );
+ throw( IllegalArgumentException, RuntimeException, std::exception ) SAL_OVERRIDE;
// XServiceInfo
- OUString SAL_CALL getImplementationName() throw (std::exception);
+ OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE;
- Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (std::exception);
+ Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (std::exception) SAL_OVERRIDE;
- sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception);
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) SAL_OVERRIDE;
/**
* @descr function of interface XExtendedFilterDetection. If this interface is registered, it will be called whenever
* a file is to be loaded.
*/
- virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
public:
uno::Reference< XFilter > rFilter;
diff --git a/lotuswordpro/source/filter/lwpfnlayout.hxx b/lotuswordpro/source/filter/lwpfnlayout.hxx
index fc24f77576fc..43d07da72056 100644
--- a/lotuswordpro/source/filter/lwpfnlayout.hxx
+++ b/lotuswordpro/source/filter/lwpfnlayout.hxx
@@ -75,11 +75,11 @@ class LwpFootnoteLayout : public LwpTableLayout
public:
LwpFootnoteLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpFootnoteLayout();
- void RegisterStyle();
- virtual void XFConvert(XFContentContainer * pCont);
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_FOOTNOTE_LAYOUT;}
+ void RegisterStyle() SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer * pCont) SAL_OVERRIDE;
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_FOOTNOTE_LAYOUT;}
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
@@ -91,11 +91,11 @@ class LwpFnRowLayout : public LwpRowLayout
public:
LwpFnRowLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpFnRowLayout();
- void RegisterStyle();
- virtual void XFConvert(XFContentContainer * pCont);
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_FOOTNOTE_ROW_LAYOUT;}
+ void RegisterStyle() SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer * pCont) SAL_OVERRIDE;
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_FOOTNOTE_ROW_LAYOUT;}
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
@@ -107,11 +107,11 @@ class LwpFnCellLayout : public LwpCellLayout
public:
LwpFnCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpFnCellLayout();
- void RegisterStyle();
- virtual void XFConvert(XFContentContainer * pCont);
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_FOOTNOTE_CELL_LAYOUT;}
+ void RegisterStyle() SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer * pCont) SAL_OVERRIDE;
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_FOOTNOTE_CELL_LAYOUT;}
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
@@ -123,11 +123,11 @@ class LwpEndnoteLayout : public LwpTableLayout
public:
LwpEndnoteLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpEndnoteLayout();
- void RegisterStyle();
- virtual void XFConvert(XFContentContainer * pCont);
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_ENDNOTE_LAYOUT;}
+ void RegisterStyle() SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer * pCont) SAL_OVERRIDE;
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_ENDNOTE_LAYOUT;}
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
@@ -139,12 +139,12 @@ class LwpEnSuperTableLayout : public LwpSuperTableLayout
public:
LwpEnSuperTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpEnSuperTableLayout();
- void RegisterStyle();
- void XFConvert(XFContentContainer* pCont);
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_ENDNOTE_SUPERTABLE_LAYOUT;}
+ void RegisterStyle() SAL_OVERRIDE;
+ void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_ENDNOTE_SUPERTABLE_LAYOUT;}
virtual LwpVirtualLayout* GetMainTableLayout();
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
@@ -156,12 +156,12 @@ class LwpFnSuperTableLayout : public LwpEnSuperTableLayout
public:
LwpFnSuperTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpFnSuperTableLayout();
- void RegisterStyle();
- void XFConvert(XFContentContainer* pCont);
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_FOOTNOTE_SUPERTABLE_LAYOUT;}
- virtual LwpVirtualLayout* GetMainTableLayout();
+ void RegisterStyle() SAL_OVERRIDE;
+ void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_FOOTNOTE_SUPERTABLE_LAYOUT;}
+ virtual LwpVirtualLayout* GetMainTableLayout() SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
@@ -173,10 +173,10 @@ class LwpContFromLayout : public LwpPlacableLayout
public:
LwpContFromLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpContFromLayout();
- void RegisterStyle();
- void XFConvert(XFContentContainer* pCont);
+ void RegisterStyle() SAL_OVERRIDE;
+ void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
@@ -188,10 +188,10 @@ class LwpContOnLayout : public LwpPlacableLayout
public:
LwpContOnLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpContOnLayout();
- void RegisterStyle();
- void XFConvert(XFContentContainer* pCont);
+ void RegisterStyle() SAL_OVERRIDE;
+ void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
#endif
diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx b/lotuswordpro/source/filter/lwpfootnote.hxx
index ef36ba29f5fc..cc9e12027d5e 100644
--- a/lotuswordpro/source/filter/lwpfootnote.hxx
+++ b/lotuswordpro/source/filter/lwpfootnote.hxx
@@ -107,7 +107,7 @@ class LwpFribFootnote: public LwpFrib
public:
LwpFribFootnote(LwpPara* pPara );
~LwpFribFootnote(){}
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
void RegisterNewStyle();
void XFConvert(XFContentContainer* pCont);
LwpFootnote* GetFootnote();
@@ -128,10 +128,10 @@ class LwpFootnote : public LwpOrderedObject
public:
LwpFootnote(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpFootnote();
- void RegisterStyle();
- void XFConvert(XFContentContainer * pCont);
+ void RegisterStyle() SAL_OVERRIDE;
+ void XFConvert(XFContentContainer * pCont) SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
private:
sal_uInt16 m_nType;
sal_uInt16 m_nRow;
@@ -157,7 +157,7 @@ public:
LwpFootnoteTable(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpFootnoteTable(){}
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
@@ -246,9 +246,9 @@ class LwpFootnoteOptions : public LwpObject
public:
LwpFootnoteOptions(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpFootnoteOptions();
- void RegisterStyle();
+ void RegisterStyle() SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
void RegisterFootnoteStyle();
void RegisterEndnoteStyle();
private:
diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx b/lotuswordpro/source/filter/lwpframelayout.hxx
index 607d5dea674e..9ab7e03f080d 100644
--- a/lotuswordpro/source/filter/lwpframelayout.hxx
+++ b/lotuswordpro/source/filter/lwpframelayout.hxx
@@ -130,17 +130,17 @@ class LwpFrameLayout: public LwpPlacableLayout
public:
LwpFrameLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpFrameLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_FRAME_LAYOUT;}
- virtual void RegisterStyle();
- virtual void XFConvert(XFContentContainer* pCont);
- void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, sal_Bool bAll = sal_False);
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_FRAME_LAYOUT;}
+ virtual void RegisterStyle() SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+ void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, sal_Bool bAll = sal_False) SAL_OVERRIDE;
OUString GetNextLinkName();
sal_Bool HasPreviousLinkLayout();
- sal_Bool IsForWaterMark();
- double GetWidth();
+ sal_Bool IsForWaterMark() SAL_OVERRIDE;
+ double GetWidth() SAL_OVERRIDE;
void ApplyGraphicSize(XFFrame* pXFFrame);
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
private:
double GetMaxWidth();
@@ -158,12 +158,12 @@ class LwpGroupLayout: public LwpPlacableLayout
public:
LwpGroupLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpGroupLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_GROUP_LAYOUT;}
- virtual void RegisterStyle();
- virtual void XFConvert(XFContentContainer* pCont);
- void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, sal_Bool bAll = sal_False);
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_GROUP_LAYOUT;}
+ virtual void RegisterStyle() SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+ void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, sal_Bool bAll = sal_False) SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
private:
LwpFrame* m_pFrame;
@@ -178,10 +178,10 @@ class LwpGroupFrame: public LwpContent
public:
LwpGroupFrame(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpGroupFrame();
- virtual void RegisterStyle();
- virtual void XFConvert(XFContentContainer* pCont);
+ virtual void RegisterStyle() SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
class LwpStory;
@@ -191,17 +191,17 @@ class LwpDropcapLayout : public LwpFrameLayout
public:
LwpDropcapLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpDropcapLayout(){}
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_DROPCAP_LAYOUT;}
- virtual void Parse(IXFStream* pOutputStream);
- virtual void XFConvert(XFContentContainer* pCont);
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_DROPCAP_LAYOUT;}
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
sal_uInt16 GetLines(){return m_nLines;}
void SetChars(sal_uInt32 nChars){ m_nChars += nChars;}
sal_uInt32 GetChars() const {return m_nChars;}
LwpStory* GetContentStory();
void RegisterStyle(LwpFoundry* pFoundry);
- void RegisterStyle();
+ void RegisterStyle() SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
private:
sal_uInt16 m_nLines;
sal_uInt32 m_nChars;
@@ -217,7 +217,7 @@ public:
LwpStory* GetContentStory();
sal_uInt8 GetPosition(){return m_nPlacement;}
sal_uInt8 GetAlignment(){return m_nAlignment;}
- void RegisterStyle();
+ void RegisterStyle() SAL_OVERRIDE;
enum{
LEFT = 4,
RIGHT = 5,
@@ -226,7 +226,7 @@ public:
BOTTOM = 3
};
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
private:
sal_uInt8 m_nPlacement;
sal_uInt8 m_nAlignment;
diff --git a/lotuswordpro/source/filter/lwpfribbreaks.hxx b/lotuswordpro/source/filter/lwpfribbreaks.hxx
index 794a89a71655..60892eae8e26 100644
--- a/lotuswordpro/source/filter/lwpfribbreaks.hxx
+++ b/lotuswordpro/source/filter/lwpfribbreaks.hxx
@@ -74,7 +74,7 @@ class LwpFribPageBreak: public LwpFrib
public:
LwpFribPageBreak( LwpPara* pPara );
~LwpFribPageBreak();
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
void RegisterBreakStyle(LwpPara* pPara);
void ParseLayout();
LwpObjectID* GetLayout(){return &m_Layout;}
diff --git a/lotuswordpro/source/filter/lwpfribframe.hxx b/lotuswordpro/source/filter/lwpfribframe.hxx
index 8a6c120e46a8..f87b56eff16d 100644
--- a/lotuswordpro/source/filter/lwpfribframe.hxx
+++ b/lotuswordpro/source/filter/lwpfribframe.hxx
@@ -73,9 +73,9 @@ class LwpFribFrame : public LwpFrib
public:
LwpFribFrame( LwpPara* pPara) : LwpFrib(pPara){}
~LwpFribFrame(){}
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
LwpObject* GetLayout();
- void RegisterStyle(LwpFoundry* pFoundry);
+ void RegisterStyle(LwpFoundry* pFoundry) SAL_OVERRIDE;
void SetParaDropcap(LwpPara* pPara);
void XFConvert(XFContentContainer* pCont);
private:
@@ -87,9 +87,9 @@ class LwpFribRubyFrame : public LwpFrib
public:
LwpFribRubyFrame( LwpPara* pPara) : LwpFrib(pPara){}
~LwpFribRubyFrame(){}
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
LwpRubyLayout* GetLayout();
- void RegisterStyle(LwpFoundry* pFoundry);
+ void RegisterStyle(LwpFoundry* pFoundry) SAL_OVERRIDE;
void XFConvert(XFContentContainer* pCont);
private:
LwpObjectID m_objLayout;
diff --git a/lotuswordpro/source/filter/lwpfribmark.hxx b/lotuswordpro/source/filter/lwpfribmark.hxx
index a32cf79aecf1..05dc66080724 100644
--- a/lotuswordpro/source/filter/lwpfribmark.hxx
+++ b/lotuswordpro/source/filter/lwpfribmark.hxx
@@ -79,7 +79,7 @@ public:
, m_nType(0)
{}
~LwpFribCHBlock(){}
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
LwpCHBlkMarker* GetMarker();
sal_uInt8 GetType(){return m_nType;}
enum{MARKER_START=1,MARKER_END,MARKER_NONE};
@@ -94,12 +94,12 @@ class LwpFribBookMark : public LwpFrib
public:
LwpFribBookMark( LwpPara* pPara );
~LwpFribBookMark(){}
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
LwpObjectID GetMarkerID(){return m_objMarker;}
sal_uInt8 GetType(){return m_nType;}
enum{MARKER_START=1,MARKER_END,MARKER_NONE};
void XFConvert(XFContentContainer* pXFPara);
- void RegisterStyle(LwpFoundry* pFoundry);
+ void RegisterStyle(LwpFoundry* pFoundry) SAL_OVERRIDE;
private:
sal_uInt8 m_nType;
LwpObjectID m_objMarker;
@@ -112,12 +112,12 @@ class LwpFribField : public LwpFrib
public:
LwpFribField( LwpPara* pPara );
~LwpFribField(){}
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
LwpFieldMark* GetMarker();
sal_uInt8 GetType(){return m_nType;}
enum{MARKER_START=1,MARKER_END,MARKER_NONE};
void XFConvert(XFContentContainer* pXFPara);
- void RegisterStyle(LwpFoundry* pFoundry);
+ void RegisterStyle(LwpFoundry* pFoundry) SAL_OVERRIDE;
enum{
SUBFIELD_INVALID = 0,
SUBFIELD_DATETIME = 1,
@@ -153,12 +153,12 @@ class LwpFribRubyMarker : public LwpFrib
public:
LwpFribRubyMarker( LwpPara* pPara );
~LwpFribRubyMarker(){}
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
LwpRubyMarker* GetMarker();
sal_uInt8 GetType(){return m_nType;}
enum{MARKER_START=1,MARKER_END,MARKER_NONE};
void XFConvert(XFContentContainer* pXFPara);
- void RegisterStyle(LwpFoundry* pFoundry);
+ void RegisterStyle(LwpFoundry* pFoundry) SAL_OVERRIDE;
private:
sal_uInt8 m_nType;
LwpObjectID m_objMarker;
diff --git a/lotuswordpro/source/filter/lwpfribsection.hxx b/lotuswordpro/source/filter/lwpfribsection.hxx
index 1c232ac3fb9d..4138e0cb22c5 100644
--- a/lotuswordpro/source/filter/lwpfribsection.hxx
+++ b/lotuswordpro/source/filter/lwpfribsection.hxx
@@ -113,7 +113,7 @@ class LwpFribSection: public LwpFrib
public:
LwpFribSection(LwpPara* pPara );
~LwpFribSection();
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
LwpSection * GetSection();
void RegisterSectionStyle();
//Modified by Helen for XFConvert refactor
diff --git a/lotuswordpro/source/filter/lwpfribtable.hxx b/lotuswordpro/source/filter/lwpfribtable.hxx
index 5d624fe76018..16a5d95a575a 100644
--- a/lotuswordpro/source/filter/lwpfribtable.hxx
+++ b/lotuswordpro/source/filter/lwpfribtable.hxx
@@ -64,7 +64,7 @@ class LwpFribTable : public LwpFrib
public:
LwpFribTable( LwpPara* pPara ) : LwpFrib(pPara){}
~LwpFribTable(){}
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
LwpSuperTableLayout* GetSuperTable();
void RegisterNewStyle();
virtual void XFConvert(XFContentContainer* pCont);
diff --git a/lotuswordpro/source/filter/lwpfribtext.hxx b/lotuswordpro/source/filter/lwpfribtext.hxx
index 880e586638cf..e9172c51a459 100644
--- a/lotuswordpro/source/filter/lwpfribtext.hxx
+++ b/lotuswordpro/source/filter/lwpfribtext.hxx
@@ -71,7 +71,7 @@ class LwpFribText : public LwpFrib
public:
LwpFribText( LwpPara* pPara, sal_Bool bNoUnicode=false);
~LwpFribText(){}
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
void XFConvert(XFContentContainer* pXFPara,LwpStory* pStory);
private:
OUString m_Content;
@@ -100,7 +100,7 @@ class LwpFribParaNumber : public LwpFrib
public:
LwpFribParaNumber( LwpPara* pPara ) : LwpFrib(pPara),
m_nStyleID(0), m_nNumberChar(0), m_nLevel(1), m_nStart(0){}
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
inline sal_uInt16 GetStyleID() const;
@@ -140,9 +140,9 @@ public:
~LwpFribDocVar();
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
- void RegisterStyle(LwpFoundry* pFoundry);//add by ,05/5/27
+ void RegisterStyle(LwpFoundry* pFoundry) SAL_OVERRIDE;//add by ,05/5/27
void XFConvert(XFContentContainer* pXFPara);//add by ,05/5/27
@@ -203,7 +203,7 @@ class LwpFribUnicode: public LwpFrib
public:
LwpFribUnicode( LwpPara* pPara ) : LwpFrib(pPara){}
~LwpFribUnicode(){}
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
void XFConvert(XFContentContainer* pXFPara,LwpStory* pStory);
private:
OUString m_Content;
@@ -217,7 +217,7 @@ public:
LwpFribPageNumber(LwpPara* pPara) : LwpFrib(pPara),
m_nNumStyle(0), m_nStartNum(1), m_nStartOnPage(1), m_nFlag(0){}
~LwpFribPageNumber(){}
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
void XFConvert(XFContentContainer* pXFPara);
private:
sal_uInt16 m_nNumStyle;
diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx
index b188fa5fb85e..be9983e0938f 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.hxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.hxx
@@ -115,11 +115,11 @@ private:
public:
//inline sal_uInt8* GetBuffer(){return m_DataBuffer;}
- void Read();
+ void Read() SAL_OVERRIDE;
//Added by for XFConvert refactor, 03/31/2005
- virtual void XFConvert (XFContentContainer* pCont);
+ virtual void XFConvert (XFContentContainer* pCont) SAL_OVERRIDE;
//End of Add
- void RegisterStyle();
+ void RegisterStyle() SAL_OVERRIDE;
// add by , 03/25/2005
void CreateDrawObjects();
@@ -128,7 +128,7 @@ public:
sal_uInt32 GetRawGrafData(sal_uInt8*& pGrafData);
sal_uInt32 GetGrafData(sal_uInt8*& pGrafData);
void GetGrafOrgSize(long& rWidth, long& rHeight) { rWidth = m_Cache.Width; rHeight = m_Cache.Height; }
- void GetGrafOrgSize(double& rWidth, double& rHeight);
+ void GetGrafOrgSize(double& rWidth, double& rHeight) SAL_OVERRIDE;
// end add
OUString GetWatermarkName(){ return m_WatermarkName;}
diff --git a/lotuswordpro/source/filter/lwpholder.hxx b/lotuswordpro/source/filter/lwpholder.hxx
index 5e5966d8979d..714f1b75c2e8 100644
--- a/lotuswordpro/source/filter/lwpholder.hxx
+++ b/lotuswordpro/source/filter/lwpholder.hxx
@@ -76,7 +76,7 @@ class LwpDLVListHeadHolder : public LwpObject
public:
LwpDLVListHeadHolder(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
~LwpDLVListHeadHolder(){}
- void Read();
+ void Read() SAL_OVERRIDE;
LwpObjectID* GetHeadID() { return &m_DLVHead;}
private:
LwpObjectID m_DLVHead;
@@ -90,7 +90,7 @@ class LwpDLVListHeadTailHolder : public LwpObject
public:
LwpDLVListHeadTailHolder(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
~LwpDLVListHeadTailHolder(){}
- void Read();
+ void Read() SAL_OVERRIDE;
LwpObjectID* GetHead(){ return m_HeadTail.GetHead();}
LwpObjectID* GetTail(){ return m_HeadTail.GetTail();}
protected:
@@ -105,7 +105,7 @@ class LwpObjectHolder : public LwpDLVList
public:
LwpObjectHolder(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
~LwpObjectHolder(){}
- void Read();
+ void Read() SAL_OVERRIDE;
LwpObjectID* GetObject(){return &m_Object;}
protected:
LwpObjectID m_Object;
@@ -120,7 +120,7 @@ class LwpListList : public LwpObjectHolder
public:
LwpListList(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
~LwpListList(){}
- void Read();
+ void Read() SAL_OVERRIDE;
LwpObjectID* GetHead(){ return m_HeadTail.GetHead();}
LwpObjectID* GetTail(){ return m_HeadTail.GetTail();}
protected:
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index a07a7d155a2a..18b9fb44db2c 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -161,7 +161,7 @@ public:
virtual sal_Bool HasContent(){return sal_False;}
//End by
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
protected:
sal_uInt32 m_nAttributes;
sal_uInt32 m_nAttributes2;
@@ -236,11 +236,11 @@ class LwpHeadLayout : public LwpVirtualLayout
public:
LwpHeadLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpHeadLayout(){}
- void RegisterStyle();
+ void RegisterStyle() SAL_OVERRIDE;
LwpVirtualLayout* FindEnSuperTableLayout();
protected:
- void Read();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_HEAD_LAYOUT;}
+ void Read() SAL_OVERRIDE;
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_HEAD_LAYOUT;}
};
class LwpLayoutStyle
@@ -274,9 +274,9 @@ class LwpMiddleLayout : public LwpVirtualLayout
public:
LwpMiddleLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm );
virtual ~LwpMiddleLayout();
- virtual sal_Bool MarginsSameAsParent();
- virtual double GetMarginsValue(const sal_uInt8& nWhichSide);
- virtual double GetExtMarginsValue(const sal_uInt8& nWhichSide);
+ virtual sal_Bool MarginsSameAsParent() SAL_OVERRIDE;
+ virtual double GetMarginsValue(const sal_uInt8& nWhichSide) SAL_OVERRIDE;
+ virtual double GetExtMarginsValue(const sal_uInt8& nWhichSide) SAL_OVERRIDE;
LwpLayoutGeometry* GetGeometry();
double GetGeometryHeight();
double GetGeometryWidth();
@@ -285,14 +285,14 @@ public:
enumXFTextDir GetTextDirection();
XFBorders* GetXFBorders();
LwpColor* GetBackColor();
- virtual sal_Bool IsAutoGrow();
- virtual sal_Bool IsAutoGrowUp();
- virtual sal_Bool IsAutoGrowDown();
- virtual sal_Bool IsAutoGrowLeft();
- virtual sal_Bool IsAutoGrowRight();
- virtual sal_uInt8 GetContentOrientation();
- virtual sal_Bool HonorProtection();
- virtual sal_Bool IsProtected();
+ virtual sal_Bool IsAutoGrow() SAL_OVERRIDE;
+ virtual sal_Bool IsAutoGrowUp() SAL_OVERRIDE;
+ virtual sal_Bool IsAutoGrowDown() SAL_OVERRIDE;
+ virtual sal_Bool IsAutoGrowLeft() SAL_OVERRIDE;
+ virtual sal_Bool IsAutoGrowRight() SAL_OVERRIDE;
+ virtual sal_uInt8 GetContentOrientation() SAL_OVERRIDE;
+ virtual sal_Bool HonorProtection() SAL_OVERRIDE;
+ virtual sal_Bool IsProtected() SAL_OVERRIDE;
virtual LwpVirtualLayout* GetWaterMarkLayout();
XFBGImage* GetXFBGImage();
virtual sal_Bool GetUsePrinterSettings();
@@ -306,7 +306,7 @@ public:
double GetScaleHeight(void);
sal_Bool CanSizeRight(void);
- virtual double GetWidth();
+ virtual double GetWidth() SAL_OVERRIDE;
virtual sal_Int32 GetMinimumWidth();
sal_Bool IsSizeRightToContent(void);
sal_Bool IsSizeRightToContainer(void);
@@ -318,11 +318,11 @@ public:
XFBGImage* GetFillPattern();
//Check whether there are contents in the layout
- virtual sal_Bool HasContent();
+ virtual sal_Bool HasContent() SAL_OVERRIDE;
//End by
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
protected:
enum
{
@@ -357,7 +357,7 @@ public:
LwpShadow* GetShadow();
XFShadow* GetXFShadow();
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
protected:
LwpUseWhen* m_pUseWhen;
LwpObjectID m_Positon;
@@ -368,10 +368,10 @@ protected:
LwpObjectID m_LayExtJoinStuff;
public:
- LwpUseWhen* VirtualGetUseWhen();
- virtual sal_uInt16 GetNumCols();
- virtual double GetColWidth(sal_uInt16 nIndex);
- virtual double GetColGap(sal_uInt16 nIndex);
+ LwpUseWhen* VirtualGetUseWhen() SAL_OVERRIDE;
+ virtual sal_uInt16 GetNumCols() SAL_OVERRIDE;
+ virtual double GetColWidth(sal_uInt16 nIndex) SAL_OVERRIDE;
+ virtual double GetColGap(sal_uInt16 nIndex) SAL_OVERRIDE;
virtual sal_uInt16 GetUsePage();
public:
enum UseWhenType
@@ -384,12 +384,12 @@ public:
};
public:
virtual UseWhenType GetUseWhenType();
- virtual sal_Bool IsUseOnAllPages();
- virtual sal_Bool IsUseOnAllEvenPages();
- virtual sal_Bool IsUseOnAllOddPages();
- virtual sal_Bool IsUseOnPage();
+ virtual sal_Bool IsUseOnAllPages() SAL_OVERRIDE;
+ virtual sal_Bool IsUseOnAllEvenPages() SAL_OVERRIDE;
+ virtual sal_Bool IsUseOnAllOddPages() SAL_OVERRIDE;
+ virtual sal_Bool IsUseOnPage() SAL_OVERRIDE;
LwpObjectID* GetPosition(){ return &m_Positon;}
- virtual LwpVirtualLayout* GetContainerLayout();
+ virtual LwpVirtualLayout* GetContainerLayout() SAL_OVERRIDE;
};
class XFFont;
@@ -400,11 +400,11 @@ public:
virtual ~LwpPlacableLayout();
virtual sal_uInt8 GetWrapType();
virtual LwpLayoutRelativity* GetRelativityPiece();
- virtual sal_uInt8 GetRelativeType();
+ virtual sal_uInt8 GetRelativeType() SAL_OVERRIDE;
virtual sal_Int32 GetBaseLineOffset();
- virtual sal_Bool IsAnchorPage();
- virtual sal_Bool IsAnchorFrame();
- virtual sal_Bool IsAnchorCell();
+ virtual sal_Bool IsAnchorPage() SAL_OVERRIDE;
+ virtual sal_Bool IsAnchorFrame() SAL_OVERRIDE;
+ virtual sal_Bool IsAnchorCell() SAL_OVERRIDE;
virtual void XFConvertFrame(XFContentContainer* /*pCont*/, sal_Int32 /*nStart*/ = 0, sal_Int32 /*nEnd*/ = 0, sal_Bool /*bAll*/ = sal_False) {}
XFFont* GetFont();
void SetFont(XFFont* pFont);
@@ -422,7 +422,7 @@ public:
LAY_WRAP_IRREG_BIGGEST
};
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
protected:
sal_uInt8 m_nWrapType;
sal_uInt8 m_nBuoyancy;
diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx
index c086f160253c..fe764e36da1c 100644
--- a/lotuswordpro/source/filter/lwplaypiece.hxx
+++ b/lotuswordpro/source/filter/lwplaypiece.hxx
@@ -82,7 +82,7 @@ class LwpLayoutGeometry : public LwpVirtualPiece
public:
LwpLayoutGeometry(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
virtual ~LwpLayoutGeometry();
- virtual void Parse(IXFStream* pOutputStream);
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
sal_Int32 GetWidth() { return m_nWidth; }
sal_Int32 GetHeight() { return m_nHeight; }
LwpPoint GetOrigin() { return m_Origin; }
@@ -90,7 +90,7 @@ public:
sal_uInt8 GetContentOrientation(){ return m_ContentOrientation;}
protected:
- virtual void Read();
+ virtual void Read() SAL_OVERRIDE;
protected:
sal_Int32 m_nWidth;
sal_Int32 m_nHeight;
@@ -109,7 +109,7 @@ public:
enum {CENTERED = 1, TILED = 2};
LwpLayoutScale(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
virtual ~LwpLayoutScale();
- virtual void Parse(IXFStream* pOutputStream);
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
sal_uInt16 GetScaleMode(){return m_nScaleMode;}
sal_uInt32 GetScalePercentage(){return m_nScalePercentage;}
void SetScalePercentage(sal_uInt32 nVal){m_nScalePercentage = nVal;}
@@ -123,7 +123,7 @@ public:
void SetPlacement(sal_uInt16 nVal){m_nPlacement = nVal;}
inline LwpPoint* GetOffset() {return &m_Offset;}
protected:
- virtual void Read();
+ virtual void Read() SAL_OVERRIDE;
protected:
sal_uInt16 m_nScaleMode;
sal_uInt32 m_nScalePercentage;
@@ -141,11 +141,11 @@ class LwpLayoutMargins : public LwpVirtualPiece
public:
LwpLayoutMargins(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
virtual ~LwpLayoutMargins();
- virtual void Parse(IXFStream* pOutputStream);
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
LwpMargins* GetMargins() { return &m_Margins; }
LwpMargins* GetExtMargins(){ return &m_ExtMargins;}
protected:
- virtual void Read();
+ virtual void Read() SAL_OVERRIDE;
protected:
LwpMargins m_Margins;
LwpMargins m_ExtMargins;
@@ -158,10 +158,10 @@ class LwpLayoutBorder : public LwpVirtualPiece
public:
LwpLayoutBorder(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
virtual ~LwpLayoutBorder();
- virtual void Parse(IXFStream* pOutputStream);
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
LwpBorderStuff* GetBorderStuff(){ return &m_BorderStuff;}
protected:
- virtual void Read();
+ virtual void Read() SAL_OVERRIDE;
protected:
LwpBorderStuff m_BorderStuff;
};
@@ -171,10 +171,10 @@ class LwpLayoutBackground : public LwpVirtualPiece
public:
LwpLayoutBackground(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
virtual ~LwpLayoutBackground();
- virtual void Parse(IXFStream* pOutputStream);
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
LwpBackgroundStuff* GetBackgoudStuff(){return &m_BackgroundStuff;}
protected:
- virtual void Read();
+ virtual void Read() SAL_OVERRIDE;
protected:
LwpBackgroundStuff m_BackgroundStuff;
};
@@ -198,9 +198,9 @@ class LwpLayoutExternalBorder : public LwpVirtualPiece
public:
LwpLayoutExternalBorder(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
virtual ~LwpLayoutExternalBorder();
- virtual void Parse(IXFStream* pOutputStream);
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
protected:
- virtual void Read();
+ virtual void Read() SAL_OVERRIDE;
protected:
LwpExternalBorder m_ExtranalBorder;
};
@@ -225,12 +225,12 @@ class LwpLayoutColumns : public LwpVirtualPiece
public:
LwpLayoutColumns(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
virtual ~LwpLayoutColumns();
- virtual void Parse(IXFStream* pOutputStream);
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
inline sal_uInt16 GetNumCols(){return m_nNumCols;}
double GetColWidth(sal_uInt16 nIndex);
double GetColGap(sal_uInt16 nIndex);
protected:
- virtual void Read();
+ virtual void Read() SAL_OVERRIDE;
protected:
sal_uInt16 m_nNumCols;
LwpColumnInfo* m_pColumns;
@@ -241,10 +241,10 @@ class LwpLayoutGutters : public LwpVirtualPiece
public:
LwpLayoutGutters(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
virtual ~LwpLayoutGutters();
- virtual void Parse(IXFStream* pOutputStream);
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
inline virtual LwpBorderStuff* GetBorderStuff(){return &m_BorderBuffer;}
protected:
- virtual void Read();
+ virtual void Read() SAL_OVERRIDE;
protected:
LwpBorderStuff m_BorderBuffer;
};
@@ -300,9 +300,9 @@ class LwpLayoutJoins : public LwpVirtualPiece
public:
LwpLayoutJoins(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
virtual ~LwpLayoutJoins();
- virtual void Parse(IXFStream* pOutputStream);
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
protected:
- virtual void Read();
+ virtual void Read() SAL_OVERRIDE;
protected:
LwpJoinStuff m_JoinStuff;
};
@@ -314,10 +314,10 @@ class LwpLayoutShadow : public LwpVirtualPiece
public:
LwpLayoutShadow(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
virtual ~LwpLayoutShadow();
- virtual void Parse(IXFStream* pOutputStream);
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
LwpShadow* GetShadow(){return &m_Shadow;}
protected:
- virtual void Read();
+ virtual void Read() SAL_OVERRIDE;
protected:
LwpShadow m_Shadow;
};
@@ -374,10 +374,10 @@ class LwpLayoutRelativity: public LwpVirtualPiece
public:
LwpLayoutRelativity(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
virtual ~LwpLayoutRelativity();
- virtual void Parse(IXFStream* pOutputStream);
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
LwpLayoutRelativityGuts* GetRelGuts(){return &m_RelGuts;}
protected:
- virtual void Read();
+ virtual void Read() SAL_OVERRIDE;
protected:
LwpLayoutRelativityGuts m_RelGuts;
};
diff --git a/lotuswordpro/source/filter/lwpmarker.hxx b/lotuswordpro/source/filter/lwpmarker.hxx
index bbf97d7a3380..b61c75f6d9be 100644
--- a/lotuswordpro/source/filter/lwpmarker.hxx
+++ b/lotuswordpro/source/filter/lwpmarker.hxx
@@ -76,7 +76,7 @@ class LwpMarker : public LwpDLNFPVList
public:
LwpMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
~LwpMarker(){}
- void Read();
+ void Read() SAL_OVERRIDE;
OUString GetNamedProperty(const OUString& name);
protected:
enum{
@@ -109,7 +109,7 @@ class LwpStoryMarker : public LwpMarker
public:
LwpStoryMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
~LwpStoryMarker(){}
- void Read();
+ void Read() SAL_OVERRIDE;
private:
LwpFribRange m_Range;
sal_uInt16 m_nFlag;
@@ -120,7 +120,7 @@ class LwpCHBlkMarker : public LwpStoryMarker
public:
LwpCHBlkMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
~LwpCHBlkMarker(){}
- void Read();
+ void Read() SAL_OVERRIDE;
sal_uInt16 GetAction(){return m_nAction;}
void ConvertCHBlock(XFContentContainer* pXFPara,sal_uInt8 nType);
enum{
@@ -179,7 +179,7 @@ public:
LwpBookMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
~LwpBookMark(){}
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
public:
sal_Bool IsRightMarker(LwpObjectID objMarker);
OUString GetName();
@@ -196,7 +196,7 @@ class LwpFieldMark : public LwpStoryMarker
public:
LwpFieldMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
~LwpFieldMark(){}
- void Read();
+ void Read() SAL_OVERRIDE;
void ParseIndex(OUString& sKey1,OUString& sKey2);
void ParseTOC(OUString& sLevel,OUString& sText);
sal_uInt16 GetFieldType(){return m_nFieldType;}
@@ -260,7 +260,7 @@ class LwpRubyMarker : public LwpStoryMarker
public:
LwpRubyMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
~LwpRubyMarker(){}
- void Read();
+ void Read() SAL_OVERRIDE;
OUString GetRubyText(){return m_strRubyText;}
void SetRubyText(const OUString& sText){m_strRubyText = sText;}
OUString GetTextStyleName(){return m_TextStyle;}
diff --git a/lotuswordpro/source/filter/lwpnotes.hxx b/lotuswordpro/source/filter/lwpnotes.hxx
index aef0d0c55817..16e59c6c63de 100644
--- a/lotuswordpro/source/filter/lwpnotes.hxx
+++ b/lotuswordpro/source/filter/lwpnotes.hxx
@@ -76,7 +76,7 @@ class LwpFribNote: public LwpFrib
public:
LwpFribNote(LwpPara* pPara );
~LwpFribNote(){}
- void Read(LwpObjectStream* pObjStrm, sal_uInt16 len);
+ void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) SAL_OVERRIDE;
void RegisterNewStyle();
void XFConvert(XFContentContainer* pCont);
private:
@@ -92,14 +92,14 @@ class LwpNoteLayout: public LwpFrameLayout
public:
LwpNoteLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpNoteLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_NOTE_LAYOUT;}
- virtual void RegisterStyle();
- virtual void XFConvert(XFContentContainer* pCont);
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_NOTE_LAYOUT;}
+ virtual void RegisterStyle() SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
sal_uInt32 GetTime(){ return m_nTime;}
OUString GetAuthor();
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
LwpVirtualLayout* GetTextLayout();
private:
@@ -116,12 +116,12 @@ class LwpNoteHeaderLayout: public LwpFrameLayout
public:
LwpNoteHeaderLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpNoteHeaderLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_NOTEHEADER_LAYOUT;}
- virtual void RegisterStyle();
- virtual void XFConvert(XFContentContainer* pCont);
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_NOTEHEADER_LAYOUT;}
+ virtual void RegisterStyle() SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
@@ -133,12 +133,12 @@ class LwpNoteTextLayout: public LwpFrameLayout
public:
LwpNoteTextLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpNoteTextLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_NOTETEXT_LAYOUT;}
- virtual void RegisterStyle();
- virtual void XFConvert(XFContentContainer* pCont);
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_NOTETEXT_LAYOUT;}
+ virtual void RegisterStyle() SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
@@ -150,12 +150,12 @@ class LwpViewportLayout: public LwpPlacableLayout
public:
LwpViewportLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpViewportLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_VIEWPORT_LAYOUT;}
- virtual void RegisterStyle();
- virtual void XFConvert(XFContentContainer* pCont);
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_VIEWPORT_LAYOUT;}
+ virtual void RegisterStyle() SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
#endif
diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.hxx b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
index 9c534f903901..dd1863dfb8b5 100644
--- a/lotuswordpro/source/filter/lwpnumberingoverride.hxx
+++ b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
@@ -69,7 +69,7 @@ public:
LwpNumberingOverride();
virtual ~LwpNumberingOverride(){}
- virtual LwpNumberingOverride* clone() const;
+ virtual LwpNumberingOverride* clone() const SAL_OVERRIDE;
enum
{
@@ -79,7 +79,7 @@ public:
SMARTLEVEL = 0x0008
};
public:
- virtual void Read(LwpObjectStream *pStrm);
+ virtual void Read(LwpObjectStream *pStrm) SAL_OVERRIDE;
inline sal_uInt16 GetLevel() const;
inline sal_uInt16 GetPosition() const;
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx
index 28b86570f5ad..ae7bb1ba7426 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.hxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx
@@ -311,7 +311,7 @@ public:
:LwpVirtualPiece(objHdr, pStrm),cNumerics(m_pObjStrm){}
~LwpLayoutNumerics(){}
XFStyle* Convert();
- virtual void Read();
+ virtual void Read() SAL_OVERRIDE;
protected:
LwpNumericFormat cNumerics;
diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx
index 8acdf94faed5..46b764d5e2dd 100644
--- a/lotuswordpro/source/filter/lwpoleobject.hxx
+++ b/lotuswordpro/source/filter/lwpoleobject.hxx
@@ -94,7 +94,7 @@ class LwpGraphicOleObject : public LwpContent
{
public:
LwpGraphicOleObject(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
- virtual void Read();
+ virtual void Read() SAL_OVERRIDE;
virtual void GetGrafScaledSize(double& fWidth, double& fHeight);
virtual void GetGrafOrgSize(double& rWidth, double& rHeight);
protected:
@@ -113,11 +113,11 @@ class LwpOleObject : public LwpGraphicOleObject
public:
LwpOleObject(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
~LwpOleObject(){}
- virtual void Read();
- virtual void Parse(IXFStream* pOutputStream);
- virtual void XFConvert(XFContentContainer * pCont);
- virtual void RegisterStyle();
- void GetGrafOrgSize(double& rWidth, double& rHeight) ;
+ virtual void Read() SAL_OVERRIDE;
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer * pCont) SAL_OVERRIDE;
+ virtual void RegisterStyle() SAL_OVERRIDE;
+ void GetGrafOrgSize(double& rWidth, double& rHeight) SAL_OVERRIDE ;
private:
sal_uInt16 cPersistentFlags;
diff --git a/lotuswordpro/source/filter/lwpoverride.hxx b/lotuswordpro/source/filter/lwpoverride.hxx
index 82483ed4b1c7..0f6b3c373efb 100644
--- a/lotuswordpro/source/filter/lwpoverride.hxx
+++ b/lotuswordpro/source/filter/lwpoverride.hxx
@@ -111,9 +111,9 @@ class LwpTextLanguageOverride : public LwpOverride
public:
LwpTextLanguageOverride() : m_nLanguage(0) {}
- virtual LwpTextLanguageOverride* clone() const;
+ virtual LwpTextLanguageOverride* clone() const SAL_OVERRIDE;
- void Read(LwpObjectStream* pStrm);
+ void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
protected:
LwpTextLanguageOverride(LwpTextLanguageOverride const& rOther);
@@ -130,9 +130,9 @@ class LwpTextAttributeOverride : public LwpOverride
public:
LwpTextAttributeOverride() : m_nHideLevels(0), m_nBaseLineOffset(0) {}
- virtual LwpTextAttributeOverride* clone() const;
+ virtual LwpTextAttributeOverride* clone() const SAL_OVERRIDE;
- void Read(LwpObjectStream* pStrm);
+ void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
inline sal_uInt16 GetHideLevels() const;
@@ -162,9 +162,9 @@ class LwpKinsokuOptsOverride : public LwpOverride
public:
LwpKinsokuOptsOverride() : m_nLevels(0) {}
- virtual LwpKinsokuOptsOverride* clone() const;
+ virtual LwpKinsokuOptsOverride* clone() const SAL_OVERRIDE;
- void Read(LwpObjectStream* pStrm);
+ void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
protected:
LwpKinsokuOptsOverride(LwpKinsokuOptsOverride const& rOther);
@@ -181,9 +181,9 @@ class LwpBulletOverride : public LwpOverride
public:
LwpBulletOverride() {m_bIsNull = sal_True;}
- virtual LwpBulletOverride* clone() const;
+ virtual LwpBulletOverride* clone() const SAL_OVERRIDE;
- void Read(LwpObjectStream* pStrm);
+ void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
inline LwpObjectID GetSilverBullet() const;
@@ -281,9 +281,9 @@ class LwpAlignmentOverride : public LwpOverride
public:
LwpAlignmentOverride() : m_nAlignType(ALIGN_LEFT), m_nPosition(0), m_nAlignChar(0){}
- virtual LwpAlignmentOverride* clone() const;
+ virtual LwpAlignmentOverride* clone() const SAL_OVERRIDE;
- void Read(LwpObjectStream* pStrm);
+ void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
enum AlignType
{
@@ -325,9 +325,9 @@ class LwpSpacingCommonOverride : public LwpOverride
public:
LwpSpacingCommonOverride() : m_nSpacingType(SPACING_NONE), m_nAmount(0), m_nMultiple(65536){}
- virtual LwpSpacingCommonOverride* clone() const;
+ virtual LwpSpacingCommonOverride* clone() const SAL_OVERRIDE;
- void Read(LwpObjectStream* pStrm);
+ void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
enum SpacingType
{
@@ -370,9 +370,9 @@ public:
LwpSpacingOverride();
virtual ~LwpSpacingOverride();
- virtual LwpSpacingOverride* clone() const;
+ virtual LwpSpacingOverride* clone() const SAL_OVERRIDE;
- void Read(LwpObjectStream* pStrm);
+ void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
void Override(LwpSpacingOverride* other);
@@ -399,9 +399,9 @@ class LwpIndentOverride : public LwpOverride
public:
LwpIndentOverride() : m_nAll(0), m_nFirst(0), m_nRest(0), m_nRight(0) {}
- virtual LwpIndentOverride* clone() const;
+ virtual LwpIndentOverride* clone() const SAL_OVERRIDE;
- void Read(LwpObjectStream* pStrm);
+ void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
enum
{
@@ -480,9 +480,9 @@ public:
virtual ~LwpAmikakeOverride();
- virtual LwpAmikakeOverride* clone() const;
+ virtual LwpAmikakeOverride* clone() const SAL_OVERRIDE;
- void Read(LwpObjectStream* pStrm);
+ void Read(LwpObjectStream* pStrm) SAL_OVERRIDE;
enum
{
AMIKAKE_NONE = 0,
diff --git a/lotuswordpro/source/filter/lwppagehint.hxx b/lotuswordpro/source/filter/lwppagehint.hxx
index 712f54a36f6c..12ecc73c8634 100644
--- a/lotuswordpro/source/filter/lwppagehint.hxx
+++ b/lotuswordpro/source/filter/lwppagehint.hxx
@@ -101,8 +101,8 @@ class LwpPageHint : public LwpDLVList
public:
LwpPageHint(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpPageHint(){}
- void Read();
- void Parse(IXFStream* pOutputStream);
+ void Read() SAL_OVERRIDE;
+ void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
sal_uInt16 GetPageNumber(){return m_nPageNumber;}
LwpObjectID* GetCurrentSectionID(){return &m_CurrentSection;}
sal_uInt16 GetCurrentSectionPage(){return m_nCurrentSectionPage;}
diff --git a/lotuswordpro/source/filter/lwppagelayout.hxx b/lotuswordpro/source/filter/lwppagelayout.hxx
index c3f348313f16..bb385e63f10a 100644
--- a/lotuswordpro/source/filter/lwppagelayout.hxx
+++ b/lotuswordpro/source/filter/lwppagelayout.hxx
@@ -71,12 +71,12 @@ class LwpPageLayout: public LwpLayout
public:
LwpPageLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpPageLayout();
- virtual void RegisterStyle();
+ virtual void RegisterStyle() SAL_OVERRIDE;
OUString RegisterEndnoteStyle();
- virtual void Parse(IXFStream* pOutputStream);
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_PAGE_LAYOUT;}
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_PAGE_LAYOUT;}
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
LwpHeaderLayout* GetHeaderLayout();
LwpFooterLayout* GetFooterLayout();
//void RegisterChildStyle();
@@ -94,8 +94,8 @@ protected:
void ParseFootNoteSeparator(XFPageMaster* pm1);
double GetMarginWidth();
void GetWidthAndHeight(double& fWidth, double& fHeight);
- double GetWidth();
- double GetHeight();
+ double GetWidth() SAL_OVERRIDE;
+ double GetHeight() SAL_OVERRIDE;
protected:
LwpAtomHolder* m_pPrinterBinName;
sal_uInt16 m_nPrinterBin;
@@ -108,7 +108,7 @@ public:
void ConvertFillerPageText(XFContentContainer* pCont);
void ResetXFColumns();
LwpPageLayout* GetOddChildLayout();
- virtual sal_Int32 GetPageNumber(sal_uInt16 nLayoutNumber = 0);
+ virtual sal_Int32 GetPageNumber(sal_uInt16 nLayoutNumber = 0) SAL_OVERRIDE;
sal_Bool operator <(LwpPageLayout& Other);
LwpPara* GetPagePosition();
};
@@ -120,12 +120,12 @@ class LwpHeaderLayout: public LwpPlacableLayout
public:
LwpHeaderLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpHeaderLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_HEADER_LAYOUT;}
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_HEADER_LAYOUT;}
using LwpPlacableLayout::RegisterStyle;
void RegisterStyle( XFPageMaster* pm1 );
void RegisterStyle( XFMasterPage* mp1 );
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
void ParseMargins( XFHeaderStyle* ph1 );
void ParseBorder( XFHeaderStyle* ph1 );
void ParseShadow( XFHeaderStyle* ph1 );
@@ -146,12 +146,12 @@ class LwpFooterLayout: public LwpPlacableLayout
public:
LwpFooterLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpFooterLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_FOOTER_LAYOUT;}
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_FOOTER_LAYOUT;}
using LwpPlacableLayout::RegisterStyle;
void RegisterStyle(XFPageMaster* pm1);
void RegisterStyle(XFMasterPage* mp1);
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
void ParseMargins( XFFooterStyle* pFooterStyle );
void ParseBorder( XFFooterStyle* pFooterStyle );
void ParseShadow( XFFooterStyle* pFooterStyle );
diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx
index 515250ee3dc9..5fb164c12943 100644
--- a/lotuswordpro/source/filter/lwppara.hxx
+++ b/lotuswordpro/source/filter/lwppara.hxx
@@ -150,10 +150,10 @@ public:
LwpPara(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
~LwpPara();
public:
- void Read();
- void RegisterStyle();
- void Parse(IXFStream* pOutputStream);
- void XFConvert(XFContentContainer* pCont);
+ void Read() SAL_OVERRIDE;
+ void RegisterStyle() SAL_OVERRIDE;
+ void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+ void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
void Release();
LwpPara* GetParent();
diff --git a/lotuswordpro/source/filter/lwpparaborderoverride.hxx b/lotuswordpro/source/filter/lwpparaborderoverride.hxx
index ed757282b2f6..5be5f1e62a52 100644
--- a/lotuswordpro/source/filter/lwpparaborderoverride.hxx
+++ b/lotuswordpro/source/filter/lwpparaborderoverride.hxx
@@ -72,7 +72,7 @@ public:
LwpParaBorderOverride();
virtual ~LwpParaBorderOverride();
- virtual LwpParaBorderOverride* clone() const;
+ virtual LwpParaBorderOverride* clone() const SAL_OVERRIDE;
enum BorderWidthType
{
@@ -82,7 +82,7 @@ public:
PB_CUSTOMWIDTH = 3 /* Border width is specified explicitly */
};
public:
- virtual void Read(LwpObjectStream *pStrm);
+ virtual void Read(LwpObjectStream *pStrm) SAL_OVERRIDE;
LwpShadow* GetShadow(){ return m_pShadow; }
LwpBorderStuff* GetBorderStuff(){ return m_pBorderStuff; }
diff --git a/lotuswordpro/source/filter/lwpparaproperty.hxx b/lotuswordpro/source/filter/lwpparaproperty.hxx
index 60fb965be79b..9675942cf68b 100644
--- a/lotuswordpro/source/filter/lwpparaproperty.hxx
+++ b/lotuswordpro/source/filter/lwpparaproperty.hxx
@@ -119,7 +119,7 @@ public:
LwpParaAlignProperty(LwpObjectStream* pFile);
virtual ~LwpParaAlignProperty(void);
LwpAlignmentOverride* GetAlignment(void);
- sal_uInt32 GetType(void);
+ sal_uInt32 GetType(void) SAL_OVERRIDE;
private:
LwpAlignmentOverride* m_pAlignment;
@@ -136,7 +136,7 @@ public:
LwpParaIndentProperty(LwpObjectStream* pFile);
virtual ~LwpParaIndentProperty(void);
LwpIndentOverride* GetIndent(void);
- sal_uInt32 GetType(void);
+ sal_uInt32 GetType(void) SAL_OVERRIDE;
inline LwpObjectID GetIndentID();
private:
@@ -158,7 +158,7 @@ public:
LwpParaSpacingProperty(LwpObjectStream* pFile);
virtual ~LwpParaSpacingProperty(void);
LwpSpacingOverride* GetSpacing(void);
- sal_uInt32 GetType(void);
+ sal_uInt32 GetType(void) SAL_OVERRIDE;
private:
LwpSpacingOverride* m_pSpacing;
@@ -175,7 +175,7 @@ class LwpParaBorderProperty : public LwpParaProperty
public:
LwpParaBorderProperty(LwpObjectStream* pStrm);
- inline sal_uInt32 GetType();
+ inline sal_uInt32 GetType() SAL_OVERRIDE;
inline LwpParaBorderOverride* GetLocalParaBorder();
@@ -198,7 +198,7 @@ class LwpParaBreaksProperty : public LwpParaProperty
public:
LwpParaBreaksProperty(LwpObjectStream* pStrm);
- inline sal_uInt32 GetType();
+ inline sal_uInt32 GetType() SAL_OVERRIDE;
inline LwpBreaksOverride* GetLocalParaBreaks();
@@ -223,7 +223,7 @@ public:
virtual ~LwpParaBulletProperty();
- inline sal_uInt32 GetType();
+ inline sal_uInt32 GetType() SAL_OVERRIDE;
inline LwpBulletOverride* GetLocalParaBullet();
@@ -245,7 +245,7 @@ class LwpParaNumberingProperty : public LwpParaProperty
public:
LwpParaNumberingProperty(LwpObjectStream* pStrm);
- inline sal_uInt32 GetType();
+ inline sal_uInt32 GetType() SAL_OVERRIDE;
inline LwpNumberingOverride* GetLocalNumbering() const;
private:
@@ -265,7 +265,7 @@ class LwpParaTabRackProperty : public LwpParaProperty
public:
LwpParaTabRackProperty(LwpObjectStream* pStrm);
~LwpParaTabRackProperty(void);
- inline sal_uInt32 GetType();
+ inline sal_uInt32 GetType() SAL_OVERRIDE;
inline LwpTabOverride* GetTab();
@@ -289,7 +289,7 @@ public:
LwpParaBackGroundProperty(LwpObjectStream* pFile);
virtual ~LwpParaBackGroundProperty(void);
LwpBackgroundOverride* GetBackground(void);
- sal_uInt32 GetType(void);
+ sal_uInt32 GetType(void) SAL_OVERRIDE;
private:
LwpBackgroundOverride* m_pBackground;
};
diff --git a/lotuswordpro/source/filter/lwpparastyle.hxx b/lotuswordpro/source/filter/lwpparastyle.hxx
index 40e4c615c08f..86e8f02c897b 100644
--- a/lotuswordpro/source/filter/lwpparastyle.hxx
+++ b/lotuswordpro/source/filter/lwpparastyle.hxx
@@ -82,7 +82,7 @@ public:
virtual ~LwpParaStyle();
- void Read();
+ void Read() SAL_OVERRIDE;
virtual void Apply(XFParaStyle *pStrm);
// 01/26/2005
@@ -95,7 +95,7 @@ public:
static void ApplyTab(XFParaStyle* pParaStyle, LwpTabOverride* pTab);
- void RegisterStyle();
+ void RegisterStyle() SAL_OVERRIDE;
LwpAlignmentOverride* GetAlignment();//add by 1-24
LwpIndentOverride* GetIndent();
diff --git a/lotuswordpro/source/filter/lwppiece.hxx b/lotuswordpro/source/filter/lwppiece.hxx
index 576b14964bff..de60072cec65 100644
--- a/lotuswordpro/source/filter/lwppiece.hxx
+++ b/lotuswordpro/source/filter/lwppiece.hxx
@@ -93,7 +93,7 @@ public:
delete m_pOverride;
}
- virtual void Read()
+ virtual void Read() SAL_OVERRIDE
{
LwpDLVList::Read();
if( m_pOverride )
diff --git a/lotuswordpro/source/filter/lwpproplist.hxx b/lotuswordpro/source/filter/lwpproplist.hxx
index 311fbf0e7719..65aca5d99eaf 100644
--- a/lotuswordpro/source/filter/lwpproplist.hxx
+++ b/lotuswordpro/source/filter/lwpproplist.hxx
@@ -74,7 +74,7 @@ class LwpPropListElement : public LwpDLVList
public:
LwpPropListElement(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
~LwpPropListElement(){}
- void Read();
+ void Read() SAL_OVERRIDE;
sal_Bool IsNamed(const OUString& name);
LwpPropListElement* GetNext();
LwpAtomHolder GetValue(){return m_Value;}
diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx
index 4d54d632c9ee..0b33d98e8abc 100644
--- a/lotuswordpro/source/filter/lwprowlayout.hxx
+++ b/lotuswordpro/source/filter/lwprowlayout.hxx
@@ -80,13 +80,13 @@ class LwpRowLayout : public LwpVirtualLayout
public:
LwpRowLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpRowLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_ROW_LAYOUT;}
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_ROW_LAYOUT;}
sal_uInt16 GetRowID() { return crowid;}
- virtual void RegisterStyle();
+ virtual void RegisterStyle() SAL_OVERRIDE;
inline LwpTableLayout * GetParentTableLayout(){return dynamic_cast<LwpTableLayout *>(GetParent()->obj());}
void SetRowMap(void);
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
sal_uInt16 crowid;
sal_Int32 cheight; // Minimum height if height is automatic.
sal_uInt8 cLeaderDotCount; // dfb - # of cells with leader dots
@@ -122,9 +122,9 @@ class LwpRowHeadingLayout : public LwpRowLayout
public:
LwpRowHeadingLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpRowHeadingLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_ROW_HEADING_LAYOUT;}
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_ROW_HEADING_LAYOUT;}
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
LwpObjectID cRowLayout;
};
diff --git a/lotuswordpro/source/filter/lwpsection.hxx b/lotuswordpro/source/filter/lwpsection.hxx
index 9eeedd0f6c83..e7ac646fada4 100644
--- a/lotuswordpro/source/filter/lwpsection.hxx
+++ b/lotuswordpro/source/filter/lwpsection.hxx
@@ -76,7 +76,7 @@ class LwpOrderedObject : public LwpDLNFVList
public:
LwpOrderedObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpOrderedObject(){}
- void Read();
+ void Read() SAL_OVERRIDE;
LwpObjectID* GetPosition(){ return &m_Para;}
LwpObjectID* GetListList(){ return &m_ListList;}
protected:
@@ -99,11 +99,11 @@ public:
inline LwpPageLayout* GetPageLayout();
inline LwpColor* GetColor();
inline LwpAtomHolder* GetAtomHolder();
- void Parse(IXFStream* pOutputStream);
+ void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
OUString GetSectionName(){return m_AtomHolder.str();}
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
private:
sal_uInt16 m_Flags;
LwpObjectID m_PageLayout;
@@ -156,7 +156,7 @@ public:
sal_Bool IsFormatRunin();
sal_Bool IsFormatSeparator();
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
private:
enum{
SEPARATORS = 0x01,
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.hxx b/lotuswordpro/source/filter/lwpsilverbullet.hxx
index 342e06a09bbe..e257f9f2c1a7 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.hxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.hxx
@@ -97,9 +97,9 @@ public:
virtual ~LwpSilverBullet();
- virtual void RegisterStyle();
+ virtual void RegisterStyle() SAL_OVERRIDE;
- void Read();
+ void Read() SAL_OVERRIDE;
sal_Bool IsBulletOrdered();
diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx
index 79ad90878d05..f17d60207a55 100644
--- a/lotuswordpro/source/filter/lwpstory.hxx
+++ b/lotuswordpro/source/filter/lwpstory.hxx
@@ -96,15 +96,15 @@ private:
XFContentContainer* m_pXFContainer;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
void XFConvertFrameInCell(XFContentContainer* pCont);
void XFConvertFrameInFrame(XFContentContainer* pCont);
void XFConvertFrameInHeaderFooter(XFContentContainer* pCont);
public:
- void RegisterStyle();
- void Parse(IXFStream* pOutputStream);
- virtual void XFConvert(XFContentContainer* pCont);
+ void RegisterStyle() SAL_OVERRIDE;
+ void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
void XFConvertFrameInPage(XFContentContainer* pCont);
inline LwpDLVListHeadTail* GetParaList();
inline LwpObjectID* GetFirstPara();
diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx
index 98f8770c4102..6fb2dce860b2 100644
--- a/lotuswordpro/source/filter/lwptable.hxx
+++ b/lotuswordpro/source/filter/lwptable.hxx
@@ -84,12 +84,12 @@ public:
LwpSuperTable(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpSuperTable();
- virtual void Parse(IXFStream* pOutputStream);
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
//Added by for XFConvert refactor, 03/31/2005
- virtual void XFConvert(XFContentContainer* pCont);
+ virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
//End of Add
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
* @brief
@@ -118,7 +118,7 @@ public:
LwpTable(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpTable();
- virtual void Parse(IXFStream* pOutputStream);
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
double GetWidth() {return LwpTools::ConvertFromUnitsToMetric(m_nWidth);}
double GetHeight() {return LwpTools::ConvertFromUnitsToMetric(m_nHeight);}
LwpObjectID * GetDefaultCellStyle() {return &m_DefaultCellStyle;}
@@ -126,7 +126,7 @@ public:
sal_uInt16 GetColumn() {return m_nColumn;}
LwpTableLayout * GetTableLayout(){return static_cast<LwpTableLayout *>(GetLayout(NULL));}
sal_Bool IsNumberDown();
- virtual sal_Bool IsTable(){ return sal_True;}
+ virtual sal_Bool IsTable() SAL_OVERRIDE { return sal_True;}
LwpSuperTableLayout* GetSuperTableLayout();
protected:
LwpDLVListHeadTail m_RowCache;
@@ -148,7 +148,7 @@ protected:
LwpObjectID m_Layout;
LwpObjectID m_DefaultCellStyle; // gCVirtualLayout
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
@@ -161,9 +161,9 @@ public:
LwpTableHeading(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpTableHeading();
- virtual void Parse(IXFStream* pOutputStream);
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
class LwpParallelColumns : public LwpTable
@@ -172,7 +172,7 @@ public:
LwpParallelColumns(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpParallelColumns();
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
LwpObjectID cDefaultLeftColumnStyle;
LwpObjectID cDefaultRightColumnStyle;
};
@@ -183,7 +183,7 @@ public:
LwpGlossary(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpGlossary();
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
sal_uInt16 GetNumIndexRows(void);
};
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx
index f5a5adf138c9..d1bfcff03c73 100644
--- a/lotuswordpro/source/filter/lwptablelayout.hxx
+++ b/lotuswordpro/source/filter/lwptablelayout.hxx
@@ -89,9 +89,9 @@ class LwpTableLayout: public LwpLayout
public:
LwpTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpTableLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_TABLE_LAYOUT;}
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_TABLE_LAYOUT;}
LwpObjectID * GetColumnLayoutHead(){return &m_ColumnLayout;}
- void RegisterStyle();
+ void RegisterStyle() SAL_OVERRIDE;
LwpTable * GetTable();
LwpCellLayout * GetDefaultCellLayout(){return m_pDefaultCellLayout;}
LwpSuperTableLayout * GetSuperTableLayout();
@@ -105,7 +105,7 @@ public:
m_WordProCellsMap[nRow * m_nCols + nCol] = pCell;
};
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
void TraverseTable();
void RegisterColumns();
void RegisterRows();
@@ -129,7 +129,7 @@ private:
LwpColumnLayout ** m_pColumns;
public:
- void XFConvert(XFContentContainer* pCont);
+ void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
void ConvertTable(XFTable* pXFTable,sal_uInt16 nStartRow,
sal_uInt16 nEndRow,sal_uInt8 nStartCol,sal_uInt8 nEndCol);
OUString GetDefaultRowStyleName(){return m_DefaultRowStyleName;}
@@ -162,7 +162,7 @@ class LwpSuperTableLayout: public LwpPlacableLayout
public:
LwpSuperTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpSuperTableLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_SUPERTABLE_LAYOUT;}
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_SUPERTABLE_LAYOUT;}
void RegisterNewStyle();
// for table style
// add by , 06/03/2005
@@ -172,17 +172,17 @@ public:
void ApplyBackColor(XFTableStyle *pTableStyle);
void ApplyShadow(XFTableStyle *pTableStyle);
- double GetWidth();
+ double GetWidth() SAL_OVERRIDE;
double GetTableWidth();
void ApplyWatermark(XFTableStyle *pTableStyle);
void ApplyAlignment(XFTableStyle * pTableStyle);
- void XFConvert(XFContentContainer* pCont);
+ void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
// for frame style
- virtual void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, sal_Bool bAll = sal_False);
+ virtual void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, sal_Bool bAll = sal_False) SAL_OVERRIDE;
void RegisterFrameStyle();
LwpTableHeadingLayout* GetTableHeadingLayout();
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
LwpTableLayout* GetTableLayout();
sal_Bool IsSizeRightToContent();
sal_Bool IsJustifiable();
@@ -199,14 +199,14 @@ class LwpColumnLayout : public LwpVirtualLayout
public:
LwpColumnLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpColumnLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_COLUMN_LAYOUT;}
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_COLUMN_LAYOUT;}
sal_uInt32 GetColumnID(){return ccolid;}
- double GetWidth(){return LwpTools::ConvertFromUnitsToMetric(cwidth);}
+ double GetWidth() SAL_OVERRIDE {return LwpTools::ConvertFromUnitsToMetric(cwidth);}
using LwpVirtualLayout::RegisterStyle;
void RegisterStyle(double dCalculatedWidth);
sal_Bool IsJustifiable(){return (( m_nAttributes2 & STYLE2_JUSTIFIABLE) != 0);}
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
sal_uInt8 ccolid;
sal_Int32 cwidth;
@@ -220,11 +220,11 @@ class LwpTableHeadingLayout : public LwpTableLayout
public:
LwpTableHeadingLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpTableHeadingLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_TABLE_HEADING_LAYOUT;}
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_TABLE_HEADING_LAYOUT;}
void GetStartEndRow(sal_uInt16& nStartRow, sal_uInt16& nEndRow);
LwpRowHeadingLayout * GetFirstRowHeadingLayout();
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
sal_uInt16 cStartRow;
sal_uInt16 cEndRow;
};
@@ -238,7 +238,7 @@ public:
LwpSuperParallelColumnLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpSuperParallelColumnLayout();
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
@@ -251,7 +251,7 @@ public:
LwpParallelColumnsLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpParallelColumnsLayout();
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
class LwpSuperGlossaryLayout : public LwpSuperTableLayout
@@ -260,7 +260,7 @@ public:
LwpSuperGlossaryLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpSuperGlossaryLayout();
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
#include "lwpcelllayout.hxx"
diff --git a/lotuswordpro/source/filter/lwptaboverride.hxx b/lotuswordpro/source/filter/lwptaboverride.hxx
index 323bb731ca16..2e8c5ed71500 100644
--- a/lotuswordpro/source/filter/lwptaboverride.hxx
+++ b/lotuswordpro/source/filter/lwptaboverride.hxx
@@ -74,9 +74,9 @@ public:
{
}
- virtual LwpTabOverride* clone() const;
+ virtual LwpTabOverride* clone() const SAL_OVERRIDE;
- virtual void Read(LwpObjectStream *pStrm)
+ virtual void Read(LwpObjectStream *pStrm) SAL_OVERRIDE
{
if (pStrm->QuickReadBool())
{
diff --git a/lotuswordpro/source/filter/lwptabrack.hxx b/lotuswordpro/source/filter/lwptabrack.hxx
index 09737ad1fe18..9fe3170d07c0 100644
--- a/lotuswordpro/source/filter/lwptabrack.hxx
+++ b/lotuswordpro/source/filter/lwptabrack.hxx
@@ -139,7 +139,7 @@ public:
LwpTabRack(LwpObjectHeader objHdr, LwpSvStream* pStrm);
virtual ~LwpTabRack(){}
public:
- void Read();
+ void Read() SAL_OVERRIDE;
sal_uInt16 GetNumTabs();
LwpTab* Lookup(sal_uInt16 nIndex);
LwpTabRack* GetNext();
diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx
index a8a26d286dcc..83e811a6e83e 100644
--- a/lotuswordpro/source/filter/lwptblcell.hxx
+++ b/lotuswordpro/source/filter/lwptblcell.hxx
@@ -85,7 +85,7 @@ public:
LwpCellList(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpCellList();
- virtual void Parse(IXFStream* pOutputStream);
+ virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
LwpObjectID GetNextID(){return *GetNext();}
sal_uInt8 GetColumnID(){return cColumn;}
virtual sal_Bool IsFormula(){return sal_False;}
@@ -96,7 +96,7 @@ protected:
sal_uInt8 cColumn;
LwpObjectID cParent;
- void Read();
+ void Read() SAL_OVERRIDE;
LwpObjectID cValue;
};
/**
@@ -109,7 +109,7 @@ public:
LwpRowList(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpRowList();
- void Parse(IXFStream* pOutputStream);
+ void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
LwpObjectID GetChildHeadID(){return *cChild.GetHead();}
LwpObjectID GetNextID(){return *GetNext();}
sal_uInt16 GetRowID(){return cRowID;}
@@ -117,7 +117,7 @@ protected:
LwpDLVListHeadTail cChild;
LwpObjectID cParent;
sal_uInt16 cRowID;
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
* @brief
@@ -130,11 +130,11 @@ public:
~LwpNumericValue();
double GetValue(){return cNumber;}
- void Parse(IXFStream* pOutputStream);
+ void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
protected:
double cNumber;
//LwpContent m_TheContent;
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
@@ -147,14 +147,14 @@ public:
LwpTableRange(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpTableRange();
- void Parse(IXFStream* pOutputStream);
+ void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
LwpObjectID GetCellRangeID(){return cpCellRange;}
LwpObjectID GetTableID(){ return cqTable;}
LwpTableRange* GetNext() { return (LwpTableRange*)(LwpDLVList::GetNext()->obj());}
protected:
LwpObjectID cqTable;
LwpObjectID cpCellRange;
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
* @brief
@@ -166,11 +166,11 @@ public:
LwpCellRange(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpCellRange();
- void Parse(IXFStream* pOutputStream);
+ void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
LwpObjectID GetFolderID(){return cpFolder;}
protected:
LwpObjectID cpFolder;
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
* @brief
@@ -182,13 +182,13 @@ public:
LwpFolder(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpFolder();
- void Parse(IXFStream* pOutputStream);
+ void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
LwpObjectID GetChildHeadID(){ return *cChild.GetHead();}
protected:
LwpDLVListHeadTail cChild;
LwpObjectID cParent;
LwpObjectID cqTable;
- void Read();
+ void Read() SAL_OVERRIDE;
};
/**
* @brief
@@ -200,9 +200,9 @@ public:
LwpDependent(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpDependent();
- void Parse(IXFStream* pOutputStream);
+ void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
LwpObjectID cFormulaInfo;
sal_uInt16 cReferenceOffset; // Used to fix dependent formula when we're
// dropped, sorted.
diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx
index ea8da42acad5..d10b3f50a23f 100644
--- a/lotuswordpro/source/filter/lwptblformula.hxx
+++ b/lotuswordpro/source/filter/lwptblformula.hxx
@@ -125,7 +125,7 @@ class LwpFormulaConst:public LwpFormulaArg
{
public:
LwpFormulaConst( double dVal);
- virtual OUString ToString(LwpTableLayout* pCellsMap);
+ virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
private:
double m_dVal;
};
@@ -134,7 +134,7 @@ class LwpFormulaText:public LwpFormulaArg
{
public:
LwpFormulaText( const OUString& aText);
- virtual OUString ToString(LwpTableLayout* /*pCellsMap*/){return m_aText;}
+ virtual OUString ToString(LwpTableLayout* /*pCellsMap*/) SAL_OVERRIDE {return m_aText;}
private:
OUString m_aText;
};
@@ -147,7 +147,7 @@ public:
sal_Int16 GetCol(){return m_aCol;}
sal_Int16 GetRow(){return m_aRow;}
- virtual OUString ToString(LwpTableLayout* pCellsMap);
+ virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
private:
sal_Int16 m_aCol;
sal_Int16 m_aRow;
@@ -158,7 +158,7 @@ class LwpFormulaCellRangeAddr:public LwpFormulaArg
public:
LwpFormulaCellRangeAddr(sal_Int16 aStartCol, sal_Int16 aStartRow, sal_Int16 aEndCol, sal_Int16 aEndRow);
- virtual OUString ToString(LwpTableLayout* pCellsMap);
+ virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
private:
sal_Int16 m_aStartCol;
sal_Int16 m_aStartRow;
@@ -174,8 +174,8 @@ public:
void AddArg(LwpFormulaArg* pArg);
- virtual OUString ToString(LwpTableLayout* pCellsMap);
- OUString ToArgString(LwpTableLayout* pCellsMap);
+ virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
+ OUString ToArgString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
protected:
vector<LwpFormulaArg*> m_aArgs;
@@ -186,14 +186,14 @@ class LwpFormulaOp : public LwpFormulaFunc
{
public:
LwpFormulaOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;}
- virtual OUString ToString(LwpTableLayout* pCellsMap);
+ virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
};
class LwpFormulaUnaryOp : public LwpFormulaFunc
{
public:
LwpFormulaUnaryOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;}
- virtual OUString ToString(LwpTableLayout* pCellsMap);
+ virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE;
};
class LwpFormulaInfo : public LwpCellList
@@ -201,12 +201,12 @@ class LwpFormulaInfo : public LwpCellList
public:
LwpFormulaInfo(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpFormulaInfo();
- sal_Bool IsFormula(){return sal_True;}
+ sal_Bool IsFormula() SAL_OVERRIDE {return sal_True;}
void SetRow(sal_uInt16 nRow){ m_nFormulaRow = nRow;}
OUString Convert(LwpTableLayout* pCellsMap);
- void Convert(XFCell * pCell, LwpTableLayout* pCellsMap);
+ void Convert(XFCell * pCell, LwpTableLayout* pCellsMap) SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
sal_Bool ReadCellID();
sal_Bool ReadText();
sal_Bool ReadCellRange();
diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx
index 53b3a021a54e..73186eecc836 100644
--- a/lotuswordpro/source/filter/lwptoc.hxx
+++ b/lotuswordpro/source/filter/lwptoc.hxx
@@ -75,12 +75,12 @@ class LwpTocSuperLayout : public LwpSuperTableLayout
public:
LwpTocSuperLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpTocSuperLayout();
- void RegisterStyle();
- virtual void XFConvert(XFContentContainer* pCont);
- virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_TOC_SUPERTABLE_LAYOUT;}
- virtual void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, sal_Bool bAll = sal_False);
+ void RegisterStyle() SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
+ virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_TOC_SUPERTABLE_LAYOUT;}
+ virtual void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, sal_Bool bAll = sal_False) SAL_OVERRIDE;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
sal_Bool GetRightAlignPageNumber(sal_uInt16 index);
sal_Bool GetUsePageNumber(sal_uInt16 index);
sal_uInt16 GetSeparatorType(sal_uInt16 index);
@@ -151,8 +151,8 @@ public:
};
LwpTocLevelData(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
~LwpTocLevelData();
- void RegisterStyle();
- virtual void XFConvert(XFContentContainer* pCont);
+ void RegisterStyle() SAL_OVERRIDE;
+ virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE;
inline sal_uInt16 GetLevel(void){return m_nLevel;}
inline sal_Bool GetUseText(void){ return (m_nFlags & USETEXT) ? sal_True : sal_False;}
inline OUString GetSearchStyle(void){return m_SearchName.str();}
@@ -163,7 +163,7 @@ private:
LwpAtomHolder m_SearchName;
protected:
- void Read();
+ void Read() SAL_OVERRIDE;
};
#endif
diff --git a/lotuswordpro/source/filter/lwpverdocument.hxx b/lotuswordpro/source/filter/lwpverdocument.hxx
index a1b6cf00beca..e392d193f33f 100644
--- a/lotuswordpro/source/filter/lwpverdocument.hxx
+++ b/lotuswordpro/source/filter/lwpverdocument.hxx
@@ -76,8 +76,8 @@ class LwpVerDocument : public LwpObject
public:
LwpVerDocument(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
~LwpVerDocument(){}
- void Read();
- virtual void RegisterStyle();
+ void Read() SAL_OVERRIDE;
+ virtual void RegisterStyle() SAL_OVERRIDE;
private:
sal_uInt32 m_nTabSpacing;
};
diff --git a/lotuswordpro/source/filter/lwpvpointer.hxx b/lotuswordpro/source/filter/lwpvpointer.hxx
index 54233f460e5a..23aaf6097227 100644
--- a/lotuswordpro/source/filter/lwpvpointer.hxx
+++ b/lotuswordpro/source/filter/lwpvpointer.hxx
@@ -73,9 +73,9 @@ class LwpVersionedPointer : public LwpObject
public:
LwpVersionedPointer(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
~LwpVersionedPointer(){}
- void Read();
- void RegisterStyle();
- void Parse(IXFStream* pOutputStream);
+ void Read() SAL_OVERRIDE;
+ void RegisterStyle() SAL_OVERRIDE;
+ void Parse(IXFStream* pOutputStream) SAL_OVERRIDE;
LwpObjectID* GetPointer(){return &m_PointerID;}
protected:
LwpObjectID m_PointerID;
diff --git a/lotuswordpro/source/filter/xfilter/xfannotation.hxx b/lotuswordpro/source/filter/xfilter/xfannotation.hxx
index 4136b7b55ff2..26dfc20966d8 100644
--- a/lotuswordpro/source/filter/xfilter/xfannotation.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfannotation.hxx
@@ -71,7 +71,7 @@ public:
void SetAuthor(const OUString& author);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
OUString m_strDate;
diff --git a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx b/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
index b25a152edd01..04a13b976652 100644
--- a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
@@ -74,9 +74,9 @@ public:
void SetSVGPath(const OUString& path);
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
OUString m_strName;
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
index e81f0441f34e..80eaaf5d7453 100644
--- a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
@@ -101,9 +101,9 @@ public:
* @descr decide whether there has been a style that is the same as this object.
* If it use base64 stream, i'll simply return sal_False because it's too slow to compare two base64 stream.
*/
- virtual sal_Bool Equal(IXFStyle *pStyle);
+ virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
friend bool operator==(XFBGImage& img1, XFBGImage& img2);
friend bool operator!=(XFBGImage& img1, XFBGImage& img2);
diff --git a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
index d50c3d961d3c..29cc59c5182f 100644
--- a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
@@ -87,7 +87,7 @@ public:
m_strName = name;
}
- virtual void ToXml(IXFStream *pStrm)
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
diff --git a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx b/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
index a7cea3203d8c..fcf45d52feb3 100644
--- a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
@@ -82,7 +82,7 @@ public:
/**
* @descr Output breaks object.
*/
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
friend bool operator==(XFBreaks& b1, XFBreaks& b2);
friend bool operator!=(XFBreaks& b1, XFBreaks& b2);
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/source/filter/xfilter/xfcell.hxx
index 960fdb9377d1..19818a188465 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.hxx
@@ -88,7 +88,7 @@ public:
/**
* @descr Add content for table cell.
*/
- void Add(IXFContent *pContent);
+ void Add(IXFContent *pContent) SAL_OVERRIDE;
/**
* @descr If cell spans more the one column, then set column span.
@@ -158,7 +158,7 @@ public:
/**
* @descr Output cell as xml element.
*/
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
XFRow *m_pOwnerRow;
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
index 7459c24d434a..9bdb292ba802 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
@@ -125,11 +125,11 @@ public:
*/
void SetWrapText(sal_Bool wrap);
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual sal_Bool Equal(IXFStyle *pStyle);
+ virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
OUString m_strDataStyle;
diff --git a/lotuswordpro/source/filter/xfilter/xfchange.hxx b/lotuswordpro/source/filter/xfilter/xfchange.hxx
index 67fcdc7d5d0e..1a3cc0a8989d 100644
--- a/lotuswordpro/source/filter/xfilter/xfchange.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfchange.hxx
@@ -75,7 +75,7 @@ class XFChangeList : public XFContentContainer
public:
XFChangeList(){}
~XFChangeList(){}
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFChangeRegion : public XFContentContainer
@@ -83,7 +83,7 @@ class XFChangeRegion : public XFContentContainer
public:
XFChangeRegion(){}
~XFChangeRegion(){}
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
void SetChangeID(const OUString& sID){m_sID=sID;}
OUString GetChangeID(){return m_sID;}
void SetEditor(const OUString& sEditor){m_sEditor=sEditor;}
@@ -97,7 +97,7 @@ class XFChangeInsert : public XFChangeRegion
public:
XFChangeInsert(){}
~XFChangeInsert(){}
- void ToXml(IXFStream *pStrm);
+ void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFChangeDelete : public XFChangeRegion
@@ -105,7 +105,7 @@ class XFChangeDelete : public XFChangeRegion
public:
XFChangeDelete(){}
~XFChangeDelete(){}
- void ToXml(IXFStream *pStrm);
+ void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFChange : public XFContent
@@ -113,7 +113,7 @@ class XFChange : public XFContent
public:
XFChange(){}
~XFChange(){}
- void ToXml(IXFStream *pStrm);
+ void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
void SetChangeID(const OUString& sID){m_sID=sID;}
OUString GetChangeID(){return m_sID;}
private:
@@ -125,7 +125,7 @@ class XFChangeStart : public XFContent
public:
XFChangeStart(){}
~XFChangeStart(){}
- void ToXml(IXFStream *pStrm);
+ void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
void SetChangeID(const OUString& sID){m_sID=sID;}
OUString GetChangeID(){return m_sID;}
private:
@@ -137,7 +137,7 @@ class XFChangeEnd : public XFContent
public:
XFChangeEnd(){}
~XFChangeEnd(){}
- void ToXml(IXFStream *pStrm);
+ void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
void SetChangeID(const OUString& sID){m_sID=sID;}
OUString GetChangeID(){return m_sID;}
private:
diff --git a/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx
index 9198bd601673..2986e888737a 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx
@@ -84,12 +84,12 @@ public:
*/
double GetWidth();
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
/**
* @descr output column style as an xml node.
*/
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
double m_fWidth;
diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
index 34482622c134..d4ff9c222b73 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
@@ -94,7 +94,7 @@ public:
/**
* @descr output column style as an xml node.
*/
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
friend bool operator==(XFColumn& c1, XFColumn& c2);
friend bool operator!=(XFColumn& c1, XFColumn& c2);
@@ -121,7 +121,7 @@ public:
void SetColor(XFColor& color);
void SetVerticalAlign(enumXFAlignType align);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
friend bool operator==(XFColumnSep& sep1, XFColumnSep& sep2);
friend bool operator!=(XFColumnSep& sep1, XFColumnSep& sep2);
diff --git a/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx b/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx
index 0c580c5bef16..95e29f114d38 100644
--- a/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx
@@ -97,7 +97,7 @@ public:
/**
* @descr Output config information.
*/
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
XFLineNumberConfig *m_pLineNumberConfig;
diff --git a/lotuswordpro/source/filter/xfilter/xfcontent.hxx b/lotuswordpro/source/filter/xfilter/xfcontent.hxx
index 599fc988db63..a0e23b6c2020 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontent.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcontent.hxx
@@ -73,21 +73,21 @@ public:
/**
* @short: return the content type.
*/
- virtual enumXFContent GetContentType(){ return enumXFContentUnknown; }
+ virtual enumXFContent GetContentType() SAL_OVERRIDE { return enumXFContentUnknown; }
/**
* @short: All content except XFTextContent can have a style.
*/
- virtual void SetStyleName(const OUString& style){m_strStyleName = style;}
+ virtual void SetStyleName(const OUString& style) SAL_OVERRIDE {m_strStyleName = style;}
/**
* @short: return the style name.
*/
- virtual OUString GetStyleName(){return m_strStyleName;}
+ virtual OUString GetStyleName() SAL_OVERRIDE {return m_strStyleName;}
/**
*/
- virtual IXFContent* Clone(){return NULL;}
+ virtual IXFContent* Clone() SAL_OVERRIDE {return NULL;}
protected:
OUString m_strStyleName;
diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
index 3097de2347c9..e5d495ab9bb0 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
@@ -120,11 +120,11 @@ public:
/**
* @descr return the content type.
*/
- virtual enumXFContent GetContentType();
+ virtual enumXFContent GetContentType() SAL_OVERRIDE;
/**
* @descr Output to OOo model or local file.
*/
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
std::vector<IXFContent*> m_aContents;
diff --git a/lotuswordpro/source/filter/xfilter/xfcrossref.hxx b/lotuswordpro/source/filter/xfilter/xfcrossref.hxx
index 607265a27901..697af4c0d74f 100644
--- a/lotuswordpro/source/filter/xfilter/xfcrossref.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcrossref.hxx
@@ -73,7 +73,7 @@ public:
~XFCrossRefStart();
void SetRefType(sal_uInt8 nType);
void SetMarkName(const OUString& sName);
- void ToXml(IXFStream *pStrm);
+ void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
enum{
CROSSREF_INVALID = 0,
@@ -100,7 +100,7 @@ class XFCrossRefEnd : public XFContent
public:
XFCrossRefEnd();
~XFCrossRefEnd();
- void ToXml(IXFStream *pStrm);
+ void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
#endif
diff --git a/lotuswordpro/source/filter/xfilter/xfdate.hxx b/lotuswordpro/source/filter/xfilter/xfdate.hxx
index a629618be32f..859b4a43fa0f 100644
--- a/lotuswordpro/source/filter/xfilter/xfdate.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdate.hxx
@@ -82,7 +82,7 @@ public:
void SetFixed(sal_Bool fixed = sal_True);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
sal_Bool m_bFixed;
@@ -118,13 +118,13 @@ inline void XFDate::SetFixed(sal_Bool fixed)
class XFDateStart : public XFDate
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFDateEnd : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
#endif
diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
index 0395679915f3..403575603981 100644
--- a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
@@ -74,7 +74,7 @@ public:
public:
void SetTexture(sal_Bool bTexture);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
sal_Bool m_bTexture;
@@ -121,9 +121,9 @@ public:
void AddText( const OUString& part );
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
sal_Bool m_bFixed;
diff --git a/lotuswordpro/source/filter/xfilter/xfdocfield.hxx b/lotuswordpro/source/filter/xfilter/xfdocfield.hxx
index b07f177bce0b..56469661c3a6 100644
--- a/lotuswordpro/source/filter/xfilter/xfdocfield.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdocfield.hxx
@@ -67,130 +67,130 @@ class XFFileName : public XFContent
{
public:
void SetType(const OUString& sType);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
OUString m_strType;
};
class XFWordCount : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFWordCountStart : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFWordCountEnd : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFPageCountStart : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFPageCountEnd : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFCharCount : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFCharCountStart : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFCharCountEnd : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFDescription : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFDescriptionStart : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFDescriptionEnd : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFKeywords : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFTotalEditTime : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFTotalEditTimeEnd : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFTotalEditTimeStart : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFCreateTime : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFCreateTimeStart : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFCreateTimeEnd : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFLastEditTime : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFLastEditTimeStart : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFLastEditTimeEnd : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFInitialCreator : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
#endif
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx
index 6c57dffd70bd..d9e2b8888400 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx
@@ -86,9 +86,9 @@ public:
XFColor GetBackColor();
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
enumXFAreaStyle m_eAreaStyle;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx b/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx
index d75c4197caea..51a3e00cb306 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx
@@ -84,7 +84,7 @@ public:
/**
* @descr Output group object and all it's children.
*/
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
XFContentContainer m_aChildren;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawline.hxx b/lotuswordpro/source/filter/xfilter/xfdrawline.hxx
index 565cf0c948be..73c3cd8703bd 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawline.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawline.hxx
@@ -86,7 +86,7 @@ public:
/**
* @descr Output line object.
*/
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
XFPoint m_aPoint1;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx
index 2cf3df54f702..93e9c9871236 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx
@@ -129,9 +129,9 @@ public:
sal_Int32 GetTransparency();
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
enumXFLineStyle m_eLineStyle;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
index d079ffac8e73..b100bac7ab34 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
@@ -110,7 +110,7 @@ public:
void ContentToXml(IXFStream *pStrm);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
protected:
XFContentContainer m_aContents;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
index d3607e20820b..be61b0c5c09b 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
@@ -121,7 +121,7 @@ public:
*/
void ClosePath(sal_Bool absPosition = sal_True);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
std::vector<XFSvgPathEntry> m_aPaths;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.hxx
index 8b519330c538..a909a0cc9ea7 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.hxx
@@ -73,7 +73,7 @@ public:
XFDrawPolygon();
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
#endif
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx
index 300e5604bd4b..3d1b9a451c03 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx
@@ -75,7 +75,7 @@ public:
XFRect CalcViewBox();
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
protected:
std::vector<XFPoint> m_aPoints;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx b/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx
index d750d4b42e28..df567c7ec945 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx
@@ -78,7 +78,7 @@ public:
void SetCornerRadius(double fCornerRadius);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
double m_fCornerRadius;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
index 8e0870ab8a39..928eb680960b 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
@@ -120,9 +120,9 @@ public:
void SetFontWorkStyle(sal_Int8 nForm, enumXFFWStyle eStyle, enumXFFWAdjust eAdjust);
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
XFFontWorkStyle* m_pFontWorkStyle;
diff --git a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
index 5d00700f9329..02c7e03b51ef 100644
--- a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
@@ -80,7 +80,7 @@ public:
void Reset();
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
friend bool operator==(XFDropcap& dc1, XFDropcap& dc2);
friend bool operator!=(XFDropcap& dc1, XFDropcap& dc2);
diff --git a/lotuswordpro/source/filter/xfilter/xfendnote.hxx b/lotuswordpro/source/filter/xfilter/xfendnote.hxx
index c7de0af798b1..acd48c6647e5 100644
--- a/lotuswordpro/source/filter/xfilter/xfendnote.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfendnote.hxx
@@ -76,7 +76,7 @@ public:
public:
void SetLabel(sal_Unicode label);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
OUString m_strID;
diff --git a/lotuswordpro/source/filter/xfilter/xfentry.hxx b/lotuswordpro/source/filter/xfilter/xfentry.hxx
index d0e7b344cce2..cc04bbb41efd 100644
--- a/lotuswordpro/source/filter/xfilter/xfentry.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfentry.hxx
@@ -107,7 +107,7 @@ public:
*/
void SetOutlineLevel(sal_Int32 level);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
enumXFEntry m_eType;
diff --git a/lotuswordpro/source/filter/xfilter/xffloatframe.hxx b/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
index 48699ae36b09..cae4d39dad3d 100644
--- a/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
@@ -78,7 +78,7 @@ public:
XFFloatFrame(sal_Int32 start, sal_Int32 end, sal_Bool all=sal_False);
public:
- void ToXml(IXFStream *pStrm);
+ void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
sal_Int32 m_nStart;
diff --git a/lotuswordpro/source/filter/xfilter/xffooter.hxx b/lotuswordpro/source/filter/xfilter/xffooter.hxx
index be656a42df01..d626b34897f2 100644
--- a/lotuswordpro/source/filter/xfilter/xffooter.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffooter.hxx
@@ -72,7 +72,7 @@ public:
XFFooter()
{
}
- virtual void ToXml(IXFStream *pStrm)
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
diff --git a/lotuswordpro/source/filter/xfilter/xffootnote.hxx b/lotuswordpro/source/filter/xfilter/xffootnote.hxx
index c7eb93e600e3..7c5136fb981b 100644
--- a/lotuswordpro/source/filter/xfilter/xffootnote.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffootnote.hxx
@@ -77,7 +77,7 @@ public:
public:
void SetLabel(sal_Unicode label);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
OUString m_strID;
diff --git a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
index cd39314edcb0..bc8ab9f738a3 100644
--- a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
@@ -94,7 +94,7 @@ public:
void SetMessageFrom(const OUString& message);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
protected:
OUString m_strBodyStyle;
diff --git a/lotuswordpro/source/filter/xfilter/xfframe.hxx b/lotuswordpro/source/filter/xfilter/xfframe.hxx
index 9d31cb99a38a..caef4cedb73b 100644
--- a/lotuswordpro/source/filter/xfilter/xfframe.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfframe.hxx
@@ -90,7 +90,7 @@ public:
/**
* @descr override the add function to adjust z-index.
*/
- virtual void Add(IXFContent *pContent);
+ virtual void Add(IXFContent *pContent) SAL_OVERRIDE;
/**
* @descr: Set the anchor type for the frame object.
@@ -164,12 +164,12 @@ public:
/**
* @descr Get content type, enumXFContentFrame.
*/
- virtual enumXFContent GetContentType();
+ virtual enumXFContent GetContentType() SAL_OVERRIDE;
/**
* @descr serialize.
*/
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
void StartFrame(IXFStream *pStrm);
diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
index 698572f7ac76..6975d6c31611 100644
--- a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
@@ -148,9 +148,9 @@ public:
void SetTransparency(sal_Int16 nTransparency);
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
protected:
enumXFWrap m_eWrap;
diff --git a/lotuswordpro/source/filter/xfilter/xfheader.hxx b/lotuswordpro/source/filter/xfilter/xfheader.hxx
index a73c29d77ba7..6802a0ec94d1 100644
--- a/lotuswordpro/source/filter/xfilter/xfheader.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfheader.hxx
@@ -71,7 +71,7 @@ public:
{
}
public:
- virtual void ToXml(IXFStream *pStrm)
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
diff --git a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx b/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
index 3f7670498e4a..f47dd4ec0d7a 100644
--- a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
@@ -116,7 +116,7 @@ public:
/**
* @descr Output header style object.
*/
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
protected:
sal_Bool m_bIsFooter;
diff --git a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx b/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
index 8daa73158c3f..5795b945e25d 100644
--- a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
@@ -74,7 +74,7 @@ public:
void SetTargetFrame(const OUString& frame="_self");
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
OUString m_strHRef;
diff --git a/lotuswordpro/source/filter/xfilter/xfimage.hxx b/lotuswordpro/source/filter/xfilter/xfimage.hxx
index 394b0ce0e159..3e27fac36cea 100644
--- a/lotuswordpro/source/filter/xfilter/xfimage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfimage.hxx
@@ -86,7 +86,7 @@ public:
/**
* @descr Output image.
*/
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
OUString m_strImageFile;
diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx
index 4766c680571b..6c78e48792ff 100644
--- a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx
@@ -89,7 +89,7 @@ public:
void SetColorMode(enumXFColorMode mode);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
sal_Int32 m_nBrightness;
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx
index 25cc538df5d8..4d911260aefc 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx
@@ -89,7 +89,7 @@ public:
/**
* @descr Set style.
*/
- void SetStyleName(const OUString& style);
+ void SetStyleName(const OUString& style) SAL_OVERRIDE;
/**
* @descr Add a entry in the template.
*/
@@ -109,7 +109,7 @@ public:
* @descr clear all index template parts.
*/
void Clear();
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
/**
@@ -165,7 +165,7 @@ public:
*/
void SetSeparator(sal_Bool sep);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
void AddTocSource(sal_uInt16 nLevel, const OUString& sStyleName);
diff --git a/lotuswordpro/source/filter/xfilter/xfinputlist.hxx b/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
index 965226a52762..d9e6da3b4015 100644
--- a/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
@@ -71,7 +71,7 @@ class XFInputList : public XFContent
public:
void SetName(const OUString& sName);
void SetLabels(std::vector<OUString> list);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
OUString m_strName;
std::vector<OUString> m_list;
diff --git a/lotuswordpro/source/filter/xfilter/xflinebreak.hxx b/lotuswordpro/source/filter/xfilter/xflinebreak.hxx
index 72bcf68da32d..ea5bd06edc75 100644
--- a/lotuswordpro/source/filter/xfilter/xflinebreak.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflinebreak.hxx
@@ -66,7 +66,7 @@
class XFLineBreak : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
inline void XFLineBreak::ToXml(IXFStream *pStrm)
diff --git a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
index f637af14e74d..5fdbe669baea 100644
--- a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
@@ -86,7 +86,7 @@ public:
void SetCountFrameLines(sal_Bool frame = sal_True);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
enumXFLineNumberPos m_ePosition;
diff --git a/lotuswordpro/source/filter/xfilter/xflist.hxx b/lotuswordpro/source/filter/xfilter/xflist.hxx
index 574ef65965e0..4525ec3178df 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflist.hxx
@@ -90,7 +90,7 @@ public:
/**
* @descr Output list object.
*/
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
virtual void StartList(IXFStream *pStrm, sal_Bool bContinueNumber = sal_False);
diff --git a/lotuswordpro/source/filter/xfilter/xflistitem.hxx b/lotuswordpro/source/filter/xfilter/xflistitem.hxx
index e204c2788a31..d1e5bd5dad02 100644
--- a/lotuswordpro/source/filter/xfilter/xflistitem.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflistitem.hxx
@@ -72,7 +72,7 @@ public:
public:
void SetIsHeader(sal_Bool isHeader=sal_True);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
sal_Bool m_bIsHeader;
diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
index dd866c47a0ed..fa18887c1a54 100644
--- a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
@@ -132,7 +132,7 @@ public:
m_aNumFmt.SetStartValue(start);
}
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
XFNumFmt m_aNumFmt;
};
@@ -163,7 +163,7 @@ public:
m_strFontName = name;
}
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
XFNumFmt m_aNumFmt;
int32_t m_chBullet;
@@ -174,7 +174,7 @@ private:
class XFListLevelImage : public XFListLevel
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
sal_Int16 m_nWidth;
sal_Int16 m_nHeight;
@@ -214,11 +214,11 @@ public:
//not implemented now.
void SetListImage(){}
- virtual enumXFStyle GetStyleFamily()
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE
{
return enumXFStyleList;
}
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
XFListLevel *m_pListLevels[10];
diff --git a/lotuswordpro/source/filter/xfilter/xfmargins.hxx b/lotuswordpro/source/filter/xfilter/xfmargins.hxx
index e30d13c3f671..6ac13ce09bef 100644
--- a/lotuswordpro/source/filter/xfilter/xfmargins.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfmargins.hxx
@@ -84,7 +84,7 @@ public:
double GetTop();
double GetBottom();
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
friend bool operator==(XFMargins& indent1, XFMargins& indent2);
friend bool operator!=(XFMargins& indent1, XFMargins& indent2);
diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
index b6aacf42e3a3..63604bbf343b 100644
--- a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
@@ -79,9 +79,9 @@ public:
void SetFooter(XFFooter *pFooter);
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
OUString m_strPageMaster;
diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
index df07de6f0247..874fe63ec302 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
@@ -92,11 +92,11 @@ public:
void SetCurrencySymbol(sal_Bool post, const OUString& symbol, sal_Bool bShowSpace=sal_False);
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual sal_Bool Equal(IXFStyle *pStyle);
+ virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
protected:
void ToXml_StartElement(IXFStream *pStrm);
diff --git a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx b/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
index de9584d89f3a..e0dbcc6a9c0e 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
@@ -127,7 +127,7 @@ public:
m_nStartValue = start;
}
- virtual void ToXml(IXFStream *pStrm)
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
diff --git a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx b/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx
index 54535fdafb5b..2c114cbf1b54 100644
--- a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx
@@ -76,7 +76,7 @@ public:
void SetLastTime(const OUString& lstime);
void SetEditTime(const OUString& edtime);
- virtual void ToXml(IXFStream *pStream);
+ virtual void ToXml(IXFStream *pStream) SAL_OVERRIDE;
private:
OUString m_strGenerator;
OUString m_strTitle;
diff --git a/lotuswordpro/source/filter/xfilter/xfpadding.hxx b/lotuswordpro/source/filter/xfilter/xfpadding.hxx
index 712c2ca75d0e..0ead45b57a9b 100644
--- a/lotuswordpro/source/filter/xfilter/xfpadding.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpadding.hxx
@@ -106,7 +106,7 @@ public:
/**
* @descr Output padding properties.
*/
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
friend bool operator==(XFPadding& p1, XFPadding& p2);
friend bool operator!=(XFPadding& p1, XFPadding& p2);
diff --git a/lotuswordpro/source/filter/xfilter/xfpagecount.hxx b/lotuswordpro/source/filter/xfilter/xfpagecount.hxx
index aeb415de638d..9c3347b178f7 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagecount.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagecount.hxx
@@ -71,7 +71,7 @@
class XFPageCount : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
inline void XFPageCount::ToXml(IXFStream *pStrm)
diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
index e7e4763b6132..9fff8ae72645 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
@@ -115,9 +115,9 @@ public:
XFColor color=XFColor(0,0,0)
);
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStream);
+ virtual void ToXml(IXFStream *pStream) SAL_OVERRIDE;
private:
double m_fPageWidth;
diff --git a/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx b/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx
index f398edec422c..ad256033a797 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx
@@ -73,7 +73,7 @@ class XFPageNumber : public XFContent
public:
void SetNumFmt(const OUString& fmt);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
XFNumFmt m_aNumFmt;
diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx b/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
index 6c56806df276..45c981928d88 100644
--- a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
@@ -81,9 +81,9 @@ public:
public:
sal_Bool HasContents();
- virtual enumXFContent GetContentType();
+ virtual enumXFContent GetContentType() SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
index f24b7563cee9..4bbcca5d302b 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
@@ -231,11 +231,11 @@ public:
XFMargins& GetMargins(){return m_aMargin;}
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual sal_Bool Equal(IXFStyle *pStyle);
+ virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
- virtual void ToXml(IXFStream *strm);
+ virtual void ToXml(IXFStream *strm) SAL_OVERRIDE;
void SetNumberRight(sal_Bool bFlag){m_bNumberRight = bFlag;}
sal_Bool GetNumberRight(){return m_bNumberRight;}
@@ -342,8 +342,8 @@ class XFDefaultParaStyle : public XFStyle
public:
XFDefaultParaStyle();
void SetTabDistance(double len);
- enumXFStyle GetStyleFamily();
- virtual void ToXml(IXFStream *pStrm);
+ enumXFStyle GetStyleFamily() SAL_OVERRIDE;
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
double m_fTabDistance;
};
diff --git a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx b/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
index ec761d406fa7..ae8592b8b6e9 100644
--- a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
@@ -74,7 +74,7 @@ public:
void SetType(const OUString& sType);
void SetDesc(const OUString& sDesc);
void SetPrompt(const OUString& sText);
- void ToXml(IXFStream *pStrm);
+ void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
OUString m_strType;
OUString m_strDesc;
@@ -121,7 +121,7 @@ class XFHolderEnd : public XFContent
public:
XFHolderEnd();
~XFHolderEnd();
- void ToXml(IXFStream *pStrm);
+ void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
XFHolderEnd::XFHolderEnd()
diff --git a/lotuswordpro/source/filter/xfilter/xfrow.hxx b/lotuswordpro/source/filter/xfilter/xfrow.hxx
index ca3649e5e649..f3babb20fa59 100644
--- a/lotuswordpro/source/filter/xfilter/xfrow.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfrow.hxx
@@ -93,7 +93,7 @@ public:
XFTable* GetOwnerTable();
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
void RemoveCell(sal_Int32 cell);
diff --git a/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx b/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx
index 5da867a2c3fc..0bbe8ef9b76d 100644
--- a/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx
@@ -80,9 +80,9 @@ public:
void SetBackColor(XFColor& color);
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
double m_fHeight;
diff --git a/lotuswordpro/source/filter/xfilter/xfruby.hxx b/lotuswordpro/source/filter/xfilter/xfruby.hxx
index 0668631f76bb..718d82b992b9 100644
--- a/lotuswordpro/source/filter/xfilter/xfruby.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfruby.hxx
@@ -65,14 +65,14 @@
class XFRubyStart : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFRubyEnd : public XFContent
{
public:
void SetText(const OUString& sText);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
OUString m_strText;
};
diff --git a/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx b/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
index a673cfc9354b..8719dc677208 100644
--- a/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
@@ -73,10 +73,10 @@ public:
{
}
virtual ~XFRubyStyle(){}
- virtual void ToXml(IXFStream *strm);
+ virtual void ToXml(IXFStream *strm) SAL_OVERRIDE;
void SetPosition(enumXFRubyPosition ePosition);
void SetAlignment(enumXFRubyPosition eAlignment);
- enumXFStyle GetStyleFamily();
+ enumXFStyle GetStyleFamily() SAL_OVERRIDE;
private:
enumXFRubyPosition m_ePos;
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
index 831740985b9f..9687bd616c95 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
@@ -76,9 +76,9 @@ public:
public:
//Interface ISaxAttributeList:
- virtual void AddAttribute(const OUString& name, const OUString& value);
+ virtual void AddAttribute(const OUString& name, const OUString& value) SAL_OVERRIDE;
- virtual void Clear();
+ virtual void Clear() SAL_OVERRIDE;
Reference<XAttributeList> GetAttributeList() const;
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
index a343a5b3c5e4..648f4aaf2b92 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
@@ -99,32 +99,32 @@ public:
/**
* @descr Start document callback.
*/
- virtual void StartDocument();
+ virtual void StartDocument() SAL_OVERRIDE;
/**
* @descr End document callback.
*/
- virtual void EndDocument();
+ virtual void EndDocument() SAL_OVERRIDE;
/**
* @descr Start output element.
*/
- virtual void StartElement(const OUString& oustr);
+ virtual void StartElement(const OUString& oustr) SAL_OVERRIDE;
/**
* @descr End output element.
*/
- virtual void EndElement(const OUString& oustr);
+ virtual void EndElement(const OUString& oustr) SAL_OVERRIDE;
/**
* @descr Output Character section.
*/
- virtual void Characters(const OUString& oustr);
+ virtual void Characters(const OUString& oustr) SAL_OVERRIDE;
/**
* @descr Get the attribute list interface.
*/
- virtual IXFAttrList* GetAttrList();
+ virtual IXFAttrList* GetAttrList() SAL_OVERRIDE;
public:
Reference<XDocumentHandler> m_aHandler;
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.hxx b/lotuswordpro/source/filter/xfilter/xfsection.hxx
index 75c82ec92407..eb75dfe8876f 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.hxx
@@ -81,7 +81,7 @@ public:
/**
* @descr Output section object.
*/
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
OUString m_strSectionName;
diff --git a/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx b/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx
index fad19370a8d1..8a4234a65c62 100644
--- a/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx
@@ -84,9 +84,9 @@ public:
void SetColumns(XFColumns *pColumns);
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
double m_fMarginLeft;
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.hxx b/lotuswordpro/source/filter/xfilter/xfshadow.hxx
index 47da66591372..4f0f19ce0c14 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfshadow.hxx
@@ -108,7 +108,7 @@ public:
OUString ToString();
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
friend sal_Bool operator==(XFShadow& s1, XFShadow& s2);
friend sal_Bool operator!=(XFShadow& s1, XFShadow& s2);
diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.hxx b/lotuswordpro/source/filter/xfilter/xfstyle.hxx
index 41951eda6a19..89e251a16d87 100644
--- a/lotuswordpro/source/filter/xfilter/xfstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstyle.hxx
@@ -77,37 +77,37 @@ public:
/**
* @descr get style name.
*/
- virtual OUString GetStyleName();
+ virtual OUString GetStyleName() SAL_OVERRIDE;
/**
* @descr set style name.
*/
- virtual void SetStyleName(const OUString& styleName);
+ virtual void SetStyleName(const OUString& styleName) SAL_OVERRIDE;
/**
* @descr set parent style name.
*/
- virtual OUString GetParentStyleName();
+ virtual OUString GetParentStyleName() SAL_OVERRIDE;
/**
* @descr return parent style name.
*/
- virtual void SetParentStyleName(const OUString& styleName);
+ virtual void SetParentStyleName(const OUString& styleName) SAL_OVERRIDE;
/**
* @descr get style family.
*/
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
/**
* @descr set style family.
*/
- virtual void SetStyleFamily(enumXFStyle family);
+ virtual void SetStyleFamily(enumXFStyle family) SAL_OVERRIDE;
/**
* @descr decide whether two style are equal.
*/
- virtual sal_Bool Equal(IXFStyle *pStyle);
+ virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
protected:
OUString m_strStyleName;
diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
index ba8b0931c24f..1b4edb323743 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
@@ -117,7 +117,7 @@ public:
/**
* @descr Output all style.
*/
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
friend bool operator==(XFStyleContainer& b1, XFStyleContainer& b2);
friend bool operator!=(XFStyleContainer& b1, XFStyleContainer& b2);
diff --git a/lotuswordpro/source/filter/xfilter/xftable.hxx b/lotuswordpro/source/filter/xfilter/xftable.hxx
index 0554b049520e..9c05a074d2cc 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.hxx
@@ -108,9 +108,9 @@ public:
void Normalize();
- enumXFContent GetContentType();
+ enumXFContent GetContentType() SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
void RemoveRow(sal_uInt16 row)
{
diff --git a/lotuswordpro/source/filter/xfilter/xftablestyle.hxx b/lotuswordpro/source/filter/xfilter/xftablestyle.hxx
index e1d9b88e1a33..ff0c7b559b04 100644
--- a/lotuswordpro/source/filter/xfilter/xftablestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftablestyle.hxx
@@ -89,9 +89,9 @@ public:
void SetBreaks(enumXFBreaks breaks);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
private:
double m_fWidth;
diff --git a/lotuswordpro/source/filter/xfilter/xftabstop.hxx b/lotuswordpro/source/filter/xfilter/xftabstop.hxx
index 963a01e054c3..b4aef7e38150 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstop.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftabstop.hxx
@@ -66,7 +66,7 @@
class XFTabStop : public XFContent
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
inline void XFTabStop::ToXml(IXFStream *pStrm)
diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
index 5173f9efe04a..6d29398fd832 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
@@ -78,7 +78,7 @@ public:
void SetLeaderChar(sal_Unicode leader);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
enumXFTab m_eType;
diff --git a/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx b/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx
index 7be96eada887..2ad8acd471c1 100644
--- a/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx
@@ -75,9 +75,9 @@ public:
public:
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
protected:
};
diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
index 7b4da82416de..3550216d9965 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
@@ -84,9 +84,9 @@ public:
*/
void SetText(const OUString& text);
- virtual enumXFContent GetContentType();
+ virtual enumXFContent GetContentType() SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
private:
OUString m_strText;
diff --git a/lotuswordpro/source/filter/xfilter/xftextspan.hxx b/lotuswordpro/source/filter/xfilter/xftextspan.hxx
index 96dbde40760b..b7142b6629f0 100644
--- a/lotuswordpro/source/filter/xfilter/xftextspan.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextspan.hxx
@@ -77,8 +77,8 @@ public:
void Add(IXFContent *pContent);
void Add(const OUString& text);
- virtual enumXFContent GetContentType();
- virtual void ToXml(IXFStream *pStrm);
+ virtual enumXFContent GetContentType() SAL_OVERRIDE;
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
protected:
std::vector<IXFContent*> m_aContents;
};
@@ -86,12 +86,12 @@ protected:
class XFTextSpanStart : public XFTextSpan //for adding style of power field
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
class XFTextSpanEnd : public XFTextSpan //for adding style of power field
{
public:
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
};
#endif
diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.hxx b/lotuswordpro/source/filter/xfilter/xftextstyle.hxx
index f728007a286d..625c94d4e23f 100644
--- a/lotuswordpro/source/filter/xfilter/xftextstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextstyle.hxx
@@ -82,11 +82,11 @@ public:
XFFont* GetFont(){ return m_pFont; }
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual sal_Bool Equal(IXFStyle *pStyle);
+ virtual sal_Bool Equal(IXFStyle *pStyle) SAL_OVERRIDE;
- virtual void ToXml(IXFStream *strm);
+ virtual void ToXml(IXFStream *strm) SAL_OVERRIDE;
private:
XFFont *m_pFont;
diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
index 5a1a2d95190c..58a20a282379 100644
--- a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
@@ -97,7 +97,7 @@ public:
public:
void SetDecimalPos(sal_Int32 pos);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
protected:
sal_Int32 m_nDecimalPos;
@@ -122,9 +122,9 @@ public:
void AddText( const OUString& part );
- virtual enumXFStyle GetStyleFamily();
+ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE;
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE;
void SetTruncate(sal_Bool bTrunc);