diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-04-02 18:29:35 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-04-13 17:21:24 +0200 |
commit | b137dfceac0740c7650b37a5a0b8935b23151114 (patch) | |
tree | e5ddb72f78a633fccba5cbba058f91dcf49b1696 /sw | |
parent | bca8d8985666d3fd22b91eb280f9baaeb933c2d0 (diff) |
simplify
Change-Id: Ib77efe1ee17afdbf058af4f1d360ef2dee658278
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/unocore/unotbl.cxx | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 59a4428e217c..578556ab6b5f 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -18,6 +18,7 @@ */ #include <list> +#include <array> #include <utility> #include <vector> #include <algorithm> @@ -1061,21 +1062,12 @@ void SwXCell::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV if(rPropertyName == "FRMDirection") { SvxFrameDirection eDir = FRMDIR_ENVIRONMENT; - sal_Int32 nNum = aValue.get<sal_Int32>(); - SAL_INFO("sw.uno", "FRMDirection val " << nNum); - switch (nNum) + try { - case 0: - eDir = FRMDIR_HORI_LEFT_TOP; - break; - case 1: - eDir = FRMDIR_HORI_RIGHT_TOP; - break; - case 2: - eDir = FRMDIR_VERT_TOP_RIGHT; - break; - default: - OSL_FAIL("unknown direction code, maybe it's a bitfield"); + const std::array<SvxFrameDirection, 3> vDirs = { FRMDIR_HORI_LEFT_TOP, FRMDIR_HORI_RIGHT_TOP, FRMDIR_VERT_TOP_RIGHT }; + eDir = vDirs.at(aValue.get<sal_Int32>()); + } catch(std::out_of_range) { + SAL_WARN("sw.uno", "unknown direction code, maybe it's a bitfield"); } SvxFrameDirectionItem aItem(eDir, RES_FRAMEDIR); pBox->GetFrmFmt()->SetFmtAttr(aItem); |