summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-21 15:52:27 +0200
committerJan Holesovsky <kendy@collabora.com>2015-05-29 20:16:52 +0200
commita5e58e66d82a63d99ced4ed8a42c38ed6179aa6c (patch)
tree234325db56cadde360176607258cdf98d2db7826 /sfx2
parentcfd5cbae2871e45c60d3df24e954708d2f0d4b94 (diff)
convert WINDOW constants for GetWindow() methods to scoped enum
Change-Id: I0c7c6d095732704eb4ab48f1277a0592b1c7fa33 Signed-off-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/newhelp.cxx4
-rw-r--r--sfx2/source/appl/sfxhelp.cxx2
-rw-r--r--sfx2/source/dialog/backingcomp.cxx2
-rw-r--r--sfx2/source/dialog/backingwindow.cxx4
-rw-r--r--sfx2/source/dialog/dialoghelper.cxx4
5 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index e6c3b2b19856..70d287e7a7d8 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1643,7 +1643,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl)
void SfxHelpIndexWindow_Impl::Resize()
{
- vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD);
+ vcl::Window *pChild = GetWindow(GetWindowType::FirstChild);
if (!pChild)
return;
VclContainer::setLayoutAllocation(*pChild, Point(0,0), GetSizePixel());
@@ -1651,7 +1651,7 @@ void SfxHelpIndexWindow_Impl::Resize()
Size SfxHelpIndexWindow_Impl::GetOptimalSize() const
{
- const vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD);
+ const vcl::Window *pChild = GetWindow(GetWindowType::FirstChild);
if (!pChild)
return Window::GetOptimalSize();
return VclContainer::getLayoutRequisition(*pChild);
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 21e56b4c1920..3aa700332458 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -589,7 +589,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const
Dialog *pDialog = static_cast<Dialog*>(pParent);
TabControl *pCtrl = pDialog->hasBuilder() ? pDialog->get<TabControl>("tabcontrol") : NULL;
TabPage* pTabPage = pCtrl ? pCtrl->GetTabPage(pCtrl->GetCurPageId()) : NULL;
- vcl::Window *pTabChild = pTabPage ? pTabPage->GetWindow(WINDOW_FIRSTCHILD) : NULL;
+ vcl::Window *pTabChild = pTabPage ? pTabPage->GetWindow(GetWindowType::FirstChild) : NULL;
if (pTabChild)
pParent = pTabChild;
}
diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx
index f11d9ffac79d..5c0b6ff6d0d6 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -439,7 +439,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
if( pParent && pBack )
{
long nMenuHeight = 0;
- vcl::Window* pMenu = pParent->GetWindow(WINDOW_NEXT);
+ vcl::Window* pMenu = pParent->GetWindow(GetWindowType::Next);
if( pMenu )
nMenuHeight = pMenu->GetSizePixel().Height();
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index ba15fd4e7deb..d58f8562baa8 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -507,7 +507,7 @@ void BackingWindow::Resize()
maStartCentButtons = Rectangle( Point(0, 0), GetOutputSizePixel() );
if (isLayoutEnabled(this))
- VclContainer::setLayoutAllocation(*GetWindow(WINDOW_FIRSTCHILD),
+ VclContainer::setLayoutAllocation(*GetWindow(GetWindowType::FirstChild),
maStartCentButtons.TopLeft(), maStartCentButtons.GetSize());
if (!IsInPaint())
@@ -758,7 +758,7 @@ void BackingWindow::dispatchURL( const OUString& i_rURL,
Size BackingWindow::GetOptimalSize() const
{
if (isLayoutEnabled(this))
- return VclContainer::getLayoutRequisition(*GetWindow(WINDOW_FIRSTCHILD));
+ return VclContainer::getLayoutRequisition(*GetWindow(GetWindowType::FirstChild));
return Window::GetOptimalSize();
}
diff --git a/sfx2/source/dialog/dialoghelper.cxx b/sfx2/source/dialog/dialoghelper.cxx
index e7c0af10a454..e60edb12ba31 100644
--- a/sfx2/source/dialog/dialoghelper.cxx
+++ b/sfx2/source/dialog/dialoghelper.cxx
@@ -27,8 +27,8 @@ void setPreviewsToSamePlace(vcl::Window *pParent, VclBuilderContainer *pPage)
std::vector<vcl::Window*> aGrids;
aGrids.push_back(pOurGrid);
- for (vcl::Window* pChild = pParent->GetWindow(WINDOW_FIRSTCHILD); pChild;
- pChild = pChild->GetWindow(WINDOW_NEXT))
+ for (vcl::Window* pChild = pParent->GetWindow(GetWindowType::FirstChild); pChild;
+ pChild = pChild->GetWindow(GetWindowType::Next))
{
VclBuilderContainer *pPeer = dynamic_cast<VclBuilderContainer*>(pChild);
if (!pPeer || pPeer == pPage || !pPeer->hasBuilder())