summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2010-10-13 02:47:36 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-10-25 19:55:33 -0500
commit64bf274cc9d5d73e2a86861f585257f76105ce3e (patch)
treed0f315dda8deb7b5b82a749f9644ba1191aadafb
parente00037f4dd92a03bd3544291e5cf1f5a4c9bccc8 (diff)
use SolarMutexGuard to guard the SolarMutex
-rw-r--r--avmedia/source/viewer/mediaevent_impl.cxx16
-rw-r--r--basic/source/classes/sb.cxx6
-rw-r--r--basic/source/classes/sbxmod.cxx2
-rw-r--r--basic/source/runtime/iosys.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx30
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx14
-rw-r--r--desktop/source/deployment/gui/dp_gui_service.cxx6
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.cxx14
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx16
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx26
-rw-r--r--desktop/source/splash/splash.cxx6
-rw-r--r--editeng/source/accessibility/AccessibleEditableTextPara.cxx74
-rw-r--r--editeng/source/accessibility/AccessibleImageBullet.cxx18
-rw-r--r--editeng/source/accessibility/AccessibleStaticTextBase.cxx38
-rw-r--r--editeng/source/editeng/impedit.cxx12
-rw-r--r--editeng/source/uno/UnoForbiddenCharsTable.cxx12
-rw-r--r--editeng/source/uno/unofield.cxx8
-rw-r--r--editeng/source/uno/unonrule.cxx6
-rw-r--r--editeng/source/uno/unotext.cxx56
-rw-r--r--editeng/source/uno/unotext2.cxx28
-rw-r--r--fpicker/source/aqua/ControlHelper.cxx12
-rw-r--r--fpicker/source/aqua/FilterHelper.cxx6
-rw-r--r--fpicker/source/aqua/SalAquaFilePicker.cxx40
-rw-r--r--fpicker/source/aqua/SalAquaFolderPicker.cxx12
-rw-r--r--fpicker/source/aqua/SalAquaPicker.cxx12
-rw-r--r--fpicker/source/aqua/resourceprovider.cxx2
-rw-r--r--fpicker/source/office/OfficeFilePicker.cxx46
-rw-r--r--fpicker/source/office/commonpicker.cxx22
-rw-r--r--fpicker/source/unx/kde4/KDE4FilePicker.cxx4
-rw-r--r--fpicker/source/win32/filepicker/asyncrequests.cxx2
-rw-r--r--fpicker/source/win32/misc/resourceprovider.cxx2
-rw-r--r--framework/source/classes/fwkresid.cxx2
-rw-r--r--framework/source/classes/fwlresid.cxx2
-rw-r--r--framework/source/classes/imagewrapper.cxx6
-rw-r--r--framework/source/classes/menumanager.cxx2
-rw-r--r--framework/source/classes/rootactiontriggercontainer.cxx4
-rw-r--r--framework/source/dispatch/helpagentdispatcher.cxx12
-rw-r--r--framework/source/dispatch/menudispatcher.cxx4
-rw-r--r--framework/source/helper/actiontriggerhelper.cxx6
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx126
-rw-r--r--framework/source/services/autorecovery.cxx2
-rw-r--r--framework/source/tabwin/tabwindow.cxx2
-rw-r--r--framework/source/uielement/addonstoolbarwrapper.cxx2
-rw-r--r--framework/source/uielement/buttontoolbarcontroller.cxx14
-rw-r--r--framework/source/uielement/comboboxtoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/complextoolbarcontroller.cxx6
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx6
-rw-r--r--framework/source/uielement/dropdownboxtoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/edittoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/fontmenucontroller.cxx2
-rw-r--r--framework/source/uielement/fontsizemenucontroller.cxx4
-rw-r--r--framework/source/uielement/generictoolbarcontroller.cxx6
-rw-r--r--framework/source/uielement/headermenucontroller.cxx2
-rw-r--r--framework/source/uielement/imagebuttontoolbarcontroller.cxx6
-rw-r--r--framework/source/uielement/langselectionmenucontroller.cxx4
-rw-r--r--framework/source/uielement/langselectionstatusbarcontroller.cxx4
-rw-r--r--framework/source/uielement/logoimagestatusbarcontroller.cxx16
-rw-r--r--framework/source/uielement/logotextstatusbarcontroller.cxx14
-rw-r--r--framework/source/uielement/macrosmenucontroller.cxx2
-rw-r--r--framework/source/uielement/menubarmanager.cxx16
-rw-r--r--framework/source/uielement/menubarwrapper.cxx2
-rw-r--r--framework/source/uielement/newmenucontroller.cxx6
-rw-r--r--framework/source/uielement/objectmenucontroller.cxx2
-rw-r--r--framework/source/uielement/popupmenucontroller.cxx2
-rw-r--r--framework/source/uielement/progressbarwrapper.cxx8
-rw-r--r--framework/source/uielement/recentfilesmenucontroller.cxx2
-rw-r--r--framework/source/uielement/simpletextstatusbarcontroller.cxx22
-rw-r--r--framework/source/uielement/spinfieldtoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/statusbar.cxx2
-rw-r--r--framework/source/uielement/statusbarwrapper.cxx2
-rw-r--r--framework/source/uielement/togglebuttontoolbarcontroller.cxx8
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx16
-rw-r--r--framework/source/uielement/toolbarwrapper.cxx2
-rw-r--r--framework/source/uifactory/addonstoolboxfactory.cxx2
-rw-r--r--framework/source/uifactory/menubarfactory.cxx2
-rw-r--r--scripting/source/basprov/baslibnode.cxx8
-rw-r--r--scripting/source/basprov/basmethnode.cxx8
-rw-r--r--scripting/source/basprov/basmodnode.cxx8
-rw-r--r--scripting/source/basprov/basprov.cxx12
-rw-r--r--scripting/source/basprov/basscript.cxx2
-rw-r--r--sfx2/source/appl/appinit.cxx9
-rw-r--r--sfx2/source/appl/appopen.cxx12
-rw-r--r--sfx2/source/appl/appuno.cxx8
-rw-r--r--sfx2/source/appl/fwkhelper.cxx2
-rw-r--r--sfx2/source/appl/imestatuswindow.cxx2
-rw-r--r--sfx2/source/appl/shutdownicon.cxx12
-rw-r--r--sfx2/source/appl/shutdowniconaqua.mm2
-rw-r--r--sfx2/source/appl/shutdowniconunx.cxx6
-rw-r--r--sfx2/source/appl/workwin.cxx8
-rw-r--r--sfx2/source/bastyp/fltlst.cxx4
-rw-r--r--sfx2/source/control/querystatus.cxx8
-rw-r--r--sfx2/source/control/sfxstatuslistener.cxx4
-rw-r--r--sfx2/source/control/unoctitm.cxx6
-rw-r--r--sfx2/source/dialog/dockwin.cxx4
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx14
-rw-r--r--sfx2/source/dialog/mailmodel.cxx2
-rw-r--r--sfx2/source/dialog/mailmodelapi.cxx2
-rw-r--r--sfx2/source/doc/Metadatable.cxx10
-rw-r--r--sfx2/source/doc/doctemplates.cxx4
-rw-r--r--sfx2/source/doc/objuno.cxx2
-rw-r--r--sfx2/source/doc/objxtor.cxx6
-rw-r--r--sfx2/source/doc/printhelper.cxx12
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx10
-rw-r--r--sfx2/source/statbar/stbitem.cxx20
-rw-r--r--sfx2/source/toolbox/imgmgr.cxx12
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx26
-rw-r--r--sfx2/source/view/frmload.cxx2
-rw-r--r--sfx2/source/view/ipclient.cxx4
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx66
-rw-r--r--sfx2/source/view/viewfrm.cxx2
-rw-r--r--sfx2/source/view/viewsh.cxx6
-rw-r--r--svx/source/accessibility/AccessibleFrameSelector.cxx48
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx6
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx14
-rw-r--r--svx/source/accessibility/DGColorNameLookUp.cxx4
-rw-r--r--svx/source/accessibility/DescriptionGenerator.cxx12
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx62
-rw-r--r--svx/source/accessibility/ShapeTypeHandler.cxx6
-rw-r--r--svx/source/accessibility/svxrectctaccessiblecontext.cxx22
-rw-r--r--svx/source/customshapes/tbxcustomshapes.cxx4
-rw-r--r--svx/source/dialog/docrecovery.cxx12
-rw-r--r--svx/source/dialog/graphctl.cxx2
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx4
-rw-r--r--svx/source/fmcomp/fmgridif.cxx32
-rw-r--r--svx/source/fmcomp/gridcell.cxx4
-rw-r--r--svx/source/fmcomp/gridctrl.cxx6
-rw-r--r--svx/source/form/ParseContext.cxx4
-rw-r--r--svx/source/form/filtnav.cxx6
-rw-r--r--svx/source/form/fmscriptingenv.cxx2
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx2
-rw-r--r--svx/source/form/fmvwimp.cxx2
-rw-r--r--svx/source/form/formcontroller.cxx2
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx6
-rw-r--r--svx/source/smarttags/SmartTagMgr.cxx6
-rw-r--r--svx/source/svdraw/svdoole2.cxx28
-rw-r--r--svx/source/table/accessiblecell.cxx18
-rw-r--r--svx/source/table/accessibletableshape.cxx42
-rw-r--r--svx/source/table/cell.cxx16
-rw-r--r--svx/source/table/celleditsource.cxx2
-rw-r--r--svx/source/table/tabledesign.cxx30
-rw-r--r--svx/source/table/tablemodel.cxx26
-rw-r--r--svx/source/tbxctrls/tbunocontroller.cxx6
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx12
-rw-r--r--svx/source/tbxctrls/tbxalign.cxx8
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx14
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx4
-rw-r--r--svx/source/unodraw/UnoNameItemTable.cxx14
-rw-r--r--svx/source/unodraw/XPropertyTable.cxx14
-rw-r--r--svx/source/unodraw/unomlstr.cxx2
-rw-r--r--svx/source/unodraw/unomod.cxx12
-rw-r--r--svx/source/unodraw/unomtabl.cxx14
-rw-r--r--svx/source/unodraw/unopage.cxx20
-rw-r--r--svx/source/unodraw/unopool.cxx12
-rw-r--r--svx/source/unodraw/unoprov.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx34
-rw-r--r--svx/source/unodraw/unoshap3.cxx12
-rw-r--r--svx/source/unodraw/unoshape.cxx94
-rw-r--r--svx/source/unodraw/unoshtxt.cxx2
-rw-r--r--svx/source/unogallery/unogalitem.cxx10
-rw-r--r--svx/source/unogallery/unogaltheme.cxx30
-rw-r--r--svx/source/unogallery/unogalthemeprovider.cxx14
-rw-r--r--ucb/workben/ucb/ucbdemo.cxx6
-rw-r--r--uui/source/iahndl-authentication.cxx6
-rw-r--r--uui/source/iahndl-cookies.cxx2
-rw-r--r--uui/source/iahndl-errorhandler.cxx6
-rw-r--r--uui/source/iahndl-filter.cxx2
-rw-r--r--uui/source/iahndl-locking.cxx6
-rw-r--r--uui/source/iahndl-ssl.cxx4
-rw-r--r--uui/source/iahndl.cxx4
-rw-r--r--vbahelper/source/vbahelper/vbashape.cxx2
170 files changed, 1016 insertions, 1015 deletions
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index 9235166b48..779aa82e39 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -74,7 +74,7 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
@@ -94,7 +94,7 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt:
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
@@ -113,7 +113,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
@@ -134,7 +134,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
@@ -155,7 +155,7 @@ void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
@@ -168,7 +168,7 @@ void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt:
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
@@ -181,7 +181,7 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
@@ -196,7 +196,7 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 1fb7db56f0..bb6f901220 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1460,7 +1460,7 @@ BOOL runsInSetup( void )
void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
{
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if( bStaticSuppressSfxResource )
{
@@ -1504,7 +1504,7 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
BOOL StarBASIC::CError
( SbError code, const String& rMsg, USHORT l, USHORT c1, USHORT c2 )
{
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
// compiler error during runtime -> stop programm
if( IsRunning() )
@@ -1546,7 +1546,7 @@ BOOL StarBASIC::RTError
BOOL StarBASIC::RTError( SbError code, const String& rMsg, USHORT l, USHORT c1, USHORT c2 )
{
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
SbError c = code;
if( (c & ERRCODE_CLASS_MASK) == ERRCODE_CLASS_COMPILER )
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index caa41ba043..638c08f756 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1248,7 +1248,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
delete pINST, pINST = NULL, bDelInst = FALSE;
// #i30690
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
SendHint( GetParent(), SBX_HINT_BASICSTOP, pMeth );
GlobalRunDeInit();
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 218de76367..b5259e4f14 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -1036,7 +1036,7 @@ void SbiIoSystem::WriteCon( const ByteString& rText )
aOut.Erase( 0, 1 );
String aStr( s, gsl_getSystemTextEncoding() );
{
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if( !MessBox( GetpApp()->GetDefDialogParent(),
WinBits( WB_OK_CANCEL | WB_DEF_OK ),
String(), aStr ).Execute() )
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 384ff32263..0d2d623032 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -101,7 +101,7 @@ namespace dp_gui {
struct StrAllFiles : public rtl::StaticWithInit< const OUString, StrAllFiles >
{
const OUString operator () () {
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
::std::auto_ptr< ResMgr > const resmgr( ResMgr::CreateResMgr( "fps_office" ) );
OSL_ASSERT( resmgr.get() != 0 );
String ret( ResId( STR_FILTERNAME_ALL, *resmgr.get() ) );
@@ -414,7 +414,7 @@ void ExtBoxWithBtns_Impl::MouseButtonDown( const MouseEvent& rMEvt )
}
else if ( rMEvt.IsLeft() )
{
- const vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
if ( rMEvt.IsMod1() && HasActive() )
selectEntry( EXTENSION_LISTBOX_ENTRY_NOTFOUND ); // Selecting an not existing entry will deselect the current one
else
@@ -560,7 +560,7 @@ DialogHelper::~DialogHelper()
//------------------------------------------------------------------------------
ResId DialogHelper::getResId( USHORT nId )
{
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
return ResId( nId, *DeploymentGuiResMgr::get() );
}
@@ -569,7 +569,7 @@ String DialogHelper::getResourceString( USHORT id )
{
// init with non-acquired solar mutex:
BrandName::get();
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
String ret( ResId( id, *DeploymentGuiResMgr::get() ) );
if (ret.SearchAscii( "%PRODUCTNAME" ) != STRING_NOTFOUND) {
ret.SearchAndReplaceAllAscii( "%PRODUCTNAME", BrandName::get() );
@@ -594,7 +594,7 @@ bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment::
{
if ( !bHadWarning && IsSharedPkgMgr( xPackage ) )
{
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
WarningBox aInfoBox( pParent, getResId( nResID ) );
String aMsgText = aInfoBox.GetMessText();
aMsgText.SearchAndReplaceAllAscii( "%PRODUCTNAME", BrandName::get() );
@@ -628,7 +628,7 @@ void DialogHelper::openWebBrowser( const OUString & sURL, const OUString &sTitle
{
uno::Any exc( ::cppu::getCaughtException() );
OUString msg( ::comphelper::anyToString( exc ) );
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
ErrorBox aErrorBox( NULL, WB_OK, msg );
aErrorBox.SetText( sTitle );
aErrorBox.Execute();
@@ -638,7 +638,7 @@ void DialogHelper::openWebBrowser( const OUString & sURL, const OUString &sTitle
//------------------------------------------------------------------------------
bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const
{
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
WarningBox aInfo( m_pVCLWindow, getResId( RID_WARNINGBOX_INSTALL_EXTENSION ) );
String sText( aInfo.GetMessText() );
@@ -651,7 +651,7 @@ bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const
//------------------------------------------------------------------------------
bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const
{
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
QueryBox aQuery( m_pVCLWindow, getResId( RID_QUERYBOX_INSTALL_FOR_ALL ) );
String sMsgText = aQuery.GetMessText();
@@ -768,7 +768,7 @@ void ExtMgrDialog::setGetExtensionsURL( const ::rtl::OUString &rURL )
long ExtMgrDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage,
bool bLicenseMissing )
{
- const vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
m_aUpdateBtn.Enable( true );
return m_pExtensionBox->addEntry( xPackage, bLicenseMissing );
}
@@ -782,14 +782,14 @@ void ExtMgrDialog::prepareChecking()
//------------------------------------------------------------------------------
void ExtMgrDialog::checkEntries()
{
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
m_pExtensionBox->checkEntries();
}
//------------------------------------------------------------------------------
bool ExtMgrDialog::removeExtensionWarn( const OUString &rExtensionName ) const
{
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
WarningBox aInfo( const_cast< ExtMgrDialog* >(this), getResId( RID_WARNINGBOX_REMOVE_EXTENSION ) );
String sText( aInfo.GetMessText() );
@@ -1040,7 +1040,7 @@ void ExtMgrDialog::updateProgress( const OUString &rText,
//------------------------------------------------------------------------------
void ExtMgrDialog::updatePackageInfo( const uno::Reference< deployment::XPackage > &xPackage )
{
- const vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
m_pExtensionBox->updateEntry( xPackage );
}
@@ -1326,7 +1326,7 @@ long UpdateRequiredDialog::addPackageToList( const uno::Reference< deployment::X
if ( !bLicenseMissing && !checkDependencies( xPackage ) )
{
m_bHasLockedEntries |= m_pManager->isReadOnly( xPackage );
- const vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
m_aUpdateBtn.Enable( true );
return m_pExtensionBox->addEntry( xPackage );
}
@@ -1342,7 +1342,7 @@ void UpdateRequiredDialog::prepareChecking()
//------------------------------------------------------------------------------
void UpdateRequiredDialog::checkEntries()
{
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
m_pExtensionBox->checkEntries();
if ( ! hasActiveEntries() )
@@ -1455,7 +1455,7 @@ void UpdateRequiredDialog::updatePackageInfo( const uno::Reference< deployment::
// We will remove all updated packages with satisfied dependencies, but
// we will show all disabled entries so the user sees the result
// of the 'disable all' button
- const vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
if ( isEnabled( xPackage ) && checkDependencies( xPackage ) )
m_pExtensionBox->removeEntry( xPackage );
else
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 2ce835c2bb..3674759f6f 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -430,7 +430,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
dp_misc::Dependencies::getErrorText( depExc.UnsatisfiedDependencies[i]) );
}
{
- vos::OGuard guard(Application::GetSolarMutex());
+ SolarMutexGuard guard;
short n = DependencyDialog( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, deps ).Execute();
// Distinguish between closing the dialog and programatically
// canceling the dialog (headless VCL):
@@ -474,7 +474,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
bool bEqualNames = verExc.NewDisplayName.equals(
verExc.Deployed->getDisplayName());
{
- vos::OGuard guard(Application::GetSolarMutex());
+ SolarMutexGuard guard;
WarningBox box( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, ResId(id, *DeploymentGuiResMgr::get()));
String s;
if (bEqualNames)
@@ -515,7 +515,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
{
if ( m_pDialogHelper )
{
- vos::OGuard guard(Application::GetSolarMutex());
+ SolarMutexGuard guard;
approve = m_pDialogHelper->installExtensionWarn( instExc.displayName );
}
@@ -526,7 +526,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
}
else if (request >>= platExc)
{
- vos::OGuard guard( Application::GetSolarMutex() );
+ SolarMutexGuard guard;
String sMsg( ResId( RID_STR_UNSUPPORTED_PLATFORM, *DeploymentGuiResMgr::get() ) );
sMsg.SearchAndReplaceAllAscii( "%Name", platExc.package->getDisplayName() );
ErrorBox box( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, WB_OK, sMsg );
@@ -600,7 +600,7 @@ void ProgressCmdEnv::update_( uno::Any const & rStatus )
if ( text.getLength() == 0 )
text = ::comphelper::anyToString( rStatus ); // fallback
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
const ::std::auto_ptr< ErrorBox > aBox( new ErrorBox( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, WB_OK, text ) );
aBox->Execute();
}
@@ -891,7 +891,7 @@ void ExtensionCmdQueue::Thread::execute()
if (msg.getLength() == 0) // fallback for debugging purposes
msg = ::comphelper::anyToString(exc);
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
::std::auto_ptr<ErrorBox> box(
new ErrorBox( currentCmdEnv->activeDialog(), WB_OK, msg ) );
if ( m_pDialogHelper )
@@ -1005,7 +1005,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates(
UpdateDialog* pUpdateDialog;
std::vector< UpdateData > vData;
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
pUpdateDialog = new UpdateDialog( m_xContext, m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, vExtensionList, &vData );
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 2eda6e618b..a01b8b309d 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -207,7 +207,7 @@ void ServiceImpl::setDialogTitle( OUString const & title )
{
if ( dp_gui::TheExtensionManager::s_ExtMgr.is() )
{
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
::rtl::Reference< ::dp_gui::TheExtensionManager > dialog(
::dp_gui::TheExtensionManager::get( m_xComponentContext,
m_parent ? *m_parent : Reference<awt::XWindow>(),
@@ -235,7 +235,7 @@ void ServiceImpl::startExecuteModal(
}
catch (Exception & exc) {
if (bAppUp) {
- const vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
std::auto_ptr<ErrorBox> box(
new ErrorBox( Application::GetActiveTopWindow(),
WB_OK, exc.Message ) );
@@ -279,7 +279,7 @@ void ServiceImpl::startExecuteModal(
}
{
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
::rtl::Reference< ::dp_gui::TheExtensionManager > myExtMgr(
::dp_gui::TheExtensionManager::get(
m_xComponentContext,
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 335849db43..60e8641d9f 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -127,7 +127,7 @@ TheExtensionManager::~TheExtensionManager()
//------------------------------------------------------------------------------
void TheExtensionManager::createDialog( const bool bCreateUpdDlg )
{
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
if ( bCreateUpdDlg )
{
@@ -152,7 +152,7 @@ void TheExtensionManager::createDialog( const bool bCreateUpdDlg )
//------------------------------------------------------------------------------
void TheExtensionManager::Show()
{
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
getDialog()->Show();
}
@@ -160,7 +160,7 @@ void TheExtensionManager::Show()
//------------------------------------------------------------------------------
void TheExtensionManager::SetText( const ::rtl::OUString &rTitle )
{
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
getDialog()->SetText( rTitle );
}
@@ -168,7 +168,7 @@ void TheExtensionManager::SetText( const ::rtl::OUString &rTitle )
//------------------------------------------------------------------------------
void TheExtensionManager::ToTop( USHORT nFlags )
{
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
getDialog()->ToTop( nFlags );
}
@@ -279,7 +279,7 @@ void TheExtensionManager::terminateDialog()
{
if ( ! dp_misc::office_is_running() )
{
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
delete m_pExtMgrDialog;
m_pExtMgrDialog = NULL;
delete m_pUpdReqDialog;
@@ -446,7 +446,7 @@ void TheExtensionManager::disposing( lang::EventObject const & rEvt )
{
if ( dp_misc::office_is_running() )
{
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
delete m_pExtMgrDialog;
m_pExtMgrDialog = NULL;
delete m_pUpdReqDialog;
@@ -515,7 +515,7 @@ void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ )
::rtl::Reference<TheExtensionManager> that( new TheExtensionManager( pParent, xContext ) );
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
if ( ! s_ExtMgr.is() )
{
OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index d035546269..ff4f5e8276 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -328,7 +328,7 @@ UpdateDialog::Thread::Thread(
void UpdateDialog::Thread::stop() {
css::uno::Reference< css::task::XAbortChannel > abort;
{
- vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
abort = m_abort;
m_stop = true;
}
@@ -358,7 +358,7 @@ UpdateDialog::Thread::~Thread()
void UpdateDialog::Thread::execute()
{
{
- vos::OGuard g( Application::GetSolarMutex() );
+ SolarMutexGuard g;
if ( m_stop ) {
return;
}
@@ -445,7 +445,7 @@ void UpdateDialog::Thread::execute()
}
- vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (!m_stop) {
m_dialog.checkingDone();
}
@@ -463,7 +463,7 @@ void UpdateDialog::Thread::handleSpecificError(
if (exception >>= e) {
data.message = e.Message;
}
- vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (!m_stop) {
m_dialog.addSpecificError(data);
}
@@ -476,7 +476,7 @@ void UpdateDialog::Thread::handleSpecificError(
rtl::OUStringBuffer b(data.aInstalledPackage->getDisplayName());
b.append(static_cast< sal_Unicode >(' '));
{
- vos::OGuard g( Application::GetSolarMutex() );
+ SolarMutexGuard g;
if(!m_stop)
b.append(m_dialog.m_version);
}
@@ -490,7 +490,7 @@ void UpdateDialog::Thread::handleSpecificError(
{
b.append(static_cast< sal_Unicode >(' '));
{
- vos::OGuard g( Application::GetSolarMutex() );
+ SolarMutexGuard g;
if(!m_stop)
b.append(m_dialog.m_browserbased);
}
@@ -538,13 +538,13 @@ bool UpdateDialog::Thread::update(
bool ret = false;
if (du.unsatisfiedDependencies.getLength() == 0)
{
- vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (!m_stop) {
m_dialog.addEnabledUpdate(getUpdateDisplayString(data), data);
}
ret = !m_stop;
} else {
- vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (!m_stop) {
m_dialog.addDisabledUpdate(du);
}
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 8e45fec244..4e4a321503 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -188,7 +188,7 @@ UpdateInstallDialog::Thread::Thread(
void UpdateInstallDialog::Thread::stop() {
cssu::Reference< css::task::XAbortChannel > abort;
{
- vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
abort = m_abort;
m_stop = true;
}
@@ -217,7 +217,7 @@ void UpdateInstallDialog::Thread::execute()
{
//make sure m_dialog is still alive
- ::vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (! m_stop)
m_dialog.updateDone();
}
@@ -389,7 +389,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
//update the name of the extension which is to be downloaded
{
- ::vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (m_stop) {
return;
}
@@ -423,7 +423,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
}
//update the progress and display download error
{
- ::vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (m_stop) {
return;
}
@@ -450,7 +450,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
}
catch (cssu::Exception & e)
{
- ::vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (m_stop) {
return;
}
@@ -461,7 +461,7 @@ void UpdateInstallDialog::Thread::installExtensions()
{
//Update the fix text in the dialog to "Installing extensions..."
{
- vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (m_stop) {
return;
}
@@ -475,7 +475,7 @@ void UpdateInstallDialog::Thread::installExtensions()
{
//update the name of the extension which is to be installed
{
- ::vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (m_stop) {
return;
}
@@ -499,7 +499,7 @@ void UpdateInstallDialog::Thread::installExtensions()
cssu::Reference< css::task::XAbortChannel > xAbortChannel(
curData.aInstalledPackage->createAbortChannel() );
{
- vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (m_stop) {
return;
}
@@ -555,7 +555,7 @@ void UpdateInstallDialog::Thread::installExtensions()
if (bLicenseDeclined)
{
- ::vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (m_stop) {
return;
}
@@ -564,7 +564,7 @@ void UpdateInstallDialog::Thread::installExtensions()
}
else if (!xExtension.is() || bError)
{
- ::vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (m_stop) {
return;
}
@@ -573,7 +573,7 @@ void UpdateInstallDialog::Thread::installExtensions()
}
}
{
- vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (m_stop) {
return;
}
@@ -600,7 +600,7 @@ void UpdateInstallDialog::Thread::removeTempDownloads()
void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, UpdateData & aUpdateData)
{
{
- ::vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (m_stop) {
return;
}
@@ -635,7 +635,7 @@ void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update
{
//the user may have cancelled the dialog because downloading took to long
{
- ::vos::OGuard g(Application::GetSolarMutex());
+ SolarMutexGuard g;
if (m_stop) {
return;
}
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index af9069fdae..f286b7ef7f 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -101,7 +101,7 @@ void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange)
_iMax = nRange;
if (_bVisible) {
_bProgressEnd = sal_False;
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if ( _eBitmapMode == BM_FULLSCREEN )
ShowFullScreenMode( TRUE );
Show();
@@ -139,7 +139,7 @@ void SAL_CALL SplashScreen::reset()
void SAL_CALL SplashScreen::setText(const OUString& rText)
throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if ( _sProgressText != rText )
{
_sProgressText = rText;
@@ -160,7 +160,7 @@ void SAL_CALL SplashScreen::setValue(sal_Int32 nValue)
RTL_LOGFILE_CONTEXT( aLog, "::SplashScreen::setValue (lo119109)" );
RTL_LOGFILE_CONTEXT_TRACE1( aLog, "value=%d", nValue );
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if (_bVisible && !_bProgressEnd) {
if ( _eBitmapMode == BM_FULLSCREEN )
ShowFullScreenMode( TRUE );
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 840d1124aa..ab0dff3f03 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -845,7 +845,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return HaveChildren() ? 1 : 0;
}
@@ -854,7 +854,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( !HaveChildren() )
throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No childs available")),
@@ -921,7 +921,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-// ::vos::OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
return ::rtl::OUString();
}
@@ -930,7 +930,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-// ::vos::OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
return ::rtl::OUString();
}
@@ -983,7 +983,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// Create a copy of the state set and return it.
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
@@ -998,7 +998,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return implGetLocale();
}
@@ -1024,7 +1024,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::contains: index value overflow");
@@ -1040,7 +1040,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( HaveChildren() )
{
@@ -1075,7 +1075,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::getBounds: index value overflow");
@@ -1101,7 +1101,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
awt::Rectangle aRect = getBounds();
@@ -1112,7 +1112,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// relate us to parent
uno::Reference< XAccessible > xParent = getAccessibleParent();
@@ -1158,7 +1158,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
awt::Rectangle aRect = getBounds();
@@ -1201,7 +1201,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( !HaveEditView() )
return -1;
@@ -1229,7 +1229,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::getCharacter: index value overflow");
@@ -1240,7 +1240,7 @@ namespace accessibility
uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
CheckIndex(nIndex); // may throw IndexOutOfBoundsException
@@ -1304,7 +1304,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::getCharacterBounds: index value overflow");
@@ -1339,7 +1339,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::getCharacterCount: index value overflow");
@@ -1351,7 +1351,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
USHORT nPara, nIndex;
@@ -1398,7 +1398,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::getSelectedText: index value overflow");
@@ -1413,7 +1413,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::getSelectionStart: index value overflow");
@@ -1428,7 +1428,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::getSelectionEnd: index value overflow");
@@ -1443,7 +1443,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::setSelection: paragraph index value overflow");
@@ -1465,7 +1465,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::getText: paragraph index value overflow");
@@ -1477,7 +1477,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::getTextRange: paragraph index value overflow");
@@ -1489,7 +1489,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::getTextAtIndex: paragraph index value overflow");
@@ -1537,7 +1537,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::getTextBeforeIndex: paragraph index value overflow");
@@ -1596,7 +1596,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::getTextBehindIndex: paragraph index value overflow");
@@ -1639,7 +1639,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
try
{
@@ -1679,7 +1679,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
try
{
@@ -1709,7 +1709,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
try
{
@@ -1739,7 +1739,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
try
{
@@ -1772,7 +1772,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
try
{
@@ -1807,7 +1807,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
try
{
@@ -1842,7 +1842,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
try
{
@@ -1902,7 +1902,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return replaceText(0, getCharacterCount(), sText);
}
@@ -1913,7 +1913,7 @@ namespace accessibility
throw (uno::RuntimeException)
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
#if OSL_DEBUG_LEVEL > 0
SvxAccessibleTextAdapter& rCacheTF =
@@ -2012,7 +2012,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
#if OSL_DEBUG_LEVEL > 0
SvxAccessibleTextAdapter& rCacheTF =
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index cb284383a0..a5846b6adf 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -168,7 +168,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// Get the string from the resource for the specified id.
return ::rtl::OUString( String( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION) ) );
@@ -178,7 +178,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// Get the string from the resource for the specified id.
return ::rtl::OUString( String ( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_NAME) ) );
@@ -196,7 +196,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// Create a copy of the state set and return it.
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
@@ -211,7 +211,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
lang::Locale aLocale;
@@ -242,7 +242,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::contains: index value overflow");
@@ -266,7 +266,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::getBounds: index value overflow");
@@ -305,7 +305,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
awt::Rectangle aRect = getBounds();
@@ -316,7 +316,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// relate us to parent
uno::Reference< XAccessible > xParent = getAccessibleParent();
@@ -343,7 +343,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
awt::Rectangle aRect = getBounds();
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index e1f90274a2..7d362a8867 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -492,7 +492,7 @@ namespace accessibility
AccessibleStaticTextBase::AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource > pEditSource ) :
mpImpl( new AccessibleStaticTextBase_Impl() )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SetEditSource( pEditSource );
}
@@ -642,7 +642,7 @@ namespace accessibility
// XAccessibleText
sal_Int32 SAL_CALL AccessibleStaticTextBase::getCaretPosition() throw (uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int32 i, nPos, nParas;
for( i=0, nPos=-1, nParas=mpImpl->GetParagraphCount(); i<nParas; ++i )
@@ -661,7 +661,7 @@ namespace accessibility
sal_Unicode SAL_CALL AccessibleStaticTextBase::getCharacter( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
EPosition aPos( mpImpl->Index2Internal(nIndex) );
@@ -670,7 +670,7 @@ namespace accessibility
uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
EPosition aPos( mpImpl->Index2Internal(nIndex) );
@@ -679,7 +679,7 @@ namespace accessibility
awt::Rectangle SAL_CALL AccessibleStaticTextBase::getCharacterBounds( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// #108900# Allow ranges for nIndex, as one-past-the-end
// values are now legal, too.
@@ -697,7 +697,7 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleStaticTextBase::getCharacterCount() throw (uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int32 i, nCount, nParas;
for( i=0, nCount=0, nParas=mpImpl->GetParagraphCount(); i<nParas; ++i )
@@ -708,7 +708,7 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleStaticTextBase::getIndexAtPoint( const awt::Point& rPoint ) throw (uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
const sal_Int32 nParas( mpImpl->GetParagraphCount() );
sal_Int32 nIndex;
@@ -736,7 +736,7 @@ namespace accessibility
::rtl::OUString SAL_CALL AccessibleStaticTextBase::getSelectedText() throw (uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int32 nStart( getSelectionStart() );
sal_Int32 nEnd( getSelectionEnd() );
@@ -750,7 +750,7 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleStaticTextBase::getSelectionStart() throw (uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int32 i, nPos, nParas;
for( i=0, nPos=-1, nParas=mpImpl->GetParagraphCount(); i<nParas; ++i )
@@ -764,7 +764,7 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleStaticTextBase::getSelectionEnd() throw (uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int32 i, nPos, nParas;
for( i=0, nPos=-1, nParas=mpImpl->GetParagraphCount(); i<nParas; ++i )
@@ -778,7 +778,7 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleStaticTextBase::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
EPosition aStartIndex( mpImpl->Range2Internal(nStartIndex) );
EPosition aEndIndex( mpImpl->Range2Internal(nEndIndex) );
@@ -789,7 +789,7 @@ namespace accessibility
::rtl::OUString SAL_CALL AccessibleStaticTextBase::getText() throw (uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int32 i, nParas;
::rtl::OUString aRes;
@@ -801,7 +801,7 @@ namespace accessibility
::rtl::OUString SAL_CALL AccessibleStaticTextBase::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( nStartIndex > nEndIndex )
::std::swap(nStartIndex, nEndIndex);
@@ -834,7 +834,7 @@ namespace accessibility
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
EPosition aPos( mpImpl->Range2Internal(nIndex) );
@@ -869,7 +869,7 @@ namespace accessibility
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
EPosition aPos( mpImpl->Range2Internal(nIndex) );
@@ -909,7 +909,7 @@ namespace accessibility
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
EPosition aPos( mpImpl->Range2Internal(nIndex) );
@@ -943,7 +943,7 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleStaticTextBase::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( nStartIndex > nEndIndex )
::std::swap(nStartIndex, nEndIndex);
@@ -960,7 +960,7 @@ namespace accessibility
{
// get the intersection of the default attributes of all paragraphs
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
PropertyValueVector aDefAttrVec( mpImpl->GetParagraph( 0 ).getDefaultAttributes( RequestedAttributes ) );
@@ -998,7 +998,7 @@ namespace accessibility
// get those default attributes of the paragraph, which are not part
// of the intersection of all paragraphs and add them to the run attributes
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
EPosition aPos( mpImpl->Index2Internal( nIndex ) );
AccessibleEditableTextPara& rPara = mpImpl->GetParagraph( aPos.nPara );
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 399ea5dfb0..8777efced4 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1538,7 +1538,7 @@ void ImpEditView::dragGestureRecognized( const ::com::sun::star::datatransfer::d
{
DBG_ASSERT( !pDragAndDropInfo, "dragGestureRecognized - DragAndDropInfo exist!" );
- vos::OGuard aVclGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aVclGuard;
pDragAndDropInfo = NULL;
@@ -1618,7 +1618,7 @@ void ImpEditView::dragGestureRecognized( const ::com::sun::star::datatransfer::d
void ImpEditView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (::com::sun::star::uno::RuntimeException)
{
- vos::OGuard aVclGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aVclGuard;
DBG_ASSERT( pDragAndDropInfo, "ImpEditView::dragDropEnd: pDragAndDropInfo is NULL!" );
@@ -1711,7 +1711,7 @@ void ImpEditView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSo
void ImpEditView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException)
{
- vos::OGuard aVclGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aVclGuard;
DBG_ASSERT( pDragAndDropInfo, "Drop - No Drag&Drop info?!" );
@@ -1784,7 +1784,7 @@ void ImpEditView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDro
void ImpEditView::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE ) throw (::com::sun::star::uno::RuntimeException)
{
- vos::OGuard aVclGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aVclGuard;
if ( !pDragAndDropInfo )
pDragAndDropInfo = new DragAndDropInfo( );
@@ -1811,7 +1811,7 @@ void ImpEditView::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTarg
void ImpEditView::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& ) throw (::com::sun::star::uno::RuntimeException)
{
- vos::OGuard aVclGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aVclGuard;
HideDDCursor();
@@ -1824,7 +1824,7 @@ void ImpEditView::dragExit( const ::com::sun::star::datatransfer::dnd::DropTarge
void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException)
{
- vos::OGuard aVclGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aVclGuard;
Point aMousePos( rDTDE.LocationX, rDTDE.LocationY );
aMousePos = GetWindow()->PixelToLogic( aMousePos );
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index 85d34760e8..7a6107ea49 100644
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -59,7 +59,7 @@ void SvxUnoForbiddenCharsTable::onChange()
ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const Locale& rLocale )
throw(NoSuchElementException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if(!mxForbiddenChars.isValid())
throw RuntimeException();
@@ -75,7 +75,7 @@ ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const Loc
sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const Locale& rLocale )
throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if(!mxForbiddenChars.isValid())
return sal_False;
@@ -89,7 +89,7 @@ sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const Locale& rLocal
void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const Locale& rLocale, const ForbiddenCharacters& rForbiddenCharacters )
throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if(!mxForbiddenChars.isValid())
throw RuntimeException();
@@ -103,7 +103,7 @@ void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const Locale& rLocale, co
void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const Locale& rLocale )
throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if(!mxForbiddenChars.isValid())
throw RuntimeException();
@@ -118,7 +118,7 @@ void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const Locale& rLocale
Sequence< Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales()
throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
const sal_Int32 nCount = mxForbiddenChars.isValid() ? mxForbiddenChars->Count() : 0;
@@ -140,7 +140,7 @@ Sequence< Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales()
sal_Bool SAL_CALL SvxUnoForbiddenCharsTable::hasLocale( const Locale& aLocale )
throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return hasForbiddenCharacters( aLocale );
}
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 1fdc5e7eb0..41cbc848ba 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -605,7 +605,7 @@ void SAL_CALL SvxUnoTextField::release() throw( )
OUString SAL_CALL SvxUnoTextField::getPresentation( sal_Bool bShowCommand )
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if(bShowCommand)
{
@@ -663,14 +663,14 @@ void SAL_CALL SvxUnoTextField::removeEventListener( const uno::Reference< lang::
uno::Reference< beans::XPropertySetInfo > SAL_CALL SvxUnoTextField::getPropertySetInfo( )
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return mpPropSet->getPropertySetInfo();
}
void SAL_CALL SvxUnoTextField::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mpImpl == NULL )
throw uno::RuntimeException();
@@ -840,7 +840,7 @@ void SAL_CALL SvxUnoTextField::setPropertyValue( const OUString& aPropertyName,
uno::Any SAL_CALL SvxUnoTextField::getPropertyValue( const OUString& PropertyName )
throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Any aValue;
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 0afd21bd3e..06f3dd5bd3 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -116,7 +116,7 @@ SvxUnoNumberingRules::~SvxUnoNumberingRules() throw()
void SAL_CALL SvxUnoNumberingRules::replaceByIndex( sal_Int32 Index, const uno::Any& Element )
throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( Index < 0 || Index >= maRule.GetLevelCount() )
throw IndexOutOfBoundsException();
@@ -131,7 +131,7 @@ void SAL_CALL SvxUnoNumberingRules::replaceByIndex( sal_Int32 Index, const uno::
// XIndexAccess
sal_Int32 SAL_CALL SvxUnoNumberingRules::getCount() throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return maRule.GetLevelCount();
}
@@ -139,7 +139,7 @@ sal_Int32 SAL_CALL SvxUnoNumberingRules::getCount() throw( RuntimeException )
Any SAL_CALL SvxUnoNumberingRules::getByIndex( sal_Int32 Index )
throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( Index < 0 || Index >= maRule.GetLevelCount() )
throw IndexOutOfBoundsException();
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 401b68fc46..8d756288bf 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -256,7 +256,7 @@ SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxItemPropertySet* _pSet ) thro
SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet ) throw()
: mpPropSet(_pSet)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT(pSource,"SvxUnoTextRangeBase: I need a valid SvxEditSource!");
@@ -285,7 +285,7 @@ SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxUnoTextRangeBase& rRange ) th
, lang::XUnoTunnel()
, mpPropSet(rRange.getPropertySet())
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
mpEditSource = rRange.mpEditSource ? rRange.mpEditSource->Clone() : NULL;
@@ -333,7 +333,7 @@ void SvxUnoTextRangeBase::SetEditSource( SvxEditSource* pSource ) throw()
corresponding with this range */
void SvxUnoTextRangeBase::attachField( const SvxFieldData* pData ) throw()
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( pData )
{
@@ -348,7 +348,7 @@ void SvxUnoTextRangeBase::attachField( const SvxFieldData* pData ) throw()
void SvxUnoTextRangeBase::SetSelection( const ESelection& rSelection ) throw()
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
maSelection = rSelection;
if (mpEditSource != NULL)
@@ -360,7 +360,7 @@ void SvxUnoTextRangeBase::SetSelection( const ESelection& rSelection ) throw()
uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getStart(void)
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference< text::XTextRange > xRange;
@@ -390,7 +390,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getStart(void)
uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getEnd(void)
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference< text::XTextRange > xRet;
@@ -418,7 +418,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getEnd(void)
OUString SAL_CALL SvxUnoTextRangeBase::getString(void)
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
if( pForwarder )
@@ -437,7 +437,7 @@ OUString SAL_CALL SvxUnoTextRangeBase::getString(void)
void SAL_CALL SvxUnoTextRangeBase::setString(const OUString& aString)
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
if( pForwarder )
@@ -477,7 +477,7 @@ void SAL_CALL SvxUnoTextRangeBase::setPropertyValue(const OUString& PropertyName
void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyName, const uno::Any& aValue, sal_Int32 nPara )
throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
if( pForwarder )
@@ -643,7 +643,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyValue(const OUString& Property
uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& PropertyName, sal_Int32 nPara )
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Any aAny;
@@ -804,7 +804,7 @@ void SAL_CALL SvxUnoTextRangeBase::setPropertyValues( const uno::Sequence< ::rtl
void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
if( pForwarder )
@@ -928,7 +928,7 @@ uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyValues( const
uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames, sal_Int32 nPara ) throw (uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int32 nCount = aPropertyNames.getLength();
@@ -1082,7 +1082,7 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxIt
beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const OUString& PropertyName, sal_Int32 nPara /* = -1 */)
throw( beans::UnknownPropertyException, uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return _getPropertyState( mpPropSet->getPropertyMapEntry( PropertyName ), nPara);
}
@@ -1233,7 +1233,7 @@ void SAL_CALL SvxUnoTextRangeBase::setPropertyToDefault( const OUString& Propert
void SvxUnoTextRangeBase::_setPropertyToDefault(const OUString& PropertyName, sal_Int32 nPara /* = -1 */)
throw( beans::UnknownPropertyException, uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
@@ -1296,7 +1296,7 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, co
uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aPropertyName )
throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
if( pForwarder )
@@ -1342,7 +1342,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp
// beans::XMultiPropertyStates
void SAL_CALL SvxUnoTextRangeBase::setAllPropertiesToDefault( ) throw (uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
@@ -1856,14 +1856,14 @@ uno::Reference< text::XTextCursor > SvxUnoTextBase::createTextCursorBySelection(
uno::Reference< text::XTextCursor > SAL_CALL SvxUnoTextBase::createTextCursor()
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return new SvxUnoTextCursor( *this );
}
uno::Reference< text::XTextCursor > SAL_CALL SvxUnoTextBase::createTextCursorByRange( const uno::Reference< text::XTextRange >& aTextPosition )
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference< text::XTextCursor > xCursor;
@@ -1880,7 +1880,7 @@ uno::Reference< text::XTextCursor > SAL_CALL SvxUnoTextBase::createTextCursorByR
void SAL_CALL SvxUnoTextBase::insertString( const uno::Reference< text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb )
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( !xRange.is() )
return;
@@ -1908,7 +1908,7 @@ void SAL_CALL SvxUnoTextBase::insertString( const uno::Reference< text::XTextRan
void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb )
throw(lang::IllegalArgumentException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = GetEditSource() ? GetEditSource()->GetTextForwarder() : NULL;
@@ -1996,7 +1996,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text
void SAL_CALL SvxUnoTextBase::insertTextContent( const uno::Reference< text::XTextRange >& xRange, const uno::Reference< text::XTextContent >& xContent, sal_Bool bAbsorb )
throw(lang::IllegalArgumentException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = GetEditSource() ? GetEditSource()->GetTextForwarder() : NULL;
if( pForwarder )
@@ -2043,7 +2043,7 @@ void SAL_CALL SvxUnoTextBase::removeTextContent( const uno::Reference< text::XTe
uno::Reference< text::XText > SAL_CALL SvxUnoTextBase::getText()
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (GetEditSource())
{
@@ -2082,7 +2082,7 @@ void SAL_CALL SvxUnoTextBase::setString( const OUString& aString ) throw(uno::Ru
uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextBase::createEnumeration()
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
ESelection aSelection;
::GetSelection( aSelection, GetEditSource()->GetTextForwarder() );
@@ -2100,7 +2100,7 @@ uno::Type SAL_CALL SvxUnoTextBase::getElementType( ) throw(uno::RuntimeExceptio
sal_Bool SAL_CALL SvxUnoTextBase::hasElements( ) throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if(GetEditSource())
{
@@ -2196,7 +2196,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendParagraph(
const uno::Sequence< beans::PropertyValue >& rCharAndParaProps )
throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference< text::XTextRange > xRet;
SvxEditSource *pEditSource = GetEditSource();
SvxTextForwarder *pTextForwarder = pEditSource ? pEditSource->GetTextForwarder() : 0;
@@ -2226,7 +2226,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraph(
const uno::Sequence< beans::PropertyValue >& rCharAndParaProps )
throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference< text::XTextRange > xRet;
SvxEditSource *pEditSource = GetEditSource();
@@ -2258,7 +2258,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion(
const uno::Sequence< beans::PropertyValue >& rCharAndParaProps )
throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxEditSource *pEditSource = GetEditSource();
SvxTextForwarder *pTextForwarder = pEditSource ? pEditSource->GetTextForwarder() : 0;
@@ -2297,7 +2297,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion(
void SvxUnoTextBase::copyText(
const uno::Reference< text::XTextCopy >& xSource ) throw ( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference< lang::XUnoTunnel > xUT( xSource, uno::UNO_QUERY );
SvxEditSource *pEditSource = GetEditSource();
SvxTextForwarder *pTextForwarder = pEditSource ? pEditSource->GetTextForwarder() : 0;
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 3a50b95b79..687a499f22 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -76,7 +76,7 @@ SvxUnoTextContentEnumeration::~SvxUnoTextContentEnumeration() throw()
sal_Bool SAL_CALL SvxUnoTextContentEnumeration::hasMoreElements(void)
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mpEditSource && mpEditSource->GetTextForwarder() )
return mnNextParagraph < mpEditSource->GetTextForwarder()->GetParagraphCount();
else
@@ -85,7 +85,7 @@ sal_Bool SAL_CALL SvxUnoTextContentEnumeration::hasMoreElements(void)
uno::Any SvxUnoTextContentEnumeration::nextElement(void) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if(!hasMoreElements())
throw container::NoSuchElementException();
@@ -260,7 +260,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextContent::getAnchor() throw
void SAL_CALL SvxUnoTextContent::dispose()
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mbDisposing )
return; // catched a recursion
@@ -292,7 +292,7 @@ void SAL_CALL SvxUnoTextContent::removeEventListener( const uno::Reference< lang
uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextContent::createEnumeration( )
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return new SvxUnoTextRangeEnumeration( mrParentText, mnParagraph );
}
@@ -308,7 +308,7 @@ uno::Type SAL_CALL SvxUnoTextContent::getElementType()
sal_Bool SAL_CALL SvxUnoTextContent::hasElements()
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = GetEditSource() ? GetEditSource()->GetTextForwarder() : NULL;
if( pForwarder )
@@ -438,7 +438,7 @@ SvxUnoTextRangeEnumeration::~SvxUnoTextRangeEnumeration() throw()
sal_Bool SAL_CALL SvxUnoTextRangeEnumeration::hasMoreElements()
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return mpPortions && mnNextPortion < mpPortions->Count();
}
@@ -446,7 +446,7 @@ sal_Bool SAL_CALL SvxUnoTextRangeEnumeration::hasMoreElements()
uno::Any SAL_CALL SvxUnoTextRangeEnumeration::nextElement()
throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mpPortions == NULL || mnNextPortion >= mpPortions->Count() )
throw container::NoSuchElementException();
@@ -592,49 +592,49 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextCursor::getImplementationId()
void SAL_CALL SvxUnoTextCursor::collapseToStart()
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
CollapseToStart();
}
void SAL_CALL SvxUnoTextCursor::collapseToEnd()
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
CollapseToEnd();
}
sal_Bool SAL_CALL SvxUnoTextCursor::isCollapsed()
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return IsCollapsed();
}
sal_Bool SAL_CALL SvxUnoTextCursor::goLeft( sal_Int16 nCount, sal_Bool bExpand )
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return GoLeft( nCount, bExpand );
}
sal_Bool SAL_CALL SvxUnoTextCursor::goRight( sal_Int16 nCount, sal_Bool bExpand )
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return GoRight( nCount, bExpand );
}
void SAL_CALL SvxUnoTextCursor::gotoStart( sal_Bool bExpand )
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
GotoStart( bExpand );
}
void SAL_CALL SvxUnoTextCursor::gotoEnd( sal_Bool bExpand )
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
GotoEnd( bExpand );
}
diff --git a/fpicker/source/aqua/ControlHelper.cxx b/fpicker/source/aqua/ControlHelper.cxx
index 5747060cb1..6412fda24b 100644
--- a/fpicker/source/aqua/ControlHelper.cxx
+++ b/fpicker/source/aqua/ControlHelper.cxx
@@ -169,7 +169,7 @@ void ControlHelper::enableControl( const sal_Int16 nControlId, const sal_Bool bE
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "enable", bEnable);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (nControlId == ExtendedFilePickerElementIds::CHECKBOX_PREVIEW) {
OSL_TRACE(" preview checkbox cannot be changed");
@@ -197,7 +197,7 @@ OUString ControlHelper::getLabel( sal_Int16 nControlId )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
NSControl* pControl = getControl( nControlId );
@@ -226,7 +226,7 @@ void ControlHelper::setLabel( sal_Int16 nControlId, const NSString* aLabel )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "label", aLabel);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
NSAutoreleasePool *pool = [NSAutoreleasePool new];
@@ -258,7 +258,7 @@ void ControlHelper::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, co
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "controlAction", nControlAction);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (nControlId == ExtendedFilePickerElementIds::CHECKBOX_PREVIEW) {
OSL_TRACE(" value for preview is unchangeable");
@@ -291,7 +291,7 @@ uno::Any ControlHelper::getValue( sal_Int16 nControlId, sal_Int16 nControlAction
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "controlAction", nControlAction);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Any aRetval;
NSControl* pControl = getControl( nControlId );
@@ -805,7 +805,7 @@ void ControlHelper::layoutControls()
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (nil == m_pUserPane) {
OSL_TRACE("no user pane to layout");
diff --git a/fpicker/source/aqua/FilterHelper.cxx b/fpicker/source/aqua/FilterHelper.cxx
index 7272208d10..29853cddac 100644
--- a/fpicker/source/aqua/FilterHelper.cxx
+++ b/fpicker/source/aqua/FilterHelper.cxx
@@ -270,7 +270,7 @@ void FilterHelper::SetCurFilter( const rtl::OUString& rFilter )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "filter", rFilter);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if(m_aCurrentFilter.equals(rFilter) == false)
{
@@ -317,7 +317,7 @@ void FilterHelper::appendFilter(const ::rtl::OUString& aTitle, const ::rtl::OUSt
throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) {
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "title", aTitle, "filter", aFilterString);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( FilterNameExists( aTitle ) ) {
throw com::sun::star::lang::IllegalArgumentException();
@@ -359,7 +359,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "title", OUStringToOString(sGroupTitle, RTL_TEXTENCODING_UTF8).getStr());
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
//add a separator if this is not the first group to be added
sal_Bool bPrependSeparator = m_pFilterList != NULL;
diff --git a/fpicker/source/aqua/SalAquaFilePicker.cxx b/fpicker/source/aqua/SalAquaFilePicker.cxx
index 2b43d6cb2e..70a1d988fb 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.cxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.cxx
@@ -143,7 +143,7 @@ void SAL_CALL SalAquaFilePicker::addFilePickerListener( const uno::Reference<XFi
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_xListener = xListener;
DBG_PRINT_EXIT(CLASS_NAME, __func__);
@@ -154,7 +154,7 @@ void SAL_CALL SalAquaFilePicker::removeFilePickerListener( const uno::Reference<
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_xListener.clear();
DBG_PRINT_EXIT(CLASS_NAME, __func__);
@@ -168,7 +168,7 @@ void SAL_CALL SalAquaFilePicker::setTitle( const rtl::OUString& aTitle ) throw(
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "title", aTitle);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
implsetTitle(aTitle);
DBG_PRINT_EXIT(CLASS_NAME, __func__);
@@ -178,7 +178,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int16 retVal = 0;
@@ -263,7 +263,7 @@ void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw(
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "multiSelectable?", bMode);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (m_nDialogType == NAVIGATIONSERVICES_OPEN) {
[(NSOpenPanel*)m_pDialog setAllowsMultipleSelection:YES];
@@ -278,7 +278,7 @@ throw( uno::RuntimeException )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "name", aName);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_sSaveFileName = aName;
@@ -290,7 +290,7 @@ throw( lang::IllegalArgumentException, uno::RuntimeException )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "directory", rDirectory);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
implsetDisplayDirectory(rDirectory);
@@ -311,7 +311,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno::
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// OSL_TRACE("starting work");
/*
@@ -372,7 +372,7 @@ throw( lang::IllegalArgumentException, uno::RuntimeException )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
ensureFilterHelper();
m_pFilterHelper->appendFilter( aTitle, aFilter );
@@ -388,7 +388,7 @@ throw( lang::IllegalArgumentException, uno::RuntimeException )
OSL_TRACE( "Setting current filter to %s",
OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ).getStr() );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
ensureFilterHelper();
m_pFilterHelper->setCurrentFilter(aTitle);
@@ -402,7 +402,7 @@ throw( lang::IllegalArgumentException, uno::RuntimeException )
rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter() throw( uno::RuntimeException )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
ensureFilterHelper();
@@ -419,7 +419,7 @@ void SAL_CALL SalAquaFilePicker::appendFilterGroup( const rtl::OUString& sGroupT
throw( lang::IllegalArgumentException, uno::RuntimeException )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
ensureFilterHelper();
m_pFilterHelper->appendFilterGroup(sGroupTitle, aFilters);
@@ -437,7 +437,7 @@ throw( uno::RuntimeException )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_pControlHelper->setValue(nControlId, nControlAction, rValue);
@@ -474,7 +474,7 @@ throw( uno::RuntimeException )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
NSString* sLabel = [NSString stringWithOUString:aLabel];
m_pControlHelper->setLabel( nControlId, sLabel ) ;
@@ -501,7 +501,7 @@ throw( uno::Exception, uno::RuntimeException )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "arguments size", aArguments.getLength());
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// parameter checking
uno::Any aAny;
@@ -587,7 +587,7 @@ void SAL_CALL SalAquaFilePicker::cancel() throw( uno::RuntimeException )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (m_pDialog != nil) {
[m_pDialog cancel:nil];
@@ -605,7 +605,7 @@ void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent ) th
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference<XFilePickerListener> xFilePickerListener( aEvent.Source, ::com::sun::star::uno::UNO_QUERY );
@@ -723,7 +723,7 @@ case ExtendedFilePickerElementIds::LISTBOX_##elem##_LABEL: \
void SalAquaFilePicker::ensureFilterHelper() {
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (NULL == m_pFilterHelper) {
m_pFilterHelper = new FilterHelper;
@@ -762,7 +762,7 @@ void SalAquaFilePicker::updateSaveFileNameExtension() {
// we need to set this here again because initial setting does
//[m_pDialog setExtensionHidden:YES];
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (m_pControlHelper->isAutoExtensionEnabled() == false) {
OSL_TRACE("allowing other file types");
@@ -794,7 +794,7 @@ void SalAquaFilePicker::filterControlChanged() {
return;
}
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
updateSaveFileNameExtension();
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.cxx b/fpicker/source/aqua/SalAquaFolderPicker.cxx
index e00d544390..eb81676439 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.cxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.cxx
@@ -107,7 +107,7 @@ void SAL_CALL SalAquaFolderPicker::setTitle( const rtl::OUString& aTitle ) throw
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "title", aTitle);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
implsetTitle(aTitle);
@@ -118,7 +118,7 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int16 retVal = 0;
@@ -154,7 +154,7 @@ void SAL_CALL SalAquaFolderPicker::setDisplayDirectory( const rtl::OUString& aDi
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "directory", aDirectory);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
implsetDisplayDirectory(aDirectory);
@@ -165,7 +165,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory() throw( uno::Ru
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
OUString aDirectory = implgetDisplayDirectory();
@@ -178,7 +178,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() throw( uno::RuntimeEx
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
NSArray *files = nil;
if (m_nDialogType == NAVIGATIONSERVICES_DIRECTORY) {
@@ -269,7 +269,7 @@ void SAL_CALL SalAquaFolderPicker::cancel() throw( uno::RuntimeException )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
[m_pDialog cancel:nil];
diff --git a/fpicker/source/aqua/SalAquaPicker.cxx b/fpicker/source/aqua/SalAquaPicker.cxx
index 77f23f33f8..de2476021e 100644
--- a/fpicker/source/aqua/SalAquaPicker.cxx
+++ b/fpicker/source/aqua/SalAquaPicker.cxx
@@ -76,7 +76,7 @@ SalAquaPicker::~SalAquaPicker()
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
NSAutoreleasePool *pool = [NSAutoreleasePool new];
@@ -95,7 +95,7 @@ void SAL_CALL SalAquaPicker::implInitialize()
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (m_pDialog != nil) {
return;
@@ -159,7 +159,7 @@ int SalAquaPicker::run()
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
NSAutoreleasePool *pool = [NSAutoreleasePool new];
@@ -219,7 +219,7 @@ int SalAquaPicker::runandwaitforresult()
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
int status = this->run();
@@ -232,7 +232,7 @@ void SAL_CALL SalAquaPicker::implsetDisplayDirectory( const rtl::OUString& aDire
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "directory", aDirectory);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (aDirectory != m_sDisplayDirectory) {
m_sDisplayDirectory = aDirectory;
@@ -253,7 +253,7 @@ void SAL_CALL SalAquaPicker::implsetTitle( const rtl::OUString& aTitle ) throw(
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "title", aTitle);
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (m_pDialog != nil) {
[m_pDialog setTitle:[NSString stringWithOUString:aTitle]];
diff --git a/fpicker/source/aqua/resourceprovider.cxx b/fpicker/source/aqua/resourceprovider.cxx
index 4236b6a4c5..628e19d76d 100644
--- a/fpicker/source/aqua/resourceprovider.cxx
+++ b/fpicker/source/aqua/resourceprovider.cxx
@@ -171,7 +171,7 @@ public:
String aResString;
OUString aResOUString;
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
try
{
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index ed8614f011..3a3cbeabd6 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -560,7 +560,7 @@ void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( Runt
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_bMultiSelection = bMode;
}
@@ -568,7 +568,7 @@ void SAL_CALL SvtFilePicker::setDefaultName( const rtl::OUString& aName ) throw(
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_aDefaultName = aName;
}
@@ -577,7 +577,7 @@ void SAL_CALL SvtFilePicker::setDisplayDirectory( const rtl::OUString& aDirector
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_aDisplayDirectory = aDirectory;
}
@@ -585,7 +585,7 @@ rtl::OUString SAL_CALL SvtFilePicker::getDisplayDirectory() throw( RuntimeExcept
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( getDialog() )
{
rtl::OUString aPath = getDialog()->GetPath();
@@ -613,7 +613,7 @@ Sequence< rtl::OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeExcep
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( ! getDialog() )
{
Sequence< rtl::OUString > aEmpty;
@@ -659,7 +659,7 @@ void SAL_CALL SvtFilePicker::setValue( sal_Int16 nElementID,
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( getDialog() )
{
::svt::OControlAccess aAccess( getDialog(), getDialog()->GetView() );
@@ -703,7 +703,7 @@ Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAc
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Any aAny;
// execute() called?
@@ -739,7 +739,7 @@ void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const rtl::OUString&
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( getDialog() )
{
::svt::OControlAccess aAccess( getDialog(), getDialog()->GetView() );
@@ -779,7 +779,7 @@ rtl::OUString SAL_CALL SvtFilePicker::getLabel( sal_Int16 nLabelID )
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
rtl::OUString aLabel;
if ( getDialog() )
@@ -812,7 +812,7 @@ void SAL_CALL SvtFilePicker::enableControl( sal_Int16 nElementID, sal_Bool bEnab
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( getDialog() )
{
::svt::OControlAccess aAccess( getDialog(), getDialog()->GetView() );
@@ -854,7 +854,7 @@ void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePicker
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_xListener = xListener;
}
@@ -863,7 +863,7 @@ void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePic
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_xListener.clear();
}
@@ -876,7 +876,7 @@ Sequence< sal_Int16 > SAL_CALL SvtFilePicker::getSupportedImageFormats()
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Sequence< sal_Int16 > aFormats( 1 );
aFormats[0] = FilePreviewImageFormats::BITMAP;
@@ -889,7 +889,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth() throw ( RuntimeException
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int32 nDepth = 0;
if ( getDialog() )
@@ -903,7 +903,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth() throw ( RuntimeException )
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int32 nWidth = 0;
if ( getDialog() )
@@ -917,7 +917,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight() throw ( RuntimeException
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int32 nHeigth = 0;
if ( getDialog() )
@@ -932,7 +932,7 @@ void SAL_CALL SvtFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( getDialog() )
getDialog()->setImage( aImageFormat, rImage );
}
@@ -943,7 +943,7 @@ sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool bShowState )
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
if ( getDialog() )
@@ -957,7 +957,7 @@ sal_Bool SAL_CALL SvtFilePicker::getShowState() throw ( RuntimeException )
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
if ( getDialog() )
@@ -976,7 +976,7 @@ void SAL_CALL SvtFilePicker::appendFilterGroup( const ::rtl::OUString& sGroupTit
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// check the names
if ( FilterNameExists( aFilters ) )
@@ -1004,7 +1004,7 @@ void SAL_CALL SvtFilePicker::appendFilter( const rtl::OUString& aTitle,
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// check the name
if ( FilterNameExists( aTitle ) )
// TODO: a more precise exception message
@@ -1023,7 +1023,7 @@ void SAL_CALL SvtFilePicker::setCurrentFilter( const rtl::OUString& aTitle )
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( ! FilterNameExists( aTitle ) )
throw IllegalArgumentException();
@@ -1039,7 +1039,7 @@ rtl::OUString SAL_CALL SvtFilePicker::getCurrentFilter()
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
rtl::OUString aFilter = getDialog() ? rtl::OUString( getDialog()->GetCurFilter() ) :
rtl::OUString( m_aCurrentFilter );
return aFilter;
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index ede2f823ed..ab7efbf1cc 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -121,7 +121,7 @@ namespace svt
//---------------------------------------------------------------------
void SAL_CALL OCommonPicker::disposing()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
stopWindowListening();
@@ -152,7 +152,7 @@ namespace svt
//---------------------------------------------------------------------
void SAL_CALL OCommonPicker::disposing( const EventObject& _rSource ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Bool bDialogDying = _rSource.Source == m_xWindow;
sal_Bool bParentDying = _rSource.Source == m_xDialogParent;
@@ -210,7 +210,7 @@ namespace svt
//---------------------------------------------------------------------
sal_Bool OCommonPicker::createPicker()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !m_pDlg )
{
@@ -263,7 +263,7 @@ namespace svt
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( createPicker() )
{
::svt::OControlAccess aAccess( m_pDlg, m_pDlg->GetView() );
@@ -276,7 +276,7 @@ namespace svt
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( createPicker() )
{
::svt::OControlAccess aAccess( m_pDlg, m_pDlg->GetView() );
@@ -293,7 +293,7 @@ namespace svt
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( createPicker() )
{
::svt::OControlAccess aAccess( m_pDlg, m_pDlg->GetView() );
@@ -308,7 +308,7 @@ namespace svt
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( createPicker() )
{
::svt::OControlAccess aAccess( m_pDlg, m_pDlg->GetView() );
@@ -323,7 +323,7 @@ namespace svt
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( createPicker() )
{
::svt::OControlAccess aAccess( m_pDlg, m_pDlg->GetView() );
@@ -338,7 +338,7 @@ namespace svt
{
checkAlive();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( createPicker() )
{
::svt::OControlAccess aAccess( m_pDlg, m_pDlg->GetView() );
@@ -353,14 +353,14 @@ namespace svt
//---------------------------------------------------------------------
void SAL_CALL OCommonPicker::setTitle( const rtl::OUString& _rTitle ) throw( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_aTitle = _rTitle;
}
//---------------------------------------------------------------------
sal_Int16 OCommonPicker::execute() throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
prepareDialog();
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 3662abc719..54c093dc4a 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -154,14 +154,14 @@ KDE4FilePicker::~KDE4FilePicker()
void SAL_CALL KDE4FilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
throw( uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_xListener = xListener;
}
void SAL_CALL KDE4FilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& )
throw( uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_xListener.clear();
}
diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/filepicker/asyncrequests.cxx
index b7a342f4e7..f3104bba4d 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.cxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.cxx
@@ -67,7 +67,7 @@ void Request::wait(::sal_Int32 nMilliSeconds)
void Request::waitProcessMessages()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
while (!m_aJoiner.check())
Application::Yield();
}
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index c4628f08a2..6b4bee1725 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -121,7 +121,7 @@ public:
CResourceProvider_Impl( )
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
com::sun::star::lang::Locale aLoc( Application::GetSettings().GetUILocale() );
m_ResMgr = new SimpleResMgr( CREATEVERSIONRESMGR_NAME( fps_office ), aLoc );
diff --git a/framework/source/classes/fwkresid.cxx b/framework/source/classes/fwkresid.cxx
index b8903405e8..03b4a43a3c 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 223d6405a7..01061339a0 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 c325a94357..ce9a7fbcec 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 43f3dde635..060650e6e9 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 5434d5ea96..9ea799b00b 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 2596a5727c..ceb29cce50 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 6146570c18..44ef2e2419 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 ca130b020f..fc42d63fbe 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 106f1d368c..5cdf7f8059 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 fbcea16d2a..f81ed77e5b 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 b65a6ac61f..409d482419 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 03045fca6a..93c5d46c77 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 a8ca511b60..40f74aedcf 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 a8213a1ef4..39dc97eb57 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 e0013da53a..6e7a440aea 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 4a82ba1ddf..2900461812 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 eb46983cef..360cd9c592 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 56ad5a2bc2..a61a9f21ae 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 fd8db61cb0..cc58e22cde 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 5c8bf31c7a..ba54c7a9e1 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 a8f8a7322e..4ff1683376 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 a56d8c7f83..2ef71b8cfe 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 4b761b76dc..a40880760a 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 553bcef346..57a2252c09 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 126ce063ba..05693a4d38 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 f516256760..96001bd1a6 100644
--- a/framework/source/uielement/logoimagestatusbarcontroller.cxx
+++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -84,12 +84,12 @@ void SAL_CALL LogoImageStatusbarController::release() throw ()
{
svt::StatusbarController::release();
}
-
-void SAL_CALL LogoImageStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+
+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 );
}
@@ -99,14 +99,14 @@ throw (::com::sun::star::uno::RuntimeException)
{
svt::StatusbarController::dispose();
}
-
+
// XEventListener
void SAL_CALL LogoImageStatusbarController::disposing( const EventObject& Source )
throw ( RuntimeException )
{
svt::StatusbarController::disposing( Source );
}
-
+
// XStatusListener
void SAL_CALL LogoImageStatusbarController::statusChanged( const FeatureStateEvent& )
throw ( RuntimeException )
@@ -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 52768ca84d..3128abaae1 100644
--- a/framework/source/uielement/logotextstatusbarcontroller.cxx
+++ b/framework/source/uielement/logotextstatusbarcontroller.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -84,12 +84,12 @@ void SAL_CALL LogoTextStatusbarController::release() throw ()
{
svt::StatusbarController::release();
}
-
-void SAL_CALL LogoTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+
+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 );
if ( m_xParentWindow.is() && m_nID > 0 )
@@ -109,14 +109,14 @@ throw (::com::sun::star::uno::RuntimeException)
{
svt::StatusbarController::dispose();
}
-
+
// XEventListener
void SAL_CALL LogoTextStatusbarController::disposing( const EventObject& Source )
throw ( RuntimeException )
{
svt::StatusbarController::disposing( Source );
}
-
+
// XStatusListener
void SAL_CALL LogoTextStatusbarController::statusChanged( const FeatureStateEvent& )
throw ( RuntimeException )
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index a43309bf53..6274a18a74 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 2628cecae9..58657f1e50 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 1e61efe425..b50b77cd6c 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 b6c1ae595c..9c177508c3 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 d7e86b2161..47618f39d8 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 c833ee5a1e..274013ce24 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 6d098641fe..849cfabb96 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 e55d16845c..2122c59ddb 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 7b5f18f0fc..9ef1068577 100644
--- a/framework/source/uielement/simpletextstatusbarcontroller.cxx
+++ b/framework/source/uielement/simpletextstatusbarcontroller.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -83,19 +83,19 @@ void SAL_CALL SimpleTextStatusbarController::release() throw ()
{
svt::StatusbarController::release();
}
-
-void SAL_CALL SimpleTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+
+void SAL_CALL SimpleTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
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 );
rtl::OUString aValue;
beans::PropertyValue aPropValue;
-
+
// Check arguments for optional "Value" property. We need it
// to set our internal simple text.
for ( int i = 0; i < aArguments.getLength(); i++ )
@@ -105,8 +105,8 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException
aPropValue.Value >>= aValue;
break;
}
- }
-
+ }
+
m_aText = aValue;
if ( m_xParentWindow.is() && m_nID > 0 )
{
@@ -125,14 +125,14 @@ throw (::com::sun::star::uno::RuntimeException)
{
svt::StatusbarController::dispose();
}
-
+
// XEventListener
void SAL_CALL SimpleTextStatusbarController::disposing( const EventObject& Source )
throw ( RuntimeException )
{
svt::StatusbarController::disposing( Source );
}
-
+
// XStatusListener
void SAL_CALL SimpleTextStatusbarController::statusChanged( const FeatureStateEvent& )
throw ( RuntimeException )
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index bbe630152d..4d508ac368 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 9ff6e7e273..66090061df 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 670f1b4a9a..436a813a14 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 ea2ce4a84f..8f98626944 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 718e9ea967..a6d7cff725 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 89822cf7a0..49f7970c2b 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 df24753046..f4383f4452 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 bfffbd2fe0..ce062788de 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 );
}
diff --git a/scripting/source/basprov/baslibnode.cxx b/scripting/source/basprov/baslibnode.cxx
index cd53a55bef..c4bad8c29b 100644
--- a/scripting/source/basprov/baslibnode.cxx
+++ b/scripting/source/basprov/baslibnode.cxx
@@ -81,7 +81,7 @@ namespace basprov
::rtl::OUString BasicLibraryNodeImpl::getName( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return m_sLibName;
}
@@ -90,7 +90,7 @@ namespace basprov
Sequence< Reference< browse::XBrowseNode > > BasicLibraryNodeImpl::getChildNodes( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Sequence< Reference< browse::XBrowseNode > > aChildNodes;
@@ -124,7 +124,7 @@ namespace basprov
sal_Bool BasicLibraryNodeImpl::hasChildNodes( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Bool bReturn = sal_False;
if ( m_xLibrary.is() )
@@ -137,7 +137,7 @@ namespace basprov
sal_Int16 BasicLibraryNodeImpl::getType( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return browse::BrowseNodeTypes::CONTAINER;
}
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index 08832700c3..feec2149cb 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -130,7 +130,7 @@ namespace basprov
::rtl::OUString BasicMethodNodeImpl::getName( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
::rtl::OUString sMethodName;
if ( m_pMethod )
@@ -143,7 +143,7 @@ namespace basprov
Sequence< Reference< browse::XBrowseNode > > BasicMethodNodeImpl::getChildNodes( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return Sequence< Reference< browse::XBrowseNode > >();
}
@@ -152,7 +152,7 @@ namespace basprov
sal_Bool BasicMethodNodeImpl::hasChildNodes( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return sal_False;
}
@@ -161,7 +161,7 @@ namespace basprov
sal_Int16 BasicMethodNodeImpl::getType( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return browse::BrowseNodeTypes::SCRIPT;
}
diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx
index 2c1c19733c..fc69f04693 100644
--- a/scripting/source/basprov/basmodnode.cxx
+++ b/scripting/source/basprov/basmodnode.cxx
@@ -75,7 +75,7 @@ namespace basprov
::rtl::OUString BasicModuleNodeImpl::getName( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
::rtl::OUString sModuleName;
if ( m_pModule )
@@ -88,7 +88,7 @@ namespace basprov
Sequence< Reference< browse::XBrowseNode > > BasicModuleNodeImpl::getChildNodes( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Sequence< Reference< browse::XBrowseNode > > aChildNodes;
@@ -125,7 +125,7 @@ namespace basprov
sal_Bool BasicModuleNodeImpl::hasChildNodes( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Bool bReturn = sal_False;
if ( m_pModule )
@@ -142,7 +142,7 @@ namespace basprov
sal_Int16 BasicModuleNodeImpl::getType( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return browse::BrowseNodeTypes::CONTAINER;
}
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index f14d720915..b325e7c890 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -240,7 +240,7 @@ namespace basprov
{
// TODO
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( aArguments.getLength() != 1 )
{
@@ -333,7 +333,7 @@ namespace basprov
{
// TODO
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Reference< provider::XScript > xScript;
Reference< lang::XMultiComponentFactory > xMcFac ( m_xContext->getServiceManager() );
@@ -467,7 +467,7 @@ namespace basprov
{
// TODO
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return ::rtl::OUString::createFromAscii( "Basic" );
}
@@ -476,7 +476,7 @@ namespace basprov
Sequence< Reference< browse::XBrowseNode > > BasicProviderImpl::getChildNodes( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Reference< script::XLibraryContainer > xLibContainer;
BasicManager* pBasicManager = NULL;
@@ -534,7 +534,7 @@ namespace basprov
sal_Bool BasicProviderImpl::hasChildNodes( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Bool bReturn = sal_False;
Reference< script::XLibraryContainer > xLibContainer;
@@ -556,7 +556,7 @@ namespace basprov
sal_Int16 BasicProviderImpl::getType( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return browse::BrowseNodeTypes::CONTAINER;
}
diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index 7a5de39a0d..19b950fad8 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -154,7 +154,7 @@ namespace basprov
// TODO: throw CannotConvertException
// TODO: check length of aOutParamIndex, aOutParam
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Any aReturn;
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 5103bc091c..31026b5e96 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -113,7 +113,7 @@ void SAL_CALL SfxTerminateListener_Impl::disposing( const EventObject& ) throw(
void SAL_CALL SfxTerminateListener_Impl::queryTermination( const EventObject& ) throw(TerminationVetoException, RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !SFX_APP()->QueryExit_Impl() )
throw TerminationVetoException();
}
@@ -127,8 +127,9 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a
if( xDesktop.is() == sal_True )
xDesktop->removeTerminateListener( this );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
utl::ConfigManager::GetConfigManager().StoreConfigItems();
+
SfxApplication* pApp = SFX_APP();
pApp->Broadcast( SfxSimpleHint( SFX_HINT_DEINITIALIZING ) );
pApp->Get_Impl()->pAppDispatch->ReleaseAll();
@@ -202,7 +203,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
static bool bDetermineFunction = false;
static PFunc_getSpecialCharsForEdit pfunc_getSpecialCharsForEdit = 0;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !bDetermineFunction )
{
bDetermineFunction = true;
@@ -304,7 +305,7 @@ bool SfxApplication::Initialize_Impl()
pAppData_Impl->pAppDispat->DoActivate_Impl( sal_True, NULL );
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// Set special characters callback on vcl edit control
Edit::SetGetSpecialCharsFunction(&GetSpecialCharsForEdit);
}
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index aefc4fd499..8b68150ec3 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -948,7 +948,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
if ( !bIsDir && !aExtendedSecurityOptions.IsSecureHyperlink( aURL.Complete ) )
{
// Security check for local files depending on the extension
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window *pWindow = SFX_APP()->GetTopWindow();
String aSecurityWarningBoxTitle( SfxResId( RID_SECURITY_WARNING_TITLE ));
@@ -972,7 +972,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
}
else if ( eMode == SvtExtendedSecurityOptions::OPEN_NEVER && aINetProtocol != INET_PROT_VND_SUN_STAR_HELP )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window *pWindow = SFX_APP()->GetTopWindow();
String aSecurityWarningBoxTitle( SfxResId( RID_SECURITY_WARNING_TITLE ));
@@ -1010,13 +1010,13 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
}
catch ( ::com::sun::star::lang::IllegalArgumentException& )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window *pWindow = SFX_APP()->GetTopWindow();
ErrorBox( pWindow, SfxResId( MSG_ERR_NO_WEBBROWSER_FOUND )).Execute();
}
catch ( ::com::sun::star::system::SystemShellExecuteException& )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window *pWindow = SFX_APP()->GetTopWindow();
ErrorBox( pWindow, SfxResId( MSG_ERR_NO_WEBBROWSER_FOUND )).Execute();
}
@@ -1093,7 +1093,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
}
catch ( ::com::sun::star::lang::IllegalArgumentException& )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window *pWindow = SFX_APP()->GetTopWindow();
ErrorBox( pWindow, SfxResId( MSG_ERR_NO_WEBBROWSER_FOUND )).Execute();
}
@@ -1101,7 +1101,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
{
if ( !pFilter )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window *pWindow = SFX_APP()->GetTopWindow();
ErrorBox( pWindow, SfxResId( MSG_ERR_NO_WEBBROWSER_FOUND )).Execute();
}
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 9d66a85dc0..803382bd48 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1653,7 +1653,7 @@ void SAL_CALL SfxMacroLoader::dispatchWithNotification( const ::com::sun::star::
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& xListener )
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_uInt32 nPropertyCount = lArgs.getLength();
::rtl::OUString aReferer;
@@ -1698,7 +1698,7 @@ void SAL_CALL SfxMacroLoader::dispatch( const ::com::sun::star::util::URL&
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArgs )
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_uInt32 nPropertyCount = lArgs.getLength();
::rtl::OUString aReferer;
@@ -1976,7 +1976,7 @@ throw( RuntimeException )
Sequence< sal_Int16 > SAL_CALL SfxAppDispatchProvider::getSupportedCommandGroups()
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
std::list< sal_Int16 > aGroupList;
SfxSlotPool* pAppSlotPool = &SFX_APP()->GetAppSlotPool_Impl();
@@ -2011,7 +2011,7 @@ throw (::com::sun::star::uno::RuntimeException)
{
std::list< ::com::sun::star::frame::DispatchInformation > aCmdList;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SfxSlotPool* pAppSlotPool = &SFX_APP()->GetAppSlotPool_Impl();
if ( pAppSlotPool )
diff --git a/sfx2/source/appl/fwkhelper.cxx b/sfx2/source/appl/fwkhelper.cxx
index bd46859c29..0784a17255 100644
--- a/sfx2/source/appl/fwkhelper.cxx
+++ b/sfx2/source/appl/fwkhelper.cxx
@@ -40,7 +40,7 @@
void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( xFrame.is() )
{
SfxFrame* pFrame=0;
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index 7f2d560792..58dc6914fd 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -159,7 +159,7 @@ void SAL_CALL
ImeStatusWindow::propertyChange(css::beans::PropertyChangeEvent const & )
throw (css::uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
SfxApplication* pApp = SfxApplication::Get();
if (pApp)
pApp->Invalidate(SID_SHOW_IME_STATUS_WINDOW);
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 5d74075e34..1ca2708fa4 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -296,7 +296,7 @@ void ShutdownIcon::FileOpen()
{
if ( getInstance() && getInstance()->m_xDesktop.is() )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
EnterModalMode();
getInstance()->StartFileDialog();
}
@@ -349,7 +349,7 @@ void ShutdownIcon::FromTemplate()
#include <tools/rcid.h>
OUString ShutdownIcon::GetResString( int id )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( ! m_pResMgr )
m_pResMgr = SfxResId::GetResMgr();
@@ -366,7 +366,7 @@ OUString ShutdownIcon::GetResString( int id )
OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return OUString( SvFileInformationManager::GetDescription( INetURLObject( aUrl ) ) );
}
@@ -375,7 +375,7 @@ OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl )
void ShutdownIcon::StartFileDialog()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
bool bDirty = ( m_bSystemDialogs != static_cast<bool>(SvtMiscOptions().UseSystemFileDialog()) );
@@ -619,7 +619,7 @@ ShutdownIcon* ShutdownIcon::createInstance()
void ShutdownIcon::init() throw( ::com::sun::star::uno::Exception )
{
// access resource system and sfx only protected by solarmutex
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
ResMgr *pResMgr = SfxResId::GetResMgr();
::osl::ResettableMutexGuard aGuard( m_aMutex );
@@ -813,7 +813,7 @@ rtl::OUString ShutdownIcon::getShortcutName()
ResMgr* pMgr = SfxResId::GetResMgr();
if( pMgr )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
UniString aRes( SfxResId( STR_QUICKSTART_LNKNAME ) );
aShortcutName = OUString( aRes );
}
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index a5bca0c3c6..a3fb6d15c3 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -386,7 +386,7 @@ extern "C"
void aqua_init_systray()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
ShutdownIcon *pShutdownIcon = ShutdownIcon::getInstance();
if( ! pShutdownIcon )
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 0f163dc7c7..1722d022e1 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -348,7 +348,7 @@ extern "C" {
static gboolean
show_at_idle( gpointer )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
gtk_widget_show_all( GTK_WIDGET( pTrayIcon ) );
return FALSE;
}
@@ -356,7 +356,7 @@ extern "C" {
void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( !g_type_from_name( "GdkDisplay" ) )
return;
@@ -400,7 +400,7 @@ void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( !pTrayIcon )
return;
gtk_widget_destroy( GTK_WIDGET( pTrayIcon ) );
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index d082864388..73491ddf4b 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -169,7 +169,7 @@ LayoutManagerListener::~LayoutManagerListener()
void LayoutManagerListener::setFrame( const css::uno::Reference< css::frame::XFrame >& xFrame )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pWrkWin && !m_bHasFrame )
{
m_xFrame = xFrame;
@@ -234,7 +234,7 @@ throw (::com::sun::star::uno::RuntimeException)
void SAL_CALL LayoutManagerListener::dispose()
throw( css::uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// reset member
m_pWrkWin = 0;
@@ -281,7 +281,7 @@ void SAL_CALL LayoutManagerListener::disposing(
const css::lang::EventObject& )
throw( css::uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_pWrkWin = 0;
m_bHasFrame = sal_False;
m_xFrame = css::uno::Reference< css::frame::XFrame >();
@@ -296,7 +296,7 @@ void SAL_CALL LayoutManagerListener::layoutEvent(
const css::uno::Any& )
throw (css::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pWrkWin )
{
if ( eLayoutEvent == css::frame::LayoutManagerEvents::VISIBLE )
diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index e874b2b374..416d9a65a0 100644
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.cxx
@@ -96,7 +96,7 @@ SfxFilterListener::~SfxFilterListener()
void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource ) throw( uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference< util::XRefreshable > xContainer( aSource.Source, uno::UNO_QUERY );
if(
(xContainer.is() ) &&
@@ -109,7 +109,7 @@ void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource ) t
void SAL_CALL SfxFilterListener::disposing( const lang::EventObject& aSource ) throw( uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference< util::XRefreshable > xNotifier( aSource.Source, uno::UNO_QUERY );
if (!xNotifier.is())
return;
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index fa6c924f4c..c0a330eeec 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -112,14 +112,14 @@ SfxQueryStatus_Impl::~SfxQueryStatus_Impl()
void SAL_CALL SfxQueryStatus_Impl::disposing( const EventObject& )
throw( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_xDispatch.clear();
}
void SAL_CALL SfxQueryStatus_Impl::statusChanged( const FeatureStateEvent& rEvent)
throw( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_pItem = NULL;
m_eState = SFX_ITEM_DISABLED;
@@ -190,7 +190,7 @@ throw( RuntimeException )
// Query method
SfxItemState SfxQueryStatus_Impl::QueryState( SfxPoolItem*& rpPoolItem )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !m_bQueryInProgress )
{
m_pItem = NULL;
@@ -237,7 +237,7 @@ SfxQueryStatus::~SfxQueryStatus()
SfxItemState SfxQueryStatus::QueryState( SfxPoolItem*& rpPoolItem )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return m_pSfxQueryStatusImpl->QueryState( rpPoolItem );
}
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index 5757932a72..7b729af8e1 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -191,7 +191,7 @@ throw ( RuntimeException )
void SAL_CALL SfxStatusListener::disposing( const EventObject& Source )
throw( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( Source.Source == Reference< XInterface >( m_xDispatch, UNO_QUERY ))
m_xDispatch.clear();
@@ -202,7 +202,7 @@ throw( RuntimeException )
void SAL_CALL SfxStatusListener::statusChanged( const FeatureStateEvent& rEvent)
throw( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SfxViewFrame* pViewFrame = NULL;
if ( m_xDispatch.is() )
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 177af542b6..1c75381f9c 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -131,7 +131,7 @@ void SfxUnoControllerItem::UnBind()
void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame::FeatureStateEvent& rEvent) throw ( ::com::sun::star::uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT( pCtrlItem, "Dispatch hat den StatusListener nicht entfern!" );
if ( rEvent.Requery )
@@ -668,7 +668,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (
pDispatch &&
(
@@ -885,7 +885,7 @@ SfxDispatcher* SfxDispatchController_Impl::GetDispatcher()
void SAL_CALL SfxDispatchController_Impl::addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw ( ::com::sun::star::uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !pDispatch )
return;
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index fc2d45a4cf..da195fe532 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -392,7 +392,7 @@ static SfxWorkWindow* lcl_getWorkWindowFromXFrame( const uno::Reference< frame::
*/
void SAL_CALL SfxDockingWindowFactory( const uno::Reference< frame::XFrame >& rFrame, const rtl::OUString& rDockingWindowName )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
USHORT nID = USHORT(rDockingWindowName.toInt32());
// Check the range of the provided ID otherwise nothing will happen
@@ -418,7 +418,7 @@ void SAL_CALL SfxDockingWindowFactory( const uno::Reference< frame::XFrame >& rF
*/
bool SAL_CALL IsDockingWindowVisible( const uno::Reference< frame::XFrame >& rFrame, const rtl::OUString& rDockingWindowName )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
USHORT nID = USHORT(rDockingWindowName.toInt32());
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index ce1851c3f8..6428f4d9ab 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -156,35 +156,35 @@ String DecodeSpaces_Impl( const String& rSource );
// ------------------------------------------------------------------------
void SAL_CALL FileDialogHelper_Impl::fileSelectionChanged( const FilePickerEvent& aEvent ) throw ( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
mpAntiImpl->FileSelectionChanged( aEvent );
}
// ------------------------------------------------------------------------
void SAL_CALL FileDialogHelper_Impl::directoryChanged( const FilePickerEvent& aEvent ) throw ( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
mpAntiImpl->DirectoryChanged( aEvent );
}
// ------------------------------------------------------------------------
OUString SAL_CALL FileDialogHelper_Impl::helpRequested( const FilePickerEvent& aEvent ) throw ( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return mpAntiImpl->HelpRequested( aEvent );
}
// ------------------------------------------------------------------------
void SAL_CALL FileDialogHelper_Impl::controlStateChanged( const FilePickerEvent& aEvent ) throw ( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
mpAntiImpl->ControlStateChanged( aEvent );
}
// ------------------------------------------------------------------------
void SAL_CALL FileDialogHelper_Impl::dialogSizeChanged() throw ( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
mpAntiImpl->DialogSizeChanged();
}
@@ -193,7 +193,7 @@ void SAL_CALL FileDialogHelper_Impl::dialogSizeChanged() throw ( RuntimeExceptio
// ------------------------------------------------------------------------
void SAL_CALL FileDialogHelper_Impl::dialogClosed( const DialogClosedEvent& _rEvent ) throw ( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
mpAntiImpl->DialogClosed( _rEvent );
postExecute( _rEvent.DialogResult );
}
@@ -316,7 +316,7 @@ void FileDialogHelper_Impl::handleDialogSizeChanged()
// ------------------------------------------------------------------------
void SAL_CALL FileDialogHelper_Impl::disposing( const EventObject& ) throw ( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
dispose();
}
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 786ff4f2af..f6a5f246ca 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -871,7 +871,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css:
{
css::uno::Reference< css::awt::XWindow > xParentWindow = xFrame->getContainerWindow();
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow );
ErrorBox aBox( pParentWindow, SfxResId( RID_ERRBOX_MAIL_CONFIG ));
diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx
index 27b76ea3a2..f33ca57b8e 100644
--- a/sfx2/source/dialog/mailmodelapi.cxx
+++ b/sfx2/source/dialog/mailmodelapi.cxx
@@ -199,7 +199,7 @@ void SAL_CALL OMailSendThreadImpl::run()
if ( m_bSend == sal_False )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Reference< ::com::sun::star::awt::XWindow > xParentWindow = m_xCurrentFrame->getContainerWindow();
Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow );
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index c5945fcc8c..6ad26b7226 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -1588,7 +1588,7 @@ Metadatable::JoinMetadatable(Metadatable const & i_rOther,
::rtl::OUString SAL_CALL MetadatableMixin::getLocalName()
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
beans::StringPair mdref( getMetadataReference() );
if (!mdref.Second.getLength())
{
@@ -1605,7 +1605,7 @@ Metadatable::JoinMetadatable(Metadatable const & i_rOther,
::rtl::OUString SAL_CALL MetadatableMixin::getNamespace()
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
const uno::Reference< frame::XModel > xModel( GetModel() );
const uno::Reference< rdf::XURI > xDMA( xModel, uno::UNO_QUERY_THROW );
return xDMA->getStringValue();
@@ -1616,7 +1616,7 @@ beans::StringPair SAL_CALL
MetadatableMixin::getMetadataReference()
throw (uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Metadatable *const pObject( GetCoreObject() );
if (!pObject)
@@ -1634,7 +1634,7 @@ MetadatableMixin::setMetadataReference(
const beans::StringPair & i_rReference)
throw (uno::RuntimeException, lang::IllegalArgumentException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Metadatable *const pObject( GetCoreObject() );
if (!pObject)
@@ -1650,7 +1650,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException)
void SAL_CALL MetadatableMixin::ensureMetadataReference()
throw (uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Metadatable *const pObject( GetCoreObject() );
if (!pObject)
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index a098c78751..47fe44a0e6 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -481,7 +481,7 @@ void SfxDocTplService_Impl::init_Impl()
update( sal_True );
anotherGuard.clear();
- ::vos::OGuard aSecondSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSecondSolarGuard;
delete pWin;
}
@@ -541,7 +541,7 @@ void SfxDocTplService_Impl::getDefaultLocale()
// -----------------------------------------------------------------------
void SfxDocTplService_Impl::readFolderList()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
ResStringArray aShortNames( SfxResId( TEMPLATE_SHORT_NAMES_ARY ) );
ResStringArray aLongNames( SfxResId( TEMPLATE_LONG_NAMES_ARY ) );
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index a997430890..fabbb4f451 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -1241,7 +1241,7 @@ uno::Reference< embed::XStorage > GetStorage_Impl( const ::rtl::OUString& rName,
// Client code checks the returned reference but is not interested on error details.
try
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
return ::comphelper::OStorageHelper::GetStorageFromURL(
rName,
bWrite ? embed::ElementModes::READWRITE : embed::ElementModes::READ,
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index bebc12a084..b9565de573 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -183,14 +183,14 @@ void SAL_CALL SfxModelListener_Impl::queryClosing( const com::sun::star::lang::E
void SAL_CALL SfxModelListener_Impl::notifyClosing( const com::sun::star::lang::EventObject& ) throw ( com::sun::star::uno::RuntimeException )
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
mpDoc->Broadcast( SfxSimpleHint(SFX_HINT_DEINITIALIZING) );
}
void SAL_CALL SfxModelListener_Impl::disposing( const com::sun::star::lang::EventObject& _rEvent ) throw ( com::sun::star::uno::RuntimeException )
{
// am I ThisComponent in AppBasic?
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if ( SfxObjectShell::GetCurrentComponent() == _rEvent.Source )
{
lcl_UpdateAppBasicDocVars( SfxObjectShell::GetCurrentComponent(), true );
@@ -868,7 +868,7 @@ SEQUENCE< OUSTRING > SfxObjectShell::GetEventNames()
if ( !pEventNameContainer )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !pEventNameContainer )
{
static uno::Sequence< ::rtl::OUString > aEventNameContainer = GlobalEventConfig().getElementNames();
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index c9f3aaee7e..fc1807f582 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -265,7 +265,7 @@ namespace
uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter() throw(::com::sun::star::uno::RuntimeException)
{
// object already disposed?
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// search for any view of this document that is currently printing
const Printer *pPrinter = NULL;
@@ -462,7 +462,7 @@ void SAL_CALL SfxPrintHelper::setPrinter(const uno::Sequence< beans::PropertyVal
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
// object already disposed?
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SfxViewShell* pViewSh = NULL;
SfxPrinter* pPrinter = NULL;
@@ -507,7 +507,7 @@ class ImplUCBPrintWatcher : public ::osl::Thread
{
/* SAFE { */
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
while( m_pPrinter->IsPrinting() )
Application::Yield();
m_pPrinter = NULL; // don't delete it! It's borrowed only :-)
@@ -585,7 +585,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
// object already disposed?
// object already disposed?
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// get view for sfx printing capabilities
SfxViewFrame *pViewFrm = m_pData->m_pObjectShell.Is() ?
@@ -894,13 +894,13 @@ void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHin
void SAL_CALL SfxPrintHelper::addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference < view::XPrintJobListener>*)0), xListener );
}
void SAL_CALL SfxPrintHelper::removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference < view::XPrintJobListener>*)0), xListener );
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index dc76b32b3b..ee9a3c2f85 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -182,7 +182,7 @@ SfxDocInfoListener_Impl::~SfxDocInfoListener_Impl()
void SAL_CALL SfxDocInfoListener_Impl::modified( const lang::EventObject& )
throw ( uno::RuntimeException )
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
// notify changes to the SfxObjectShell
m_rShell.FlushDocInfo();
@@ -922,7 +922,7 @@ SfxBaseModel::getDocumentProperties()
void SAL_CALL SfxBaseModel::disposing( const lang::EventObject& aObject )
throw(::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( impl_isDisposed() )
return;
@@ -1368,7 +1368,7 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo
{
static ::rtl::OUString MSG_1 = ::rtl::OUString::createFromAscii("Cant close while saving.");
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( impl_isDisposed() || m_pData->m_bClosed || m_pData->m_bClosing )
return;
@@ -3033,7 +3033,7 @@ void SAL_CALL SfxBaseModel::removePrintJobListener( const uno::Reference< view::
class SvObject;
sal_Int64 SAL_CALL SfxBaseModel::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( GetObjectShell() )
{
SvGlobalName aName( aIdentifier );
@@ -3174,7 +3174,7 @@ rtl::OUString SfxBaseModel::getRuntimeUID() const
sal_Bool SfxBaseModel::hasValidSignatures() const
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pData->m_pObjectShell.Is() )
return ( m_pData->m_pObjectShell->ImplGetSignatureState( sal_False ) == SIGNATURESTATE_SIGNATURES_OK );
return sal_False;
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 9d107b09d0..40c75d09ed 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -85,7 +85,7 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory(
unsigned short nID,
const ::rtl::OUString& aCommandURL )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
util::URL aTargetURL;
aTargetURL.Complete = aCommandURL;
@@ -220,7 +220,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
SfxViewFrame* pViewFrame = NULL;
uno::Reference < frame::XController > xController;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_xFrame.is() )
xController = m_xFrame->getController();
@@ -325,7 +325,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
const awt::MouseEvent& rMouseEvent )
throw ( uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
::Point aPos( rMouseEvent.X, rMouseEvent.Y );
::MouseEvent aMouseEvent( aPos,
@@ -343,7 +343,7 @@ throw ( uno::RuntimeException )
const awt::MouseEvent& rMouseEvent )
throw (uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
::Point aPos( rMouseEvent.X, rMouseEvent.Y );
::MouseEvent aMouseEvent( aPos,
@@ -360,7 +360,7 @@ throw (uno::RuntimeException)
const ::awt::MouseEvent& rMouseEvent )
throw ( uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
::Point aPos( rMouseEvent.X, rMouseEvent.Y );
::MouseEvent aMouseEvent( aPos,
@@ -380,7 +380,7 @@ void SAL_CALL SfxStatusBarControl::command(
const ::com::sun::star::uno::Any& /*aData*/ )
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
::Point aPos( rPos.X, rPos.Y );
CommandEvent aCmdEvent( aPos, (USHORT)nCommand, TRUE, NULL );
@@ -396,7 +396,7 @@ void SAL_CALL SfxStatusBarControl::paint(
::sal_Int32 nStyle )
throw ( ::uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
OutputDevice* pOutDev = VCLUnoHelper::GetOutputDevice( xGraphics );;
if ( pOutDev )
@@ -412,7 +412,7 @@ throw ( ::uno::RuntimeException )
void SAL_CALL SfxStatusBarControl::click()
throw ( uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Click();
}
@@ -421,7 +421,7 @@ throw ( uno::RuntimeException )
void SAL_CALL SfxStatusBarControl::doubleClick()
throw ( uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DoubleClick();
}
@@ -639,7 +639,7 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl
SfxModule* pMod
)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SfxApplication *pApp = SFX_APP();
SfxSlotPool *pSlotPool;
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 698eea32e8..b5d2192918 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -91,7 +91,7 @@ static ImageList* pImageListHiBig=0;
static SfxImageManager_Impl* GetImageManager( SfxModule* pModule )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( pModule == 0 )
{
@@ -120,7 +120,7 @@ static SfxImageManager_Impl* GetImageManager( SfxModule* pModule )
// Global image list
static ImageList* GetImageList( BOOL bBig, BOOL bHiContrast )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// Has to be changed if we know how the IDs are named!!!
ImageList*& rpList = bBig ? ( bHiContrast ? pImageListHiBig : pImageListBig ) :
@@ -209,7 +209,7 @@ Image SfxImageManager_Impl::GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast )
void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( nNewSymbolsSize != m_nSymbolsSize )
{
@@ -290,7 +290,7 @@ SfxImageManager::~SfxImageManager()
SfxImageManager* SfxImageManager::GetImageManager( SfxModule* pModule )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SfxImageManagerMap::const_iterator pIter =
m_ImageManagerMap.find( sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( pModule )));
@@ -353,7 +353,7 @@ Image SfxImageManager::SeekImage( USHORT nId, BOOL bHiContrast ) const
void SfxImageManager::RegisterToolBox( ToolBox *pBox, USHORT nFlags )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
ToolBoxInf_Impl* pInf = new ToolBoxInf_Impl;
pInf->pToolBox = pBox;
@@ -365,7 +365,7 @@ void SfxImageManager::RegisterToolBox( ToolBox *pBox, USHORT nFlags )
void SfxImageManager::ReleaseToolBox( ToolBox *pBox )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
for ( sal_uInt32 n=0; n < pImp->m_aToolBoxes.size(); n++ )
{
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 665f24eaa0..6209a3d312 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -149,7 +149,7 @@ static Window* GetTopMostParentSystemWindow( Window* pWindow )
svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
URL aTargetURL;
aTargetURL.Complete = aCommandURL;
@@ -293,7 +293,7 @@ void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::Runtime
svt::ToolboxController::dispose();
// Remove and destroy our item window at our toolbox
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window* pWindow = pImpl->pBox->GetItemWindow( pImpl->nTbxId );
pImpl->pBox->SetItemWindow( pImpl->nTbxId, 0 );
delete pWindow;
@@ -326,7 +326,7 @@ void SfxToolBoxControl::RegisterToolBoxControl( SfxModule* pMod, SfxTbxCtrlFacto
SfxToolBoxControl* SfxToolBoxControl::CreateControl( USHORT nSlotId, USHORT nTbxId, ToolBox *pBox, SfxModule* pMod )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SfxToolBoxControl *pCtrl;
SfxApplication *pApp = SFX_APP();
@@ -464,7 +464,7 @@ void SfxToolBoxControl::Dispatch( const ::rtl::OUString& aCommand, ::com::sun::s
{
Reference < XController > xController;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( getFrameInterface().is() )
xController = getFrameInterface()->getController();
@@ -535,7 +535,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
SfxViewFrame* pViewFrame = NULL;
Reference < XController > xController;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( getFrameInterface().is() )
xController = getFrameInterface()->getController();
@@ -665,24 +665,24 @@ void SAL_CALL SfxToolBoxControl::updateImage() throw (::com::sun::star::uno::Run
// XToolbarController
void SAL_CALL SfxToolBoxControl::execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Select( (USHORT)KeyModifier );
}
void SAL_CALL SfxToolBoxControl::click() throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Click();
}
void SAL_CALL SfxToolBoxControl::doubleClick() throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DoubleClick();
}
Reference< ::com::sun::star::awt::XWindow > SAL_CALL SfxToolBoxControl::createPopupWindow() throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window* pWindow = CreatePopupWindow();
if ( pWindow )
return VCLUnoHelper::GetInterface( pWindow );
@@ -692,7 +692,7 @@ Reference< ::com::sun::star::awt::XWindow > SAL_CALL SfxToolBoxControl::createPo
Reference< ::com::sun::star::awt::XWindow > SAL_CALL SfxToolBoxControl::createItemWindow( const Reference< ::com::sun::star::awt::XWindow >& rParent ) throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return VCLUnoHelper::GetInterface( CreateItemWindow( VCLUnoHelper::GetWindow( rParent )));
}
@@ -731,7 +731,7 @@ throw (::com::sun::star::uno::RuntimeException)
void SAL_CALL SfxToolBoxControl::endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& aEvent )
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
::rtl::OUString aSubToolBarResName;
if ( pImpl->mxUIElement.is() )
@@ -817,7 +817,7 @@ throw (::com::sun::star::uno::RuntimeException)
void SfxToolBoxControl::createAndPositionSubToolBar( const ::rtl::OUString& rSubToolBarResName )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( pImpl->pBox )
{
@@ -1108,7 +1108,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
SfxViewFrame* pViewFrame = NULL;
Reference < XController > xController;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_xFrame.is() )
xController = m_xFrame->getController();
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 3a38629395..e29afda2d5 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -546,7 +546,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
{
ENSURE_OR_THROW( _rTargetFrame.is(), "illegal NULL frame" );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxFrameLoader::load" );
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index da928bce02..17628cda6e 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -217,7 +217,7 @@ throw (::com::sun::star::uno::RuntimeException)
void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pClient && aEvent.EventName.equalsAscii("OnVisAreaChanged") && m_nAspect != embed::Aspects::MSOLE_ICON )
{
@@ -354,7 +354,7 @@ void SAL_CALL SfxInPlaceClient_Impl::visibilityChanged( sal_Bool bVisible )
throw ( embed::WrongStateException,
uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !m_pClient || !m_pClient->GetViewShell() )
throw uno::RuntimeException();
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 755287c92a..b7dd674152 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -276,7 +276,7 @@ public:
void SAL_CALL SfxStatusIndicator::start(const ::rtl::OUString& aText, sal_Int32 nRange) throw(::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( xOwner.is() )
{
_nRange = nRange;
@@ -295,7 +295,7 @@ void SAL_CALL SfxStatusIndicator::start(const ::rtl::OUString& aText, sal_Int32
void SAL_CALL SfxStatusIndicator::end(void) throw(::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( xOwner.is() )
{
if ( !xProgress.is() )
@@ -310,7 +310,7 @@ void SAL_CALL SfxStatusIndicator::end(void) throw(::com::sun::star::uno::Runtime
void SAL_CALL SfxStatusIndicator::setText(const ::rtl::OUString& aText) throw(::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( xOwner.is() )
{
if ( !xProgress.is() )
@@ -325,7 +325,7 @@ void SAL_CALL SfxStatusIndicator::setText(const ::rtl::OUString& aText) throw(::
void SAL_CALL SfxStatusIndicator::setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( xOwner.is() )
{
_nValue = nValue;
@@ -344,7 +344,7 @@ void SAL_CALL SfxStatusIndicator::setValue( sal_Int32 nValue ) throw(::com::sun:
void SAL_CALL SfxStatusIndicator::reset() throw(::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( xOwner.is() )
{
if ( !xProgress.is() )
@@ -359,7 +359,7 @@ void SAL_CALL SfxStatusIndicator::reset() throw(::com::sun::star::uno::RuntimeEx
void SAL_CALL SfxStatusIndicator::disposing( const com::sun::star::lang::EventObject& /*Source*/ ) throw(::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
xOwner = 0;
xProgress.clear();
}
@@ -421,7 +421,7 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::disposing( const EVENT
void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const EVENTOBJECT& aEvent, sal_Bool bDeliverOwnership )
throw (RUNTIMEEXCEPTION, com::sun::star::util::CloseVetoException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SfxViewShell* pShell = m_pController->GetViewShell_Impl();
if ( m_pController != NULL && pShell )
{
@@ -505,7 +505,7 @@ IMPL_SfxBaseController_ListenerHelper::~IMPL_SfxBaseController_ListenerHelper()
void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const FRAMEACTIONEVENT& aEvent ) throw( RUNTIMEEXCEPTION )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (
( m_pController != NULL ) &&
( aEvent.Frame == m_pController->getFrame() ) &&
@@ -530,7 +530,7 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const FRAMEACT
void SAL_CALL IMPL_SfxBaseController_ListenerHelper::disposing( const EVENTOBJECT& /*aEvent*/ ) throw( ::com::sun::star::uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pController && m_pController->getFrame().is() )
m_pController->getFrame()->removeFrameActionListener( this ) ;
}
@@ -562,7 +562,7 @@ SfxBaseController::~SfxBaseController()
Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !m_pData->m_pViewShell )
throw DisposedException();
@@ -571,7 +571,7 @@ Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (Run
::rtl::OUString SAL_CALL SfxBaseController::getViewControllerName() throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !m_pData->m_pViewShell || !m_pData->m_pViewShell->GetObjectShell() )
throw DisposedException();
@@ -588,7 +588,7 @@ Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (Run
Sequence< PropertyValue > SAL_CALL SfxBaseController::getCreationArguments() throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !m_pData->m_pViewShell || !m_pData->m_pViewShell->GetObjectShell() )
throw DisposedException();
@@ -617,7 +617,7 @@ void SAL_CALL SfxBaseController::attachFrame( const REFERENCE< XFRAME >& xFrame
{
REFERENCE< XFRAME > xTemp( getFrame() ) ;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( xTemp.is() )
{
xTemp->removeFrameActionListener( m_pData->m_xListener ) ;
@@ -671,7 +671,7 @@ sal_Bool SAL_CALL SfxBaseController::attachModel( const REFERENCE< XMODEL >& xMo
sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( ::com::sun::star::uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// ignore dublicate calls, which doesnt change anything real
if (bSuspend == m_pData->m_bSuspendState)
@@ -731,7 +731,7 @@ ANY SfxBaseController::getViewData() throw( ::com::sun::star::uno::RuntimeExcept
{
ANY aAny;
String sData1;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pData->m_pViewShell )
{
m_pData->m_pViewShell->WriteUserData( sData1 ) ;
@@ -748,7 +748,7 @@ ANY SfxBaseController::getViewData() throw( ::com::sun::star::uno::RuntimeExcept
void SAL_CALL SfxBaseController::restoreViewData( const ANY& aValue ) throw( ::com::sun::star::uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pData->m_pViewShell )
{
OUSTRING sData;
@@ -763,7 +763,7 @@ void SAL_CALL SfxBaseController::restoreViewData( const ANY& aValue ) throw( ::c
REFERENCE< XFRAME > SAL_CALL SfxBaseController::getFrame() throw( ::com::sun::star::uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return m_pData->m_xFrame;
}
@@ -773,7 +773,7 @@ REFERENCE< XFRAME > SAL_CALL SfxBaseController::getFrame() throw( ::com::sun::st
REFERENCE< XMODEL > SAL_CALL SfxBaseController::getModel() throw( ::com::sun::star::uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return m_pData->m_pViewShell ? m_pData->m_pViewShell->GetObjectShell()->GetModel() : REFERENCE < XMODEL > () ;
}
@@ -785,7 +785,7 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch( const UNOURL&
const OUSTRING& sTargetFrameName,
sal_Int32 eSearchFlags ) throw( RUNTIMEEXCEPTION )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
REFERENCE< XDISPATCH > xDisp;
if ( m_pData->m_pViewShell )
{
@@ -965,7 +965,7 @@ frame::BorderWidths SAL_CALL SfxBaseController::getBorder()
{
frame::BorderWidths aResult;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pData->m_pViewShell )
{
SvBorder aBorder = m_pData->m_pViewShell->GetBorderPixel();
@@ -995,7 +995,7 @@ void SAL_CALL SfxBaseController::removeBorderResizeListener( const uno::Referenc
awt::Rectangle SAL_CALL SfxBaseController::queryBorderedArea( const awt::Rectangle& aPreliminaryRectangle )
throw ( uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pData->m_pViewShell )
{
Rectangle aTmpRect = VCLRectangle( aPreliminaryRectangle );
@@ -1036,7 +1036,7 @@ void SfxBaseController::BorderWidthsChanged_Impl()
void SAL_CALL SfxBaseController::dispose() throw( ::com::sun::star::uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Reference< XController > xTmp( this );
m_pData->m_bDisposing = sal_True ;
@@ -1121,7 +1121,7 @@ void SAL_CALL SfxBaseController::removeEventListener( const REFERENCE< XEVENTLIS
void SfxBaseController::ReleaseShell_Impl()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pData->m_pViewShell )
{
SfxObjectShell* pDoc = m_pData->m_pViewShell->GetObjectShell() ;
@@ -1147,7 +1147,7 @@ SfxViewShell* SfxBaseController::GetViewShell_Impl() const
::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > SAL_CALL SfxBaseController::getStatusIndicator( ) throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pData->m_pViewShell && !m_pData->m_xIndicator.is() )
m_pData->m_xIndicator = new SfxStatusIndicator( this, m_pData->m_pViewShell->GetViewFrame()->GetFrame().GetWorkWindow_Impl() );
return m_pData->m_xIndicator;
@@ -1158,7 +1158,7 @@ void SAL_CALL SfxBaseController::registerContextMenuInterceptor( const REFERENCE
{
m_pData->m_aInterceptorContainer.addInterface( xInterceptor );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pData->m_pViewShell )
m_pData->m_pViewShell->AddContextMenuInterceptor_Impl( xInterceptor );
}
@@ -1168,39 +1168,39 @@ void SAL_CALL SfxBaseController::releaseContextMenuInterceptor( const REFERENCE<
{
m_pData->m_aInterceptorContainer.removeInterface( xInterceptor );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pData->m_pViewShell )
m_pData->m_pViewShell->RemoveContextMenuInterceptor_Impl( xInterceptor );
}
void SAL_CALL SfxBaseController::addKeyHandler( const ::com::sun::star::uno::Reference< XKEYHANDLER >& xHandler ) throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_pData->m_aUserInputInterception.addKeyHandler( xHandler );
}
void SAL_CALL SfxBaseController::removeKeyHandler( const ::com::sun::star::uno::Reference< XKEYHANDLER >& xHandler ) throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_pData->m_aUserInputInterception.removeKeyHandler( xHandler );
}
void SAL_CALL SfxBaseController::addMouseClickHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseClickHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_pData->m_aUserInputInterception.addMouseClickHandler( xHandler );
}
void SAL_CALL SfxBaseController::removeMouseClickHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseClickHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_pData->m_aUserInputInterception.removeMouseClickHandler( xHandler );
}
::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL SfxBaseController::getSupportedCommandGroups()
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
std::list< sal_Int16 > aGroupList;
SfxViewFrame* pViewFrame( m_pData->m_pViewShell->GetFrame() );
@@ -1236,7 +1236,7 @@ throw (::com::sun::star::uno::RuntimeException)
{
std::list< ::com::sun::star::frame::DispatchInformation > aCmdList;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pData->m_pViewShell )
{
const ULONG nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
@@ -1488,7 +1488,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect )
//=============================================================================
css::uno::Reference< css::frame::XTitle > SfxBaseController::impl_getTitleHelper ()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( ! m_pData->m_xTitleHelper.is ())
{
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 94ce98d433..0c54e4d0ff 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3573,7 +3573,7 @@ void SfxViewFrame::SetViewFrame( SfxViewFrame* pFrame )
// ---------------------------------------------------------------------------------------------------------------------
void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// look up the SfxFrame for the given XFrame
SfxFrame* pFrame = NULL;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index c06fc957dd..0f82ab002c 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -150,7 +150,7 @@ void SAL_CALL SfxClipboardChangeListener::disposing( const lang::EventObject& /*
throw ( uno::RuntimeException )
{
// either clipboard or ViewShell is going to be destroyed -> no interest in listening anymore
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
if ( pViewShell )
{
uno::Reference < lang::XComponent > xCtrl( pViewShell->GetController(), uno::UNO_QUERY );
@@ -164,7 +164,7 @@ throw ( uno::RuntimeException )
void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::clipboard::ClipboardEvent& )
throw ( RuntimeException )
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
if( pViewShell )
{
SfxBindings& rBind = pViewShell->GetViewFrame()->GetBindings();
@@ -652,7 +652,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
}
catch ( uno::Exception& )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window *pParent = SFX_APP()->GetTopWindow();
ErrorBox( pParent, SfxResId( MSG_ERROR_NO_WEBBROWSER_FOUND )).Execute();
bRet = FALSE;
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index bea8515078..d495f43eb0 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -121,7 +121,7 @@ Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext( )
sal_Int32 AccFrameSelector::getAccessibleChildCount( ) throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
return (meBorder == FRAMEBORDER_NONE) ? mpFrameSel->GetEnabledBorderCount() : 0;
}
@@ -131,7 +131,7 @@ sal_Int32 AccFrameSelector::getAccessibleChildCount( ) throw (RuntimeException)
Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i )
throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
Reference< XAccessible > xRet;
if( meBorder == FRAMEBORDER_NONE )
@@ -146,7 +146,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i )
Reference< XAccessible > AccFrameSelector::getAccessibleParent( )
throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
Reference< XAccessible > xRet;
if(meBorder == FRAMEBORDER_NONE)
@@ -161,7 +161,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleParent( )
sal_Int32 AccFrameSelector::getAccessibleIndexInParent( )
throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
sal_Int32 nIdx = 0;
@@ -193,7 +193,7 @@ sal_Int16 AccFrameSelector::getAccessibleRole( ) throw (RuntimeException)
OUString AccFrameSelector::getAccessibleDescription( )
throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
return maDescriptions.GetString(meBorder);
}
@@ -203,7 +203,7 @@ OUString AccFrameSelector::getAccessibleDescription( )
OUString AccFrameSelector::getAccessibleName( )
throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
return maNames.GetString(meBorder);
}
@@ -213,7 +213,7 @@ OUString AccFrameSelector::getAccessibleName( )
Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet( )
throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
utl::AccessibleRelationSetHelper* pHelper;
Reference< XAccessibleRelationSet > xRet = pHelper = new utl::AccessibleRelationSetHelper;
@@ -238,7 +238,7 @@ Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet(
Reference< XAccessibleStateSet > AccFrameSelector::getAccessibleStateSet( )
throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
Reference< XAccessibleStateSet > xRet = pStateSetHelper;
@@ -311,7 +311,7 @@ void AccFrameSelector::removePropertyChangeListener( const Reference< XPropertyC
sal_Bool AccFrameSelector::containsPoint( const AwtPoint& aPt )
throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
//aPt is relative to the frame selector
return mpFrameSel->ContainsClickPoint( Point( aPt.X, aPt.Y ) );
@@ -323,7 +323,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint(
const AwtPoint& aPt )
throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
//aPt is relative to the frame selector
return mpFrameSel->GetChildAccessible( Point( aPt.X, aPt.Y ) );
@@ -331,7 +331,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint(
AwtRectangle AccFrameSelector::getBounds( ) throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
Size aSz;
Point aPos;
@@ -358,7 +358,7 @@ AwtRectangle AccFrameSelector::getBounds( ) throw (RuntimeException)
AwtPoint AccFrameSelector::getLocation( ) throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
Point aPos;
switch(meBorder)
@@ -378,7 +378,7 @@ AwtPoint AccFrameSelector::getLocation( ) throw (RuntimeException)
AwtPoint AccFrameSelector::getLocationOnScreen( ) throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
Point aPos;
switch(meBorder)
@@ -399,7 +399,7 @@ AwtPoint AccFrameSelector::getLocationOnScreen( ) throw (RuntimeException)
AwtSize AccFrameSelector::getSize( ) throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
Size aSz;
switch(meBorder)
@@ -419,7 +419,7 @@ AwtSize AccFrameSelector::getSize( ) throw (RuntimeException)
sal_Bool AccFrameSelector::isShowing( ) throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
return sal_True;
}
@@ -428,7 +428,7 @@ sal_Bool AccFrameSelector::isShowing( ) throw (RuntimeException)
sal_Bool AccFrameSelector::isVisible( ) throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
return sal_True;
}
@@ -437,7 +437,7 @@ sal_Bool AccFrameSelector::isVisible( ) throw (RuntimeException)
sal_Bool AccFrameSelector::isFocusTraversable( ) throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
return sal_True;
}
@@ -460,7 +460,7 @@ void AccFrameSelector::removeFocusListener( const Reference< XFocusListener >& x
void AccFrameSelector::grabFocus( ) throw (RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
mpFrameSel->GrabFocus();
}
@@ -470,7 +470,7 @@ void AccFrameSelector::grabFocus( ) throw (RuntimeException)
Any AccFrameSelector::getAccessibleKeyBinding( ) throw (RuntimeException)
{
Any aRet;
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
utl::AccessibleRelationSetHelper* pHelper;
Reference< XAccessibleRelationSet > xRet = pHelper = new utl::AccessibleRelationSetHelper;
@@ -508,7 +508,7 @@ sal_Int32 AccFrameSelector::getForeground( )
throw (RuntimeException)
{
Any aRet;
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
return mpFrameSel->GetControlForeground().GetColor();
}
@@ -519,7 +519,7 @@ sal_Int32 AccFrameSelector::getBackground( )
throw (RuntimeException)
{
Any aRet;
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
IsValid();
return mpFrameSel->GetControlBackground().GetColor();
}
@@ -528,7 +528,7 @@ sal_Int32 AccFrameSelector::getBackground( )
void AccFrameSelector::addEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( xListener.is() )
{
@@ -544,7 +544,7 @@ void AccFrameSelector::addEventListener( const Reference< XAccessibleEventListen
void AccFrameSelector::removeEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( xListener.is() && mnClientId != 0 &&
::comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener ) == 0 )
@@ -605,7 +605,7 @@ void AccFrameSelector::IsValid() throw (RuntimeException)
void AccFrameSelector::NotifyFocusListeners(sal_Bool bGetFocus)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
AwtFocusEvent aEvent;
aEvent.FocusFlags = 0;
if(bGetFocus)
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index a99c913270..61dde0820e 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -481,7 +481,7 @@ uno::Reference<XAccessible > SAL_CALL
awt::Rectangle SAL_CALL AccessibleShape::getBounds (void)
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard (maMutex);
ThrowIfDisposed ();
@@ -878,7 +878,7 @@ void SAL_CALL
AccessibleShape::disposing (const lang::EventObject& aEvent)
throw (uno::RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard (maMutex);
try
@@ -1143,7 +1143,7 @@ uno::Reference< drawing::XShape > AccessibleShape::GetXShape()
// protected
void AccessibleShape::disposing (void)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard (maMutex);
// Make sure to send an event that this object looses the focus in the
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 11670ca2e7..a1b4a4baa1 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -294,7 +294,7 @@ namespace accessibility
{
DBG_DTOR( AccessibleTextHelper_Impl, NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
try
{
@@ -1743,7 +1743,7 @@ namespace accessibility
AccessibleTextHelper::AccessibleTextHelper( ::std::auto_ptr< SvxEditSource > pEditSource ) :
mpImpl( new AccessibleTextHelper_Impl() )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SetEditSource( pEditSource );
}
@@ -1964,7 +1964,7 @@ namespace accessibility
// As Dispose calls ShutdownEditSource, which in turn
// deregisters as listener on the edit source, have to lock
// here
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
#ifdef DBG_UTIL
mpImpl->CheckInvariants();
@@ -1979,7 +1979,7 @@ namespace accessibility
sal_Bool AccessibleTextHelper::IsSelected() const
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
#ifdef DBG_UTIL
mpImpl->CheckInvariants();
@@ -1997,7 +1997,7 @@ namespace accessibility
// XAccessibleContext
sal_Int32 AccessibleTextHelper::GetChildCount() SAL_THROW((uno::RuntimeException))
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
#ifdef DBG_UTIL
mpImpl->CheckInvariants();
@@ -2014,7 +2014,7 @@ namespace accessibility
uno::Reference< XAccessible > AccessibleTextHelper::GetChild( sal_Int32 i ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
#ifdef DBG_UTIL
mpImpl->CheckInvariants();
@@ -2058,7 +2058,7 @@ namespace accessibility
// XAccessibleComponent
uno::Reference< XAccessible > AccessibleTextHelper::GetAt( const awt::Point& aPoint ) SAL_THROW((uno::RuntimeException))
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
#ifdef DBG_UTIL
mpImpl->CheckInvariants();
diff --git a/svx/source/accessibility/DGColorNameLookUp.cxx b/svx/source/accessibility/DGColorNameLookUp.cxx
index 730757e520..5405a10ce8 100644
--- a/svx/source/accessibility/DGColorNameLookUp.cxx
+++ b/svx/source/accessibility/DGColorNameLookUp.cxx
@@ -52,7 +52,7 @@ DGColorNameLookUp& DGColorNameLookUp::Instance (void)
// the shape type handler is instantiated.
if (mpInstance == NULL)
{
- ::vos::OGuard aGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
if (mpInstance == NULL)
{
// Create the single instance of the color name look up.
@@ -108,7 +108,7 @@ DGColorNameLookUp::DGColorNameLookUp (void)
{
// Look the solar mutex here as workarround for missing lock in
// called function.
- ::vos::OGuard aGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
aNames = xNA->getElementNames();
}
}
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index 7b1d2a4df2..acc7627859 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -92,7 +92,7 @@ void DescriptionGenerator::Initialize (sal_Int32 nResourceId)
// Get the string from the resource for the specified id.
OUString sPrefix;
{
- ::vos::OGuard aGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
sPrefix = OUString (SVX_RESSTR (nResourceId));
}
@@ -109,7 +109,7 @@ void DescriptionGenerator::Initialize (::rtl::OUString sPrefix)
if (mxSet.is())
{
{
- ::vos::OGuard aGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
msDescription.append (sal_Unicode (' '));
msDescription.append (OUString (SVX_RESSTR(RID_SVXSTR_A11Y_WITH)));
@@ -160,7 +160,7 @@ void DescriptionGenerator::AddProperty (
{
OUString sLocalizedName;
{
- ::vos::OGuard aGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
sLocalizedName = SVX_RESSTR (nLocalizedNameId);
}
AddProperty (sPropertyName, aType, sLocalizedName, nWhichId);
@@ -182,7 +182,7 @@ void DescriptionGenerator::AddProperty (const OUString& sPropertyName,
msDescription.append (sal_Unicode (','));
else
{
- ::vos::OGuard aGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
msDescription.append (sal_Unicode (' '));
msDescription.append (OUString (SVX_RESSTR(RID_SVXSTR_A11Y_AND)));
@@ -355,7 +355,7 @@ void DescriptionGenerator::AddString (const OUString& sPropertyName,
if (nWhichId >= 0)
{
- ::vos::OGuard aGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
String sLocalizedValue;
SvxUnogetInternalNameForItem (sal::static_int_cast<sal_Int16>(nWhichId),
sValue, sLocalizedValue);
@@ -392,7 +392,7 @@ void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName,
// Get the fill style name from the resource.
OUString sFillStyleName;
{
- ::vos::OGuard aGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
switch (aFillStyle)
{
case drawing::FillStyle_NONE:
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index bbcc01e783..aa099b85ca 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -116,7 +116,7 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext(
}
else
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
msName = SVX_RESSTR( RID_SVXSTR_GRAPHCTRL_ACC_NAME );
}
@@ -126,7 +126,7 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext(
}
else
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
msDescription = SVX_RESSTR( RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION );
}
@@ -286,7 +286,7 @@ awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeExcept
sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( NULL == mpPage )
throw DisposedException();
@@ -300,7 +300,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount( void
SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex )
throw( RuntimeException, lang::IndexOutOfBoundsException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( NULL == mpPage )
throw DisposedException();
@@ -340,7 +340,7 @@ void SvxGraphCtrlAccessibleContext::FireEvent (const AccessibleEventObject& aEve
Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChild( sal_Int32 nIndex )
throw( RuntimeException, lang::IndexOutOfBoundsException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return getAccessible( getSdrObject( nIndex ) );
}
@@ -356,7 +356,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessiblePa
sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// Use a simple but slow solution for now. Optimize later.
// Iterate over all the parent's children and search for this object.
@@ -395,7 +395,7 @@ sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole( void ) thro
OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return msDescription;
}
@@ -403,7 +403,7 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void
OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return msName;
}
@@ -421,7 +421,7 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getA
Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
@@ -448,7 +448,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAcce
lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mxParent.is() )
{
@@ -468,7 +468,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addEventListener( const Reference<
{
if (xListener.is())
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (!mnClientId)
mnClientId = comphelper::AccessibleEventNotifier::registerClient( );
comphelper::AccessibleEventNotifier::addEventListener( mnClientId, xListener );
@@ -482,7 +482,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeEventListener( const Referenc
{
if (xListener.is())
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener );
if ( !nListenerCount )
@@ -502,7 +502,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeEventListener( const Referenc
void SAL_CALL SvxGraphCtrlAccessibleContext::addFocusListener( const Reference< awt::XFocusListener >& xListener )
throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( xListener.is() )
{
@@ -517,7 +517,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addFocusListener( const Reference<
void SAL_CALL SvxGraphCtrlAccessibleContext::removeFocusListener( const Reference< awt::XFocusListener >& xListener )
throw (RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( xListener.is() )
{
@@ -531,7 +531,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeFocusListener( const Referenc
void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( NULL == mpControl )
throw DisposedException();
@@ -581,7 +581,7 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName( void ) t
sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// Iterate over all supported service names and return true if on of them
// matches the given name.
Sequence< OUString > aSupportedServices( getSupportedServiceNames() );
@@ -613,7 +613,7 @@ Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedService
Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId( void ) throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return getUniqueId();
}
@@ -628,7 +628,7 @@ OUString SvxGraphCtrlAccessibleContext::getServiceName( void ) throw( RuntimeExc
void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( NULL == mpView )
throw DisposedException();
@@ -643,7 +643,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nI
sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( NULL == mpView )
throw DisposedException();
@@ -655,7 +655,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_
void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( NULL == mpView )
throw DisposedException();
@@ -667,7 +667,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( R
void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( NULL == mpView )
throw DisposedException();
@@ -679,7 +679,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw
sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCount() throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( NULL == mpView )
throw DisposedException();
@@ -693,7 +693,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCoun
Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChild( sal_Int32 nIndex )
throw( lang::IndexOutOfBoundsException, RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
checkChildIndexOnSelection( nIndex );
@@ -711,7 +711,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAcce
void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
checkChildIndexOnSelection( nIndex );
@@ -758,7 +758,7 @@ void SvxGraphCtrlAccessibleContext::checkChildIndexOnSelection( long nIndex ) th
void SvxGraphCtrlAccessibleContext::setName( const OUString& rName )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
msName = rName;
}
@@ -767,7 +767,7 @@ void SvxGraphCtrlAccessibleContext::setName( const OUString& rName )
void SvxGraphCtrlAccessibleContext::setDescription( const OUString& rDescr )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
msDescription = rDescr;
}
@@ -782,7 +782,7 @@ void SvxGraphCtrlAccessibleContext::setModelAndView (
SdrModel* pModel,
SdrView* pView)
{
- OGuard aGuard (Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
mpModel = pModel;
if (mpModel != NULL)
@@ -809,7 +809,7 @@ void SvxGraphCtrlAccessibleContext::setModelAndView (
void SAL_CALL SvxGraphCtrlAccessibleContext::disposing()
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mbDisposed )
return;
@@ -848,7 +848,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing()
Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( NULL == mpControl )
throw DisposedException();
@@ -867,7 +867,7 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( R
*/
Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox( void ) throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Rectangle aBounds ( 0, 0, 0, 0 );
@@ -896,7 +896,7 @@ Sequence< sal_Int8 > SvxGraphCtrlAccessibleContext::getUniqueId( void )
static OImplementationId* pId = 0;
if( !pId )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( !pId)
{
static OImplementationId aId;
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index c356d01e4d..06d391b7db 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -68,7 +68,7 @@ ShapeTypeHandler& ShapeTypeHandler::Instance (void)
// the shape type handler is instantiated.
if (instance == NULL)
{
- ::vos::OGuard aGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
if (instance == NULL)
{
// Create the single instance of the shape type handler.
@@ -181,7 +181,7 @@ ShapeTypeHandler::~ShapeTypeHandler (void)
bool ShapeTypeHandler::AddShapeTypeList (int nDescriptorCount,
ShapeTypeDescriptor aDescriptorList[])
{
- ::vos::OGuard aGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
// Determine first id of new type descriptor(s).
int nFirstId = maShapeTypeDescriptorList.size();
@@ -329,7 +329,7 @@ long ShapeTypeHandler::GetSlotId (const uno::Reference<drawing::XShape>& rxShape
if (nResourceId != -1)
{
- ::vos::OGuard aGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
sName = OUString (SVX_RESSTR((unsigned short)nResourceId));
}
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index ba6ebf6116..69c3cb99cc 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -167,7 +167,7 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
msName = *pName;
else
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
msName = SVX_RESSTR( mbAngleMode? RID_SVXSTR_RECTCTL_ACC_ANGL_NAME : RID_SVXSTR_RECTCTL_ACC_CORN_NAME );
}
@@ -175,7 +175,7 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
msDescription = *pDesc;
else
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
msDescription = SVX_RESSTR( mbAngleMode? RID_SVXSTR_RECTCTL_ACC_ANGL_DESCR : RID_SVXSTR_RECTCTL_ACC_CORN_DESCR );
}
@@ -292,7 +292,7 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil
Reference< XAccessible > xChild = mpChilds[ nIndex ];
if( !xChild.is() )
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
@@ -486,7 +486,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::removeFocusListener( const Reference<
void SAL_CALL SvxRectCtlAccessibleContext::grabFocus() throw( RuntimeException )
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive();
@@ -503,7 +503,7 @@ Any SAL_CALL SvxRectCtlAccessibleContext::getAccessibleKeyBinding() throw( Runti
sal_Int32 SvxRectCtlAccessibleContext::getForeground( )
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive();
@@ -512,7 +512,7 @@ sal_Int32 SvxRectCtlAccessibleContext::getForeground( )
sal_Int32 SvxRectCtlAccessibleContext::getBackground( )
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive();
@@ -561,7 +561,7 @@ Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId(
void SAL_CALL SvxRectCtlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException )
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
@@ -756,7 +756,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing()
Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException )
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive();
@@ -766,7 +766,7 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( Run
Rectangle SvxRectCtlAccessibleContext::GetBoundingBox( void ) throw( RuntimeException )
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive();
@@ -922,7 +922,7 @@ Any SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleKeyBinding() throw(
sal_Int32 SvxRectCtlChildAccessibleContext::getForeground( )
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( maMutex );
ThrowExceptionIfNotAlive();
return mrParentWindow.GetControlForeground().GetColor();
@@ -930,7 +930,7 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getForeground( )
sal_Int32 SvxRectCtlChildAccessibleContext::getBackground( )
throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( maMutex );
ThrowExceptionIfNotAlive();
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index 3800aa3760..619a82ffa0 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -174,7 +174,7 @@ void SAL_CALL SvxTbxCtlCustomShapes::functionSelected( const ::rtl::OUString& rC
m_aCommand = rCommand;
// Our sub-toolbar wants to execute a function.
// We have to change the image of our toolbar button to reflect the new function.
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !m_bDisposed )
{
if ( m_aCommand.getLength() > 0 )
@@ -191,7 +191,7 @@ void SAL_CALL SvxTbxCtlCustomShapes::updateImage( ) throw (::com::sun::star::un
{
// We should update the button image of our parent (toolbar).
// Use the stored command to set the correct current image.
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_aCommand.getLength() > 0 )
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 9acf271608..0b66d62a16 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -99,7 +99,7 @@ void TabDialog4Recovery::addTabPage(IExtendedTabPage* pPage)
//===============================================
short TabDialog4Recovery::Execute()
{
- ::vos::OGuard aLock(Application::GetSolarMutex());
+ SolarMutexGuard aLock;
Show();
m_pActualPage = m_lTabPages.begin();
@@ -807,7 +807,7 @@ IMPL_LINK( SaveDialog, OKButtonHdl, void*, EMPTYARG )
//===============================================
short SaveDialog::execute()
{
- ::vos::OGuard aLock(Application::GetSolarMutex());
+ SolarMutexGuard aLock;
// wait for user input "OK"
m_nResult = DLG_RET_UNKNOWN;
@@ -858,7 +858,7 @@ SaveProgressDialog::~SaveProgressDialog()
//===============================================
short SaveProgressDialog::Execute()
{
- ::vos::OGuard aLock(Application::GetSolarMutex());
+ SolarMutexGuard aLock;
m_pCore->setProgressHandler(m_xProgress);
m_pCore->setUpdateListener(this);
@@ -1121,7 +1121,7 @@ RecoveryDialog::~RecoveryDialog()
//===============================================
short RecoveryDialog::execute()
{
- ::vos::OGuard aSolarLock(Application::GetSolarMutex());
+ SolarMutexGuard aSolarLock;
switch(m_eRecoveryState)
{
@@ -1658,7 +1658,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
short ErrorRepWelcomeDialog::execute()
{
- ::vos::OGuard aLock(Application::GetSolarMutex());
+ SolarMutexGuard aLock;
Show();
m_nResult = DLG_RET_UNKNOWN;
while(m_nResult == DLG_RET_UNKNOWN)
@@ -1768,7 +1768,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
short ErrorRepSendDialog::execute()
{
- ::vos::OGuard aLock(Application::GetSolarMutex());
+ SolarMutexGuard aLock;
Show();
m_nResult = DLG_RET_UNKNOWN;
while(m_nResult == DLG_RET_UNKNOWN)
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index ac2936ef6a..c970269d67 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -181,7 +181,7 @@ void GraphCtrl::SetWinStyle( WinBits nWinBits )
void GraphCtrl::InitSdrModel()
{
- ::vos::OGuard aGuard (Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
SdrPage* pPage;
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 61b13c2ada..03623fbafd 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1100,7 +1100,7 @@ void FmGridControl::propertyChange(const ::com::sun::star::beans::PropertyChange
if (eStatus != xRow->GetStatus())
{
xRow->SetStatus(eStatus);
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
RowModified(GetCurrentPos());
}
}
@@ -1839,7 +1839,7 @@ void FmGridControl::ShowColumn(sal_uInt16 nId)
//------------------------------------------------------------------------------
sal_Bool FmGridControl::selectBookmarks(const Sequence< Any >& _rBookmarks)
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// need to lock the SolarMutex so that no paint call disturbs us ...
if ( !m_pSeekCursor )
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 761a649d89..6941fd670d 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -446,7 +446,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& Service
//------------------------------------------------------------------------------
void SAL_CALL FmXGridControl::dispose() throw( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
EventObject aEvt;
aEvt.Source = static_cast< ::cppu::OWeakObject* >(this);
@@ -467,7 +467,7 @@ void SAL_CALL FmXGridControl::dispose() throw( RuntimeException )
//------------------------------------------------------------------------------
sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< ::com::sun::star::awt::XControlModel >& rModel) throw( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if (!UnoControl::setModel(rModel))
return sal_False;
@@ -679,7 +679,7 @@ void FmXGridControl::addModifyListener(const Reference< ::com::sun::star::util::
//------------------------------------------------------------------------------
sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection ) throw (IllegalArgumentException, RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Reference< XSelectionSupplier > xPeer(getPeer(), UNO_QUERY);
return xPeer->select(_rSelection);
}
@@ -687,7 +687,7 @@ sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection ) throw (Illega
//------------------------------------------------------------------------------
Any SAL_CALL FmXGridControl::getSelection( ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Reference< XSelectionSupplier > xPeer(getPeer(), UNO_QUERY);
return xPeer->getSelection();
}
@@ -754,7 +754,7 @@ void SAL_CALL FmXGridControl::removeModifyListener(const Reference< ::com::sun::
//------------------------------------------------------------------------------
void SAL_CALL FmXGridControl::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_bInDraw = sal_True;
UnoControl::draw(x, y);
m_bInDraw = sal_False;
@@ -767,7 +767,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio
// --- <mutex_lock> ---
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Reference< XRowSetSupplier > xGrid(getPeer(), UNO_QUERY);
@@ -943,7 +943,7 @@ void SAL_CALL FmXGridControl::setCurrentColumnPosition(sal_Int16 nPos) throw( Ru
Reference< XGridControl > xGrid( getPeer(), UNO_QUERY );
if ( xGrid.is() )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
xGrid->setCurrentColumnPosition( nPos );
}
}
@@ -1469,7 +1469,7 @@ void FmXGridPeer::CellModified()
//------------------------------------------------------------------------------
void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// want to do a lot of VCL stuff here ...
// this should not be (deadlock) critical, as by definition, every component should release
// any own mutexes before notifying
@@ -1728,7 +1728,7 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol)
//------------------------------------------------------------------------------
void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns) throw( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
FmGridControl* pGrid = static_cast< FmGridControl* >( GetWindow() );
@@ -1811,7 +1811,7 @@ sal_Bool FmXGridPeer::isDesignMode() throw( RuntimeException )
//------------------------------------------------------------------------------
void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
FmGridControl* pGrid = (FmGridControl*) GetWindow();
// Handle Column beruecksichtigen
@@ -1845,7 +1845,7 @@ void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeExcep
//------------------------------------------------------------------------------
void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
FmGridControl* pGrid = (FmGridControl*) GetWindow();
@@ -1901,7 +1901,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep
//------------------------------------------------------------------------------
void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
FmGridControl* pGrid = (FmGridControl*) GetWindow();
@@ -1919,7 +1919,7 @@ void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeExcept
//------------------------------------------------------------------------------
void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& Value) throw( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
FmGridControl* pGrid = (FmGridControl*) GetWindow();
@@ -2352,7 +2352,7 @@ void FmXGridPeer::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeExcepti
//------------------------------------------------------------------------------
void FmXGridPeer::selectionChanged(const EventObject& evt) throw( RuntimeException )
{
- ::vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
FmGridControl* pGrid = (FmGridControl*) GetWindow();
if (pGrid)
@@ -2739,13 +2739,13 @@ void FmXGridPeer::resetted(const EventObject& rEvent) throw( RuntimeException )
FmGridControl* pGrid = (FmGridControl*)GetWindow();
if (!pGrid)
return;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
pGrid->resetCurrentRow();
}
// if the cursor fired a reset event we seem to be on the insert row
else if (m_xCursor == rEvent.Source)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
FmGridControl* pGrid = (FmGridControl*) GetWindow();
if (pGrid && pGrid->IsOpen())
pGrid->positioned(rEvent);
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index bd93292ee9..3abf290269 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -674,7 +674,7 @@ void DbCellControl::implAdjustGenericFieldSetting( const Reference< XPropertySet
//------------------------------------------------------------------------------
void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Reference< XPropertySet > xSourceProps( _rEvent.Source, UNO_QUERY );
@@ -4043,7 +4043,7 @@ void SAL_CALL FmXCheckBoxCell::removeActionListener( const Reference< awt::XActi
//------------------------------------------------------------------
void SAL_CALL FmXCheckBoxCell::setLabel( const ::rtl::OUString& _Label ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pColumn )
{
DbGridControl& rGrid( m_pColumn->GetParent() );
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 348145b6a9..1af6a9e23c 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2272,7 +2272,7 @@ void DbGridControl::forceROController(sal_Bool bForce)
void DbGridControl::AdjustDataSource(sal_Bool bFull)
{
TRACE_RANGE("DbGridControl::AdjustDataSource");
- ::vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
// wird die aktuelle Zeile gerade neu bestimmt,
// wird kein abgleich vorgenommen
@@ -2804,7 +2804,7 @@ void DbGridControl::PostExecuteRowContextMenu(sal_uInt16 /*nRow*/, const PopupMe
void DbGridControl::DataSourcePropertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException )
{
TRACE_RANGE("DbGridControl::DataSourcePropertyChanged");
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// prop "IsModified" changed ?
// during update don't care about the modified state
if (!IsUpdating() && evt.PropertyName.compareTo(FM_PROP_ISMODIFIED) == COMPARE_EQUAL)
@@ -3791,7 +3791,7 @@ void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent
return;
}
// here we got the solar mutex, transfer it to a guard for safety reasons
- ::vos::OGuard aPaintSafety(Application::GetSolarMutex());
+ SolarMutexGuard aPaintSafety;
Application::GetSolarMutex().release();
// and finally do the update ...
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 1b08f8279f..7e12e5367d 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -51,7 +51,7 @@ DBG_NAME(OSystemParseContext)
OSystemParseContext::OSystemParseContext() : IParseContext()
{
DBG_CTOR(OSystemParseContext,NULL);
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
::svx::StringListResource aKeywords( SVX_RES( RID_RSC_SQL_INTERNATIONAL ) );
aKeywords.get( m_aLocalizedKeywords );
@@ -73,7 +73,7 @@ OSystemParseContext::~OSystemParseContext()
::rtl::OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const
{
String aMsg;
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
switch (_eCode)
{
case ERROR_GENERAL: aMsg = SVX_RES(RID_STR_SVT_SQL_SYNTAX_ERROR); break;
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index ff0656d61b..5176265d77 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -446,7 +446,7 @@ namespace
//------------------------------------------------------------------------
void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) throw( RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !m_pModel )
return;
@@ -496,7 +496,7 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) th
//------------------------------------------------------------------------
void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& _Event ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Reference< XFormController > xController( _Event.Source, UNO_QUERY_THROW );
Reference< XFilterController > xFilterController( _Event.Source, UNO_QUERY_THROW );
@@ -531,7 +531,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& _Event
//------------------------------------------------------------------------
void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) throw (RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Reference< XFormController > xController( _Event.Source, UNO_QUERY_THROW );
Reference< XFilterController > xFilterController( _Event.Source, UNO_QUERY_THROW );
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index a1f1d58dd9..ebf7632058 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -554,7 +554,7 @@ namespace svxform
{
// object shells are not thread safe, so guard the destruction
- ::vos::OGuard aSolarGuarsReset( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuarsReset;
xObjectShell = NULL;
}
}
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 6ed6f4d9a9..b8af6a5b8a 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -343,7 +343,7 @@ namespace svx
//--------------------------------------------------------------------
void SAL_CALL FmMouseListenerAdapter::mousePressed( const awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// is this a request for a context menu?
if ( _rEvent.PopupTrigger )
{
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index d845b2f5b3..67d6f13acc 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -295,7 +295,7 @@ Any SAL_CALL FmXPageViewWinRec::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBo
//------------------------------------------------------------------------
void SAL_CALL FmXPageViewWinRec::makeVisible( const Reference< XControl >& _Control ) throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard(Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
Reference< XWindow > xWindow( _Control, UNO_QUERY );
if ( xWindow.is() && m_pViewImpl->getView() && m_pWindow )
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 54798c8a5f..df85fa9649 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3927,7 +3927,7 @@ void SAL_CALL FormController::removeParameterListener(const Reference< XDatabase
//------------------------------------------------------------------------------
sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& aEvent) throw( RuntimeException )
{
- ::vos::OGuard aSolarGuard(Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 3e033d1e5b..75cfef14a6 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -1431,7 +1431,7 @@ namespace sdr { namespace contact {
//--------------------------------------------------------------------
void SAL_CALL ViewObjectContactOfUnoControl_Impl::disposing( const EventObject& Source ) throw(RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
// some code below - in particular our disposal - might trigger actions which require the
// SolarMutex. In particular, in our disposal, we remove ourself as listener from the control,
// which alone needs the SolarMutex. Of course this - a removeFooListener needed the SolarMutex -
@@ -1484,7 +1484,7 @@ namespace sdr { namespace contact {
//--------------------------------------------------------------------
void SAL_CALL ViewObjectContactOfUnoControl_Impl::propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) throw(RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
// (re)painting might require VCL operations, which need the SolarMutex
OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::propertyChange: already disposed()" );
@@ -1536,7 +1536,7 @@ namespace sdr { namespace contact {
//--------------------------------------------------------------------
void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementRemoved( const ContainerEvent& Event ) throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
// some code below - in particular our disposal - might trigger actions which require the
// SolarMutex. In particular, in our disposal, we remove ourself as listener from the control,
// which alone needs the SolarMutex. Of course this - a removeFooListener needed the SolarMutex -
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index 2fa786189c..58c4badf01 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -262,7 +262,7 @@ void SmartTagMgr::WriteConfiguration( const bool* pIsLabelTextWithSmartTags,
// ::com::sun::star::util::XModifyListener
void SmartTagMgr::modified( const lang::EventObject& ) throw( RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
maRecognizerList.clear();
maActionList.clear();
@@ -274,7 +274,7 @@ void SmartTagMgr::modified( const lang::EventObject& ) throw( RuntimeException )
// ::com::sun::star::lang::XEventListener
void SmartTagMgr::disposing( const lang::EventObject& rEvent ) throw( RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
uno::Reference< frame::XModel > xModel( rEvent.Source, uno::UNO_QUERY );
uno::Reference< util::XModifyBroadcaster > xMB(xModel, uno::UNO_QUERY);
@@ -301,7 +301,7 @@ void SmartTagMgr::disposing( const lang::EventObject& rEvent ) throw( RuntimeExc
// ::com::sun::star::util::XChangesListener
void SmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
const util::ElementChange* pElementChanges = rEvent.Changes.getConstArray();
const sal_Int32 nNumberOfChanges = rEvent.Changes.getLength();
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index b96fcd7a3b..5c48b65df8 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -202,7 +202,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changingState( const ::com::sun::star
void SdrLightEmbeddedClient_Impl::Release()
{
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
mpObj = NULL;
}
@@ -212,7 +212,7 @@ void SdrLightEmbeddedClient_Impl::Release()
//--------------------------------------------------------------------
void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const ::com::sun::star::lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( mpObj && nOldState == embed::EmbedStates::LOADED && nNewState == embed::EmbedStates::RUNNING )
{
@@ -228,7 +228,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const ::com::sun::star:
//--------------------------------------------------------------------
void SAL_CALL SdrLightEmbeddedClient_Impl::disposing( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
GetSdrGlobalData().GetOLEObjCache().RemoveObj(mpObj);
}
@@ -238,7 +238,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj
{
// TODO/LATER: when writer uses this implementation the code could be shared with SfxInPlaceClient_Impl
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// the code currently makes sence only in case there is no other client
if ( mpObj && mpObj->GetAspect() != embed::Aspects::MSOLE_ICON && aEvent.EventName.equalsAscii("OnVisAreaChanged")
@@ -310,7 +310,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::saveObject()
uno::Reference< util::XModifiable > xModifiable;
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !mpObj )
throw embed::ObjectSaveVetoException();
@@ -353,7 +353,7 @@ uno::Reference< util::XCloseable > SAL_CALL SdrLightEmbeddedClient_Impl::getComp
{
uno::Reference< util::XCloseable > xResult;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( mpObj )
xResult = uno::Reference< util::XCloseable >( mpObj->GetParentXModel(), uno::UNO_QUERY );
@@ -365,7 +365,7 @@ sal_Bool SAL_CALL SdrLightEmbeddedClient_Impl::canInplaceActivate()
throw ( uno::RuntimeException )
{
sal_Bool bRet = sal_False;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( mpObj )
{
uno::Reference< embed::XEmbeddedObject > xObject = mpObj->GetObjRef();
@@ -389,7 +389,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI()
throw ( embed::WrongStateException,
uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference < beans::XPropertySet > xFrame( lcl_getFrame_throw(mpObj));
uno::Reference < frame::XFrame > xOwnFrame( xFrame,uno::UNO_QUERY);
@@ -443,7 +443,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI()
throw ( embed::WrongStateException,
uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager(getLayoutManager());
if ( xLayoutManager.is() )
{
@@ -459,7 +459,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SdrLightEmbed
uno::RuntimeException )
{
uno::Reference< ::com::sun::star::frame::XLayoutManager > xMan;
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference < beans::XPropertySet > xFrame( lcl_getFrame_throw(mpObj));
try
{
@@ -478,7 +478,7 @@ uno::Reference< frame::XDispatchProvider > SAL_CALL SdrLightEmbeddedClient_Impl:
throw ( embed::WrongStateException,
uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return uno::Reference < frame::XDispatchProvider >( lcl_getFrame_throw(mpObj), uno::UNO_QUERY_THROW );
}
@@ -487,7 +487,7 @@ awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getPlacement()
throw ( embed::WrongStateException,
uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !mpObj )
throw uno::RuntimeException();
@@ -529,7 +529,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl
uno::Exception,
uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !mpObj )
throw uno::RuntimeException();
@@ -589,7 +589,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl
uno::Reference< awt::XWindow > SAL_CALL SdrLightEmbeddedClient_Impl::getWindow()
throw ( uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference< awt::XWindow > xCurrent = m_xWindow;
if ( !xCurrent.is() )
{
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 4729de7f14..9c8b0edb85 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -195,7 +195,7 @@ void SAL_CALL AccessibleCell::release( ) throw ()
*/
sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
ThrowIfDisposed ();
return mpText != NULL ? mpText->GetChildCount () : 0;
}
@@ -207,7 +207,7 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() throw (::com::sun::
*/
Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nIndex) throw (IndexOutOfBoundsException, RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
ThrowIfDisposed ();
// todo: does GetChild throw IndexOutOfBoundsException?
@@ -224,7 +224,7 @@ Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nI
*/
Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet (void) throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard (maMutex);
Reference<XAccessibleStateSet> xStateSet;
@@ -276,7 +276,7 @@ sal_Bool SAL_CALL AccessibleCell::containsPoint( const ::com::sun::star::awt::Po
*/
Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const ::com::sun::star::awt::Point& aPoint) throw(RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard (maMutex);
sal_Int32 nChildCount = getAccessibleChildCount ();
@@ -307,7 +307,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const :
::com::sun::star::awt::Rectangle SAL_CALL AccessibleCell::getBounds(void) throw(RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard (maMutex);
ThrowIfDisposed ();
@@ -466,7 +466,7 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException)
void SAL_CALL AccessibleCell::addEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard (maMutex);
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
@@ -486,7 +486,7 @@ void SAL_CALL AccessibleCell::addEventListener( const Reference<XAccessibleEvent
void SAL_CALL AccessibleCell::removeEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
AccessibleContextBase::removeEventListener(rxListener);
if (mpText != NULL)
mpText->RemoveEventListener (rxListener);
@@ -540,7 +540,7 @@ void AccessibleCell::ViewForwarderChanged (ChangeType /*aChangeType*/, const IAc
void AccessibleCell::disposing (void)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard (maMutex);
// Make sure to send an event that this object looses the focus in the
@@ -574,7 +574,7 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent (void) throw (Runt
::rtl::OUString SAL_CALL AccessibleCell::getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException)
{
ThrowIfDisposed ();
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
if( mxCell.is() )
return mxCell->getName();
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 66b4320b09..8669b91261 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -343,14 +343,14 @@ OUString AccessibleTableShape::CreateAccessibleBaseName(void) throw (RuntimeExce
sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleChildCount( ) throw(RuntimeException)
{
- ::vos::OGuard aSolarGuard(::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
return mxImpl->mxTable.is() ? mxImpl->mxTable->getRowCount() * mxImpl->mxTable->getColumnCount() : 0;
}
//--------------------------------------------------------------------
Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleChild( sal_Int32 i ) throw(IndexOutOfBoundsException, RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
ThrowIfDisposed();
return mxImpl->getAccessibleChild( i );
@@ -385,7 +385,7 @@ void SAL_CALL AccessibleTableShape::disposing (void)
sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowCount() throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
return mxImpl->mxTable.is() ? mxImpl->mxTable->getRowCount() : 0;
}
@@ -393,7 +393,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowCount() throw (RuntimeE
sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnCount( ) throw (RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
return mxImpl->mxTable.is() ? mxImpl->mxTable->getColumnCount() : 0;
}
@@ -409,7 +409,7 @@ OUString SAL_CALL AccessibleTableShape::getAccessibleRowDescription( sal_Int32 n
OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
checkCellPosition( nColumn, 0 );
return OUString();
}
@@ -418,7 +418,7 @@ OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int3
sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
checkCellPosition( nColumn, nRow );
if( mxImpl->mxTable.is() )
{
@@ -433,7 +433,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRo
sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
checkCellPosition( nColumn, nRow );
if( mxImpl->mxTable.is() )
{
@@ -480,7 +480,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumn
sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
checkCellPosition( 0, nRow );
return sal_False;
}
@@ -489,7 +489,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow
sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
checkCellPosition( nColumn, 0 );
return sal_False;
}
@@ -498,7 +498,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nC
Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
checkCellPosition( nColumn, nRow );
sal_Int32 nChildIndex = 0;
@@ -528,7 +528,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleSummary( )
sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
checkCellPosition( nColumn, nRow );
SvxTableController* pController = getTableController();
@@ -547,7 +547,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sa
sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
checkCellPosition( nColumn, nRow );
return mxImpl->mxTable.is() ? (nRow * mxImpl->mxTable->getColumnCount() + nColumn) : 0;
}
@@ -556,7 +556,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal
sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
sal_Int32 nColumn = 0, nRow = 0;
mxImpl->getColumnAndRow( nChildIndex, nColumn, nRow );
return nRow;
@@ -566,7 +566,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex
sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
sal_Int32 nColumn = 0, nRow = 0;
mxImpl->getColumnAndRow( nChildIndex, nColumn, nRow );
return nChildIndex;
@@ -578,7 +578,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIn
void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException )
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
CellPos aPos;
mxImpl->getColumnAndRow( nChildIndex, aPos.mnCol, aPos.mnRow );
@@ -604,7 +604,7 @@ void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex
sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException )
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
CellPos aPos;
mxImpl->getColumnAndRow( nChildIndex, aPos.mnCol, aPos.mnRow );
@@ -615,7 +615,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nCh
void SAL_CALL AccessibleTableShape::clearAccessibleSelection() throw ( RuntimeException )
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
SvxTableController* pController = getTableController();
if( pController )
@@ -625,7 +625,7 @@ void SAL_CALL AccessibleTableShape::clearAccessibleSelection() throw ( RuntimeEx
void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() throw ( RuntimeException )
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
// todo: force selection of shape?
SvxTableController* pController = getTableController();
@@ -637,7 +637,7 @@ void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() throw ( Runtim
sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw ( RuntimeException )
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
SvxTableController* pController = getTableController();
if( pController && pController->hasSelectedCells() )
@@ -657,7 +657,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw
Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException)
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
SvxTableController* pController = getTableController();
if( pController && pController->hasSelectedCells() )
@@ -686,7 +686,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChi
void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException )
{
- ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
CellPos aPos;
mxImpl->getColumnAndRow( nChildIndex, aPos.mnCol, aPos.mnRow );
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index fac14a30d3..061c8e4f17 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -994,7 +994,7 @@ Reference< XPropertySetInfo > SAL_CALL Cell::getPropertySetInfo() throw(RuntimeE
void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
@@ -1139,7 +1139,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any&
Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
@@ -1255,7 +1255,7 @@ void SAL_CALL Cell::removeVetoableChangeListener( const OUString& /*PropertyName
void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
- OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
@@ -1286,7 +1286,7 @@ void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyName
Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException)
{
- OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
@@ -1340,7 +1340,7 @@ void SAL_CALL Cell::firePropertiesChangeEvent( const Sequence< OUString >& /*aPr
PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
@@ -1452,7 +1452,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th
Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
@@ -1483,7 +1483,7 @@ Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUSt
void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
@@ -1526,7 +1526,7 @@ void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(U
Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (mpProperties == 0) || (GetModel() == 0) )
throw DisposedException();
diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx
index 1cac1b878f..6de9d376e2 100644
--- a/svx/source/table/celleditsource.cxx
+++ b/svx/source/table/celleditsource.cxx
@@ -939,7 +939,7 @@ CellEditSource::CellEditSource( CellEditSourceImpl* pImpl )
//------------------------------------------------------------------------
CellEditSource::~CellEditSource()
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
mpImpl->release();
}
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index 4b10347f2d..170cc7b6c4 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -314,7 +314,7 @@ void SAL_CALL TableDesignStyle::setName( const OUString& rName ) throw (RuntimeE
Any SAL_CALL TableDesignStyle::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
const CellStyleNameMap& rMap = getCellStyleNameMap();
@@ -329,7 +329,7 @@ Any SAL_CALL TableDesignStyle::getByName( const OUString& rName ) throw(NoSuchEl
Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
const CellStyleNameMap& rMap = getCellStyleNameMap();
Sequence< OUString > aRet( rMap.size() );
@@ -346,7 +346,7 @@ Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeE
sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName ) throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
const CellStyleNameMap& rMap = getCellStyleNameMap();
@@ -383,7 +383,7 @@ sal_Int32 SAL_CALL TableDesignStyle::getCount() throw(RuntimeException)
Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (Index < 0) || (Index >= style_count) )
throw IndexOutOfBoundsException();
@@ -397,7 +397,7 @@ Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index ) throw(IndexOutOfBou
void SAL_CALL TableDesignStyle::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
const CellStyleNameMap& rMap = getCellStyleNameMap();
CellStyleNameMap::const_iterator iter = rMap.find( rName );
@@ -547,7 +547,7 @@ void SAL_CALL TableDesignFamily::setName( const OUString& ) throw (RuntimeExcept
Any SAL_CALL TableDesignFamily::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
for( TableDesignStyleVector::iterator iter( maDesigns.begin() ); iter != maDesigns.end(); iter++ )
{
@@ -562,7 +562,7 @@ Any SAL_CALL TableDesignFamily::getByName( const OUString& rName ) throw(NoSuchE
Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Sequence< OUString > aRet( maDesigns.size() );
OUString* pNames = aRet.getArray();
@@ -577,7 +577,7 @@ Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(Runtime
sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName ) throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
for( TableDesignStyleVector::iterator iter( maDesigns.begin() ); iter != maDesigns.end(); iter++ )
if( (*iter)->getName() == aName )
@@ -599,7 +599,7 @@ Type SAL_CALL TableDesignFamily::getElementType() throw(RuntimeException)
sal_Bool SAL_CALL TableDesignFamily::hasElements() throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return maDesigns.empty() ? sal_False : sal_True;
}
@@ -610,7 +610,7 @@ sal_Bool SAL_CALL TableDesignFamily::hasElements() throw(RuntimeException)
sal_Int32 SAL_CALL TableDesignFamily::getCount() throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return sal::static_int_cast< sal_Int32 >( maDesigns.size() );
}
@@ -619,7 +619,7 @@ sal_Int32 SAL_CALL TableDesignFamily::getCount() throw(RuntimeException)
Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (Index >= 0) && (Index < sal::static_int_cast< sal_Int32 >( maDesigns.size() ) ) )
return Any( maDesigns[Index] );
@@ -633,7 +633,7 @@ Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBo
void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any& rElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Reference< XStyle > xStyle( rElement, UNO_QUERY );
if( !xStyle.is() )
@@ -651,7 +651,7 @@ void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any&
void SAL_CALL TableDesignFamily::removeByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
for( TableDesignStyleVector::iterator iter( maDesigns.begin() ); iter != maDesigns.end(); iter++ )
{
@@ -672,7 +672,7 @@ void SAL_CALL TableDesignFamily::removeByName( const OUString& rName ) throw(NoS
void SAL_CALL TableDesignFamily::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Reference< XStyle > xStyle( aElement, UNO_QUERY );
if( !xStyle.is() )
@@ -697,7 +697,7 @@ void SAL_CALL TableDesignFamily::replaceByName( const OUString& rName, const Any
Reference< XInterface > SAL_CALL TableDesignFamily::createInstance() throw(Exception, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return Reference< XInterface >( static_cast< XStyle* >( new TableDesignStyle ) );
}
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 774b223363..fa76fc37e4 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -316,7 +316,7 @@ void TableModel::UndoRemoveColumns( sal_Int32 nIndex, ColumnVector& aCols, CellV
Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return createCursorByRange( Reference< XCellRange >( this ) );
}
@@ -324,7 +324,7 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeExcep
Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Reference< XCellRange >& Range ) throw (IllegalArgumentException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
ICellRange* pRange = dynamic_cast< ICellRange* >( Range.get() );
if( (pRange == 0) || (pRange->getTable().get() != this) )
@@ -338,7 +338,7 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Referen
sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return getRowCountImpl();
}
@@ -346,7 +346,7 @@ sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException)
sal_Int32 SAL_CALL TableModel::getColumnCount() throw (RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return getColumnCountImpl();
}
@@ -356,7 +356,7 @@ sal_Int32 SAL_CALL TableModel::getColumnCount() throw (RuntimeException)
void TableModel::dispose() throw (RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
TableModelBase::dispose();
}
@@ -380,7 +380,7 @@ void SAL_CALL TableModel::removeEventListener( const Reference< XEventListener >
sal_Bool SAL_CALL TableModel::isModified( ) throw (RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return mbModified;
}
@@ -389,7 +389,7 @@ sal_Bool SAL_CALL TableModel::isModified( ) throw (RuntimeException)
void SAL_CALL TableModel::setModified( sal_Bool bModified ) throw (PropertyVetoException, RuntimeException)
{
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
mbModified = bModified;
}
if( bModified )
@@ -418,7 +418,7 @@ void SAL_CALL TableModel::removeModifyListener( const Reference< XModifyListener
Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( !mxTableColumns.is() )
mxTableColumns.set( new TableColumns( this ) );
@@ -429,7 +429,7 @@ Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeExcep
Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( !mxTableRows.is() )
mxTableRows.set( new TableRows( this ) );
@@ -442,7 +442,7 @@ Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException)
Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw ( IndexOutOfBoundsException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
CellRef xCell( getCell( nColumn, nRow ) );
if( xCell.is() )
@@ -455,7 +455,7 @@ Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sa
Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (nLeft >= 0) && (nTop >= 0) && (nRight >= nLeft) && (nBottom >= nTop) && (nRight < getColumnCountImpl()) && (nBottom < getRowCountImpl() ) )
{
@@ -593,14 +593,14 @@ void TableModel::disposing()
void TableModel::lockBroadcasts() throw (RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
++mnNotifyLock;
}
// -----------------------------------------------------------------------------
void TableModel::unlockBroadcasts() throw (RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
--mnNotifyLock;
if( mnNotifyLock <= 0 )
{
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 4bcf8c3516..bf262e3959 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -324,7 +324,7 @@ throw (uno::RuntimeException)
{
svt::ToolboxController::dispose();
- vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarMutexGuard;
delete m_pBox;
m_pBox = 0;
}
@@ -336,7 +336,7 @@ throw ( uno::RuntimeException )
{
if ( m_pBox )
{
- vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarMutexGuard;
if ( rEvent.FeatureURL.Path.equalsAscii( "FontHeight" ))
{
if ( rEvent.IsEnabled )
@@ -391,7 +391,7 @@ uno::Reference< awt::XWindow > SAL_CALL FontHeightToolBoxControl::createItemWind
Window* pParent = VCLUnoHelper::GetWindow( xParent );
if ( pParent )
{
- vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarMutexGuard;
m_pBox = new SvxFontSizeBox_Impl(
pParent,
uno::Reference< frame::XDispatchProvider >( m_xFrame, uno::UNO_QUERY ),
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 2d6c4c722e..5772ec09a6 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -340,7 +340,7 @@ css::uno::Sequence< ::rtl::OUString > FindTextToolbarController::getSupportedSe
// XComponent
void SAL_CALL FindTextToolbarController::dispose() throw ( css::uno::RuntimeException )
{
- vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarMutexGuard;
SearchToolbarControllersManager::createControllersManager()->freeController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
@@ -400,7 +400,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::cre
// XStatusListener
void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException )
{
- vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarMutexGuard;
if ( m_bDisposed )
return;
@@ -504,7 +504,7 @@ css::uno::Sequence< ::rtl::OUString > DownSearchToolboxController::getSupported
// XComponent
void SAL_CALL DownSearchToolboxController::dispose() throw ( css::uno::RuntimeException )
{
- vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarMutexGuard;
SearchToolbarControllersManager::createControllersManager()->freeController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
@@ -561,7 +561,7 @@ void SAL_CALL DownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
// XStatusListener
void SAL_CALL DownSearchToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ ) throw ( css::uno::RuntimeException )
{
- vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarMutexGuard;
if ( m_bDisposed )
return;
}
@@ -633,7 +633,7 @@ css::uno::Sequence< ::rtl::OUString > UpSearchToolboxController::getSupportedSe
// XComponent
void SAL_CALL UpSearchToolboxController::dispose() throw ( css::uno::RuntimeException )
{
- vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarMutexGuard;
SearchToolbarControllersManager::createControllersManager()->freeController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
@@ -690,7 +690,7 @@ void SAL_CALL UpSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) th
// XStatusListener
void SAL_CALL UpSearchToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ ) throw ( css::uno::RuntimeException )
{
- vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarMutexGuard;
if ( m_bDisposed )
return;
}
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index 0f874c0bff..44a1ecf0bf 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -84,7 +84,7 @@ SfxPopupWindowType SvxTbxCtlAlign::GetPopupWindowType() const
SfxPopupWindow* SvxTbxCtlAlign::CreatePopupWindow()
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( GetSlotId() == SID_OBJECT_ALIGN )
createAndPositionSubToolBar( m_aSubTbResName );
return NULL;
@@ -104,7 +104,7 @@ SfxPopupWindow* SvxTbxCtlAlign::CreatePopupWindow()
{
// Provide the controlled sub-toolbar name, so we are notified whenever
// this toolbar executes a function.
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return m_aSubTbName;
}
@@ -112,7 +112,7 @@ void SAL_CALL SvxTbxCtlAlign::functionSelected( const ::rtl::OUString& aCommand
{
// Our sub-toolbar wants to executes a function. We have to change
// the image of our toolbar button to reflect the new function.
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( !m_bDisposed )
{
if ( aCommand.getLength() > 0 )
@@ -129,7 +129,7 @@ void SAL_CALL SvxTbxCtlAlign::updateImage() throw (::com::sun::star::uno::Runtim
{
// We should update the button image of our parent (toolbar). Use the stored
// command to set the correct current image.
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_aCommand.getLength() > 0 )
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index dd6aed8547..e9a0be190b 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -70,7 +70,7 @@ ChineseTranslation_UnoDialog::ChineseTranslation_UnoDialog( const uno::Reference
ChineseTranslation_UnoDialog::~ChineseTranslation_UnoDialog()
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
impl_DeleteDialog();
}
@@ -132,7 +132,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::setTitle( const ::rtl::OUString& ) t
//-------------------------------------------------------------------------
void SAL_CALL ChineseTranslation_UnoDialog::initialize( const uno::Sequence< uno::Any >& aArguments ) throw(uno::Exception, uno::RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
if( m_bDisposed || m_bInDispose )
return;
@@ -155,7 +155,7 @@ sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() throw(uno::RuntimeExc
{
sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL;
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
if( m_bDisposed || m_bInDispose )
return nRet;
@@ -187,7 +187,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::dispose() throw (uno::RuntimeExcepti
{
lang::EventObject aEvt;
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
if( m_bDisposed || m_bInDispose )
return;
m_bInDispose = true;
@@ -204,7 +204,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::dispose() throw (uno::RuntimeExcepti
void SAL_CALL ChineseTranslation_UnoDialog::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) throw (uno::RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
if( m_bDisposed || m_bInDispose )
return;
m_aDisposeEventListeners.addInterface( xListener );
@@ -212,7 +212,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::addEventListener( const uno::Referen
void SAL_CALL ChineseTranslation_UnoDialog::removeEventListener( const uno::Reference< lang::XEventListener > & xListener ) throw (uno::RuntimeException)
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
if( m_bDisposed || m_bInDispose )
return;
m_aDisposeEventListeners.removeInterface( xListener );
@@ -239,7 +239,7 @@ uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const ::rtl::O
sal_Bool bTranslateCommonTerms = sal_False;
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+ SolarMutexGuard aSolarGuard;
if( m_bDisposed || m_bInDispose || !m_pDialog )
return aRet;
m_pDialog->getSettings( bDirectionToSimplified, bUseCharacterVariants, bTranslateCommonTerms );
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index f3eb0896c5..06e28bee33 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -1000,7 +1000,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDescriptor )
throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( NULL == mpUnoPage )
return sal_False;
@@ -1091,7 +1091,7 @@ void SAL_CALL GraphicExporter::cancel()
void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XComponent >& xComponent )
throw(IllegalArgumentException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
mxShapes = NULL;
mpUnoPage = NULL;
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 3115b6df94..d8c13de229 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -117,7 +117,7 @@ void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, cons
void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const uno::Any& aElement )
throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( hasByName( aApiName ) )
throw container::ElementExistException();
@@ -133,7 +133,7 @@ void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const
void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName )
throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// a little quickfix for 2.0 to let applications clear api
// created items that are not used
@@ -172,7 +172,7 @@ void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName )
void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, const uno::Any& aElement )
throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
String aName;
SvxUnogetInternalNameForItem( mnWhich, aApiName, aName );
@@ -228,7 +228,7 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons
uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName )
throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
String aName;
SvxUnogetInternalNameForItem( mnWhich, aApiName, aName );
@@ -260,7 +260,7 @@ uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName )
uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames( )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
std::set< OUString, comphelper::UStringLess > aNameSet;
@@ -297,7 +297,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames( )
sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
String aName;
SvxUnogetInternalNameForItem( mnWhich, aApiName, aName );
@@ -324,7 +324,7 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName )
sal_Bool SAL_CALL SvxUnoNameItemTable::hasElements( )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
const NameOrIndex *pItem;
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 8b6a5b6415..cd68bddf19 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -134,7 +134,7 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::supportsService( const OUString& Servic
void SAL_CALL SvxUnoXPropertyTable::insertByName( const OUString& aName, const uno::Any& aElement )
throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( NULL == mpList && NULL == mpTable )
throw lang::IllegalArgumentException();
@@ -158,7 +158,7 @@ void SAL_CALL SvxUnoXPropertyTable::insertByName( const OUString& aName, const
void SAL_CALL SvxUnoXPropertyTable::removeByName( const OUString& Name )
throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
String aInternalName;
SvxUnogetInternalNameForItem( mnWhich, Name, aInternalName );
@@ -186,7 +186,7 @@ void SAL_CALL SvxUnoXPropertyTable::removeByName( const OUString& Name )
void SAL_CALL SvxUnoXPropertyTable::replaceByName( const OUString& aName, const uno::Any& aElement )
throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
String aInternalName;
SvxUnogetInternalNameForItem( mnWhich, aName, aInternalName );
@@ -218,7 +218,7 @@ void SAL_CALL SvxUnoXPropertyTable::replaceByName( const OUString& aName, const
uno::Any SAL_CALL SvxUnoXPropertyTable::getByName( const OUString& aName )
throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
String aInternalName;
SvxUnogetInternalNameForItem( mnWhich, aName, aInternalName );
@@ -240,7 +240,7 @@ uno::Any SAL_CALL SvxUnoXPropertyTable::getByName( const OUString& aName )
uno::Sequence< OUString > SAL_CALL SvxUnoXPropertyTable::getElementNames()
throw( uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
const long nCount = getCount();
uno::Sequence< OUString > aNames( nCount );
@@ -264,7 +264,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXPropertyTable::getElementNames()
sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const OUString& aName )
throw( uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
String aInternalName;
SvxUnogetInternalNameForItem( mnWhich, aName, aInternalName );
@@ -286,7 +286,7 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const OUString& aName )
sal_Bool SAL_CALL SvxUnoXPropertyTable::hasElements( )
throw( uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return getCount() != 0;
}
diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx
index 2b4de37170..00e78ff184 100644
--- a/svx/source/unodraw/unomlstr.cxx
+++ b/svx/source/unodraw/unomlstr.cxx
@@ -50,7 +50,7 @@ SvxUnoShapeModifyListener::~SvxUnoShapeModifyListener() throw()
// ::com::sun::star::util::XModifyListener
void SAL_CALL SvxUnoShapeModifyListener::modified(const lang::EventObject& ) throw( uno::RuntimeException )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mpObj )
{
mpObj->SetChanged();
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index bacbe83f57..2d99897a7d 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -348,7 +348,7 @@ sal_Bool SAL_CALL SvxUnoDrawingModel::hasControllersLocked( )
uno::Reference< drawing::XDrawPages > SAL_CALL SvxUnoDrawingModel::getDrawPages()
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference< drawing::XDrawPages > xDrawPages( mxDrawPagesAccess );
@@ -362,7 +362,7 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SvxUnoDrawingModel::getDrawPages(
uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( const OUString& aServiceSpecifier )
throw(uno::Exception, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( 0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DashTable") ) )
{
@@ -601,7 +601,7 @@ SvxUnoDrawPagesAccess::~SvxUnoDrawPagesAccess() throw()
sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount()
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int32 nCount = 0;
@@ -614,7 +614,7 @@ sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount()
uno::Any SAL_CALL SvxUnoDrawPagesAccess::getByIndex( sal_Int32 Index )
throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Any aAny;
@@ -666,7 +666,7 @@ sal_Bool SAL_CALL SvxUnoDrawPagesAccess::hasElements()
uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex )
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference< drawing::XDrawPage > xDrawPage;
@@ -689,7 +689,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewBy
void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage )
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_uInt16 nPageCount = mrModel.mpDoc->GetPageCount();
if( nPageCount > 1 )
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 0cad126217..602a167835 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -188,7 +188,7 @@ void SAL_CALL SvxUnoMarkerTable::ImplInsertByName( const OUString& aName, const
void SAL_CALL SvxUnoMarkerTable::insertByName( const OUString& aApiName, const uno::Any& aElement )
throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( hasByName( aApiName ) )
throw container::ElementExistException();
@@ -202,7 +202,7 @@ void SAL_CALL SvxUnoMarkerTable::insertByName( const OUString& aApiName, const u
void SAL_CALL SvxUnoMarkerTable::removeByName( const OUString& aApiName )
throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// a little quickfix for 2.0 to let applications clear api
// created items that are not used
@@ -241,7 +241,7 @@ void SAL_CALL SvxUnoMarkerTable::removeByName( const OUString& aApiName )
void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const uno::Any& aElement )
throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
String aName;
SvxUnogetInternalNameForItem( XATTR_LINEEND, aApiName, aName );
@@ -330,7 +330,7 @@ static sal_Bool getByNameFromPool( const String& rSearchName, SfxItemPool* pPool
uno::Any SAL_CALL SvxUnoMarkerTable::getByName( const OUString& aApiName )
throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
String aName;
SvxUnogetInternalNameForItem( XATTR_LINEEND, aApiName, aName );
@@ -379,7 +379,7 @@ static void createNamesForPool( SfxItemPool* pPool, USHORT nWhich, std::set< OUS
uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getElementNames()
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
std::set< OUString, comphelper::UStringLess > aNameSet;
@@ -406,7 +406,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getElementNames()
sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( aName.getLength() == 0 )
return sal_False;
@@ -447,7 +447,7 @@ uno::Type SAL_CALL SvxUnoMarkerTable::getElementType( )
sal_Bool SAL_CALL SvxUnoMarkerTable::hasElements( )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
NameOrIndex *pItem;
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index e4f9abb217..0847f35df4 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -196,7 +196,7 @@ void SvxDrawPage::disposing() throw()
void SvxDrawPage::dispose()
throw(::com::sun::star::uno::RuntimeException)
{
- OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
// An frequently programming error is to release the last
// reference to this object in the disposing message.
@@ -253,7 +253,7 @@ void SvxDrawPage::dispose()
void SAL_CALL SvxDrawPage::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mpModel == 0 )
throw lang::DisposedException();
@@ -265,7 +265,7 @@ void SAL_CALL SvxDrawPage::addEventListener( const ::com::sun::star::uno::Refere
void SAL_CALL SvxDrawPage::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mpModel == 0 )
throw lang::DisposedException();
@@ -305,7 +305,7 @@ void SvxDrawPage::Notify( SfxBroadcaster&, const SfxHint& /*rHint*/ )
void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (mpModel == 0) || (mpPage == 0) )
throw lang::DisposedException();
@@ -340,7 +340,7 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape
void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (mpModel == 0) || (mpPage == 0) )
throw lang::DisposedException();
@@ -377,7 +377,7 @@ void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape )
sal_Int32 SAL_CALL SvxDrawPage::getCount()
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (mpModel == 0) || (mpPage == 0) )
throw lang::DisposedException();
@@ -389,7 +389,7 @@ sal_Int32 SAL_CALL SvxDrawPage::getCount()
uno::Any SAL_CALL SvxDrawPage::getByIndex( sal_Int32 Index )
throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (mpModel == 0) || (mpPage == 0) )
throw lang::DisposedException();
@@ -420,7 +420,7 @@ uno::Type SAL_CALL SvxDrawPage::getElementType()
sal_Bool SAL_CALL SvxDrawPage::hasElements()
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (mpModel == 0) || (mpPage == 0) )
throw lang::DisposedException();
@@ -488,7 +488,7 @@ void SvxDrawPage::_SelectObjectInView( const Reference< drawing::XShape > & xSha
Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference< drawing::XShapes >& xShapes )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (mpModel == 0) || (mpPage == 0) )
throw lang::DisposedException();
@@ -527,7 +527,7 @@ Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference<
void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGroup )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (mpModel == 0) || (mpPage == 0) )
throw lang::DisposedException();
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 726627d706..63c3cf0cd1 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -207,7 +207,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
void SvxUnoDrawPool::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues )
throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SfxItemPool* pPool = getModelPool( sal_False );
@@ -222,7 +222,7 @@ void SvxUnoDrawPool::_setPropertyValues( const comphelper::PropertyMapEntry** pp
void SvxUnoDrawPool::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValue )
throw(beans::UnknownPropertyException, lang::WrappedTargetException )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SfxItemPool* pPool = getModelPool( sal_True );
@@ -237,7 +237,7 @@ void SvxUnoDrawPool::_getPropertyValues( const comphelper::PropertyMapEntry** pp
void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** ppEntries, beans::PropertyState* pStates )
throw(beans::UnknownPropertyException )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SfxItemPool* pPool = getModelPool( sal_True );
@@ -300,7 +300,7 @@ void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** pp
void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry )
throw(beans::UnknownPropertyException )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SfxItemPool* pPool = getModelPool( sal_True );
@@ -319,7 +319,7 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry*
uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry* pEntry )
throw(beans::UnknownPropertyException, lang::WrappedTargetException )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
// OD 13.10.2003 #i18732# - use method <GetPoolDefaultItem(..)> instead of
// using probably incompatible item pool <mpDefaultsPool>
@@ -390,7 +390,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawPool::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL SvxUnoDrawPool::getImplementationId()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
static uno::Sequence< sal_Int8 > aId;
if( aId.getLength() == 0 )
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 143aede591..2c3c1355ea 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1419,7 +1419,7 @@ void SvxUnogetInternalNameForItem( const sal_Int16 nWhich, const rtl::OUString&
comphelper::PropertySetInfo* SvxPropertySetInfoPool::getOrCreate( sal_Int32 nServiceId ) throw()
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( nServiceId > SVXUNO_SERVICEID_LASTID )
{
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index ffeb60b81e..2bd53bd9cc 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -222,7 +222,7 @@ void SAL_CALL SvxShapeGroup::leaveGroup( ) throw(uno::RuntimeException)
void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShape )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxShape* pShape = SvxShape::getImplementation( xShape );
@@ -264,7 +264,7 @@ void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShap
void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xShape )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SdrObject* pSdrShape = NULL;
SvxShape* pShape = SvxShape::getImplementation( xShape );
@@ -318,7 +318,7 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS
//----------------------------------------------------------------------
sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int32 nRetval = 0;
@@ -334,7 +334,7 @@ sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException )
uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index )
throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( !mpObj.is() || mpObj->GetSubList() == NULL )
throw uno::RuntimeException();
@@ -362,7 +362,7 @@ uno::Type SAL_CALL SvxShapeGroup::getElementType() throw( uno::RuntimeException
//----------------------------------------------------------------------
sal_Bool SAL_CALL SvxShapeGroup::hasElements() throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return mpObj.is() && mpObj->GetSubList() && (mpObj->GetSubList()->GetObjCount() > 0);
}
@@ -480,7 +480,7 @@ void SAL_CALL SvxShapeConnector::setSize( const awt::Size& rSize )
void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType ) throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Reference< drawing::XShape > xRef( xShape, UNO_QUERY );
SvxShape* pShape = SvxShape::getImplementation( xRef );
@@ -496,7 +496,7 @@ void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XC
void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Reference< drawing::XShape > xRef( xShape, UNO_QUERY );
SvxShape* pShape = SvxShape::getImplementation( xRef );
@@ -512,7 +512,7 @@ void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XCon
void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing::XConnectableShape >& )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if(mpObj.is())
mpObj->DisconnectFromNode( sal_True );
@@ -525,7 +525,7 @@ void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing:
void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::XConnectableShape >& )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if(mpObj.is())
mpObj->DisconnectFromNode( sal_False );
@@ -648,7 +648,7 @@ void SAL_CALL SvxShapeControl::setSize( const awt::Size& rSize )
Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl()
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Reference< awt::XControlModel > xModel;
@@ -663,7 +663,7 @@ Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl()
void SAL_CALL SvxShapeControl::setControl( const Reference< awt::XControlModel >& xControl )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SdrUnoObj* pUnoObj = dynamic_cast< SdrUnoObj * >(mpObj.get());
if( pUnoObj )
@@ -1290,7 +1290,7 @@ drawing::PolygonKind SvxShapePolyPolygon::GetPolygonKind() const throw()
//----------------------------------------------------------------------
void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw()
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if(mpObj.is())
((SdrPathObj*)mpObj.get())->SetPathPoly(rNew);
@@ -1299,7 +1299,7 @@ void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(
//----------------------------------------------------------------------
basegfx::B2DPolyPolygon SvxShapePolyPolygon::GetPolygon() const throw()
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if(mpObj.is())
{
@@ -1586,7 +1586,7 @@ drawing::PolygonKind SvxShapePolyPolygonBezier::GetPolygonKind() const throw()
//----------------------------------------------------------------------
void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw()
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if(mpObj.is())
static_cast<SdrPathObj*>(mpObj.get())->SetPathPoly(rNew);
@@ -1595,7 +1595,7 @@ void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew)
//----------------------------------------------------------------------
basegfx::B2DPolyPolygon SvxShapePolyPolygonBezier::GetPolygon() const throw()
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if(mpObj.is())
{
@@ -1957,7 +1957,7 @@ OUString SAL_CALL SvxCustomShape::getShapeType()
//------------------------------------------------------------------1----
awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( mpModel && mpObj.is() )
{
SdrAShapeObjGeoData aCustomShapeGeoData;
@@ -2062,7 +2062,7 @@ void SAL_CALL SvxCustomShape::setSize( const awt::Size& rSize )
void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SdrObject* pObject = mpObj.get();
sal_Bool bCustomShapeGeometry = pObject && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CustomShapeGeometry" ) );
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index c637865a96..3763be0e1b 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -151,7 +151,7 @@ uno::Sequence< sal_Int8 > SAL_CALL Svx3DSceneObject::getImplementationId()
void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape )
throw( uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxShape* pShape = SvxShape::getImplementation( xShape );
@@ -180,7 +180,7 @@ void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape
void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xShape )
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxShape* pShape = SvxShape::getImplementation( xShape );
@@ -221,7 +221,7 @@ void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xSha
sal_Int32 SAL_CALL Svx3DSceneObject::getCount()
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
sal_Int32 nRetval = 0;
@@ -235,7 +235,7 @@ sal_Int32 SAL_CALL Svx3DSceneObject::getCount()
uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index )
throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( !mpObj.is() || mpObj->GetSubList() == NULL )
throw uno::RuntimeException();
@@ -266,7 +266,7 @@ uno::Type SAL_CALL Svx3DSceneObject::getElementType()
sal_Bool SAL_CALL Svx3DSceneObject::hasElements()
throw( uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return mpObj.is() && mpObj->GetSubList() && (mpObj->GetSubList()->GetObjCount() > 0);
}
@@ -515,7 +515,7 @@ Svx3DCubeObject::~Svx3DCubeObject() throw()
//----------------------------------------------------------------------
bool Svx3DCubeObject::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
switch( pProperty->nWID )
{
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index ea0be618ca..cdd60e8cad 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -253,7 +253,7 @@ SvxShape::SvxShape() throw()
//----------------------------------------------------------------------
SvxShape::~SvxShape() throw()
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT( mnLockCount == 0, "Locked shape was disposed!" );
@@ -1242,7 +1242,7 @@ static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mpObj.is() && mpModel)
{
@@ -1265,7 +1265,7 @@ awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException)
//----------------------------------------------------------------------
void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mpObj.is() && mpModel )
{
@@ -1295,7 +1295,7 @@ void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::Run
//----------------------------------------------------------------------
awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mpObj.is() && mpModel)
{
@@ -1312,7 +1312,7 @@ awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException)
void SAL_CALL SvxShape::setSize( const awt::Size& rSize )
throw(beans::PropertyVetoException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mpObj.is() && mpModel)
{
@@ -1356,7 +1356,7 @@ void SAL_CALL SvxShape::setSize( const awt::Size& rSize )
// XNamed
OUString SAL_CALL SvxShape::getName( ) throw(::com::sun::star::uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mpObj.is() )
{
return mpObj->GetName();
@@ -1371,7 +1371,7 @@ OUString SAL_CALL SvxShape::getName( ) throw(::com::sun::star::uno::RuntimeExce
void SAL_CALL SvxShape::setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mpObj.is() )
{
mpObj->SetName( aName );
@@ -1398,7 +1398,7 @@ OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException)
//----------------------------------------------------------------------
void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mpImpl->mbDisposing )
return; // caught a recursion
@@ -1931,7 +1931,7 @@ void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const u
void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal )
throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(rPropertyName);
@@ -2056,7 +2056,7 @@ uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName )
uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName);
@@ -2115,7 +2115,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
// XMultiPropertySet
void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{
- OGuard aSolarGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aSolarGuard;
const sal_Int32 nCount = aPropertyNames.getLength();
const OUString* pNames = aPropertyNames.getConstArray();
@@ -2341,7 +2341,7 @@ beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& Proper
beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& PropertyName )
throw(beans::UnknownPropertyException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName);
@@ -3338,7 +3338,7 @@ void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName )
void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName )
throw(beans::UnknownPropertyException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
const SfxItemPropertySimpleEntry* pProperty = mpPropSet->getPropertyMapEntry(PropertyName);
@@ -3371,7 +3371,7 @@ uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName )
uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName )
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(aPropertyName);
@@ -3397,7 +3397,7 @@ uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName )
// XMultiPropertyStates
void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( !mpObj.is() )
throw lang::DisposedException();
@@ -3517,7 +3517,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::getSupportedServiceNames()
uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mpObj.is() && mpObj->GetObjInventor() == SdrInventor)
{
@@ -3530,7 +3530,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_GroupServices;
@@ -3550,7 +3550,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_CustomShapeServices;
@@ -3581,7 +3581,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_LineServices;
@@ -3616,7 +3616,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_RectServices;
@@ -3653,7 +3653,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_CircServices;
@@ -3690,7 +3690,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_PathServices;
@@ -3725,7 +3725,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_PolyServices;
@@ -3762,7 +3762,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_FreeLineServices;
@@ -3801,7 +3801,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_FreeFillServices;
@@ -3839,7 +3839,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_TextServices;
@@ -3873,7 +3873,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_GrafServices;
@@ -3905,7 +3905,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_Ole2Services;
@@ -3925,7 +3925,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_CaptionServices;
@@ -3961,7 +3961,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_PageServices;
@@ -3982,7 +3982,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_MeasureServices;
@@ -4019,7 +4019,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_FrameServices;
@@ -4040,7 +4040,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard _aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard _aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_UnoServices;
@@ -4059,7 +4059,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_EdgeServices;
@@ -4094,7 +4094,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_MediaServices;
@@ -4119,7 +4119,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
static uno::Sequence< OUString > *pSeq = 0;
if( 0 == pSeq )
{
-// OGuard aGuard( Application::GetSolarMutex() );
+// SolarMutexGuard aGuard;
// if( 0 == pSeq )
{
static uno::Sequence< OUString > SvxShape_UnoServices;
@@ -4156,7 +4156,7 @@ sal_Bool SAL_CALL SvxShape::supportsService( const OUString& ServiceName ) throw
uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints()
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
uno::Reference< container::XIndexContainer > xGluePoints( mxGluePoints );
if( mpObj.is() && !xGluePoints.is() )
@@ -4174,7 +4174,7 @@ uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints()
uno::Reference< uno::XInterface > SAL_CALL SvxShape::getParent( )
throw(uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mpObj.is() && mpObj->GetObjList() )
{
@@ -4228,7 +4228,7 @@ void SvxShape::unlock()
// XActionLockable
sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (::com::sun::star::uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
return mnLockCount != 0;
}
@@ -4237,7 +4237,7 @@ sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (::com::sun::star::uno::Run
void SAL_CALL SvxShape::addActionLock( ) throw (::com::sun::star::uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT( mnLockCount < 0xffff, "lock overflow in SvxShape!" );
mnLockCount++;
@@ -4250,7 +4250,7 @@ void SAL_CALL SvxShape::addActionLock( ) throw (::com::sun::star::uno::RuntimeE
void SAL_CALL SvxShape::removeActionLock( ) throw (::com::sun::star::uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
DBG_ASSERT( mnLockCount > 0, "lock underflow in SvxShape!" );
mnLockCount--;
@@ -4263,7 +4263,7 @@ void SAL_CALL SvxShape::removeActionLock( ) throw (::com::sun::star::uno::Runti
void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (::com::sun::star::uno::RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( (mnLockCount == 0) && (nLock != 0) )
unlock();
@@ -4278,7 +4278,7 @@ void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (::com::sun::sta
sal_Int16 SAL_CALL SvxShape::resetActionLocks( ) throw (::com::sun::star::uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if( mnLockCount != 0 )
unlock();
@@ -4479,7 +4479,7 @@ void SvxShapeText::unlock()
// ::com::sun::star::text::XTextRange
uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
if( pForwarder )
::GetSelection( maSelection, pForwarder );
@@ -4489,7 +4489,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno::
uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
if( pForwarder )
::GetSelection( maSelection, pForwarder );
@@ -4498,7 +4498,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::Ru
OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
if( pForwarder )
::GetSelection( maSelection, pForwarder );
@@ -4508,7 +4508,7 @@ OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException)
void SAL_CALL SvxShapeText::setString( const OUString& aString ) throw(uno::RuntimeException)
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL;
if( pForwarder )
::GetSelection( maSelection, pForwarder );
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index ad2e398ff8..d9b26e2227 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -1054,7 +1054,7 @@ SvxTextEditSource::SvxTextEditSource( SvxTextEditSourceImpl* pImpl )
//------------------------------------------------------------------------
SvxTextEditSource::~SvxTextEditSource()
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
mpImpl->release();
}
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 5538098199..e04a3715dd 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -208,7 +208,7 @@ uno::Sequence< uno::Type > SAL_CALL GalleryItem::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL GalleryItem::getImplementationId()
throw(uno::RuntimeException)
{
- const vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
static uno::Sequence< sal_Int8 > aId;
if( aId.getLength() == 0 )
@@ -225,7 +225,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GalleryItem::getImplementationId()
sal_Int8 SAL_CALL GalleryItem::getType()
throw (uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
sal_Int8 nRet = gallery::GalleryItemType::EMPTY;
if( isValid() )
@@ -254,7 +254,7 @@ sal_Int8 SAL_CALL GalleryItem::getType()
::comphelper::PropertySetInfo* GalleryItem::createPropertySetInfo()
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
::comphelper::PropertySetInfo* pRet = new ::comphelper::PropertySetInfo();
static ::comphelper::PropertyMapEntry aEntries[] =
@@ -294,7 +294,7 @@ void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEnt
lang::IllegalArgumentException,
lang::WrappedTargetException )
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
while( *ppEntries )
{
@@ -339,7 +339,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt
throw( beans::UnknownPropertyException,
lang::WrappedTargetException )
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
while( *ppEntries )
{
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index d34f57b294..04eddd8a3c 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -66,7 +66,7 @@ GalleryTheme::GalleryTheme( const ::rtl::OUString& rThemeName )
GalleryTheme::~GalleryTheme()
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
DBG_ASSERT( !mpTheme || mpGallery, "Theme is living without Gallery" );
@@ -154,7 +154,7 @@ uno::Sequence< uno::Type > SAL_CALL GalleryTheme::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL GalleryTheme::getImplementationId()
throw(uno::RuntimeException)
{
- const vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
static uno::Sequence< sal_Int8 > aId;
if( aId.getLength() == 0 )
@@ -179,7 +179,7 @@ uno::Type SAL_CALL GalleryTheme::getElementType()
sal_Bool SAL_CALL GalleryTheme::hasElements()
throw (uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
return( ( mpTheme != NULL ) && ( mpTheme->GetObjectCount() > 0 ) );
}
@@ -189,7 +189,7 @@ sal_Bool SAL_CALL GalleryTheme::hasElements()
sal_Int32 SAL_CALL GalleryTheme::getCount()
throw (uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
return( mpTheme ? mpTheme->GetObjectCount() : 0 );
}
@@ -199,7 +199,7 @@ sal_Int32 SAL_CALL GalleryTheme::getCount()
uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex )
throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
uno::Any aRet;
if( mpTheme )
@@ -225,7 +225,7 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex )
::rtl::OUString SAL_CALL GalleryTheme::getName( )
throw (uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
::rtl::OUString aRet;
if( mpTheme )
@@ -239,7 +239,7 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex )
void SAL_CALL GalleryTheme::update( )
throw (uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
if( mpTheme )
{
@@ -254,7 +254,7 @@ void SAL_CALL GalleryTheme::update( )
const ::rtl::OUString& rURL, ::sal_Int32 nIndex )
throw (lang::WrappedTargetException, uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
sal_Int32 nRet = -1;
if( mpTheme )
@@ -287,7 +287,7 @@ void SAL_CALL GalleryTheme::update( )
const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nIndex )
throw (lang::WrappedTargetException, uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
sal_Int32 nRet = -1;
if( mpTheme )
@@ -315,7 +315,7 @@ void SAL_CALL GalleryTheme::update( )
const uno::Reference< lang::XComponent >& Drawing, sal_Int32 nIndex )
throw (lang::WrappedTargetException, uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
sal_Int32 nRet = -1;
if( mpTheme )
@@ -371,7 +371,7 @@ void SAL_CALL GalleryTheme::update( )
void SAL_CALL GalleryTheme::removeByIndex( sal_Int32 nIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
if( mpTheme )
{
@@ -386,7 +386,7 @@ void SAL_CALL GalleryTheme::removeByIndex( sal_Int32 nIndex )
void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
const GalleryHint& rGalleryHint = static_cast< const GalleryHint& >( rHint );
switch( rGalleryHint.GetType() )
@@ -423,7 +423,7 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint )
void GalleryTheme::implReleaseItems( GalleryObject* pObj )
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
for( GalleryItemList::iterator aIter = maItemList.begin(); aIter != maItemList.end(); )
{
@@ -448,7 +448,7 @@ void GalleryTheme::implReleaseItems( GalleryObject* pObj )
void GalleryTheme::implRegisterGalleryItem( ::unogallery::GalleryItem& rItem )
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
// DBG_ASSERT( maItemList.find( &rItem ) == maItemList.end(), "Item already registered" );
maItemList.push_back( &rItem );
@@ -458,7 +458,7 @@ void GalleryTheme::implRegisterGalleryItem( ::unogallery::GalleryItem& rItem )
void GalleryTheme::implDeregisterGalleryItem( ::unogallery::GalleryItem& rItem )
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
// DBG_ASSERT( maItemList.find( &rItem ) != maItemList.end(), "Item is not registered" );
maItemList.remove( &rItem );
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index 43f317d775..df84f4c154 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -160,7 +160,7 @@ uno::Sequence< uno::Type > SAL_CALL GalleryThemeProvider::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL GalleryThemeProvider::getImplementationId()
throw(uno::RuntimeException)
{
- const vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
static uno::Sequence< sal_Int8 > aId;
if( aId.getLength() == 0 )
@@ -208,7 +208,7 @@ uno::Type SAL_CALL GalleryThemeProvider::getElementType()
sal_Bool SAL_CALL GalleryThemeProvider::hasElements()
throw (uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
return( ( mpGallery != NULL ) && ( mpGallery->GetThemeCount() > 0 ) );
}
@@ -218,7 +218,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasElements()
uno::Any SAL_CALL GalleryThemeProvider::getByName( const ::rtl::OUString& rName )
throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
uno::Any aRet;
if( !mpGallery || !mpGallery->HasTheme( rName ) )
@@ -238,7 +238,7 @@ uno::Any SAL_CALL GalleryThemeProvider::getByName( const ::rtl::OUString& rName
uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider::getElementNames()
throw (uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
sal_uInt32 i = 0, nCount = ( mpGallery ? mpGallery->GetThemeCount() : 0 ), nRealCount = 0;
uno::Sequence< ::rtl::OUString > aSeq( nCount );
@@ -260,7 +260,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider::getElementNames(
sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const ::rtl::OUString& rName )
throw (uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
@@ -275,7 +275,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const ::rtl::OUString& rName
uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNewByName( const ::rtl::OUString& rThemeName )
throw (container::ElementExistException, uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
uno::Reference< gallery::XGalleryTheme > xRet;
if( mpGallery )
@@ -298,7 +298,7 @@ uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNe
void SAL_CALL GalleryThemeProvider::removeByName( const ::rtl::OUString& rName )
throw (container::NoSuchElementException, uno::RuntimeException)
{
- const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aGuard;
if( !mpGallery ||
!mpGallery->HasTheme( rName ) ||
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index 02cc2a4d50..f19811e98a 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -159,7 +159,7 @@ void MessagePrinter::print( const sal_Char* pText )
//-------------------------------------------------------------------------
void MessagePrinter::print( const UniString& rText )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pOutEdit )
{
@@ -2100,7 +2100,7 @@ void MyWin::print( const sal_Char* pText )
//-------------------------------------------------------------------------
void MyWin::print( const UniString& rText )
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
if ( m_pOutEdit )
{
@@ -2121,7 +2121,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
{
case MYWIN_ITEMID_CLEAR:
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_pOutEdit->Clear();
m_pOutEdit->Show();
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 562d525814..e235b9ebc0 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -71,7 +71,7 @@ executeLoginDialog(
{
try
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
bool bAccount = (rInfo.GetFlags() & LOGINERROR_FLAG_MODIFY_ACCOUNT) != 0;
bool bSavePassword = rInfo.GetCanRememberPassword();
@@ -424,7 +424,7 @@ executeMasterPasswordDialog(
rtl::OString aMaster;
try
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
std::auto_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
@@ -526,7 +526,7 @@ executePasswordDialog(
{
try
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
std::auto_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
diff --git a/uui/source/iahndl-cookies.cxx b/uui/source/iahndl-cookies.cxx
index 690545ab45..5263a40a9d 100644
--- a/uui/source/iahndl-cookies.cxx
+++ b/uui/source/iahndl-cookies.cxx
@@ -61,7 +61,7 @@ executeCookieDialog(Window * pParent, CntHTTPCookieRequest & rRequest)
{
try
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
std::auto_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 5f2d60eaa9..087a1cfd36 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -58,7 +58,7 @@ executeErrorDialog(
WinBits nButtonMask)
SAL_THROW((uno::RuntimeException))
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
rtl::OUStringBuffer aText(rContext);
if (rContext.getLength() != 0 && rMessage.getLength() != 0)
@@ -183,7 +183,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
SOURCE_SVX :
SOURCE_UUI;
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
std::auto_ptr< ResMgr > xManager;
xManager.reset(ResMgr::CreateResMgr(aManager[eSource]));
if (!xManager.get())
@@ -267,7 +267,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
rtl::OUString aContext(getContextProperty());
if (aContext.getLength() == 0 && nErrorCode != 0)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
ErrorContext * pContext = ErrorContext::GetContext();
if (pContext)
{
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index eaa0c0c6e9..571558b1bf 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -63,7 +63,7 @@ executeFilterDialog(
{
try
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
std::auto_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index c959ff436e..ceff1fb393 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -81,7 +81,7 @@ handleLockedDocumentRequest_(
try
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
std::auto_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
if (!xManager.get())
@@ -172,7 +172,7 @@ handleChangedByOthersRequest_(
try
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
std::auto_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
if (!xManager.get())
@@ -211,7 +211,7 @@ handleLockFileIgnoreRequest_(
try
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
std::auto_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
if (!xManager.get())
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index 890c3f07b2..6bdeade49f 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -138,7 +138,7 @@ executeUnknownAuthDialog(
{
try
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
std::auto_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
@@ -187,7 +187,7 @@ executeSSLWarnDialog(
{
try
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
std::auto_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 265ac935ac..425b3b9c5a 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -1152,7 +1152,7 @@ executeMessageBox(
WinBits nButtonMask )
SAL_THROW((uno::RuntimeException))
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
MessBox xBox( pParent, nButtonMask, rTitle, rMessage );
@@ -1410,7 +1410,7 @@ UUIInteractionHelper::handleBrokenPackageRequest(
::rtl::OUString aMessage;
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
std::auto_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
if (!xManager.get())
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index ab5c7c313f..8603a4a12b 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -368,7 +368,7 @@ ScVbaShape::TextFrame() throw (uno::RuntimeException)
void SAL_CALL
ScVbaShape::Delete() throw (uno::RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
m_xShapes->remove( m_xShape );
}