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 /sc | |
| parent | eba9e9f88cf518a289e69e676098319177409e60 (diff) | |
convert SfxChildAlignment to enum class
Change-Id: I9013bc6dace79421b0a9ad0401a4fb59365d4dcf
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/formdlg/dwfunctr.cxx | 34 |
2 files changed, 18 insertions, 18 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index f47387bc66dc..fb5abdfa215a 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -131,7 +131,7 @@ ScInputWindowWrapper::ScInputWindowWrapper( vcl::Window* pParentP, pWin->SetSizePixel( pWin->CalcWindowSizePixel() ); - eChildAlignment = SFX_ALIGN_LOWESTTOP; + eChildAlignment = SfxChildAlignment::LOWESTTOP; pBindings->Invalidate( FID_TOGGLEINPUTLINE ); } diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index dec89910ea2f..5809ea5dc720 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -67,7 +67,7 @@ ScFunctionChildWindow::ScFunctionChildWindow( vcl::Window* pParentP, pParentP, ScResId( FID_FUNCTION_BOX ) ); pWindow = pWin; - eChildAlignment = SFX_ALIGN_RIGHT; + eChildAlignment = SfxChildAlignment::RIGHT; pWin->Initialize( pInfo ); } @@ -109,7 +109,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, if (pCW != NULL) eSfxNewAlignment=GetAlignment(); else - eSfxNewAlignment=SFX_ALIGN_RIGHT; + eSfxNewAlignment=SfxChildAlignment::RIGHT; eSfxOldAlignment=eSfxNewAlignment; aFiFuncDesc.SetUpdateMode(true); pAllFuncList=&aFuncList; @@ -242,13 +242,13 @@ void ScFunctionDockWin::SetSize() short nNewDockMode; switch(aChildAlign) { - case SFX_ALIGN_HIGHESTTOP: - case SFX_ALIGN_TOP: - case SFX_ALIGN_LOWESTTOP: - case SFX_ALIGN_LOWESTBOTTOM: - case SFX_ALIGN_BOTTOM: - case SFX_ALIGN_TOOLBOXTOP: - case SFX_ALIGN_TOOLBOXBOTTOM: + case SfxChildAlignment::HIGHESTTOP: + case SfxChildAlignment::TOP: + case SfxChildAlignment::LOWESTTOP: + case SfxChildAlignment::LOWESTBOTTOM: + case SfxChildAlignment::BOTTOM: + case SfxChildAlignment::TOOLBOXTOP: + case SfxChildAlignment::TOOLBOXBOTTOM: nNewDockMode=1; if(nDockMode!=nNewDockMode) @@ -656,20 +656,20 @@ SfxChildAlignment ScFunctionDockWin::CheckAlignment(SfxChildAlignment /* abla */ switch(eSfxOldAlignment) { - case SFX_ALIGN_HIGHESTTOP: - case SFX_ALIGN_TOP: - case SFX_ALIGN_LOWESTTOP: - case SFX_ALIGN_LOWESTBOTTOM: - case SFX_ALIGN_BOTTOM: - case SFX_ALIGN_TOOLBOXTOP: - case SFX_ALIGN_TOOLBOXBOTTOM: + case SfxChildAlignment::HIGHESTTOP: + case SfxChildAlignment::TOP: + case SfxChildAlignment::LOWESTTOP: + case SfxChildAlignment::LOWESTBOTTOM: + case SfxChildAlignment::BOTTOM: + case SfxChildAlignment::TOOLBOXTOP: + case SfxChildAlignment::TOOLBOXBOTTOM: nMinWidth= 0; nMinHeight=0; break; - case SFX_ALIGN_NOALIGNMENT: + case SfxChildAlignment::NOALIGNMENT: aString = aCatBox.GetEntry(0); aString += "www"; |