From 9e28cc8ca79b5c42955867a62e89faf8facc5e80 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 23 Jul 2015 13:19:40 +0200
Subject: convert WindowAlign to scoped enum

Change-Id: I028d108b3a83bd5541d873c4d03b87339cd3be52
---
 framework/source/layoutmanager/helpers.cxx           | 10 +++++-----
 .../source/layoutmanager/toolbarlayoutmanager.cxx    | 20 ++++++++++----------
 .../source/uielement/popuptoolbarcontroller.cxx      |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'framework')

diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index 527eeebfbb2e..6ea1c831e736 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -64,7 +64,7 @@ bool isReverseOrderDockingArea( const sal_Int32 nDockArea )
 bool isToolboxHorizontalAligned( ToolBox* pToolBox )
 {
     if ( pToolBox )
-        return (( pToolBox->GetAlign() == WINDOWALIGN_TOP ) || ( pToolBox->GetAlign() == WINDOWALIGN_BOTTOM ));
+        return (( pToolBox->GetAlign() == WindowAlign::Top ) || ( pToolBox->GetAlign() == WindowAlign::Bottom ));
     return false;
 }
 
@@ -184,13 +184,13 @@ uno::Reference< awt::XWindowPeer > createToolkitWindow( const uno::Reference< un
 WindowAlign ImplConvertAlignment( sal_Int16 aAlignment )
 {
     if ( aAlignment == ui::DockingArea_DOCKINGAREA_LEFT )
-        return WINDOWALIGN_LEFT;
+        return WindowAlign::Left;
     else if ( aAlignment == ui::DockingArea_DOCKINGAREA_RIGHT )
-        return WINDOWALIGN_RIGHT;
+        return WindowAlign::Right;
     else if ( aAlignment == ui::DockingArea_DOCKINGAREA_TOP )
-        return WINDOWALIGN_TOP;
+        return WindowAlign::Top;
     else
-        return WINDOWALIGN_BOTTOM;
+        return WindowAlign::Bottom;
 }
 
 OUString getElementTypeFromResourceURL( const OUString& aResourceURL )
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 40a62d94c767..6eb25c055194 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -1032,13 +1032,13 @@ void ToolbarLayoutManager::setParentWindow(
     {
         SolarMutexGuard aGuard;
         VclPtr< ::DockingAreaWindow > pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xTopDockWindow ).get() );
-        if( pWindow ) pWindow->SetAlign( WINDOWALIGN_TOP );
+        if( pWindow ) pWindow->SetAlign( WindowAlign::Top );
         pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xBottomDockWindow ).get() );
-        if( pWindow ) pWindow->SetAlign( WINDOWALIGN_BOTTOM );
+        if( pWindow ) pWindow->SetAlign( WindowAlign::Bottom );
         pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xLeftDockWindow ).get() );
-        if( pWindow ) pWindow->SetAlign( WINDOWALIGN_LEFT );
+        if( pWindow ) pWindow->SetAlign( WindowAlign::Left );
         pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xRightDockWindow ).get() );
-        if( pWindow ) pWindow->SetAlign( WINDOWALIGN_RIGHT );
+        if( pWindow ) pWindow->SetAlign( WindowAlign::Right );
         implts_reparentToolbars();
     }
     else
@@ -3540,9 +3540,9 @@ throw (uno::RuntimeException, std::exception)
             if( e.bFloating )
             {
                 if ( aUIDockingElement.m_aFloatingData.m_bIsHorizontal )
-                    pToolBox->SetAlign( WINDOWALIGN_TOP );
+                    pToolBox->SetAlign( WindowAlign::Top );
                 else
-                    pToolBox->SetAlign( WINDOWALIGN_LEFT );
+                    pToolBox->SetAlign( WindowAlign::Left );
             }
             else
             {
@@ -3655,9 +3655,9 @@ throw (uno::RuntimeException, std::exception)
                 {
                     pToolBox->SetLineCount( aUIDockingElement.m_aFloatingData.m_nLines );
                     if ( aUIDockingElement.m_aFloatingData.m_bIsHorizontal )
-                        pToolBox->SetAlign( WINDOWALIGN_TOP );
+                        pToolBox->SetAlign( WindowAlign::Top );
                     else
-                        pToolBox->SetAlign( WINDOWALIGN_LEFT );
+                        pToolBox->SetAlign( WindowAlign::Left );
                 }
 
                 bool bUndefPos = hasDefaultPosValue( aUIDockingElement.m_aFloatingData.m_aPos );
@@ -3734,9 +3734,9 @@ throw (uno::RuntimeException, std::exception)
             if ( aUIDockingElement.m_bFloating )
             {
                 if ( aUIDockingElement.m_aFloatingData.m_bIsHorizontal )
-                    pToolBox->SetAlign( WINDOWALIGN_TOP );
+                    pToolBox->SetAlign( WindowAlign::Top );
                 else
-                    pToolBox->SetAlign( WINDOWALIGN_LEFT );
+                    pToolBox->SetAlign( WindowAlign::Left );
             }
             else
                 pToolBox->SetAlign( ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea) );
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index d2e9da89f434..aa529089023e 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -190,7 +190,7 @@ PopupMenuToolbarController::createPopupWindow()
     sal_uInt16 nId = m_xPopupMenu->execute(
         css::uno::Reference< css::awt::XWindowPeer >( getParent(), css::uno::UNO_QUERY ),
         VCLUnoHelper::ConvertToAWTRect( pToolBox->GetItemRect( m_nToolBoxId ) ),
-        ( eAlign == WINDOWALIGN_TOP || eAlign == WINDOWALIGN_BOTTOM ) ?
+        ( eAlign == WindowAlign::Top || eAlign == WindowAlign::Bottom ) ?
             css::awt::PopupMenuDirection::EXECUTE_DOWN :
             css::awt::PopupMenuDirection::EXECUTE_RIGHT );
     pToolBox->SetItemDown( m_nToolBoxId, false );
-- 
cgit