diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-20 06:26:32 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:34 -0500 |
| commit | dbc4dae204e774a0e7274b63e82d6f9ac1cf94c0 (patch) | |
| tree | 7fdd99ee3288dbdd4111ac3bc64cf9b894b9eb87 | |
| parent | 48ba58a5fcf61a626624a3332f71bacca1c1d90b (diff) | |
rename osl::SolarMutexGuard -> SolarGuard to avoid namespace ambiguity
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/docstoragemodifylistener.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index ef44f07ce8c4..f08bbadcc300 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -295,7 +295,7 @@ void ShutdownIcon::FileOpen() { if ( getInstance() && getInstance()->m_xDesktop.is() ) { - SolarMutexGuard aGuard; + ::SolarMutexGuard aGuard; EnterModalMode(); getInstance()->StartFileDialog(); } diff --git a/sfx2/source/doc/docstoragemodifylistener.cxx b/sfx2/source/doc/docstoragemodifylistener.cxx index 25bf00d241be..847cb15c2082 100644 --- a/sfx2/source/doc/docstoragemodifylistener.cxx +++ b/sfx2/source/doc/docstoragemodifylistener.cxx @@ -71,14 +71,14 @@ namespace sfx2 //-------------------------------------------------------------------- void DocumentStorageModifyListener::dispose() { - ::osl::SolarMutexGuard aGuard( m_rMutex ); + ::osl::SolarGuard aGuard( m_rMutex ); m_pDocument = NULL; } //-------------------------------------------------------------------- void SAL_CALL DocumentStorageModifyListener::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException) { - ::osl::SolarMutexGuard aGuard( m_rMutex ); + ::osl::SolarGuard aGuard( m_rMutex ); // storageIsModified must not contain any locking! if ( m_pDocument ) m_pDocument->storageIsModified(); |