rename osl::SolarMutexGuard -> SolarGuard to avoid namespace ambiguity

6 files changed, 130 insertions, 130 deletions

diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx
index 703ce138629a..ce22d1b7c914 100644
--- a/svtools/source/toolpanel/paneltabbarpeer.cxx
+++ b/svtools/source/toolpanel/paneltabbarpeer.cxx
@@ -75,7 +75,7 @@ namespace svt
     //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessibleContext > PanelTabBarPeer::CreateAccessibleContext()
     {
-        ::osl::SolarMutexGuard aSolarGuard( GetMutex() );
+        ::osl::SolarGuard aSolarGuard( GetMutex() );
         if ( m_pTabBar == NULL )
             throw DisposedException( ::rtl::OUString(), *this );
 
@@ -91,7 +91,7 @@ namespace svt
     void SAL_CALL PanelTabBarPeer::dispose() throw(RuntimeException)
     {
         {
-            ::osl::SolarMutexGuard aSolarGuard( GetMutex() );
+            ::osl::SolarGuard aSolarGuard( GetMutex() );
             m_pTabBar = NULL;
         }
         VCLXWindow::dispose();
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
index d99dfcefe855..c0a6f041f06f 100644
--- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
@@ -75,7 +75,7 @@ namespace svt
     //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessibleContext > ToolPanelDeckPeer::CreateAccessibleContext()
     {
-        ::osl::SolarMutexGuard aSolarGuard( GetMutex() );
+        ::osl::SolarGuard aSolarGuard( GetMutex() );
         if ( m_pDeck == NULL )
             throw DisposedException( ::rtl::OUString(), *this );
 
@@ -89,7 +89,7 @@ namespace svt
     void SAL_CALL ToolPanelDeckPeer::dispose() throw(RuntimeException)
     {
         {
-            ::osl::SolarMutexGuard aSolarGuard( GetMutex() );
+            ::osl::SolarGuard aSolarGuard( GetMutex() );
             m_pDeck = NULL;
         }
         VCLXWindow::dispose();
diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
index ce6d7300f23c..e6282c530a00 100644
--- a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
@@ -134,7 +134,7 @@ namespace svt
     //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessibleContext > ToolPanelDrawerPeer::CreateAccessibleContext()
     {
-        ::osl::SolarMutexGuard aSolarGuard( GetMutex() );
+        ::osl::SolarGuard aSolarGuard( GetMutex() );
         return new ToolPanelDrawerContext( *this );
     }
 
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 447cf8f9715d..5251376f1bc4 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -124,7 +124,7 @@ void SAL_CALL SVTXGridControl::removeSelectionListener(const ::com::sun::star::u
 
 void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const Any& aValue) throw(RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     TableControl* pTable = (TableControl*)GetWindow();
     switch( GetPropertyId( PropertyName ) )
@@ -363,7 +363,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
 
 Any SVTXGridControl::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     const sal_uInt16 nPropId = GetPropertyId( PropertyName );
     TableControl* pTable = (TableControl*)GetWindow();
@@ -422,7 +422,7 @@ void SVTXGridControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 }
 void SAL_CALL SVTXGridControl::setVisible( sal_Bool bVisible ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
     TableControl* pTable = (TableControl*)GetWindow();
     if ( pTable )
     {
@@ -432,13 +432,13 @@ void SAL_CALL SVTXGridControl::setVisible( sal_Bool bVisible ) throw(::com::sun:
 }
 void SAL_CALL SVTXGridControl::setFocus() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
     if ( GetWindow())
         GetWindow()->GrabFocus();
 }
 void SAL_CALL SVTXGridControl::rowAdded(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     std::vector< Any > newRow;
     Sequence< Any > rawRowData = Event.rowData;
@@ -486,7 +486,7 @@ void SAL_CALL SVTXGridControl::rowAdded(const ::com::sun::star::awt::grid::GridD
 
 void SAL_CALL SVTXGridControl::rowRemoved(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     TableControl* pTable = (TableControl*)GetWindow();
     if(Event.index == -1)
@@ -529,7 +529,7 @@ void SAL_CALL SVTXGridControl::rowRemoved(const ::com::sun::star::awt::grid::Gri
 
 void SAL_CALL  SVTXGridControl::columnChanged(const ::com::sun::star::awt::grid::GridColumnEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     TableControl* pTable = (TableControl*)GetWindow();
     if(Event.valueName == rtl::OUString::createFromAscii("ColumnResize"))
@@ -578,7 +578,7 @@ void SAL_CALL  SVTXGridControl::columnChanged(const ::com::sun::star::awt::grid:
 }
 void SAL_CALL  SVTXGridControl::dataChanged(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     TableControl* pTable = (TableControl*)GetWindow();
     if(Event.valueName == rtl::OUString::createFromAscii("RowHeight"))
@@ -819,7 +819,7 @@ void SAL_CALL SVTXGridControl::selectColumn(::sal_Int32 x) throw (::com::sun::st
 }
 void SVTXGridControl::dispose() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::lang::EventObject aObj;
     aObj.Source = (::cppu::OWeakObject*)this;
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index b4bbbe61cfc1..5ec1f1cc40cd 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -487,7 +487,7 @@ UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (Runtim
 
 void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, bool bSetSelection ) throw( RuntimeException, IllegalArgumentException )
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
 
@@ -549,7 +549,7 @@ void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect,
 
 sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
     ChangeNodesSelection( rSelection, true, true );
     return sal_True;
 }
@@ -558,7 +558,7 @@ sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (Illega
 
 Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
 
@@ -625,7 +625,7 @@ void SAL_CALL TreeControlPeer::removeSelection( const Any& rSelection ) throw (I
 
 void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
     getTreeListBoxOrThrow().SelectAll( FALSE );
 }
 
@@ -633,7 +633,7 @@ void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException)
 
 sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
     return getTreeListBoxOrThrow().GetSelectionCount();
 }
 
@@ -679,7 +679,7 @@ Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementExcepti
 
 Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() throw (RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
 
@@ -703,7 +703,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration()
 
 Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumeration() throw (RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
 
@@ -729,7 +729,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer
 
 OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
     return msDefaultExpandedGraphicURL;
 }
 
@@ -737,7 +737,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com::
 
 void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const ::rtl::OUString& sDefaultExpandedGraphicURL ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
     if( msDefaultExpandedGraphicURL != sDefaultExpandedGraphicURL )
     {
         if( sDefaultExpandedGraphicURL.getLength() )
@@ -767,7 +767,7 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const ::rtl::OUStri
 
 OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
     return msDefaultCollapsedGraphicURL;
 }
 
@@ -775,7 +775,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com:
 
 void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const ::rtl::OUString& sDefaultCollapsedGraphicURL ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
     if( msDefaultCollapsedGraphicURL != sDefaultCollapsedGraphicURL )
     {
         if( sDefaultCollapsedGraphicURL.getLength() )
@@ -805,7 +805,7 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const ::rtl::OUStr
 
 sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -816,7 +816,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >&
 
 sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
     return !isNodeExpanded( xNode );
 }
 
@@ -824,7 +824,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >
 
 void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -836,7 +836,7 @@ void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xN
 
 sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -847,7 +847,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >&
 
 void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -859,7 +859,7 @@ void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode )
 
 void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -885,7 +885,7 @@ void SAL_CALL TreeControlPeer::removeTreeExpansionListener( const Reference< XTr
 
 Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
 
@@ -903,7 +903,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x
 
 Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
 
@@ -921,7 +921,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_
 
 awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode >& i_Node ) throw (IllegalArgumentException, RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     UnoTreeListEntry* pEntry = getEntry( i_Node, true );
@@ -934,7 +934,7 @@ awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode
 
 sal_Bool SAL_CALL TreeControlPeer::isEditing(  ) throw (RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     return rTree.IsEditingActive() ? sal_True : sal_False;
@@ -944,7 +944,7 @@ sal_Bool SAL_CALL TreeControlPeer::isEditing(  ) throw (RuntimeException)
 
 sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     if( rTree.IsEditingActive() )
@@ -962,7 +962,7 @@ sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException)
 
 void SAL_CALL TreeControlPeer::cancelEditing(  ) throw (RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     rTree.EndEditing(FALSE);
@@ -972,7 +972,7 @@ void SAL_CALL TreeControlPeer::cancelEditing(  ) throw (RuntimeException)
 
 void SAL_CALL TreeControlPeer::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -1042,7 +1042,7 @@ bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const XubString&
 
 void SAL_CALL TreeControlPeer::treeNodesChanged( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     if( mnEditLock != 0 )
         return;
@@ -1052,7 +1052,7 @@ void SAL_CALL TreeControlPeer::treeNodesChanged( const ::com::sun::star::awt::tr
 
 void SAL_CALL TreeControlPeer::treeNodesInserted( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     if( mnEditLock != 0 )
         return;
@@ -1062,7 +1062,7 @@ void SAL_CALL TreeControlPeer::treeNodesInserted( const ::com::sun::star::awt::t
 
 void SAL_CALL TreeControlPeer::treeNodesRemoved( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     if( mnEditLock != 0 )
         return;
@@ -1072,7 +1072,7 @@ void SAL_CALL TreeControlPeer::treeNodesRemoved( const ::com::sun::star::awt::tr
 
 void SAL_CALL TreeControlPeer::treeStructureChanged( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     if( mnEditLock != 0 )
         return;
@@ -1242,7 +1242,7 @@ OUString TreeControlPeer::getEntryString( const Any& rValue )
 void SAL_CALL TreeControlPeer::disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException)
 {
     // model is disposed, so we clear our tree
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     rTree.Clear();
     mxDataModel.clear();
@@ -1282,7 +1282,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
 
 ::com::sun::star::awt::Size TreeControlPeer::getMinimumSize() throw(RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::awt::Size aSz;
 /* todo
@@ -1300,7 +1300,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
 
 ::com::sun::star::awt::Size TreeControlPeer::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::awt::Size aSz = rNewSize;
 /* todo
@@ -1317,7 +1317,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
 
 void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& aValue) throw(RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
 
@@ -1420,7 +1420,7 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An
 
 Any TreeControlPeer::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     const sal_uInt16 nPropId = GetPropertyId( PropertyName );
     if( (nPropId >= BASEPROPERTY_TREE_START) && (nPropId <= BASEPROPERTY_TREE_END) )
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index daec6a674a59..cc40453f2d72 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -226,7 +226,7 @@ void VCLXMultiLineEdit::removeTextListener( const ::com::sun::star::uno::Referen
 
 void VCLXMultiLineEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow();
     if ( pEdit )
@@ -243,7 +243,7 @@ void VCLXMultiLineEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun
 
 void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow();
     if ( pEdit )
@@ -255,7 +255,7 @@ void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel
 
 ::rtl::OUString VCLXMultiLineEdit::getText() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::rtl::OUString aText;
     MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow();
@@ -266,7 +266,7 @@ void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel
 
 ::rtl::OUString VCLXMultiLineEdit::getSelectedText() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::rtl::OUString aText;
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
@@ -278,7 +278,7 @@ void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel
 
 void VCLXMultiLineEdit::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
     if ( pMultiLineEdit )
@@ -289,7 +289,7 @@ void VCLXMultiLineEdit::setSelection( const ::com::sun::star::awt::Selection& aS
 
 ::com::sun::star::awt::Selection VCLXMultiLineEdit::getSelection() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::awt::Selection aSel;
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
@@ -303,7 +303,7 @@ void VCLXMultiLineEdit::setSelection( const ::com::sun::star::awt::Selection& aS
 
 sal_Bool VCLXMultiLineEdit::isEditable() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
     return ( pMultiLineEdit && !pMultiLineEdit->IsReadOnly() && pMultiLineEdit->IsEnabled() ) ? sal_True : sal_False;
@@ -311,7 +311,7 @@ sal_Bool VCLXMultiLineEdit::isEditable() throw(::com::sun::star::uno::RuntimeExc
 
 void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
     if ( pMultiLineEdit )
@@ -320,7 +320,7 @@ void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star
 
 void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
     if ( pMultiLineEdit )
@@ -329,7 +329,7 @@ void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::
 
 sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
     return pMultiLineEdit ? (sal_Int16)pMultiLineEdit->GetMaxTextLen() : (sal_Int16)0;
@@ -337,7 +337,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
 
 ::rtl::OUString VCLXMultiLineEdit::getTextLines() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::rtl::OUString aText;
     MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow();
@@ -348,7 +348,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
 
 ::com::sun::star::awt::Size VCLXMultiLineEdit::getMinimumSize() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::awt::Size aSz;
     MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow();
@@ -364,7 +364,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
 
 ::com::sun::star::awt::Size VCLXMultiLineEdit::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::awt::Size aSz = rNewSize;
     MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow();
@@ -375,7 +375,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
 
 ::com::sun::star::awt::Size VCLXMultiLineEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::awt::Size aSz;
     MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow();
@@ -386,7 +386,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
 
 void VCLXMultiLineEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     nCols = nLines = 0;
     MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow();
@@ -423,7 +423,7 @@ void VCLXMultiLineEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEven
 
 void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*)GetWindow();
     if ( pMultiLineEdit )
@@ -479,7 +479,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const
 
 ::com::sun::star::uno::Any VCLXMultiLineEdit::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::uno::Any aProp;
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*)GetWindow();
@@ -523,7 +523,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const
 
 void SAL_CALL VCLXMultiLineEdit::setFocus(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     // don't grab the focus if we already have it. Reason is that the only thing which the edit
     // does is forwarding the focus to it's text window. This text window then does a "select all".
@@ -578,7 +578,7 @@ IMPL_XTYPEPROVIDER_END
 
 void SAL_CALL VCLXFileControl::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FileControl* pControl = (FileControl*)GetWindow();
     if ( pControl )
@@ -628,7 +628,7 @@ void VCLXFileControl::removeTextListener( const ::com::sun::star::uno::Reference
 
 void VCLXFileControl::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -643,7 +643,7 @@ void VCLXFileControl::setText( const ::rtl::OUString& aText ) throw(::com::sun::
 
 void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FileControl* pFileControl = (FileControl*) GetWindow();
     if ( pFileControl )
@@ -655,7 +655,7 @@ void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel,
 
 ::rtl::OUString VCLXFileControl::getText() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::rtl::OUString aText;
     Window* pWindow = GetWindow();
@@ -666,7 +666,7 @@ void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel,
 
 ::rtl::OUString VCLXFileControl::getSelectedText() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::rtl::OUString aText;
     FileControl* pFileControl = (FileControl*) GetWindow();
@@ -678,7 +678,7 @@ void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel,
 
 void VCLXFileControl::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FileControl* pFileControl = (FileControl*) GetWindow();
     if ( pFileControl )
@@ -687,7 +687,7 @@ void VCLXFileControl::setSelection( const ::com::sun::star::awt::Selection& aSel
 
 ::com::sun::star::awt::Selection VCLXFileControl::getSelection() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::awt::Selection aSel;
     FileControl* pFileControl = (FileControl*) GetWindow();
@@ -701,7 +701,7 @@ void VCLXFileControl::setSelection( const ::com::sun::star::awt::Selection& aSel
 
 sal_Bool VCLXFileControl::isEditable() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FileControl* pFileControl = (FileControl*) GetWindow();
     return ( pFileControl && !pFileControl->GetEdit().IsReadOnly() && pFileControl->GetEdit().IsEnabled() ) ? sal_True : sal_False;
@@ -709,7 +709,7 @@ sal_Bool VCLXFileControl::isEditable() throw(::com::sun::star::uno::RuntimeExcep
 
 void VCLXFileControl::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FileControl* pFileControl = (FileControl*) GetWindow();
     if ( pFileControl )
@@ -718,7 +718,7 @@ void VCLXFileControl::setEditable( sal_Bool bEditable ) throw(::com::sun::star::
 
 void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FileControl* pFileControl = (FileControl*) GetWindow();
     if ( pFileControl )
@@ -727,7 +727,7 @@ void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::un
 
 sal_Int16 VCLXFileControl::getMaxTextLen() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FileControl* pFileControl = (FileControl*) GetWindow();
     return pFileControl ? pFileControl->GetEdit().GetMaxTextLen() : 0;
@@ -745,7 +745,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG )
 
 ::com::sun::star::awt::Size VCLXFileControl::getMinimumSize() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::awt::Size aSz;
     FileControl* pControl = (FileControl*) GetWindow();
@@ -767,7 +767,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG )
 
 ::com::sun::star::awt::Size VCLXFileControl::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::awt::Size aSz =rNewSize;
     FileControl* pControl = (FileControl*) GetWindow();
@@ -782,7 +782,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG )
 
 ::com::sun::star::awt::Size VCLXFileControl::getMinimumSize( sal_Int16 nCols, sal_Int16 ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::awt::Size aSz;
     FileControl* pControl = (FileControl*) GetWindow();
@@ -796,7 +796,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG )
 
 void VCLXFileControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     nCols = 0;
     nLines = 1;
@@ -847,7 +847,7 @@ void SVTXFormattedField::SetWindow( Window* _pWindow )
 // --------------------------------------------------------------------------------------
 void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -972,7 +972,7 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const
 // --------------------------------------------------------------------------------------
 ::com::sun::star::uno::Any SVTXFormattedField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::uno::Any aReturn;
 
@@ -1433,7 +1433,7 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     {
         case VCLEVENT_ROADMAP_ITEMSELECTED:
         {
-            ::osl::SolarMutexGuard aGuard( GetMutex() );
+            ::osl::SolarGuard aGuard( GetMutex() );
             ::svt::ORoadmap* pField = GetRoadmap();
             if ( pField )
             {
@@ -1455,7 +1455,7 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 
 void SVTXRoadmap::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
     ::svt::ORoadmap* pField = GetRoadmap();
     if ( pField )
     {
@@ -1524,7 +1524,7 @@ RMItemData SVTXRoadmap::GetRMItemData( const ::com::sun::star::container::Contai
 
 void SVTXRoadmap::elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent )throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
     ::svt::ORoadmap* pField = GetRoadmap();
     if ( pField )
     {
@@ -1537,7 +1537,7 @@ void SVTXRoadmap::elementInserted( const ::com::sun::star::container::ContainerE
 
 void SVTXRoadmap::elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent )throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
     ::svt::ORoadmap* pField = GetRoadmap();
     if ( pField )
     {
@@ -1551,7 +1551,7 @@ void SVTXRoadmap::elementRemoved( const ::com::sun::star::container::ContainerEv
 
 void SVTXRoadmap::elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent )throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
     ::svt::ORoadmap* pField = GetRoadmap();
     if ( pField )
     {
@@ -1567,7 +1567,7 @@ void SVTXRoadmap::elementReplaced( const ::com::sun::star::container::ContainerE
 // --------------------------------------------------------------------------------------
 void SVTXRoadmap::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::svt::ORoadmap* pField = GetRoadmap();
     if ( pField )
@@ -1622,7 +1622,7 @@ void SVTXRoadmap::setProperty( const ::rtl::OUString& PropertyName, const ::com:
 // --------------------------------------------------------------------------------------
 ::com::sun::star::uno::Any SVTXRoadmap::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::uno::Any aReturn;
 
@@ -1696,7 +1696,7 @@ IMPL_XTYPEPROVIDER_END
 
 void SVTXNumericField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1705,7 +1705,7 @@ void SVTXNumericField::setValue( double Value ) throw(::com::sun::star::uno::Run
 
 double SVTXNumericField::getValue() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetValue() : 0;
@@ -1713,7 +1713,7 @@ double SVTXNumericField::getValue() throw(::com::sun::star::uno::RuntimeExceptio
 
 void SVTXNumericField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1722,7 +1722,7 @@ void SVTXNumericField::setMin( double Value ) throw(::com::sun::star::uno::Runti
 
 double SVTXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetMinValue() : 0;
@@ -1730,7 +1730,7 @@ double SVTXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException)
 
 void SVTXNumericField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1739,7 +1739,7 @@ void SVTXNumericField::setMax( double Value ) throw(::com::sun::star::uno::Runti
 
 double SVTXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetMaxValue() : 0;
@@ -1747,7 +1747,7 @@ double SVTXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException)
 
 void SVTXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1756,7 +1756,7 @@ void SVTXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::Run
 
 double SVTXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetSpinFirst() : 0;
@@ -1764,7 +1764,7 @@ double SVTXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeExceptio
 
 void SVTXNumericField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1773,7 +1773,7 @@ void SVTXNumericField::setLast( double Value ) throw(::com::sun::star::uno::Runt
 
 double SVTXNumericField::getLast() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetSpinLast() : 0;
@@ -1781,7 +1781,7 @@ double SVTXNumericField::getLast() throw(::com::sun::star::uno::RuntimeException
 
 void SVTXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1790,7 +1790,7 @@ void SVTXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno::
 
 double SVTXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetSpinSize() : 0;
@@ -1798,7 +1798,7 @@ double SVTXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeExcep
 
 void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1807,7 +1807,7 @@ void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::sta
 
 sal_Int16 SVTXNumericField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetDecimalDigits() : 0;
@@ -1815,7 +1815,7 @@ sal_Int16 SVTXNumericField::getDecimalDigits() throw(::com::sun::star::uno::Runt
 
 void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1824,7 +1824,7 @@ void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::sta
 
 sal_Bool SVTXNumericField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->IsStrictFormat() : sal_False;
@@ -1862,7 +1862,7 @@ IMPL_XTYPEPROVIDER_END
 
 void SVTXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1871,7 +1871,7 @@ void SVTXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::Ru
 
 double SVTXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetValue() : 0;
@@ -1879,7 +1879,7 @@ double SVTXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeExcepti
 
 void SVTXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1888,7 +1888,7 @@ void SVTXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::Runt
 
 double SVTXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetMinValue() : 0;
@@ -1896,7 +1896,7 @@ double SVTXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException
 
 void SVTXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1905,7 +1905,7 @@ void SVTXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::Runt
 
 double SVTXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetMaxValue() : 0;
@@ -1913,7 +1913,7 @@ double SVTXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException
 
 void SVTXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1922,7 +1922,7 @@ void SVTXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::Ru
 
 double SVTXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetSpinFirst() : 0;
@@ -1930,7 +1930,7 @@ double SVTXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeExcepti
 
 void SVTXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1939,7 +1939,7 @@ void SVTXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::Run
 
 double SVTXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetSpinLast() : 0;
@@ -1947,7 +1947,7 @@ double SVTXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeExceptio
 
 void SVTXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1956,7 +1956,7 @@ void SVTXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno:
 
 double SVTXCurrencyField::getSpinSize() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetSpinSize() : 0;
@@ -1964,7 +1964,7 @@ double SVTXCurrencyField::getSpinSize() throw(::com::sun::star::uno::RuntimeExce
 
 void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1973,7 +1973,7 @@ void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::st
 
 sal_Int16 SVTXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetDecimalDigits() : 0;
@@ -1981,7 +1981,7 @@ sal_Int16 SVTXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::Run
 
 void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1990,7 +1990,7 @@ void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::st
 
 sal_Bool SVTXCurrencyField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->IsStrictFormat() : sal_False;
@@ -1998,7 +1998,7 @@ sal_Bool SVTXCurrencyField::isStrictFormat() throw(::com::sun::star::uno::Runtim
 
 void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::uno::Any aReturn;
 
@@ -2038,7 +2038,7 @@ void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const
 
 ::com::sun::star::uno::Any SVTXCurrencyField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::uno::Any aReturn;
 
@@ -2159,7 +2159,7 @@ IMPL_XTYPEPROVIDER_END
 // ::com::sun::star::awt::XProgressBar
 void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -2171,7 +2171,7 @@ void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(::com::sun::s
 
 void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -2185,7 +2185,7 @@ void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::s
 
 void VCLXProgressBar::setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     m_nValue = nValue;
     ImplUpdateValue();
@@ -2193,7 +2193,7 @@ void VCLXProgressBar::setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::
 
 void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException )
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     if ( nMin < nMax )
     {
@@ -2213,7 +2213,7 @@ void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::su
 
 sal_Int32 VCLXProgressBar::getValue() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     return m_nValue;
 }
@@ -2221,7 +2221,7 @@ sal_Int32 VCLXProgressBar::getValue() throw(::com::sun::star::uno::RuntimeExcept
 // ::com::sun::star::awt::VclWindowPeer
 void VCLXProgressBar::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ProgressBar* pProgressBar = (ProgressBar*)GetWindow();
     if ( pProgressBar )
@@ -2279,7 +2279,7 @@ void VCLXProgressBar::setProperty( const ::rtl::OUString& PropertyName, const ::
 
 ::com::sun::star::uno::Any VCLXProgressBar::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarMutexGuard aGuard( GetMutex() );
+    ::osl::SolarGuard aGuard( GetMutex() );
 
     ::com::sun::star::uno::Any aProp;
     ProgressBar* pProgressBar = (ProgressBar*)GetWindow();