From d88b292704957818eff9a348a524b5c90b40031b Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 16 Oct 2010 03:20:00 -0500 Subject: merge vosremoval-mutex.diff In practice the changeset is 'inspired' by vosremoval-mutex.diff but was essentially redone manually --- toolkit/source/awt/vclxdialog.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'toolkit/source/awt/vclxdialog.cxx') diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx index 4af3fabfa1ac..de96baff8009 100644 --- a/toolkit/source/awt/vclxdialog.cxx +++ b/toolkit/source/awt/vclxdialog.cxx @@ -80,7 +80,7 @@ VCLXDialog::~VCLXDialog() DBG_DTOR( VCLXDialog, NULL ); } -vos::IMutex& VCLXDialog::GetMutexImpl() +osl::SolarMutex& VCLXDialog::GetMutexImpl() { return VCLXWindow::GetMutex(); } @@ -102,7 +102,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXDialog, VCLXWindow, VCLXDialog_Base ); void SAL_CALL VCLXDialog::dispose() throw(::com::sun::star::uno::RuntimeException) { { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::lang::EventObject aDisposeEvent; aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this); @@ -147,7 +147,7 @@ void SAL_CALL VCLXDialog::allocateArea( const css::awt::Rectangle &rArea ) void VCLXDialog::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) { - ::vos::OClearableGuard aGuard( GetMutex() ); + ::osl::ClearableSolarMutexGuard aGuard( GetMutex() ); switch ( _rVclWindowEvent.GetId() ) { @@ -162,7 +162,7 @@ void VCLXDialog::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) void SAL_CALL VCLXDialog::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any &Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -179,7 +179,7 @@ void SAL_CALL VCLXDialog::setProperty( const ::rtl::OUString& PropertyName, cons ::com::sun::star::uno::Any SAL_CALL VCLXDialog::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aReturn; if ( GetWindow() ) @@ -200,7 +200,7 @@ void SAL_CALL VCLXDialog::setProperty( const ::rtl::OUString& PropertyName, cons void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -209,7 +209,7 @@ void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -218,7 +218,7 @@ void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeE ::rtl::OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aTitle; Window* pWindow = GetWindow(); @@ -229,7 +229,7 @@ void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeE sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int16 nRet = 0; if ( GetWindow() ) @@ -253,7 +253,7 @@ sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException) void VCLXDialog::endDialog( sal_Int32 nResult ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( nResult == BUTTONID_HELP ) { -- cgit v1.2.3