diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-21 15:52:27 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-05-29 20:16:52 +0200 |
| commit | a5e58e66d82a63d99ced4ed8a42c38ed6179aa6c (patch) | |
| tree | 234325db56cadde360176607258cdf98d2db7826 /sc | |
| parent | cfd5cbae2871e45c60d3df24e954708d2f0d4b94 (diff) | |
convert WINDOW constants for GetWindow() methods to scoped enum
Change-Id: I0c7c6d095732704eb4ab48f1277a0592b1c7fa33
Signed-off-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/miscdlgs/anyrefdg.cxx | 14 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/retypepassdlg.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/gridwin.cxx | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 34ecb427fab9..aab5194546b7 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -421,8 +421,8 @@ namespace void hideUnless(vcl::Window *pTop, const winset& rVisibleWidgets, std::vector<VclPtr<vcl::Window> > &rWasVisibleWidgets) { - for (vcl::Window* pChild = pTop->GetWindow(WINDOW_FIRSTCHILD); pChild; - pChild = pChild->GetWindow(WINDOW_NEXT)) + for (vcl::Window* pChild = pTop->GetWindow(GetWindowType::FirstChild); pChild; + pChild = pChild->GetWindow(GetWindowType::Next)) { if (!pChild->IsVisible()) continue; @@ -489,10 +489,10 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: if (!mbOldDlgLayoutEnabled) { - for (vcl::Window* pChild = m_pWindow->GetWindow(WINDOW_FIRSTCHILD); pChild; - pChild = pChild->GetWindow(WINDOW_NEXT)) + for (vcl::Window* pChild = m_pWindow->GetWindow(GetWindowType::FirstChild); pChild; + pChild = pChild->GetWindow(GetWindowType::Next)) { - vcl::Window *pWin = pChild->GetWindow(WINDOW_CLIENT); + vcl::Window *pWin = pChild->GetWindow(GetWindowType::Client); if (pWin == (vcl::Window*)pRefEdit || pWin == (vcl::Window*)pRefBtn) continue; // do nothing else if (pWin->IsVisible()) @@ -512,7 +512,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: vcl::Window *pContentArea = pResizeDialog->get_content_area(); for (vcl::Window *pCandidate = pRefEdit; pCandidate && (pCandidate != pContentArea && pCandidate->IsVisible()); - pCandidate = pCandidate->GetWindow(WINDOW_REALPARENT)) + pCandidate = pCandidate->GetWindow(GetWindowType::RealParent)) { m_aVisibleWidgets.insert(pCandidate); } @@ -520,7 +520,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: //shared parent in the existing widgets for (vcl::Window *pCandidate = pRefBtn; pCandidate && (pCandidate != pContentArea && pCandidate->IsVisible()); - pCandidate = pCandidate->GetWindow(WINDOW_REALPARENT)) + pCandidate = pCandidate->GetWindow(GetWindowType::RealParent)) { if (m_aVisibleWidgets.insert(pCandidate).second) break; diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index ce482a3a2156..ba02adcacfb8 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -72,11 +72,11 @@ void ScRetypePassDlg::DeleteSheets() for(auto it = maSheets.begin(); it != maSheets.end(); ++it) { VclPtr<vcl::Window> pWindow = (*it); - vcl::Window *pChild = pWindow->GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pChild = pWindow->GetWindow(GetWindowType::FirstChild); while (pChild) { VclPtr<vcl::Window> pOldChild = pChild; - pChild = pChild->GetWindow(WINDOW_NEXT); + pChild = pChild->GetWindow(GetWindowType::Next); pOldChild.disposeAndClear(); } pWindow.disposeAndClear(); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 32b091ca3bfc..c31d2466b228 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -370,7 +370,7 @@ void ScFilterFloatingWindow::dispose() vcl::Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow() { // redirect keyinput in the child window - return GetWindow(WINDOW_FIRSTCHILD) ? GetWindow(WINDOW_FIRSTCHILD)->GetPreferredKeyInputWindow() : NULL; // will be the FilterBox + return GetWindow(GetWindowType::FirstChild) ? GetWindow(GetWindowType::FirstChild)->GetPreferredKeyInputWindow() : NULL; // will be the FilterBox } static bool lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange ) |