summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2010-10-20 06:26:32 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-10-25 19:55:34 -0500
commit3d70c1584ffc3f76a44d48b10a1fb5c45292460f (patch)
treeb9a77c24c0b866222d91ce00927f2c19143c746b
parent4a7025164c4d996ca784e7ee8497ee1a2545b79e (diff)
rename osl::SolarMutexGuard -> SolarGuard to avoid namespace ambiguity
-rw-r--r--sfx2/source/appl/shutdownicon.cxx6
-rw-r--r--sfx2/source/doc/docstoragemodifylistener.cxx4
2 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 314d170c82..e49584308b 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();
}
@@ -876,8 +876,8 @@ void ShutdownIcon::SetAutostart( bool bActivate )
osl_getThreadTextEncoding() );
OString aShortcutUnx = OUStringToOString( aShortcut,
osl_getThreadTextEncoding() );
- if ((0 != symlink(aDesktopFileUnx, aShortcutUnx)) && (errno == EEXIST))
- {
+ if ((0 != symlink(aDesktopFileUnx, aShortcutUnx)) && (errno == EEXIST))
+ {
unlink(aShortcutUnx);
int ret = symlink(aDesktopFileUnx, aShortcutUnx);
(void)ret; //deliberately ignore return value, it's non-critical if it fails
diff --git a/sfx2/source/doc/docstoragemodifylistener.cxx b/sfx2/source/doc/docstoragemodifylistener.cxx
index 4f874290d0..1da9832a4f 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();