diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-23 12:44:45 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-03-24 09:36:56 +0200 |
commit | ffcfcd76d12a54e8a65a2b8d0ba7432d4c57f6ea (patch) | |
tree | 907e2824a4cb8423bef30382753bf78a987e2438 /starmath | |
parent | eba9e9f88cf518a289e69e676098319177409e60 (diff) |
convert SfxChildAlignment to enum class
Change-Id: I9013bc6dace79421b0a9ad0401a4fb59365d4dcf
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/source/ElementsDockingWindow.cxx | 6 | ||||
-rw-r--r-- | starmath/source/toolbox.cxx | 2 | ||||
-rw-r--r-- | starmath/source/view.cxx | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 84591f702826..907d1480b020 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -687,7 +687,7 @@ void SmElementsDockingWindow::ToggleFloatingMode() void SmElementsDockingWindow::EndDocking( const Rectangle& rReactangle, bool bFloatMode) { SfxDockingWindow::EndDocking(rReactangle, bFloatMode); - bool bVertical = ( GetAlignment() == SFX_ALIGN_TOP || GetAlignment() == SFX_ALIGN_BOTTOM ); + bool bVertical = ( GetAlignment() == SfxChildAlignment::TOP || GetAlignment() == SfxChildAlignment::BOTTOM ); mpElementsControl->setVerticalMode(bVertical); } @@ -726,7 +726,7 @@ SmViewShell* SmElementsDockingWindow::GetView() void SmElementsDockingWindow::Resize() { - bool bVertical = ( GetAlignment() == SFX_ALIGN_TOP || GetAlignment() == SFX_ALIGN_BOTTOM ); + bool bVertical = ( GetAlignment() == SfxChildAlignment::TOP || GetAlignment() == SfxChildAlignment::BOTTOM ); mpElementsControl->setVerticalMode(bVertical); #if 0 sal_uInt32 aWidth = GetOutputSizePixel().Width(); @@ -760,7 +760,7 @@ SmElementsDockingWindowWrapper::SmElementsDockingWindowWrapper( pDialog->SetPosSizePixel(Point(0, 0), Size(300, 0)); pDialog->Show(); - eChildAlignment = SFX_ALIGN_LEFT; + eChildAlignment = SfxChildAlignment::LEFT; pDialog->Initialize( pInfo ); } diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx index 1092d251d815..d6ff88adbab8 100644 --- a/starmath/source/toolbox.cxx +++ b/starmath/source/toolbox.cxx @@ -349,7 +349,7 @@ SmToolBoxWrapper::SmToolBoxWrapper(vcl::Window *pParentWindow, SfxChildWinInfo *pInfo) : SfxChildWindow(pParentWindow, nId) { - eChildAlignment = SFX_ALIGN_NOALIGNMENT; + eChildAlignment = SfxChildAlignment::NOALIGNMENT; pWindow = new SmToolBoxWindow(pBindings, this, pParentWindow); static_cast<SfxFloatingWindow *>(pWindow)->Initialize(pInfo); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index f0c497fd5bf3..5d4010257429 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -765,8 +765,8 @@ Size SmCmdBoxWindow::CalcDockingSize(SfxChildAlignment eAlign) { switch (eAlign) { - case SFX_ALIGN_LEFT: - case SFX_ALIGN_RIGHT: + case SfxChildAlignment::LEFT: + case SfxChildAlignment::RIGHT: return Size(); default: break; @@ -779,9 +779,9 @@ SfxChildAlignment SmCmdBoxWindow::CheckAlignment(SfxChildAlignment eActual, { switch (eWish) { - case SFX_ALIGN_TOP: - case SFX_ALIGN_BOTTOM: - case SFX_ALIGN_NOALIGNMENT: + case SfxChildAlignment::TOP: + case SfxChildAlignment::BOTTOM: + case SfxChildAlignment::NOALIGNMENT: return eWish; default: break; @@ -892,7 +892,7 @@ SmCmdBoxWrapper::SmCmdBoxWrapper(vcl::Window *pParentWindow, sal_uInt16 nId, pWindow = new SmCmdBoxWindow(pBindings, this, pParentWindow); // make window docked to the bottom initially (after first start) - eChildAlignment = SFX_ALIGN_BOTTOM; + eChildAlignment = SfxChildAlignment::BOTTOM; static_cast<SfxDockingWindow *>(pWindow)->Initialize(pInfo); } |