diff options
Diffstat (limited to 'framework')
44 files changed, 157 insertions, 157 deletions
diff --git a/framework/source/classes/fwkresid.cxx b/framework/source/classes/fwkresid.cxx index 990bd9a0c912..74b8c50661ac 100644 --- a/framework/source/classes/fwkresid.cxx +++ b/framework/source/classes/fwkresid.cxx @@ -48,7 +48,7 @@ ResMgr* FwkResId::GetResManager() rtl::OStringBuffer aBuf( 32 ); aBuf.append( "fwe" ); - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; pResMgr = ResMgr::CreateResMgr( aBuf.getStr() ); } diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx index 6a494fe6dab3..9e06707eac2a 100644 --- a/framework/source/classes/fwlresid.cxx +++ b/framework/source/classes/fwlresid.cxx @@ -48,7 +48,7 @@ ResMgr* FwlResId::GetResManager() rtl::OStringBuffer aBuf( 32 ); aBuf.append( "fwe" ); - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; pResMgr = ResMgr::CreateResMgr( aBuf.getStr() ); } diff --git a/framework/source/classes/imagewrapper.cxx b/framework/source/classes/imagewrapper.cxx index 424193a4754b..405930a5e32b 100644 --- a/framework/source/classes/imagewrapper.cxx +++ b/framework/source/classes/imagewrapper.cxx @@ -70,7 +70,7 @@ Sequence< sal_Int8 > ImageWrapper::GetUnoTunnelId() // XBitmap com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; BitmapEx aBitmapEx( m_aImage.GetBitmapEx() ); Size aBitmapSize( aBitmapEx.GetSizePixel() ); @@ -80,7 +80,7 @@ com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeExcept Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SvMemoryStream aMem; aMem << m_aImage.GetBitmapEx().GetBitmap(); @@ -89,7 +89,7 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException ) Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; BitmapEx aBmpEx( m_aImage.GetBitmapEx() ); if ( aBmpEx.IsAlpha() ) diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 0d626c98deab..1c86cdd421c3 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -385,7 +385,7 @@ throw ( RuntimeException ) if ( pStatusChangedMenu ) { - OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; { ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/classes/rootactiontriggercontainer.cxx b/framework/source/classes/rootactiontriggercontainer.cxx index be2d70b2d427..759ca2133c27 100644 --- a/framework/source/classes/rootactiontriggercontainer.cxx +++ b/framework/source/classes/rootactiontriggercontainer.cxx @@ -212,7 +212,7 @@ throw ( RuntimeException ) { if ( m_pMenu ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; return m_pMenu->GetItemCount(); } else @@ -248,7 +248,7 @@ throw (::com::sun::star::uno::RuntimeException) { if ( m_pMenu ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; return ( m_pMenu->GetItemCount() > 0 ); } diff --git a/framework/source/dispatch/helpagentdispatcher.cxx b/framework/source/dispatch/helpagentdispatcher.cxx index a67dbd71f596..4ae8ac15ee6f 100644 --- a/framework/source/dispatch/helpagentdispatcher.cxx +++ b/framework/source/dispatch/helpagentdispatcher.cxx @@ -229,7 +229,7 @@ void HelpAgentDispatcher::implts_acceptCurrentURL() // show the right help content // SOLAR SAFE -> { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; Help* pHelp = Application::GetHelp(); if (pHelp) pHelp->Start(sAcceptedURL, NULL); @@ -266,7 +266,7 @@ void HelpAgentDispatcher::implts_stopTimer() // Timer access needs no "own lock" ! It lives if we live ... // But it requires locking of the solar mutex ... because it's a vcl based timer. { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; if (! m_aTimer.IsActive()) return; m_aTimer.Stop(); @@ -281,7 +281,7 @@ void HelpAgentDispatcher::implts_startTimer() // Timer access needs no "own lock" ! It lives if we live ... // But it requires locking of the solar mutex ... because it's a vcl based timer. { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; if (m_aTimer.IsActive()) return; } @@ -302,7 +302,7 @@ void HelpAgentDispatcher::implts_startTimer() // Timer access needs no "own lock" ! It lives if we live ... // But it requires locking of the solar mutex ... because it's a vcl based timer. { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; m_aTimer.SetTimeout(nTime*1000); // sec => ms ! m_aTimer.Start(); } @@ -411,7 +411,7 @@ css::uno::Reference< css::awt::XWindow > HelpAgentDispatcher::implts_ensureAgent ::svt::HelpAgentWindow* pAgentWindow = 0; // SOLAR SAFE -> { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; // create the agent window Window* pContainerWindow = VCLUnoHelper::GetWindow(xContainerWindow); pAgentWindow = new ::svt::HelpAgentWindow(pContainerWindow); @@ -431,7 +431,7 @@ css::uno::Reference< css::awt::XWindow > HelpAgentDispatcher::implts_ensureAgent // SOLAR SAFE -> { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; // establish callback for our internal used timer. // Note: Its only active, if the timer will be started ... m_aTimer.SetTimeoutHdl(LINK(this, HelpAgentDispatcher, implts_timerExpired)); diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index c9e588ca2217..6ae5f86c5ed0 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -211,7 +211,7 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro { uno::Reference< ::com::sun::star::awt::XWindow >xContainerWindow = xFrame->getContainerWindow(); - OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; { Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) @@ -307,7 +307,7 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR Window* pWindow = NULL; // Use SolarMutex for threadsafe code too! - OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; { pWindow = VCLUnoHelper::GetWindow( xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx index 498c41de59d2..1827e6d6d99b 100644 --- a/framework/source/helper/actiontriggerhelper.cxx +++ b/framework/source/helper/actiontriggerhelper.cxx @@ -131,7 +131,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta if ( IsSeparator( xPropSet )) { // Separator - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pSubMenu->InsertSeparator(); } else @@ -147,7 +147,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta USHORT nNewItemId = nItemId++; GetMenuItemAttributes( xPropSet, aLabel, aCommandURL, aHelpURL, xBitmap, xSubContainer ); - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; { // insert new menu item sal_Int32 nIndex = aCommandURL.indexOf( aSlotURL ); @@ -336,7 +336,7 @@ Reference< XIndexContainer > CreateActionTriggerContainer( const Reference< XInd void FillActionTriggerContainerWithMenu( const Menu* pMenu, Reference< XIndexContainer >& rActionTriggerContainer ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; for ( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ ) { diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 445d79483218..f94037909ef8 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -125,7 +125,7 @@ bool lcl_checkUIElement(const Reference< XUIElement >& xUIElement,css::awt::Rect bool bRet = xUIElement.is(); if ( bRet ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; _xWindow.set( xUIElement->getRealInterface(), UNO_QUERY ); _rPosSize = _xWindow->getPosSize(); @@ -450,7 +450,7 @@ void LayoutManager::impl_clearUpMenuBar() // Clear up VCL menu bar to prepare shutdown if ( m_xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) @@ -823,7 +823,7 @@ void LayoutManager::implts_createCustomToolBar( const rtl::OUString& aTbxResName Reference< XUIElement > xUIElement = getElement( aTbxResName ); if ( xUIElement.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -1006,7 +1006,7 @@ void LayoutManager::implts_createAddonsToolBars() if ( xWindow.is() ) { // Set generic title for add-on toolbar - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow->GetText().Len() == 0 ) pWindow->SetText( aGenericAddonTitle ); @@ -1121,7 +1121,7 @@ void LayoutManager::implts_toggleFloatingUIElementsVisibility( sal_Bool bActive if ( xDockWindow.is() && xWindow.is() ) { sal_Bool bVisible( sal_True ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) bVisible = pWindow->IsVisible(); @@ -1608,7 +1608,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< if ( xDockWindow.is() && xWindow.is() ) { { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) { @@ -1635,7 +1635,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< { if ( pWindow ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; String aText = pWindow->GetText(); if ( aText.Len() == 0 ) pWindow->SetText( rElement.m_aUIName ); @@ -1663,7 +1663,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< if( pToolBox ) { // set an optimal initial floating size - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; ::Size aSize( pToolBox->CalcFloatingWindowSizePixel() ); pToolBox->SetOutputSizePixel( aSize ); } @@ -1684,7 +1684,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< implts_writeWindowStateData( rElement.m_aName, rElement ); if ( bShowElement && pWindow ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); } } @@ -1697,7 +1697,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< if ( pToolBox ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pToolBox->SetAlign( ImplConvertAlignment(rElement.m_aDockedData.m_nDockedArea ) ); pToolBox->SetLineCount( 1 ); if ( rElement.m_aDockedData.m_bLocked ) @@ -1725,7 +1725,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< if ( bShowElement && pWindow ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pWindow->Show( sal_True ); } } @@ -1752,7 +1752,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< Window* pContainerWindow( 0 ); if ( xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); if ( pContainerWindow ) aStartPos = pContainerWindow->OutputToScreenPixel( aStartPos ); @@ -1776,7 +1776,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< Reference< css::awt::XWindow > xWindow( xDockWindow, UNO_QUERY ); if ( xDockWindow.is() && xDockWindow->isFloating() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->IsVisible() ) { @@ -1811,7 +1811,7 @@ void LayoutManager::implts_findNextDockingPos( DockingArea DockingArea, const :: { // Retrieve output size from container Window - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pDockingWindow = VCLUnoHelper::GetWindow( xDockingWindow ); if ( pDockingWindow ) aDockingWinSize = pDockingWindow->GetOutputSizePixel(); @@ -1956,7 +1956,7 @@ void LayoutManager::implts_findNextDockingPos( DockingArea DockingArea, const :: aReadLock.unlock(); // Retrieve output size from container Window - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); if ( pContainerWindow ) return pContainerWindow->GetOutputSizePixel(); @@ -2202,7 +2202,7 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); if ( xWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY ); if ( pWindow && pIter->m_bVisible && xDockWindow.is() && !pIter->m_bFloating ) @@ -2378,7 +2378,7 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea aReadLock.unlock(); // Calc correct position of the column/row rectangle to be able to compare it with mouse pos/tracking rect - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // Retrieve output size from container Window Window* pContainerWindow( VCLUnoHelper::GetWindow( xContainerWindow )); @@ -2513,7 +2513,7 @@ LayoutManager::implts_determineDockingOperation( Window* pDockingAreaWindow( 0 ); Window* pContainerWindow( 0 ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow ); pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); nDockPosY = pDockingAreaWindow->ScreenToOutputPixel( @@ -2555,7 +2555,7 @@ void LayoutManager::implts_calcDockingPosSize( { // Retrieve output size from container Window - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); aContainerWinSize = pContainerWindow->GetOutputSizePixel(); } @@ -2589,7 +2589,7 @@ void LayoutManager::implts_calcDockingPosSize( aReadLock.unlock(); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow ); pDockWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pDockWindow && pDockWindow->GetType() == WINDOW_TOOLBOX ) @@ -2641,7 +2641,7 @@ void LayoutManager::implts_calcDockingPosSize( { // Calc correct position of the column/row rectangle to be able to compare it with mouse pos/tracking rect - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; aRect.SetPos( pContainerWindow->ScreenToOutputPixel( pDockingAreaWindow->OutputToScreenPixel( aRect.TopLeft() ))); } @@ -2740,7 +2740,7 @@ void LayoutManager::implts_calcDockingPosSize( // Set virtual position sal_Int32 nPosY( 0 ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; nPosY = pDockingAreaWindow->ScreenToOutputPixel( pContainerWindow->OutputToScreenPixel( aWindowRect.BottomRight() )).Y(); } @@ -2866,7 +2866,7 @@ void LayoutManager::implts_calcDockingPosSize( rTrackingRect.setWidth( nSize ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; nPosX = pDockingAreaWindow->ScreenToOutputPixel( pContainerWindow->OutputToScreenPixel( rTrackingRect.TopLeft() )).X(); } @@ -2914,7 +2914,7 @@ void LayoutManager::implts_calcDockingPosSize( rTrackingRect.setHeight( nSize ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; nPosY = pDockingAreaWindow->ScreenToOutputPixel( pContainerWindow->OutputToScreenPixel( rTrackingRect.TopLeft() )).Y(); } @@ -3138,7 +3138,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible ) try { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; const sal_uInt32 nCount = aWinVector.size(); for ( sal_uInt32 i = 0; i < nCount; i++ ) { @@ -3166,7 +3166,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible ) if (( xMenuBar.is() || xInplaceMenuBar.is() ) && xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; MenuBar* pMenuBar( 0 ); if ( xInplaceMenuBar.is() ) @@ -3344,7 +3344,7 @@ void LayoutManager::implts_createProgressBar() { Reference< css::awt::XWindow > xStatusBarWindow = pWrapper->getStatusBar(); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pStatusBarWnd = VCLUnoHelper::GetWindow( xStatusBarWindow ); if ( !pStatusBarWnd ) { @@ -3434,7 +3434,7 @@ void LayoutManager::implts_setStatusBarPosSize( const ::Point& rPos, const ::Siz if ( xWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pParentWindow = VCLUnoHelper::GetWindow( xContainerWindow ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pParentWindow && ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR )) @@ -3475,7 +3475,7 @@ sal_Bool LayoutManager::implts_showProgressBar() } aWriteLock.unlock(); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) { @@ -3517,7 +3517,7 @@ sal_Bool LayoutManager::implts_hideProgressBar() bHideStatusBar = !m_aStatusBarElement.m_bVisible; aWriteLock.unlock(); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->IsVisible() && ( bHideStatusBar || bInternalStatusBar )) @@ -3544,7 +3544,7 @@ sal_Bool LayoutManager::implts_showStatusBar( sal_Bool bStoreState ) { Reference< css::awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && !pWindow->IsVisible() ) { @@ -3570,7 +3570,7 @@ sal_Bool LayoutManager::implts_hideStatusBar( sal_Bool bStoreState ) { Reference< css::awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->IsVisible() ) { @@ -3590,7 +3590,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( !m_bInplaceMenuSet ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // Reset old inplace menubar! m_pInplaceMenuBar = 0; @@ -3640,7 +3640,7 @@ throw (::com::sun::star::uno::RuntimeException) // if ( m_xMenuBar.is() && if ( m_xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; MenuBarWrapper* pMenuBarWrapper = SAL_STATIC_CAST( MenuBarWrapper*, m_xMenuBar.get() ); Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) @@ -3805,7 +3805,7 @@ throw ( RuntimeException ) // #i37884# set initial visibility state - in the plugin case the container window is already shown // and we get no notification anymore { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pContainerWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); if( pContainerWindow ) m_bParentWindowVisible = pContainerWindow->IsVisible(); @@ -3827,7 +3827,7 @@ throw ( RuntimeException ) if ( xDockingAreaAcceptor.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; ::DockingAreaWindow* pWindow; pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xTopDockWindow ) ); if( pWindow ) pWindow->SetAlign( WINDOWALIGN_TOP ); @@ -3922,7 +3922,7 @@ void LayoutManager::implts_reparentChildWindows() } } - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); Window* pTopDockWindow = VCLUnoHelper::GetWindow( xTopDockWindow ); Window* pBottomDockWindow = VCLUnoHelper::GetWindow( xBottomDockWindow ); @@ -4177,7 +4177,7 @@ throw (RuntimeException) { if ( aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ) && !bInPlaceMenu ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // PB 2004-12-15 #i38743# don't create a menubar if frame isn't top if ( !m_xMenuBar.is() && implts_isFrameOrWindowTop(xFrame) ) m_xMenuBar = implts_createElement( aName ); @@ -4432,7 +4432,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( xUIElement.is() ) { // we need VCL here to pass special flags to Show() - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) @@ -4486,7 +4486,7 @@ throw (::com::sun::star::uno::RuntimeException) aWriteLock.unlock(); // we need VCL here to pass special flags to Show() - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if( pWindow && !pWindow->IsReallyVisible() ) { @@ -4675,7 +4675,7 @@ throw (RuntimeException) if ( xDockWindow.is() && bShowElement ) { // we need VCL here to pass special flags to Show() - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if( pWindow ) { @@ -4744,7 +4744,7 @@ throw (RuntimeException) if ( m_xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) pWindow = pWindow->GetParent(); @@ -4859,7 +4859,7 @@ throw (RuntimeException) ToolBox* pToolBox( 0 ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { @@ -4878,7 +4878,7 @@ throw (RuntimeException) // we have to find a good place for it. ::Size aSize; - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; { if ( pToolBox ) aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIElement.m_aDockedData.m_nDockedArea ) ); @@ -5219,7 +5219,7 @@ throw (RuntimeException) { aReadLock.unlock(); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) pWindow = pWindow->GetParent(); @@ -5776,7 +5776,7 @@ void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockin css::awt::Rectangle& rWinRect = rRowColumnWindowData.aRowColumnWindowSizes[i]; ::Size aMinSize; - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; { Reference< css::awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i]; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -5845,7 +5845,7 @@ void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockin else if ( nDockingArea == DockingArea_DOCKINGAREA_BOTTOM ) nStartOffset = pDockAreaWindow->GetSizePixel().Height() - rRowColumnWindowData.nStaticSize; - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; for ( sal_uInt32 i = 0; i < nCount; i++ ) { Reference< css::awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i]; @@ -5952,7 +5952,7 @@ css::awt::Rectangle LayoutManager::implts_calcDockingAreaSizes() Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY ); if ( xWindow.is() && xDockWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->IsVisible() && !xDockWindow->isFloating() ) @@ -6123,7 +6123,7 @@ void LayoutManager::implts_updateMenuBarClose() if ( xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) @@ -6170,7 +6170,7 @@ sal_Bool LayoutManager::implts_resetMenuBar() aWriteLock.unlock(); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) pWindow = pWindow->GetParent(); @@ -6191,7 +6191,7 @@ sal_Int16 LayoutManager::implts_getCurrentSymbolsSize() { ReadGuard aReadLock( m_aLock ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( m_pMiscOptions ) eOptSymbolsSize = m_pMiscOptions->GetCurrentSymbolsSize(); } @@ -6205,7 +6205,7 @@ sal_Int16 LayoutManager::implts_getCurrentSymbolsStyle() { ReadGuard aReadLock( m_aLock ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( m_pMiscOptions ) eOptSymbolsStyle = m_pMiscOptions->GetCurrentSymbolsStyle(); } @@ -6304,7 +6304,7 @@ void SAL_CALL LayoutManager::startDocking( const ::com::sun::star::awt::DockingE Window* pWindow( 0 ); ::Point aMousePos; { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); aMousePos = pContainerWindow->ScreenToOutputPixel( ::Point( e.MousePos.X, e.MousePos.Y )); } @@ -6323,7 +6323,7 @@ void SAL_CALL LayoutManager::startDocking( const ::com::sun::star::awt::DockingE aUIElement.m_aFloatingData.m_aPos = ::Point( aPos.X, aPos.Y ); aUIElement.m_aFloatingData.m_aSize = ::Size( aSize.Width, aSize.Height ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { @@ -6396,7 +6396,7 @@ throw (::com::sun::star::uno::RuntimeException) { try { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; sal_Int16 eDockingArea( -1 ); // none sal_Int32 nMagneticZone( aUIDockingElement.m_bFloating ? MAGNETIC_DISTANCE_DOCK : MAGNETIC_DISTANCE_UNDOCK ); @@ -6607,7 +6607,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( bDockingInProgress ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( Reference< css::awt::XWindow >( e.Source, UNO_QUERY )); ToolBox* pToolBox = 0; if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) @@ -6672,7 +6672,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( xDockWindow->isFloating() ) { { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) { @@ -6717,7 +6717,7 @@ throw (::com::sun::star::uno::RuntimeException) Reference< css::awt::XWindow2 > xWindow; { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; xWindow = Reference< css::awt::XWindow2 >( e.Source, UNO_QUERY ); pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -6739,7 +6739,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( aUIDockingElement.m_bFloating ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( pToolBox ) { pToolBox->SetLineCount( aUIDockingElement.m_aFloatingData.m_nLines ); @@ -6782,7 +6782,7 @@ throw (::com::sun::star::uno::RuntimeException) ::Size aSize; { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( pToolBox ) aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea ) ); else @@ -6796,7 +6796,7 @@ throw (::com::sun::star::uno::RuntimeException) aUIDockingElement.m_aDockedData.m_aPos = aDockPos; } - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( pToolBox ) { pToolBox->SetAlign( ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea) ); @@ -6822,7 +6822,7 @@ throw (::com::sun::star::uno::RuntimeException) } else { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( pToolBox ) { if ( aUIDockingElement.m_bFloating ) @@ -7336,7 +7336,7 @@ void SAL_CALL LayoutManager::elementInserted( const ::com::sun::star::ui::Config } { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index d7ac6945b1e5..0b1b4bd2824d 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -3698,7 +3698,7 @@ void AutoRecovery::impl_flushALLConfigChanges() ::comphelper::ConfigurationHelper::flush(xRecoveryCfg); // SOLAR SAFE -> - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; ::utl::ConfigManager& rCfgMgr = ::utl::ConfigManager::GetConfigManager(); rCfgMgr.StoreConfigItems(); } diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 354b07322759..007608a06dcd 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -420,7 +420,7 @@ throw (css::uno::Exception, css::uno::RuntimeException) xWindow->setPosSize( 0, 0, aSize.Width, aSize.Height, css::awt::PosSize::POSSIZE ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if( pWindow ) pWindow->Show( TRUE ); diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index c35b920813a3..5db482745950 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -136,7 +136,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument ToolBar* pToolBar = 0; AddonsToolBarManager* pToolBarManager = 0; { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); if ( pWindow ) { diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index 825011eb5777..54191bef7787 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -134,7 +134,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException bool bInitialized( true ); { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) throw DisposedException(); @@ -144,7 +144,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException if ( !bInitialized ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_bInitialized = sal_True; PropertyValue aPropValue; @@ -169,7 +169,7 @@ void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::R Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) throw DisposedException(); @@ -199,7 +199,7 @@ throw (::com::sun::star::uno::RuntimeException) void SAL_CALL ButtonToolbarController::update() throw (::com::sun::star::uno::RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) throw DisposedException(); } @@ -211,7 +211,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) { uno::Reference< uno::XInterface > xSource( Source.Source ); - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) return; @@ -240,7 +240,7 @@ throw (::com::sun::star::uno::RuntimeException) ::com::sun::star::util::URL aTargetURL; { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) throw DisposedException(); @@ -294,7 +294,7 @@ throw (::com::sun::star::uno::RuntimeException) void SAL_CALL ButtonToolbarController::click() throw (::com::sun::star::uno::RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) throw DisposedException(); diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 05bf7b47b28b..6288e157030c 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -194,7 +194,7 @@ ComboboxToolbarController::~ComboboxToolbarController() void SAL_CALL ComboboxToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_pToolbar->SetItemWindow( m_nID, 0 ); delete m_pComboBox; diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 83fb8a263626..320b68bd1970 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -100,7 +100,7 @@ ComplexToolbarController::~ComplexToolbarController() void SAL_CALL ComplexToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_pToolbar->SetItemWindow( m_nID, 0 ); svt::ToolboxController::dispose(); @@ -131,7 +131,7 @@ throw ( RuntimeException ) Sequence<PropertyValue> aArgs; { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) throw DisposedException(); @@ -171,7 +171,7 @@ throw ( RuntimeException ) void ComplexToolbarController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) return; diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 38c7807533f1..2139ebef9165 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -260,7 +260,7 @@ void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rP VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) @@ -305,7 +305,7 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve { VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu ); - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); @@ -358,7 +358,7 @@ void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) thro if ( m_xPopupMenu.is() ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; // Check if some modes have changed so we have to update our menu images const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index b14415174784..8ac988114332 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -177,7 +177,7 @@ DropdownToolbarController::~DropdownToolbarController() void SAL_CALL DropdownToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_pToolbar->SetItemWindow( m_nID, 0 ); delete m_pListBoxControl; diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 1622022e1afa..b52ce4f4aba0 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -174,7 +174,7 @@ EditToolbarController::~EditToolbarController() void SAL_CALL EditToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_pToolbar->SetItemWindow( m_nID, 0 ); delete m_pEditControl; diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 158b98114131..b593cf453b08 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -104,7 +104,7 @@ void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFont VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index f729abb6e1cb..abc6f9157a79 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -166,7 +166,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r Printer* pInfoPrinter = 0; rtl::OUString aPrinterName; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; // try to retrieve printer name of document aPrinterName = retrievePrinterName( m_xFrame ); @@ -305,7 +305,7 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev if ( m_xPopupMenu.is() ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; setCurHeight( long( m_aFontHeight.Height * 10), m_xPopupMenu ); } } diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index b67bf9cc2270..1fc728e419d6 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -145,7 +145,7 @@ GenericToolbarController::~GenericToolbarController() void SAL_CALL GenericToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; svt::ToolboxController::dispose(); @@ -161,7 +161,7 @@ throw ( RuntimeException ) ::rtl::OUString aCommandURL; { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) throw DisposedException(); @@ -208,7 +208,7 @@ throw ( RuntimeException ) void GenericToolbarController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) return; diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 24f6ed458563..9e4abf317472 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -108,7 +108,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index aef18690fffc..4bd53d6d2436 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -90,7 +90,7 @@ uno::Reference< util::XMacroExpander > GetMacroExpander() uno::Reference< util::XMacroExpander > xMacroExpander( m_xMacroExpander ); if ( !xMacroExpander.is() ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( !xMacroExpander.is() ) { @@ -155,7 +155,7 @@ ImageButtonToolbarController::~ImageButtonToolbarController() void SAL_CALL ImageButtonToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; ComplexToolbarController::dispose(); } @@ -163,7 +163,7 @@ throw ( RuntimeException ) void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; // i73486 to be downward compatible use old and "wrong" also! if (( rControlCommand.Command.equalsAsciiL( "SetImag", 7 )) || ( rControlCommand.Command.equalsAsciiL( "SetImage", 8 )) ) diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 30b6f50e1472..2b68790a46d0 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -131,7 +131,7 @@ void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) t // XStatusListener void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if (rBHelper.bDisposed || rBHelper.bInDispose) return; @@ -227,7 +227,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup VCLXPopupMenu* pVCLPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if (!m_bShowMenu) diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index ea51b890b488..50b2f44c97c9 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -126,7 +126,7 @@ void SAL_CALL LangSelectionStatusbarController::initialize( const ::com::sun::st throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::initialize" ); - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; svt::StatusbarController::initialize( aArguments ); @@ -390,7 +390,7 @@ throw ( RuntimeException ) // m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedText RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::statusChanged" ); - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) return; diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx index 17ad76af6ac5..a4ba634c307d 100644 --- a/framework/source/uielement/logoimagestatusbarcontroller.cxx +++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx @@ -88,7 +88,7 @@ void SAL_CALL LogoImageStatusbarController::release() throw () void SAL_CALL LogoImageStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; svt::StatusbarController::initialize( aArguments ); } @@ -152,7 +152,7 @@ void SAL_CALL LogoImageStatusbarController::paint( ::sal_Int32 /*nStyle*/ ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; OutputDevice* pOutDev = VCLUnoHelper::GetOutputDevice( xGraphics );; if ( pOutDev ) diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx index 8c63348bfa13..6ae22de22474 100644 --- a/framework/source/uielement/logotextstatusbarcontroller.cxx +++ b/framework/source/uielement/logotextstatusbarcontroller.cxx @@ -88,7 +88,7 @@ void SAL_CALL LogoTextStatusbarController::release() throw () void SAL_CALL LogoTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; svt::StatusbarController::initialize( aArguments ); diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index a2bb0e39f3db..6a8ab3f1c3f1 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -88,7 +88,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo VCLXPopupMenu* pVCLPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if ( pVCLPopupMenu ) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index dacf8c6bee4b..6e6e72aad362 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -312,7 +312,7 @@ Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*Proces if ( m_pVCLMenu ) { - OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; SystemMenuData aSystemMenuData; aSystemMenuData.nSize = sizeof( SystemMenuData ); @@ -349,7 +349,7 @@ MenuBarManager::~MenuBarManager() void MenuBarManager::Destroy() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Destroy" ); - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( !m_bDisposed ) { @@ -508,7 +508,7 @@ throw ( RuntimeException ) RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::statusChanged" ); ::rtl::OUString aFeatureURL = Event.FeatureURL.Complete; - OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; { ResetableGuard aGuard( m_aLock ); @@ -669,7 +669,7 @@ void MenuBarManager::RemoveListener() { { // Remove popup menu from menu structure - OGuard aGuard2( Application::GetSolarMutex() ); + SolarMutexGuard aGuard2; m_pVCLMenu->SetPopupMenu( pItemHandler->nItemId, 0 ); } @@ -767,7 +767,7 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run { // Remove popup menu from menu structure as we release our reference to // the controller. - OGuard aGuard2( Application::GetSolarMutex() ); + SolarMutexGuard aGuard2; m_pVCLMenu->SetPopupMenu( pMenuItemDisposing->nItemId, 0 ); } @@ -1061,7 +1061,7 @@ IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu ) IMPL_LINK( MenuBarManager, AsyncSettingsHdl, Timer*,) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< XInterface > xSelfHold( static_cast< ::cppu::OWeakObject* >( this ), UNO_QUERY_THROW ); @@ -1928,7 +1928,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon // Clear MenuBarManager structures { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; // Check active state as we cannot change our VCL menu during activation by the user if ( m_bActive ) @@ -1970,7 +1970,7 @@ void MenuBarManager::GetPopupController( PopupControllerCache& rPopupController RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::GetPopupController" ); String aPopupScheme = String::CreateFromAscii( "vnd.sun.star.popup:" ); - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; std::vector< MenuItemHandler* >::iterator p; for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 714d668f6997..c5a661990e36 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -155,7 +155,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th MenuBar* pVCLMenuBar = 0; VCLXMenuBar* pAwtMenuBar = 0; { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; pVCLMenuBar = new MenuBar(); } diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 267b1eeae448..c5d09e12584e 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -346,7 +346,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) @@ -439,7 +439,7 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr if ( pPopupMenu ) { { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); aTargetURL.Complete = pVCLPopupMenu->GetItemCommand( rEvent.MenuId ); } @@ -475,7 +475,7 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_xFrame.is() && m_xPopupMenu.is() ) { VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( m_xPopupMenu ); diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index c55bf45417f9..2668c0cdf288 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -96,7 +96,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed: VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx index ee6978e404cb..0eb398000eef 100644 --- a/framework/source/uielement/popupmenucontroller.cxx +++ b/framework/source/uielement/popupmenucontroller.cxx @@ -193,7 +193,7 @@ bool PopupMenuController::CreatePopupMenuController() throw (Exception) Reference< awt::XWindow > SAL_CALL PopupMenuController::createPopupWindow() throw (RuntimeException) { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; Reference< awt::XWindow > xRet; diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index 6847c9218e57..591b834af108 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -139,7 +139,7 @@ throw (uno::RuntimeException) if ( xWindow.is() ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR ) { @@ -177,7 +177,7 @@ throw (uno::RuntimeException) if ( xWindow.is() ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR ) { @@ -207,7 +207,7 @@ throw (uno::RuntimeException) if ( xWindow.is() ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR ) { @@ -260,7 +260,7 @@ throw (uno::RuntimeException) if ( xWindow.is() && bSetValue ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR ) { diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 4a2d45ae393c..d0ce26a9f330 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -121,7 +121,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx index 0228db7267b2..fe9be5614e84 100644 --- a/framework/source/uielement/simpletextstatusbarcontroller.cxx +++ b/framework/source/uielement/simpletextstatusbarcontroller.cxx @@ -89,7 +89,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException { const rtl::OUString aPropValueName( RTL_CONSTASCII_USTRINGPARAM( "Value" )); - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; svt::StatusbarController::initialize( aArguments ); diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 2886e353d6ba..0cf4455fe697 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -235,7 +235,7 @@ SpinfieldToolbarController::~SpinfieldToolbarController() void SAL_CALL SpinfieldToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_pToolbar->SetItemWindow( m_nID, 0 ); delete m_pSpinfieldControl; diff --git a/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx index 96b2812b541b..ea1734802417 100644 --- a/framework/source/uielement/statusbar.cxx +++ b/framework/source/uielement/statusbar.cxx @@ -61,7 +61,7 @@ FrameworkStatusBar::~FrameworkStatusBar() void FrameworkStatusBar::SetStatusBarManager( StatusBarManager* pStatusBarManager ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_pMgr = pStatusBarManager; } diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 31c9e3db440c..e22b047045e5 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -126,7 +126,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) StatusBar* pStatusBar( 0 ); StatusBarManager* pStatusBarManager( 0 ); { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); if ( pWindow ) { diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index bcc87570bbae..6dc632bbf8d3 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -105,7 +105,7 @@ ToggleButtonToolbarController::~ToggleButtonToolbarController() void SAL_CALL ToggleButtonToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; ComplexToolbarController::dispose(); } @@ -129,7 +129,7 @@ throw (::com::sun::star::uno::RuntimeException) { uno::Reference< awt::XWindow > xWindow; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if (( m_eStyle == STYLE_DROPDOWNBUTTON ) || ( m_eStyle == STYLE_TOGGLE_DROPDOWNBUTTON )) { @@ -159,7 +159,7 @@ throw (::com::sun::star::uno::RuntimeException) void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if (( m_eStyle == STYLE_DROPDOWNBUTTON ) || ( m_eStyle == STYLE_TOGGLE_DROPDOWNBUTTON )) @@ -303,7 +303,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta IMPL_LINK( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; sal_uInt16 nItemId = pMenu->GetCurItemId(); if ( nItemId > 0 && nItemId <= m_aDropdownMenuList.size() ) diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index ae045961514e..52deaff461e8 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -197,7 +197,7 @@ void ToolbarsMenuController::addCommand( m_xPopupMenu->enableItem( nItemId, sal_False ); } - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; Image aImage; const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); @@ -225,7 +225,7 @@ Reference< XDispatch > ToolbarsMenuController::getDispatchFromCommandURL( const Reference< XFrame > xFrame; { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; xURLTransformer = m_xURLTransformer; xFrame = m_xFrame; } @@ -334,7 +334,7 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl aToolBarInfo.aToolBarResName = aResName; - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) @@ -375,7 +375,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r if( SvtMiscOptions().DisableUICustomization() ) return; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); m_aCommandVector.clear(); @@ -476,7 +476,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r m_xPopupMenu->checkItem( nIndex, sal_True ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; VCLXPopupMenu* pXPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu ); PopupMenu* pVCLPopupMenu = (PopupMenu *)pXPopupMenu->GetMenu(); @@ -588,7 +588,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev if ( xPopupMenu.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; VCLXPopupMenu* pXPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( xPopupMenu ); PopupMenu* pVCLPopupMenu = (PopupMenu *)pXPopupMenu->GetMenu(); @@ -644,7 +644,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu ); if ( pPopupMenu ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); rtl::OUString aCmd( pVCLPopupMenu->GetItemCommand( rEvent.MenuId )); @@ -834,7 +834,7 @@ void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::X if ( m_xFrame.is() && !m_xPopupMenu.is() ) { // Create popup menu on demand - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_xPopupMenu = xPopupMenu; m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY )); diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index 5b2874bac041..c46966765a1b 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -171,7 +171,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th ToolBar* pToolBar = 0; ToolBarManager* pToolBarManager = 0; { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); if ( pWindow ) { diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx index 8156979f7f2a..652bb2f62909 100644 --- a/framework/source/uifactory/addonstoolboxfactory.cxx +++ b/framework/source/uifactory/addonstoolboxfactory.cxx @@ -206,7 +206,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, aPropValue.Value <<= aResourceURL; aPropSeq[2] <<= aPropValue; - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; AddonsToolBarWrapper* pToolBarWrapper = new AddonsToolBarWrapper( m_xServiceManager ); xToolBar = Reference< ::com::sun::star::ui::XUIElement >( (OWeakObject *)pToolBarWrapper, UNO_QUERY ); Reference< XInitialization > xInit( xToolBar, UNO_QUERY ); diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx index 0aa5e1c77ccd..360398d87a1c 100644 --- a/framework/source/uifactory/menubarfactory.cxx +++ b/framework/source/uifactory/menubarfactory.cxx @@ -201,7 +201,7 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL aPropSeq[4] <<= aPropValue; } - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< XInitialization > xInit( _xMenuBar, UNO_QUERY ); xInit->initialize( aPropSeq ); } |