diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-20 06:26:34 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:38 -0500 |
| commit | c21186c38d1bed344cc95ce7572f0d7366186ab2 (patch) | |
| tree | aeddd531ba4e4c9b5557b780d64ab74d771487fb /toolkit/source/awt/vclxcontainer.cxx | |
| parent | 505309ad2d33068449e2eabc62e90e81b4049cf0 (diff) | |
rename osl::SolarMutexGuard -> SolarGuard to avoid namespace ambiguity
Diffstat (limited to 'toolkit/source/awt/vclxcontainer.cxx')
| -rw-r--r-- | toolkit/source/awt/vclxcontainer.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index 64af167d8c7d..f0988c6d1eac 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -77,21 +77,21 @@ IMPL_XTYPEPROVIDER_END // ::com::sun::star::awt::XVclContainer void VCLXContainer::addVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - osl::SolarMutexGuard aGuard( GetMutex() ); + osl::SolarGuard aGuard( GetMutex() ); GetContainerListeners().addInterface( rxListener ); } void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - osl::SolarMutexGuard aGuard( GetMutex() ); + osl::SolarGuard aGuard( GetMutex() ); GetContainerListeners().removeInterface( rxListener ); } ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > VCLXContainer::getWindows( ) throw(::com::sun::star::uno::RuntimeException) { - osl::SolarMutexGuard aGuard( GetMutex() ); + osl::SolarGuard aGuard( GetMutex() ); // Bei allen Childs das Container-Interface abfragen... ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > aSeq; @@ -119,7 +119,7 @@ void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Ref // ::com::sun::star::awt::XVclContainerPeer void VCLXContainer::enableDialogControl( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException) { - osl::SolarMutexGuard aGuard( GetMutex() ); + osl::SolarGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -135,7 +135,7 @@ void VCLXContainer::enableDialogControl( sal_Bool bEnable ) throw(::com::sun::st void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& Components, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Tabs, sal_Bool bGroupControl ) throw(::com::sun::star::uno::RuntimeException) { - osl::SolarMutexGuard aGuard( GetMutex() ); + osl::SolarGuard aGuard( GetMutex() ); sal_uInt32 nCount = Components.getLength(); DBG_ASSERT( nCount == (sal_uInt32)Tabs.getLength(), "setTabOrder: TabCount != ComponentCount" ); @@ -180,7 +180,7 @@ void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::s void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& Components ) throw(::com::sun::star::uno::RuntimeException) { - osl::SolarMutexGuard aGuard( GetMutex() ); + osl::SolarGuard aGuard( GetMutex() ); sal_uInt32 nCount = Components.getLength(); const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > * pComps = Components.getConstArray(); |