diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-09 16:31:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-05-10 08:40:10 +0200 |
| commit | 9c7222c11c331ecd1562e963e78ab85be75b8e49 (patch) | |
| tree | 24ec24a42a54cafdc4e4eb1da7f47fb2f0d71d8c /framework | |
| parent | 00bfc137d3a62a252f158c4a9100dd1379f410fd (diff) | |
convert WINDOWSTATE_MASK to scoped enum
Change-Id: Ic8259d81d8080c518aa07697e253a59cd6efaa4b
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/helper/persistentwindowstate.cxx | 3 | ||||
| -rw-r--r-- | framework/source/uiconfiguration/windowstateconfiguration.cxx | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index c4fbaf055b60..6938cc28a35e 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -220,8 +220,7 @@ OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno:: (pWindow->IsSystemWindow()) ) { - sal_uLong nMask = WINDOWSTATE_MASK_ALL; - nMask &= ~(WINDOWSTATE_MASK_MINIMIZED); + WindowStateMask nMask = WindowStateMask::All & ~(WindowStateMask::Minimized); sWindowState = OStringToOUString( static_cast<SystemWindow*>(pWindow)->GetWindowState(nMask), RTL_TEXTENCODING_UTF8); diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index aef78238b43b..72b7c8492241 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -56,8 +56,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::ui; using namespace framework; -#undef WINDOWSTATE_MASK_POS - namespace { // Zero based indexes, order must be the same as WindowStateMask && CONFIGURATION_PROPERTIES! |