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

[Norbert Thiebaud]

 sfx2/source/appl/shutdownicon.cxx    |   10 +++++-----
 sfx2/source/appl/shutdowniconunx.cxx |    6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 3f314926b2e1fd4f960d2e11ab3cd86a6bbbf292
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Oct 20 04:44:19 2010 -0500

    fix namespace ambiguity

diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 5b4c431..37fec5d 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -348,7 +348,7 @@ void ShutdownIcon::FromTemplate()
 #include <tools/rcid.h>
 OUString ShutdownIcon::GetResString( int id )
 {
-    SolarMutexGuard aGuard;
+    ::SolarMutexGuard aGuard;
 
     if( ! m_pResMgr )
         m_pResMgr = SfxResId::GetResMgr();
@@ -365,7 +365,7 @@ OUString ShutdownIcon::GetResString( int id )
 
 OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl )
 {
-    SolarMutexGuard aGuard;
+    ::SolarMutexGuard aGuard;
 
     return OUString( SvFileInformationManager::GetDescription( INetURLObject( aUrl ) ) );
 }
@@ -374,7 +374,7 @@ OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl )
 
 void ShutdownIcon::StartFileDialog()
 {
-    SolarMutexGuard aGuard;
+    ::SolarMutexGuard aGuard;
 
     bool bDirty = ( m_bSystemDialogs != static_cast<bool>(SvtMiscOptions().UseSystemFileDialog()) );
     
@@ -618,7 +618,7 @@ ShutdownIcon* ShutdownIcon::createInstance()
 void ShutdownIcon::init() throw( ::com::sun::star::uno::Exception )
 {
     // access resource system and sfx only protected by solarmutex
-    SolarMutexGuard aSolarGuard;
+    ::SolarMutexGuard aSolarGuard;
     ResMgr *pResMgr = SfxResId::GetResMgr();
 
     ::osl::ResettableMutexGuard	aGuard(	m_aMutex );
@@ -804,7 +804,7 @@ rtl::OUString ShutdownIcon::getShortcutName()
     ResMgr* pMgr = SfxResId::GetResMgr();
     if( pMgr )
     {
-        SolarMutexGuard aGuard;
+        ::SolarMutexGuard aGuard;
         UniString aRes( SfxResId( STR_QUICKSTART_LNKNAME ) );
         aShortcutName = OUString( aRes );
     }
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index ab3b2c6..510c6ca 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 )
     {
-        SolarMutexGuard aGuard;
+        ::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()
 {
-    SolarMutexGuard aGuard;
+    ::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()
 {
-    SolarMutexGuard aGuard;
+    ::SolarMutexGuard aGuard;
     if( !pTrayIcon )
         return;
     gtk_widget_destroy( GTK_WIDGET( pTrayIcon ) );