[Libreoffice-commits] .: Branch 'feature/vos-removal' - sfx2/source

[Norbert Thiebaud]

 sfx2/source/appl/shutdownicon.cxx            |   11 ++++++-----
 sfx2/source/doc/docstoragemodifylistener.cxx |    4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit ade4fe67ac21315cac7d66def618c284a7a54bea
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Oct 20 06:26:32 2010 -0500

    rename osl::SolarMutexGuard -> SolarGuard to avoid namespace ambiguity

diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 37fec5d..c2ffa19 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();
     }
@@ -868,10 +868,11 @@ void ShutdownIcon::SetAutostart( bool bActivate )
                                                      osl_getThreadTextEncoding() );
         OString aShortcutUnx = OUStringToOString( aShortcut,
                                                   osl_getThreadTextEncoding() );
-        if ((0 != symlink(aDesktopFileUnx, aShortcutUnx)) && (errno == EEXIST)) 
-        { 
-        unlink(aShortcutUnx); 
-        symlink(aDesktopFileUnx, aShortcutUnx); 
+        if ((0 != symlink(aDesktopFileUnx, aShortcutUnx)) && (errno == EEXIST))
+        {
+            unlink(aShortcutUnx);
+            int rc = symlink(aDesktopFileUnx, aShortcutUnx);
+            (void)rc; // ignore return code
         }
 
         ShutdownIcon *pIcon = ShutdownIcon::createInstance();
diff --git a/sfx2/source/doc/docstoragemodifylistener.cxx b/sfx2/source/doc/docstoragemodifylistener.cxx
index 4f87429..1da9832 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();