summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-22 13:48:09 +0200
committerNoel Grandin <noel@peralex.com>2015-05-25 10:31:35 +0200
commit65be8fd0f7f30eaca4fbc35e3fdc9cb7763cb44d (patch)
treebbfe99aba8f0155c7365b4b9d4bcd226654d88d6 /dbaccess
parentb419da0f53cf7f65b1d0c58351176ece23fbfe1f (diff)
convert WINDOW_ZORDER constants to scoped enum
Change-Id: I91a583fe7d4195ee6bc73b4854f757517b38408b
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx2
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx10
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx4
-rw-r--r--dbaccess/source/ui/relationdesign/RelationTableView.cxx2
4 files changed, 9 insertions, 9 deletions
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index c3dc8ef4a089..557e89e82ec9 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -582,7 +582,7 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon
);
pTreeView->notifyHiContrastChanged();
- m_aBorder->SetZOrder(pTreeView, WINDOW_ZORDER_BEHIND);
+ m_aBorder->SetZOrder(pTreeView, ZOrderFlags::Behind);
}
if ( !m_pLists[E_TABLE]->GetEntryCount() )
{
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 3cce5975a3a1..ca610b1467da 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -745,13 +745,13 @@ void OFieldDescControl::ArrangeAggregates()
SetPosSize(adAggregates[i].pctrlInputControl, nCurrentControlPos, adAggregates[i].nPosSizeArgument);
// Set the z-order in a way such that the Controls can be traversed in the same sequence in which they have been arranged here
- adAggregates[i].pctrlTextControl->SetZOrder(pZOrderPredecessor, pZOrderPredecessor ? WINDOW_ZORDER_BEHIND : WINDOW_ZORDER_FIRST);
- adAggregates[i].pctrlInputControl->SetZOrder(adAggregates[i].pctrlTextControl, WINDOW_ZORDER_BEHIND );
+ adAggregates[i].pctrlTextControl->SetZOrder(pZOrderPredecessor, pZOrderPredecessor ? ZOrderFlags::Behind : ZOrderFlags::First);
+ adAggregates[i].pctrlInputControl->SetZOrder(adAggregates[i].pctrlTextControl, ZOrderFlags::Behind );
pZOrderPredecessor = adAggregates[i].pctrlInputControl;
if (adAggregates[i].pctrlInputControl == pFormatSample)
{
- pFormat->SetZOrder(pZOrderPredecessor, WINDOW_ZORDER_BEHIND);
+ pFormat->SetZOrder(pZOrderPredecessor, ZOrderFlags::Behind);
pZOrderPredecessor = pFormat;
}
@@ -768,8 +768,8 @@ void OFieldDescControl::ArrangeAggregates()
}
// Finally, put the ScrollBars at the top of the z-order
- m_pVertScroll->SetZOrder(NULL, WINDOW_ZORDER_FIRST);
- m_pHorzScroll->SetZOrder(NULL, WINDOW_ZORDER_FIRST);
+ m_pVertScroll->SetZOrder(NULL, ZOrderFlags::First);
+ m_pHorzScroll->SetZOrder(NULL, ZOrderFlags::First);
}
void OFieldDescControl::ActivateAggregate( EControlType eType )
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 571067e061d6..f5daa40ef329 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -622,7 +622,7 @@ void OJoinTableView::BeginChildMove( OTableWindow* pTabWin, const Point& rMouseP
SetPointer(Pointer(PointerStyle::Move));
Point aMousePos = ScreenToOutputPixel( rMousePos );
m_aDragOffset = aMousePos - pTabWin->GetPosPixel();
- m_pDragWin->SetZOrder(NULL, WINDOW_ZORDER_FIRST);
+ m_pDragWin->SetZOrder(NULL, ZOrderFlags::First);
m_bTrackingInitiallyMoved = false;
StartTracking();
}
@@ -752,7 +752,7 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt )
// position window
EndTracking();
- m_pDragWin->SetZOrder(NULL, WINDOW_ZORDER_FIRST);
+ m_pDragWin->SetZOrder(NULL, ZOrderFlags::First);
// check, if I really moved
// (this prevents setting the modified-Flag, when there actually was no change0
TTableWindowData::value_type pData = m_pDragWin->GetData();
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index 71efb0999d33..a0c3c2553863 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -288,7 +288,7 @@ void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUStrin
if(aIter != GetTabWinMap().end())
{
- aIter->second->SetZOrder(NULL, WINDOW_ZORDER_FIRST);
+ aIter->second->SetZOrder(NULL, ZOrderFlags::First);
aIter->second->GrabFocus();
EnsureVisible(aIter->second);
// no new one