summaryrefslogtreecommitdiff
path: root/lotuswordpro/source/filter/lwpcelllayout.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /lotuswordpro/source/filter/lwpcelllayout.hxx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'lotuswordpro/source/filter/lwpcelllayout.hxx')
-rw-r--r--lotuswordpro/source/filter/lwpcelllayout.hxx36
1 files changed, 18 insertions, 18 deletions
diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx
index 4ac11b1d0a29..e818d839d012 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.hxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.hxx
@@ -88,20 +88,20 @@ class LwpCellLayout : public LwpMiddleLayout
public:
LwpCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpCellLayout();
- virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_CELL_LAYOUT;}
+ virtual LWP_LAYOUT_TYPE GetLayoutType () 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() SAL_OVERRIDE;
+ void RegisterStyle() override;
LwpObjectID& GetNumericsObject() {return cLayNumerics;}
LwpObjectID * GetPreviousCellStory();
- virtual LwpPara* GetLastParaOfPreviousStory() SAL_OVERRIDE;
+ virtual LwpPara* GetLastParaOfPreviousStory() override;
LwpTableLayout * GetTableLayout();
virtual void SetCellMap();
double GetActualWidth();
OUString GetNumfmtName(){return m_NumfmtName;}
protected:
- void Read() SAL_OVERRIDE;
+ void Read() override;
LwpTable * GetTable();
void ApplyPadding(XFCellStyle* pCellStyle);
void ApplyBorders(XFCellStyle* pCellStyle);
@@ -145,13 +145,13 @@ class LwpHiddenCellLayout : public LwpCellLayout
public:
LwpHiddenCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpHiddenCellLayout();
- 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() SAL_OVERRIDE;
+ virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_HIDDEN_CELL_LAYOUT;}
+ virtual void Parse(IXFStream* pOutputStream) override;
+ virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) override;
+ void RegisterStyle() override {}
+ virtual void SetCellMap() override;
protected:
- void Read() SAL_OVERRIDE;
+ void Read() override;
LwpObjectID cconnectedlayout;
};
@@ -164,17 +164,17 @@ class LwpConnectedCellLayout : public LwpCellLayout
public:
LwpConnectedCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpConnectedCellLayout();
- 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;
+ virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_CONNECTED_CELL_LAYOUT;}
+ virtual void Parse(IXFStream* pOutputStream) override;
+ virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) override;
sal_uInt16 GetNumrows(){return m_nRealrowspan;}
sal_uInt8 GetNumcols(){return m_nRealcolspan;}
- virtual void SetCellMap() SAL_OVERRIDE;
+ virtual void SetCellMap() override;
void SetNumrows(sal_uInt16 nVal){m_nRealrowspan = nVal;}
protected:
- 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;
+ void Read() override;
+ virtual sal_uInt16 GetBelowRowID(sal_uInt16 nRow) override {return nRow + m_nRealrowspan; };
+ virtual LwpCellBorderType GetCellBorderType(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout) override;
sal_uInt16 cnumrows;
sal_uInt8 cnumcols;
sal_uInt16 m_nRealrowspan;
@@ -191,7 +191,7 @@ public:
LwpParallelColumnsBlock(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
virtual ~LwpParallelColumnsBlock();
protected:
- void Read() SAL_OVERRIDE;
+ void Read() override;
};