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 /framework/inc/uielement | |
| 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 'framework/inc/uielement')
| -rw-r--r-- | framework/inc/uielement/uielement.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx index 265e0db69661..0a55739cdcf6 100644 --- a/framework/inc/uielement/uielement.hxx +++ b/framework/inc/uielement/uielement.hxx @@ -37,9 +37,9 @@ struct DockedData m_nDockedArea( css::ui::DockingArea_DOCKINGAREA_TOP ), m_bLocked( false ) {} - css::awt::Point m_aPos; - sal_Int16 m_nDockedArea; - bool m_bLocked; + css::awt::Point m_aPos; + css::ui::DockingArea m_nDockedArea; + bool m_bLocked; }; struct FloatingData |