From c21186c38d1bed344cc95ce7572f0d7366186ab2 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Wed, 20 Oct 2010 06:26:34 -0500
Subject: rename osl::SolarMutexGuard -> SolarGuard to avoid namespace
 ambiguity

---
 toolkit/source/awt/vclxsystemdependentwindow.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toolkit/source/awt/vclxsystemdependentwindow.cxx')

diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index d2ff5cb9cc98..fb28d89b9cbc 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -80,7 +80,7 @@ IMPL_XTYPEPROVIDER_END
 
 ::com::sun::star::uno::Any VCLXSystemDependentWindow::getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     // TODO, check the process id
     ::com::sun::star::uno::Any aRet;
-- 
cgit