summaryrefslogtreecommitdiff
path: root/sw/inc/fesh.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-04-12 14:35:52 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-04-13 08:49:43 +0200
commit518cf484c7aed6cd09c7db4a19d16fbf72d25e3b (patch)
tree3f063cb9751273056e6acca375723b638ac39c45 /sw/inc/fesh.hxx
parent890d6790715c4c3f3565b476d538643f04dc6936 (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/fesh.hxx')
-rw-r--r--sw/inc/fesh.hxx3
1 files changed, 1 insertions, 2 deletions
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 );