From 9c7222c11c331ecd1562e963e78ab85be75b8e49 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 9 May 2016 16:31:21 +0200
Subject: convert WINDOWSTATE_MASK to scoped enum

Change-Id: Ic8259d81d8080c518aa07697e253a59cd6efaa4b
---
 framework/source/helper/persistentwindowstate.cxx             | 3 +--
 framework/source/uiconfiguration/windowstateconfiguration.cxx | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'framework/source')

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!
-- 
cgit