diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-22 16:39:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-04 06:38:03 +0000 |
| commit | 5676ced82539d9e40bde6196d2aa3b2e4c7b3fdb (patch) | |
| tree | db860b2365f8cb0e2fab4772e80e4e38d4d89b37 /forms | |
| parent | 1a1d1a86e9129ec3885610b641179b30f9bf5e79 (diff) | |
make UNO enums scoped for internal LO code
this modifies codemaker so that, for an UNO enum, we generate code
that effectively looks like:
#ifdef LIBO_INTERNAL_ONLY && HAVE_CX11_CONSTEXPR
enum class XXX {
ONE = 1
};
constexpr auto ONE = XXX_ONE;
#else
...the old normal way..
#endif
which means that for LO internal code, the enums are scoped.
The "constexpr auto" trick acts like an alias so we don't have to
use scoped naming everywhere.
Change-Id: I3054ecb230e8666ce98b4a9cb87b384df5f64fb4
Reviewed-on: https://gerrit.libreoffice.org/34546
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/DatabaseForm.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 3c17f1e7e3a8..0ce27865f7ce 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -2373,7 +2373,7 @@ sal_Bool SAL_CALL ODatabaseForm::getGroupControl() { sal_Int32 nCycle = 0; ::cppu::enum2int(nCycle, m_aCycle); - return nCycle != TabulatorCycle_PAGE; + return (TabulatorCycle)nCycle != TabulatorCycle_PAGE; } if (isLoaded() && getConnection().is()) @@ -3812,13 +3812,13 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS _rxOutStream << m_aTargetFrame; // version 2 didn't know some options and the "default" state - sal_Int32 nCycle = TabulatorCycle_RECORDS; + sal_Int32 nCycle = (sal_Int32)TabulatorCycle_RECORDS; if (m_aCycle.hasValue()) { ::cppu::enum2int(nCycle, m_aCycle); if (m_aCycle == TabulatorCycle_PAGE) // unknown in earlier versions - nCycle = TabulatorCycle_RECORDS; + nCycle = (sal_Int32)TabulatorCycle_RECORDS; } _rxOutStream->writeShort((sal_Int16) nCycle); |