summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-22 12:49:04 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-02-05 21:35:17 -0500
commit23ed3993e0f44584893e78226da20cd63242dbdb (patch)
treeb6a101b7b0b66fb953eb9a9d95c44b6929ac8441 /sfx2/source
parent4ed58fd8721b441e3c131408188dec7ba5029a5e (diff)
convert SHOW constants to scoped enum
(cherry picked from commit b419da0f53cf7f65b1d0c58351176ece23fbfe1f) Change-Id: I2712a0901049885502cade31f9757f712048bb33
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/appl/childwin.cxx2
-rw-r--r--sfx2/source/appl/workwin.cxx8
-rw-r--r--sfx2/source/dialog/dockwin.cxx4
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx2
4 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 35e53d6e8892..9ff222003f43 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -675,7 +675,7 @@ void SfxChildWindow::Hide()
}
}
-void SfxChildWindow::Show( sal_uInt16 nFlags )
+void SfxChildWindow::Show( ShowFlags nFlags )
{
switch ( pWindow->GetType() )
{
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index b9999cb8b698..8766b25d2a83 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1065,7 +1065,7 @@ void SfxWorkWindow::ShowChildren_Impl()
if ( SfxChildVisibility::VISIBLE == (pCli->nVisible & SfxChildVisibility::VISIBLE) && bVisible )
{
- sal_uInt16 nFlags = pCli->bSetFocus ? 0 : SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE;
+ ShowFlags nFlags = pCli->bSetFocus ? ShowFlags::NONE : ShowFlags::NoFocusChange | ShowFlags::NoActivate;
switch ( pCli->pWin->GetType() )
{
case RSC_DOCKINGWINDOW :
@@ -1672,7 +1672,7 @@ void SfxWorkWindow::HidePopups_Impl(bool bHide, bool bParent, sal_uInt16 nId )
{
pChild->nVisible |= SfxChildVisibility::ACTIVE;
if ( SfxChildVisibility::VISIBLE == (pChild->nVisible & SfxChildVisibility::VISIBLE) )
- pCW->Show( SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ pCW->Show( ShowFlags::NoFocusChange | ShowFlags::NoActivate );
}
}
}
@@ -1741,7 +1741,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
pWin = pSplitWin->GetSplitWindow();
if ( pSplitWin->GetWindowCount() == 1 )
- static_cast<SplitWindow*>(pWin)->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ static_cast<SplitWindow*>(pWin)->Show( true, ShowFlags::NoFocusChange | ShowFlags::NoActivate );
}
}
@@ -2265,7 +2265,7 @@ void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, bool bVisible, bool bSe
{
pCW->pCli->bSetFocus = bSetFocus;
pCW->pCli->nVisible = SfxChildVisibility::VISIBLE;
- pChildWin->Show( bSetFocus && pChildWin->WantsFocus() ? 0 : SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ pChildWin->Show( bSetFocus && pChildWin->WantsFocus() ? ShowFlags::NONE : ShowFlags::NoFocusChange | ShowFlags::NoActivate );
}
else
static_cast<SfxDockingWindow*>(pChildWin->GetWindow())->Reappear_Impl();
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 8d8c31fb6087..64592894a28e 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -764,7 +764,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode )
// before Show() is called must the reassignment have been made,
// therefore the base class can not be called
if ( IsFloatingMode() || !pImp->bSplitable )
- Show( false, SHOW_NOFOCUSCHANGE );
+ Show( false, ShowFlags::NoFocusChange );
// Set the size for toggling.
pImp->aSplitSize = rRect.GetSize();
@@ -772,7 +772,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode )
{
SetFloatingMode( bFloatMode );
if ( IsFloatingMode() || !pImp->bSplitable )
- Show( true, SHOW_NOFOCUSCHANGE );
+ Show( true, ShowFlags::NoFocusChange );
}
else
{
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index d29910967de4..cf205e766554 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1366,7 +1366,7 @@ void SfxPopupWindow::StateChanged(
}
else if ( m_bFloating )
{
- Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ Show( true, ShowFlags::NoFocusChange | ShowFlags::NoActivate );
}
}