[Libreoffice-commits] .: patches/vba

[Norbert Thiebaud]

 patches/vba/vba-container-controls.diff |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 6801dd53fdd4aa1ff2ee7a799683992fb33d4ebe
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 28 16:27:55 2010 -0500

    fix Guard usage. Use osl::SolarGuard to guard on the SolarMutex

diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index f8c8a5e..f2b3e27 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -2533,7 +2533,7 @@ index 9332a0b..f367f7d 100644
 +}
 +void SAL_CALL VCLXMultiPage::dispose() throw(::com::sun::star::uno::RuntimeException)
 +{
-+    ::osl::MutexGuard aGuard( GetMutex() );
++    ::osl::SolarGuard aGuard( GetMutex() );
 +
 +    ::com::sun::star::lang::EventObject aObj;
 +    aObj.Source = (::cppu::OWeakObject*)this;
@@ -2557,7 +2557,7 @@ index 9332a0b..f367f7d 100644
 +void SAL_CALL VCLXMultiPage::draw( sal_Int32 nX, sal_Int32 nY )
 +throw(::com::sun::star::uno::RuntimeException)
 +{
-+    ::osl::MutexGuard aGuard( GetMutex() );
++    ::osl::SolarGuard aGuard( GetMutex() );
 +    Window* pWindow = GetWindow();
 +
 +    if ( pWindow )
@@ -2583,7 +2583,7 @@ index 9332a0b..f367f7d 100644
 +
 +uno::Any SAL_CALL VCLXMultiPage::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 +{
-+    ::osl::MutexGuard aGuard( GetMutex() );
++    ::osl::SolarGuard aGuard( GetMutex() );
 +    OSL_TRACE(" **** VCLXMultiPage::getProperty( %s )", 
 +        rtl::OUStringToOString( PropertyName,
 +        RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -2608,7 +2608,7 @@ index 9332a0b..f367f7d 100644
 +    const ::com::sun::star::uno::Any& Value )
 +throw(::com::sun::star::uno::RuntimeException)
 +{
-+    ::osl::MutexGuard aGuard( GetMutex() );
++    ::osl::SolarGuard aGuard( GetMutex() );
 +    OSL_TRACE(" **** VCLXMultiPage::setProperty( %s )", rtl::OUStringToOString( PropertyName, RTL_TEXTENCODING_UTF8 ).getStr() );
 +
 +    TabControl* pTabControl = (TabControl*)GetWindow();
@@ -2708,19 +2708,19 @@ index 9332a0b..f367f7d 100644
 +
 +void SAL_CALL VCLXMultiPage::addTabListener( const uno::Reference< awt::XTabListener >& xListener ) throw (uno::RuntimeException)
 +{
-+    ::osl::MutexGuard aGuard( GetMutex() );
++    ::osl::SolarGuard aGuard( GetMutex() );
 +    maTabListeners.addInterface( xListener );
 +}
 +
 +void SAL_CALL VCLXMultiPage::removeTabListener( const uno::Reference< awt::XTabListener >& xListener ) throw (uno::RuntimeException)
 +{
-+    ::osl::MutexGuard aGuard( GetMutex() );
++    ::osl::SolarGuard aGuard( GetMutex() );
 +    maTabListeners.addInterface( xListener );
 +}
 +
 +void SAL_CALL VCLXMultiPage::setTabProps( sal_Int32 ID, const uno::Sequence< beans::NamedValue >& Properties ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 +{
-+    ::osl::MutexGuard aGuard( GetMutex() );
++    ::osl::SolarGuard aGuard( GetMutex() );
 +    TabControl *pTabControl = getTabControl();
 +    if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( ID ) ) == NULL )
 +        throw lang::IndexOutOfBoundsException();
@@ -2741,7 +2741,7 @@ index 9332a0b..f367f7d 100644
 +uno::Sequence< beans::NamedValue > SAL_CALL VCLXMultiPage::getTabProps( sal_Int32 ID )
 +    throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 +{
-+    ::osl::MutexGuard aGuard( GetMutex() );
++    ::osl::SolarGuard aGuard( GetMutex() );
 +    TabControl *pTabControl = getTabControl();
 +    if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( ID ) ) == NULL )
 +        throw lang::IndexOutOfBoundsException();
@@ -2876,7 +2876,7 @@ index 9332a0b..f367f7d 100644
 +void SAL_CALL VCLXFrame::draw( sal_Int32 nX, sal_Int32 nY )
 +throw(::com::sun::star::uno::RuntimeException)
 +{
-+	::osl::MutexGuard aGuard( GetMutex() );
++	::osl::SolarGuard aGuard( GetMutex() );
 +	Window* pWindow = GetWindow();
 +
 +	if ( pWindow )
@@ -2905,7 +2905,7 @@ index 9332a0b..f367f7d 100644
 +    const ::com::sun::star::uno::Any& Value )
 +throw(::com::sun::star::uno::RuntimeException)
 +{
-+	::osl::MutexGuard aGuard( GetMutex() );
++	::osl::SolarGuard aGuard( GetMutex() );
 +
 +#if OSL_DEBUG_LEVEL > 0
 +	sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;