tweak after rebase from master

2 files changed, 16 insertions, 17 deletions

diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index fe2ba597d299..5154e769c6c3 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2535,7 +2535,7 @@ VCLXMultiPage::~VCLXMultiPage()
 }
 void SAL_CALL VCLXMultiPage::dispose() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::lang::EventObject aObj;
     aObj.Source = (::cppu::OWeakObject*)this;
@@ -2559,7 +2559,7 @@ IMPL_XTYPEPROVIDER_END
 void SAL_CALL VCLXMultiPage::draw( sal_Int32 nX, sal_Int32 nY )
 throw(::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     Window* pWindow = GetWindow();
 
     if ( pWindow )
@@ -2585,7 +2585,7 @@ throw(::com::sun::star::uno::RuntimeException)
 
 uno::Any SAL_CALL VCLXMultiPage::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     OSL_TRACE(" **** VCLXMultiPage::getProperty( %s )",
         rtl::OUStringToOString( PropertyName,
         RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -2610,7 +2610,7 @@ void SAL_CALL VCLXMultiPage::setProperty(
     const ::com::sun::star::uno::Any& Value )
 throw(::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     OSL_TRACE(" **** VCLXMultiPage::setProperty( %s )", rtl::OUStringToOString( PropertyName, RTL_TEXTENCODING_UTF8 ).getStr() );
 
     TabControl* pTabControl = (TabControl*)GetWindow();
@@ -2710,19 +2710,19 @@ sal_Int32 SAL_CALL VCLXMultiPage::getActiveTabID() throw (uno::RuntimeException)
 
 void SAL_CALL VCLXMultiPage::addTabListener( const uno::Reference< awt::XTabListener >& xListener ) throw (uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maTabListeners.addInterface( xListener );
 }
 
 void SAL_CALL VCLXMultiPage::removeTabListener( const uno::Reference< awt::XTabListener >& xListener ) throw (uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maTabListeners.addInterface( xListener );
 }
 
 void SAL_CALL VCLXMultiPage::setTabProps( sal_Int32 ID, const uno::Sequence< beans::NamedValue >& Properties ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     TabControl *pTabControl = getTabControl();
     if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( ID ) ) == NULL )
         throw lang::IndexOutOfBoundsException();
@@ -2743,7 +2743,7 @@ void SAL_CALL VCLXMultiPage::setTabProps( sal_Int32 ID, const uno::Sequence< bea
 uno::Sequence< beans::NamedValue > SAL_CALL VCLXMultiPage::getTabProps( sal_Int32 ID )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     TabControl *pTabControl = getTabControl();
     if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( ID ) ) == NULL )
         throw lang::IndexOutOfBoundsException();
@@ -6628,7 +6628,7 @@ IMPL_XTYPEPROVIDER_END
 void SAL_CALL VCLXFrame::draw( sal_Int32 nX, sal_Int32 nY )
 throw(::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     Window* pWindow = GetWindow();
 
     if ( pWindow )
@@ -6657,7 +6657,7 @@ void SAL_CALL VCLXFrame::setProperty(
     const ::com::sun::star::uno::Any& Value )
 throw(::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
 #if OSL_DEBUG_LEVEL > 0
     sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 9481d2ae37ed..031a4931f9c7 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -1717,7 +1717,8 @@ void UnoMultiPageControl::bindPage( const uno::Reference< awt::XControl >& _rxCo
 
 void UnoMultiPageControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw(RuntimeException)
 {
-    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
+
     UnoControlContainer::createPeer( rxToolkit, rParentPeer );
 
     uno::Sequence< uno::Reference< awt::XControl > > aCtrls = getControls();
@@ -2160,7 +2161,7 @@ UnoDialogContainerControl::getTypes() throw(RuntimeException)
 
 void UnoDialogContainerControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw(RuntimeException)
 {
-    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
     UnoControlContainer::createPeer( rxToolkit, rParentPeer );
 }
 
@@ -2266,7 +2267,7 @@ throw(RuntimeException)
 
 sal_Bool UnoDialogContainerControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException)
 {
-    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
 
     // destroy the old tab controller, if existent
     if ( mxTabController.is() )
@@ -2339,8 +2340,7 @@ sal_Bool UnoDialogContainerControl::setModel( const Reference< XControlModel >&
 }
 void UnoDialogContainerControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException)
 {
-    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+    SolarMutexGuard aSolarGuard;
 
     UnoControl::setDesignMode( bOn );
 
@@ -2360,7 +2360,6 @@ void UnoDialogContainerControl::setDesignMode( sal_Bool bOn ) throw(RuntimeExcep
 void UnoDialogContainerControl::elementInserted( const ContainerEvent& Event ) throw(RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
-
     Reference< XControlModel > xModel;
     ::rtl::OUString aName;
 
@@ -2598,7 +2597,7 @@ throw(RuntimeException)
 sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException)
 {
         // #Can we move all the Resource stuff to the UnoDialogContainerControl ?
-    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
         sal_Bool bRet = UnoDialogContainerControl::setModel( rxModel );
     ImplStartListingForResourceEvents();
     return bRet;