diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-22 12:49:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-25 10:31:35 +0200 |
| commit | b419da0f53cf7f65b1d0c58351176ece23fbfe1f (patch) | |
| tree | b29c038348d6aae8e5ec9c0c97ed8eeb41f5cd67 /framework/source/layoutmanager | |
| parent | acf5049188e1be0ededc70f9bbedaa0032610680 (diff) | |
convert SHOW constants to scoped enum
Change-Id: I2712a0901049885502cade31f9757f712048bb33
Diffstat (limited to 'framework/source/layoutmanager')
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 2 | ||||
| -rw-r--r-- | framework/source/layoutmanager/toolbarlayoutmanager.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index cd6932451f11..76dfc71ad7e2 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -1660,7 +1660,7 @@ throw (uno::RuntimeException, std::exception) vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) { - pWindow->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); + pWindow->Show( true, ShowFlags::NoFocusChange | ShowFlags::NoActivate ); bResult = true; bNotify = true; } diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 1b1b9fc41948..40a62d94c767 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -675,7 +675,7 @@ bool ToolbarLayoutManager::showToolbar( const OUString& rResourceURL ) if ( !aUIElement.m_bFloating ) implts_setLayoutDirty(); else - pWindow->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); + pWindow->Show( true, ShowFlags::NoFocusChange | ShowFlags::NoActivate ); aUIElement.m_bVisible = true; implts_writeWindowStateData( aUIElement ); @@ -755,7 +755,7 @@ void ToolbarLayoutManager::setFloatingToolbarsVisibility( bool bVisible ) if ( bVisible ) { if ( pIter->m_bVisible && !pIter->m_bMasterHide ) - pWindow->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); + pWindow->Show( true, ShowFlags::NoFocusChange | ShowFlags::NoActivate ); } else pWindow->Show( false ); @@ -789,7 +789,7 @@ void ToolbarLayoutManager::setVisible( bool bVisible ) else { if ( pIter->m_bFloating ) - pWindow->Show(true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); + pWindow->Show(true, ShowFlags::NoFocusChange | ShowFlags::NoActivate ); } } } @@ -1479,7 +1479,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno if ( bShowElement && pWindow ) { SolarMutexGuard aGuard; - pWindow->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); + pWindow->Show( true, ShowFlags::NoFocusChange | ShowFlags::NoActivate ); } } else @@ -2542,7 +2542,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( if ( aWinRect.X < nCurrPos ) aWinRect.X = nCurrPos; pWindow->SetPosSizePixel( ::Point( aWinRect.X, nOffset ), ::Size( aWinRect.Width, rRowColumnWindowData.nStaticSize )); - pWindow->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); + pWindow->Show( true, ShowFlags::NoFocusChange | ShowFlags::NoActivate ); nCurrPos += ( aWinRect.X - nCurrPos ) + aWinRect.Width; } else @@ -2550,7 +2550,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( if ( aWinRect.Y < nCurrPos ) aWinRect.Y = nCurrPos; pWindow->SetPosSizePixel( ::Point( nOffset, aWinRect.Y ), ::Size( rRowColumnWindowData.nStaticSize, aWinRect.Height )); - pWindow->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); + pWindow->Show( true, ShowFlags::NoFocusChange | ShowFlags::NoActivate ); nCurrPos += ( aWinRect.Y - nCurrPos ) + aWinRect.Height; } } |