diff options
Diffstat (limited to 'framework/source/uielement')
4 files changed, 8 insertions, 8 deletions
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 4f8a4f6a7b7d..0043c25a45c2 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -356,7 +356,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue if ( pItemWin ) { WindowType nType = pItemWin->GetType(); - if ( nType == WINDOW_LISTBOX || nType == WINDOW_MULTILISTBOX || nType == WINDOW_COMBOBOX ) + if ( nType == WindowType::LISTBOX || nType == WindowType::MULTILISTBOX || nType == WindowType::COMBOBOX ) pItemWin->SetAccessibleName( m_pToolBar->GetItemText( nId ) ); m_pToolBar->SetItemWindow( nId, pItemWin ); } diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index 07f34520c5aa..981e7eef3c53 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -104,7 +104,7 @@ void ProgressBarWrapper::start( const OUString& Text, ::sal_Int32 Range ) { SolarMutexGuard aSolarMutexGuard; VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xWindow ); - if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR ) + if ( pWindow && pWindow->GetType() == WindowType::STATUSBAR ) { StatusBar* pStatusBar = static_cast<StatusBar *>(pWindow.get()); if ( !pStatusBar->IsProgressMode() ) @@ -141,7 +141,7 @@ void ProgressBarWrapper::end() { SolarMutexGuard aSolarMutexGuard; VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xWindow ); - if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR ) + if ( pWindow && pWindow->GetType() == WindowType::STATUSBAR ) { StatusBar* pStatusBar = static_cast<StatusBar *>(pWindow.get()); if ( pStatusBar->IsProgressMode() ) @@ -170,7 +170,7 @@ void ProgressBarWrapper::setText( const OUString& Text ) { SolarMutexGuard aSolarMutexGuard; VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xWindow ); - if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR ) + if ( pWindow && pWindow->GetType() == WindowType::STATUSBAR ) { StatusBar* pStatusBar = static_cast<StatusBar *>(pWindow.get()); if( pStatusBar->IsProgressMode() ) @@ -222,7 +222,7 @@ void ProgressBarWrapper::setValue( ::sal_Int32 nValue ) { SolarMutexGuard aSolarMutexGuard; VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xWindow ); - if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR ) + if ( pWindow && pWindow->GetType() == WindowType::STATUSBAR ) { StatusBar* pStatusBar = static_cast<StatusBar *>(pWindow.get()); if ( !pStatusBar->IsProgressMode() ) diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx index aa5450fe9436..146051d1958f 100644 --- a/framework/source/uielement/subtoolbarcontroller.cxx +++ b/framework/source/uielement/subtoolbarcontroller.cxx @@ -238,7 +238,7 @@ css::uno::Reference< css::awt::XWindow > SubToolBarController::createPopupWindow m_xUIElement = xUIElement; VclPtr<vcl::Window> pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar ); - if ( pTbxWindow && pTbxWindow->GetType() == WINDOW_TOOLBOX ) + if ( pTbxWindow && pTbxWindow->GetType() == WindowType::TOOLBOX ) { ToolBox* pToolBar = static_cast< ToolBox* >( pTbxWindow.get() ); pToolBar->SetParent( pToolBox ); @@ -369,7 +369,7 @@ void SubToolBarController::endPopupMode( const css::awt::EndPopupModeEvent& e ) try { VclPtr<vcl::Window> pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar ); - if ( pTbxWindow && pTbxWindow->GetType() == WINDOW_TOOLBOX ) + if ( pTbxWindow && pTbxWindow->GetType() == WindowType::TOOLBOX ) { css::uno::Any a = xProp->getPropertyValue( aPersistentString ); xProp->setPropertyValue( aPersistentString, css::uno::makeAny( false ) ); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index c7af7cf5869e..a42fe2d2ecf2 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -854,7 +854,7 @@ void ToolBarManager::CreateControllers() if ( pItemWin ) { WindowType nType = pItemWin->GetType(); - if ( nType == WINDOW_LISTBOX || nType == WINDOW_MULTILISTBOX || nType == WINDOW_COMBOBOX ) + if ( nType == WindowType::LISTBOX || nType == WindowType::MULTILISTBOX || nType == WindowType::COMBOBOX ) pItemWin->SetAccessibleName( m_pToolBar->GetItemText( nId ) ); m_pToolBar->SetItemWindow( nId, pItemWin ); } |