diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-12 14:35:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-13 08:49:43 +0200 |
| commit | 518cf484c7aed6cd09c7db4a19d16fbf72d25e3b (patch) | |
| tree | 3f063cb9751273056e6acca375723b638ac39c45 /sw/inc | |
| parent | 890d6790715c4c3f3565b476d538643f04dc6936 (diff) | |
convert TableMergeErr to scoped enum
Change-Id: Ie3d15845e47c514411baadecff92025f3e0c4e21
Reviewed-on: https://gerrit.libreoffice.org/36476
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/doc.hxx | 3 | ||||
| -rw-r--r-- | sw/inc/fesh.hxx | 3 | ||||
| -rw-r--r-- | sw/inc/tblenum.hxx | 8 | ||||
| -rw-r--r-- | sw/inc/tblsel.hxx | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index a285846cd63a..f75ed2775890 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1206,8 +1206,7 @@ public: bool SplitTable( const SwSelBoxes& rBoxes, bool bVert, sal_uInt16 nCnt, bool bSameHeight = false ); - // @return enum TableMergeErr. - sal_uInt16 MergeTable( SwPaM& rPam ); + TableMergeErr MergeTable( SwPaM& rPam ); OUString GetUniqueTableName() const; bool IsInsTableFormatNum() const; bool IsInsTableChangeNumFormat() const; diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 9b8a6d4304e3..3932c5af033b 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -638,8 +638,7 @@ public: bool DeleteTableSel(); ///< Current selection, may be whole table. - sal_uInt16 MergeTab(); /**< Merge selected parts of table. - @return error via enum. */ + TableMergeErr MergeTab(); /**< Merge selected parts of table */ /// Split cell vertically or horizontally. bool SplitTab( bool bVert, sal_uInt16 nCnt, bool bSameHeight = false ); diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx index b5590a6ebc01..fbef062307c8 100644 --- a/sw/inc/tblenum.hxx +++ b/sw/inc/tblenum.hxx @@ -64,11 +64,11 @@ enum class SplitTable_HeadlineOption BoxAttrAllCopy // Copy box attributes and paragraph styles of 1st line. }; -enum TableMergeErr +enum class TableMergeErr { - TBLMERGE_OK, - TBLMERGE_NOSELECTION, - TBLMERGE_TOOCOMPLEX + Ok, + NoSelection, + TooComplex }; #endif diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index 295cd2da21c1..72057211e3f5 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -109,8 +109,8 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo ); // Check if selected boxes allow for a valid merge. -sal_uInt16 CheckMergeSel( const SwPaM& rPam ); -sal_uInt16 CheckMergeSel( const SwSelBoxes& rBoxes ); +TableMergeErr CheckMergeSel( const SwPaM& rPam ); +TableMergeErr CheckMergeSel( const SwSelBoxes& rBoxes ); bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam ); |