replace ScUnoGuard by SolarMutexGuard

ScUnoGaurd provide a Guard wrapper around Application::GetSolarMutex(). This is now provided by the class SolarMutexGuard.
author: Norbert Thiebaud <nthiebaud@gmail.com> 2010-10-14 22:18:02 -0500
committer: Norbert Thiebaud <nthiebaud@gmail.com> 2010-10-25 17:57:35 -0500
commit: 2622a457404ff6593535219aab8e3cba1cb07c9e (patch)
tree: c0252373576c4ae240a27e54ce22239532038774 /sc/source/ui/Accessibility
parent: defa3490b432f331b0f27a9ab14795f476cd3990 (diff)
17 files changed, 240 insertions, 241 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 9d16743c4057..aaf38396ac42 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -41,7 +41,6 @@
 #include "document.hxx"
 #include "attrib.hxx"
 #include "miscuno.hxx"
-#include "unoguard.hxx"
 #include "editsrc.hxx"
 #include "dociter.hxx"
 #include "cell.hxx"
@@ -56,6 +55,7 @@
 #include <editeng/brshitem.hxx>
 #include <comphelper/sequence.hxx>
 #include <float.h>
+#include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
@@ -100,7 +100,7 @@ void ScAccessibleCell::Init()
 
 void SAL_CALL ScAccessibleCell::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     // #100593# dispose in AccessibleStaticTextBase
     Dispose();
 
@@ -134,7 +134,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleCell::getAccessibleAtPoint(
 void SAL_CALL ScAccessibleCell::grabFocus(  )
         throw (uno::RuntimeException)
 {
-     ScUnoGuard aGuard;
+     SolarMutexGuard aGuard;
     IsObjectValid();
     if (getAccessibleParent().is() && mpViewShell)
     {
@@ -227,7 +227,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
     ScAccessibleCell::getAccessibleStateSet(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
     if (getAccessibleParent().is())
     {
@@ -265,7 +265,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL
        ScAccessibleCell::getAccessibleRelationSet(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     utl::AccessibleRelationSetHelper* pRelationSet = NULL;
     if (mpAccDoc)
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 75a853433d69..5e59d9b09eee 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -37,7 +37,6 @@
 #include "document.hxx"
 #include "docfunc.hxx"
 #include "cell.hxx"
-#include "unoguard.hxx"
 #include "scresid.hxx"
 #include "sc.hrc"
 #include "unonames.hxx"
@@ -51,6 +50,7 @@
 #include <rtl/uuid.h>
 #include <comphelper/sequence.hxx>
 #include <sfx2/objsh.hxx>
+#include <vcl/svapp.hxx>
 
 #include <float.h>
 
@@ -81,7 +81,7 @@ ScAccessibleCellBase::~ScAccessibleCellBase()
 sal_Bool SAL_CALL ScAccessibleCellBase::isVisible(  )
         throw (uno::RuntimeException)
 {
-     ScUnoGuard aGuard;
+     SolarMutexGuard aGuard;
     IsObjectValid();
     // test whether the cell is hidden (column/row - hidden/filtered)
     sal_Bool bVisible(sal_True);
@@ -101,7 +101,7 @@ sal_Bool SAL_CALL ScAccessibleCellBase::isVisible(  )
 sal_Int32 SAL_CALL ScAccessibleCellBase::getForeground()
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     sal_Int32 nColor(0);
     if (mpDoc)
@@ -141,7 +141,7 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getForeground()
 sal_Int32 SAL_CALL ScAccessibleCellBase::getBackground()
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     sal_Int32 nColor(0);
 
@@ -207,7 +207,7 @@ sal_Int32
     ScAccessibleCellBase::getAccessibleIndexInParent(void)
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     return mnIndex;
 }
@@ -244,7 +244,7 @@ uno::Any SAL_CALL
     ScAccessibleCellBase::getCurrentValue(  )
     throw (uno::RuntimeException)
 {
-     ScUnoGuard aGuard;
+     SolarMutexGuard aGuard;
     IsObjectValid();
     uno::Any aAny;
     if (mpDoc)
@@ -257,7 +257,7 @@ sal_Bool SAL_CALL
     ScAccessibleCellBase::setCurrentValue( const uno::Any& aNumber )
     throw (uno::RuntimeException)
 {
-     ScUnoGuard aGuard;
+     SolarMutexGuard aGuard;
     IsObjectValid();
     double fValue = 0;
     sal_Bool bResult(sal_False);
@@ -319,7 +319,7 @@ uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleCellBase::getImplementationId(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     static uno::Sequence<sal_Int8> aId;
     if (aId.getLength() == 0)
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index c5a79d90604d..621a55ae0c18 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -31,7 +31,6 @@
 
 
 #include "AccessibleContextBase.hxx"
-#include "unoguard.hxx"
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -47,6 +46,7 @@
 #include <vcl/unohelp.hxx>
 #include <tools/color.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
+#include <vcl/svapp.hxx>
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
@@ -99,7 +99,7 @@ void ScAccessibleContextBase::Init()
 
 void SAL_CALL ScAccessibleContextBase::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
 //  CommitDefunc(); not necessary and should not be send, because it cost a lot of time
 
     // hold reference to make sure that the destructor is not called
@@ -173,7 +173,7 @@ uno::Reference< XAccessibleContext> SAL_CALL
 sal_Bool SAL_CALL ScAccessibleContextBase::containsPoint(const awt::Point& rPoint )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     return Rectangle (Point(), GetBoundingBox().GetSize()).IsInside(VCLPoint(rPoint));
 }
@@ -189,7 +189,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleContextBase::getAccessibleAtP
 awt::Rectangle SAL_CALL ScAccessibleContextBase::getBounds(  )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     return AWTRectangle(GetBoundingBox());
 }
@@ -197,7 +197,7 @@ awt::Rectangle SAL_CALL ScAccessibleContextBase::getBounds(  )
 awt::Point SAL_CALL ScAccessibleContextBase::getLocation(  )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     return AWTPoint(GetBoundingBox().TopLeft());
 }
@@ -205,7 +205,7 @@ awt::Point SAL_CALL ScAccessibleContextBase::getLocation(  )
 awt::Point SAL_CALL ScAccessibleContextBase::getLocationOnScreen(  )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     return AWTPoint(GetBoundingBoxOnScreen().TopLeft());
 }
@@ -213,7 +213,7 @@ awt::Point SAL_CALL ScAccessibleContextBase::getLocationOnScreen(  )
 awt::Size SAL_CALL ScAccessibleContextBase::getSize(  )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     return AWTSize(GetBoundingBox().GetSize());
 }
@@ -221,7 +221,7 @@ awt::Size SAL_CALL ScAccessibleContextBase::getSize(  )
 sal_Bool SAL_CALL ScAccessibleContextBase::isShowing(  )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     sal_Bool bShowing(sal_False);
     if (mxParent.is())
@@ -290,7 +290,7 @@ sal_Int32 SAL_CALL
        ScAccessibleContextBase::getAccessibleIndexInParent(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     //  Use a simple but slow solution for now.  Optimize later.
    //   Return -1 to indicate that this object's parent does not know about the
@@ -331,7 +331,7 @@ sal_Int16 SAL_CALL
        ScAccessibleContextBase::getAccessibleDescription(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (!msDescription.getLength())
     {
@@ -358,7 +358,7 @@ OUString SAL_CALL
        ScAccessibleContextBase::getAccessibleName(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (!msName.getLength())
     {
@@ -400,7 +400,7 @@ lang::Locale SAL_CALL
     throw (IllegalAccessibleComponentStateException,
         uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (mxParent.is())
     {
@@ -424,7 +424,7 @@ void SAL_CALL
 {
     if (xListener.is())
     {
-        ScUnoGuard aGuard;
+        SolarMutexGuard aGuard;
         IsObjectValid();
         if (!IsDefunc())
         {
@@ -442,7 +442,7 @@ void SAL_CALL
 {
     if (xListener.is())
     {
-        ScUnoGuard aGuard;
+        SolarMutexGuard aGuard;
         if (!IsDefunc() && mnClientId)
         {
             sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener );
@@ -465,7 +465,7 @@ void SAL_CALL ScAccessibleContextBase::disposing(
     const lang::EventObject& rSource )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     if (rSource.Source == mxParent)
         dispose();
 }
@@ -528,7 +528,7 @@ uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleContextBase::getImplementationId(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     static uno::Sequence<sal_Int8> aId;
     if (aId.getLength() == 0)
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 6a279f61d281..c70aa3a5e56e 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -53,11 +53,11 @@
 #include "csvgrid.hxx"
 #include "AccessibleText.hxx"
 #include "editsrc.hxx"
-#include "unoguard.hxx"
 #include "scresid.hxx"
 #include "sc.hrc"
 #include "scmod.hxx"
 #include <svtools/colorcfg.hxx>
+#include <vcl/svapp.hxx>
 // ause
 #include "editutil.hxx"
 
@@ -119,7 +119,7 @@ ScAccessibleCsvControl::~ScAccessibleCsvControl()
 
 void SAL_CALL ScAccessibleCsvControl::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     mpControl = NULL;
     ScAccessibleContextBase::disposing();
 }
@@ -136,14 +136,14 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvControl::getAccessibleAtPoint(
 
 sal_Bool SAL_CALL ScAccessibleCsvControl::isVisible() throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return implGetControl().IsVisible();
 }
 
 void SAL_CALL ScAccessibleCsvControl::grabFocus() throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     implGetControl().GrabFocus();
 }
@@ -200,21 +200,21 @@ void ScAccessibleCsvControl::SendRemoveColumnEvent( sal_uInt32 /* nFirstColumn *
 
 Rectangle ScAccessibleCsvControl::GetBoundingBoxOnScreen() const throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return implGetControl().GetWindowExtentsRelative( NULL );
 }
 
 Rectangle ScAccessibleCsvControl::GetBoundingBox() const throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return implGetControl().GetWindowExtentsRelative( implGetControl().GetAccessibleParentWindow() );
 }
 
 void ScAccessibleCsvControl::getUuid( Sequence< sal_Int8 >& rSeq )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     if( !rSeq.hasElements() )
     {
@@ -264,7 +264,7 @@ Reference< XAccessible > ScAccessibleCsvControl::implGetChildByRole(
 
 AccessibleStateSetHelper* ScAccessibleCsvControl::implCreateStateSet()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     AccessibleStateSetHelper* pStateSet = new AccessibleStateSetHelper();
     if( implIsAlive() )
     {
@@ -390,7 +390,7 @@ ScAccessibleCsvRuler::~ScAccessibleCsvRuler()
 sal_Int32 SAL_CALL ScAccessibleCsvRuler::getForeground(  )
     throw (RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return implGetRuler().GetSettings().GetStyleSettings().GetLabelTextColor().GetColor();
 }
@@ -398,7 +398,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getForeground(  )
 sal_Int32 SAL_CALL ScAccessibleCsvRuler::getBackground(  )
     throw (RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return implGetRuler().GetSettings().GetStyleSettings().GetFaceColor().GetColor();
 }
@@ -421,7 +421,7 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvRuler::getAccessibleChild( sal_
 Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvRuler::getAccessibleRelationSet()
         throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     AccessibleRelationSetHelper* pRelationSet = new AccessibleRelationSetHelper();
     Reference< XAccessible > xAccObj = implGetChildByRole( getAccessibleParent(), nGridRole );
@@ -437,7 +437,7 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvRuler::getAccessible
 Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvRuler::getAccessibleStateSet()
         throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     AccessibleStateSetHelper* pStateSet = implCreateStateSet();
     if( implIsAlive() )
     {
@@ -454,7 +454,7 @@ Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvRuler::getAccessibleSta
 
 sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCaretPosition() throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return lcl_GetApiPos( implGetRuler().GetRulerCursorPos() );
 }
@@ -462,7 +462,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCaretPosition() throw( RuntimeExcept
 sal_Bool SAL_CALL ScAccessibleCsvRuler::setCaretPosition( sal_Int32 nIndex )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidIndex( nIndex );
     ScCsvRuler& rRuler = implGetRuler();
@@ -474,7 +474,7 @@ sal_Bool SAL_CALL ScAccessibleCsvRuler::setCaretPosition( sal_Int32 nIndex )
 sal_Unicode SAL_CALL ScAccessibleCsvRuler::getCharacter( sal_Int32 nIndex )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidIndex( nIndex );
     return maBuffer.charAt( nIndex );
@@ -484,7 +484,7 @@ Sequence< PropertyValue > SAL_CALL ScAccessibleCsvRuler::getCharacterAttributes(
             const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* aRequestedAttributes */ )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidIndexWithEnd( nIndex );
     Sequence< PropertyValue > aSeq;
@@ -502,7 +502,7 @@ Sequence< PropertyValue > SAL_CALL ScAccessibleCsvRuler::getCharacterAttributes(
 ScAccessibleCsvRuler::AwtRectangle SAL_CALL ScAccessibleCsvRuler::getCharacterBounds( sal_Int32 nIndex )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidIndexWithEnd( nIndex );
     ScCsvRuler& rRuler = implGetRuler();
@@ -519,7 +519,7 @@ ScAccessibleCsvRuler::AwtRectangle SAL_CALL ScAccessibleCsvRuler::getCharacterBo
 
 sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCharacterCount() throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return implGetTextLength();
 }
@@ -527,7 +527,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCharacterCount() throw( RuntimeExcep
 sal_Int32 SAL_CALL ScAccessibleCsvRuler::getIndexAtPoint( const AwtPoint& rPoint )
         throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ScCsvRuler& rRuler = implGetRuler();
     // #107054# use object's coordinate system, convert to API position
@@ -561,7 +561,7 @@ sal_Bool SAL_CALL ScAccessibleCsvRuler::setSelection( sal_Int32 /* nStartIndex *
 
 OUString SAL_CALL ScAccessibleCsvRuler::getText() throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return OUString( maBuffer.getStr(), implGetTextLength() );
 }
@@ -569,7 +569,7 @@ OUString SAL_CALL ScAccessibleCsvRuler::getText() throw( RuntimeException )
 OUString SAL_CALL ScAccessibleCsvRuler::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidRange( nStartIndex, nEndIndex );
     return OUString( maBuffer.getStr() + nStartIndex, nEndIndex - nStartIndex );
@@ -578,7 +578,7 @@ OUString SAL_CALL ScAccessibleCsvRuler::getTextRange( sal_Int32 nStartIndex, sal
 TextSegment SAL_CALL ScAccessibleCsvRuler::getTextAtIndex( sal_Int32 nIndex, sal_Int16 nTextType )
         throw( IndexOutOfBoundsException, IllegalArgumentException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
 
     TextSegment aResult;
@@ -643,7 +643,7 @@ TextSegment SAL_CALL ScAccessibleCsvRuler::getTextAtIndex( sal_Int32 nIndex, sal
 TextSegment SAL_CALL ScAccessibleCsvRuler::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 nTextType )
         throw( IndexOutOfBoundsException, IllegalArgumentException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidIndexWithEnd( nIndex );
 
@@ -696,7 +696,7 @@ TextSegment SAL_CALL ScAccessibleCsvRuler::getTextBeforeIndex( sal_Int32 nIndex,
 TextSegment SAL_CALL ScAccessibleCsvRuler::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 nTextType )
         throw( IndexOutOfBoundsException, IllegalArgumentException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidIndexWithEnd( nIndex );
 
@@ -858,7 +858,7 @@ ScCsvRuler& ScAccessibleCsvRuler::implGetRuler() const
 
 void ScAccessibleCsvRuler::constructStringBuffer() throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     // extend existing string buffer to new ruler size
     sal_Int32 nRulerCount = implGetRuler().GetPosCount();
@@ -943,7 +943,7 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleAtPoint( con
     Reference< XAccessible > xRet;
     if( containsPoint( rPoint ) )
     {
-        ScUnoGuard aGuard;
+        SolarMutexGuard aGuard;
         ensureAlive();
 
         const ScCsvGrid& rGrid = implGetGrid();
@@ -960,7 +960,7 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleAtPoint( con
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getForeground(  )
 throw (RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return implGetGrid().GetSettings().GetStyleSettings().GetButtonTextColor().GetColor();
 }
@@ -968,7 +968,7 @@ throw (RuntimeException)
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getBackground(  )
 throw (RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return SC_MOD()->GetColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor;
 }
@@ -977,7 +977,7 @@ throw (RuntimeException)
 
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleChildCount() throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return implGetCellCount();
 }
@@ -985,7 +985,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleChildCount() throw( Runtime
 Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleChild( sal_Int32 nIndex )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidIndex( nIndex );
     return implCreateCellObj( implGetRow( nIndex ), implGetColumn( nIndex ) );
@@ -994,7 +994,7 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleChild( sal_I
 Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleRelationSet()
         throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     AccessibleRelationSetHelper* pRelationSet = new AccessibleRelationSetHelper();
     Reference< XAccessible > xAccObj = implGetChildByRole( getAccessibleParent(), nRulerRole );
@@ -1010,7 +1010,7 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleR
 Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleStateSet()
         throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     AccessibleStateSetHelper* pStateSet = implCreateStateSet();
     if( implIsAlive() )
     {
@@ -1030,14 +1030,14 @@ Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleStat
 
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRowCount() throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return implGetRowCount();
 }
 
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnCount() throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return implGetColumnCount();
 }
@@ -1045,7 +1045,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnCount() throw( Runtim
 OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleRowDescription( sal_Int32 nRow )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidPosition( nRow, 0 );
     return implGetCellText( nRow, 0 );
@@ -1054,7 +1054,7 @@ OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleRowDescription( sal_Int32 nR
 OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnDescription( sal_Int32 nColumn )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidPosition( 0, nColumn );
     return implGetCellText( 0, nColumn );
@@ -1100,7 +1100,7 @@ Sequence< sal_Int32 > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleRows()
 Sequence< sal_Int32 > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleColumns()
         throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
 
     ScCsvGrid& rGrid = implGetGrid();
@@ -1125,7 +1125,7 @@ sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleRowSelected( sal_Int32 /* nRo
 sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleColumnSelected( sal_Int32 nColumn )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidIndex( nColumn );
     return implIsColumnSelected( nColumn );
@@ -1134,7 +1134,7 @@ sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleColumnSelected( sal_Int32 nCo
 Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidPosition( nRow, nColumn );
     return implCreateCellObj( nRow, nColumn );
@@ -1163,7 +1163,7 @@ sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleSelected( sal_Int32 /* nRow *
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidPosition( nRow, nColumn );
     return implGetIndex( nRow, nColumn );
@@ -1172,7 +1172,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleIndex( sal_Int32 nRow, sal_
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRow( sal_Int32 nChildIndex )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidIndex( nChildIndex );
     return implGetRow( nChildIndex );
@@ -1181,7 +1181,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRow( sal_Int32 nChildIndex
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int32 nChildIndex )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidIndex( nChildIndex );
     return implGetColumn( nChildIndex );
@@ -1193,7 +1193,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int32 nChildInd
 void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int32 nChildIndex )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidIndex( nChildIndex );
     sal_Int32 nColumn = implGetColumn( nChildIndex );
@@ -1206,7 +1206,7 @@ void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int32 nChildIndex
 sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleChildSelected( sal_Int32 nChildIndex )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ensureValidIndex( nChildIndex );
     sal_Int32 nColumn = implGetColumn( nChildIndex );
@@ -1215,7 +1215,7 @@ sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleChildSelected( sal_Int32 nChi
 
 void SAL_CALL ScAccessibleCsvGrid::clearAccessibleSelection() throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     implGetGrid().SelectAll( false );
 }
@@ -1227,7 +1227,7 @@ void SAL_CALL ScAccessibleCsvGrid::selectAllAccessibleChildren() throw( RuntimeE
 
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChildCount() throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return implGetRowCount() * implGetSelColumnCount();
 }
@@ -1235,7 +1235,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChildCount() throw(
 Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     sal_Int32 nColumns = implGetSelColumnCount();
     if( nColumns == 0 )
@@ -1249,7 +1249,7 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChil
 void SAL_CALL ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
         throw( IndexOutOfBoundsException, RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     sal_Int32 nColumns = implGetSelColumnCount();
     if( nColumns == 0 )
@@ -1489,7 +1489,7 @@ ScAccessibleCsvCell::~ScAccessibleCsvCell()
 
 void SAL_CALL ScAccessibleCsvCell::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     SetEditSource( SvxEditSourcePtr( NULL ) );
     ScAccessibleCsvControl::disposing();
 }
@@ -1499,7 +1499,7 @@ void SAL_CALL ScAccessibleCsvCell::disposing()
 
 void SAL_CALL ScAccessibleCsvCell::grabFocus() throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     ScCsvGrid& rGrid = implGetGrid();
     rGrid.Execute( CSVCMD_MOVEGRIDCURSOR, rGrid.GetColumnPos( mnColumn ) );
@@ -1508,7 +1508,7 @@ void SAL_CALL ScAccessibleCsvCell::grabFocus() throw( RuntimeException )
 sal_Int32 SAL_CALL ScAccessibleCsvCell::getForeground(  )
 throw (RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return implGetGrid().GetSettings().GetStyleSettings().GetButtonTextColor().GetColor();
 }
@@ -1516,7 +1516,7 @@ throw (RuntimeException)
 sal_Int32 SAL_CALL ScAccessibleCsvCell::getBackground(  )
 throw (RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return SC_MOD()->GetColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor;
 }
@@ -1536,7 +1536,7 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvCell::getAccessibleChild( sal_I
 
 sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleIndexInParent() throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return mnIndex;
 }
@@ -1544,7 +1544,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleIndexInParent() throw( Runt
 Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvCell::getAccessibleRelationSet()
         throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return new AccessibleRelationSetHelper();
 }
@@ -1552,7 +1552,7 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvCell::getAccessibleR
 Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvCell::getAccessibleStateSet()
         throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     AccessibleStateSetHelper* pStateSet = implCreateStateSet();
     if( implIsAlive() )
     {
@@ -1587,7 +1587,7 @@ OUString SAL_CALL ScAccessibleCsvCell::getImplementationName() throw( RuntimeExc
 
 Rectangle ScAccessibleCsvCell::GetBoundingBoxOnScreen() const throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     Rectangle aRect( implGetBoundingBox() );
     aRect.SetPos( implGetAbsPos( aRect.TopLeft() ) );
@@ -1596,7 +1596,7 @@ Rectangle ScAccessibleCsvCell::GetBoundingBoxOnScreen() const throw( RuntimeExce
 
 Rectangle ScAccessibleCsvCell::GetBoundingBox() const throw( RuntimeException )
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     ensureAlive();
     return implGetBoundingBox();
 }
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index 51cadd4aed98..ea4865c91724 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -29,7 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 #include "AccessibleDataPilotControl.hxx"
-#include "unoguard.hxx"
 #include "fieldwnd.hxx"
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -41,6 +40,7 @@
 #include <tools/gen.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
@@ -179,7 +179,7 @@ void ScAccessibleDataPilotControl::Init()
 
 void SAL_CALL ScAccessibleDataPilotControl::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     mpDPFieldWindow = NULL;
 
     ScAccessibleContextBase::disposing();
@@ -330,7 +330,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDataPilotControl::getAccessib
     uno::Reference<XAccessible> xAcc;
     if (containsPoint(rPoint))
     {
-        ScUnoGuard aGuard;
+        SolarMutexGuard aGuard;
         IsObjectValid();
         if (mpDPFieldWindow)
         {
@@ -354,7 +354,7 @@ sal_Bool SAL_CALL ScAccessibleDataPilotControl::isVisible(  )
 void SAL_CALL ScAccessibleDataPilotControl::grabFocus(  )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (mpDPFieldWindow)
         mpDPFieldWindow->GrabFocus();
@@ -363,7 +363,7 @@ void SAL_CALL ScAccessibleDataPilotControl::grabFocus(  )
 sal_Int32 SAL_CALL ScAccessibleDataPilotControl::getForeground(  )
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     sal_Int32 nColor(0);
     if (mpDPFieldWindow)
@@ -376,7 +376,7 @@ sal_Int32 SAL_CALL ScAccessibleDataPilotControl::getForeground(  )
 sal_Int32 SAL_CALL ScAccessibleDataPilotControl::getBackground(  )
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     sal_Int32 nColor(0);
     if (mpDPFieldWindow)
@@ -398,7 +398,7 @@ sal_Int32 SAL_CALL ScAccessibleDataPilotControl::getBackground(  )
 sal_Int32 SAL_CALL ScAccessibleDataPilotControl::getAccessibleChildCount(void)
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (mpDPFieldWindow)
         return mpDPFieldWindow->GetFieldCount();
@@ -409,7 +409,7 @@ sal_Int32 SAL_CALL ScAccessibleDataPilotControl::getAccessibleChildCount(void)
 uno::Reference< XAccessible> SAL_CALL ScAccessibleDataPilotControl::getAccessibleChild(sal_Int32 nIndex)
         throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     uno::Reference<XAccessible> xAcc;
     if (mpDPFieldWindow)
@@ -435,7 +435,7 @@ uno::Reference< XAccessible> SAL_CALL ScAccessibleDataPilotControl::getAccessibl
 uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotControl::getAccessibleStateSet(void)
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     utl::AccessibleStateSetHelper* pStateSet = new utl::AccessibleStateSetHelper();
@@ -468,7 +468,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotControl::getAc
 uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotControl::getImplementationId(void)
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     static uno::Sequence<sal_Int8> aId;
     if (aId.getLength() == 0)
@@ -484,7 +484,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotControl::getImplementation
 ::rtl::OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleDescription(void)
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (mpDPFieldWindow)
         return mpDPFieldWindow->GetDescription();
@@ -495,7 +495,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotControl::getImplementation
 ::rtl::OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleName(void)
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (mpDPFieldWindow)
         return mpDPFieldWindow->GetName();
@@ -552,7 +552,7 @@ void ScAccessibleDataPilotButton::Init()
 
 void SAL_CALL ScAccessibleDataPilotButton::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     mpDPFieldWindow = NULL;
 
     ScAccessibleContextBase::disposing();
@@ -586,7 +586,7 @@ sal_Bool SAL_CALL ScAccessibleDataPilotButton::isVisible(  )
 void SAL_CALL ScAccessibleDataPilotButton::grabFocus(  )
         throw (::com::sun::star::uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (mpDPFieldWindow)
     {
@@ -597,7 +597,7 @@ void SAL_CALL ScAccessibleDataPilotButton::grabFocus(  )
 sal_Int32 SAL_CALL ScAccessibleDataPilotButton::getForeground(  )
 throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     sal_Int32 nColor(0);
     if (mpDPFieldWindow)
@@ -610,7 +610,7 @@ throw (uno::RuntimeException)
 sal_Int32 SAL_CALL ScAccessibleDataPilotButton::getBackground(  )
 throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     sal_Int32 nColor(0);
     if (mpDPFieldWindow)
@@ -638,7 +638,7 @@ uno::Reference< XAccessible> SAL_CALL ScAccessibleDataPilotButton::getAccessible
 sal_Int32 SAL_CALL ScAccessibleDataPilotButton::getAccessibleIndexInParent(void)
         throw (::com::sun::star::uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     return mnIndex;
 }
@@ -646,7 +646,7 @@ sal_Int32 SAL_CALL ScAccessibleDataPilotButton::getAccessibleIndexInParent(void)
 uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotButton::getAccessibleStateSet(void)
         throw (::com::sun::star::uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     utl::AccessibleStateSetHelper* pStateSet = new utl::AccessibleStateSetHelper();
@@ -682,7 +682,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotButton::getAcc
 uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotButton::getImplementationId(void)
         throw (::com::sun::star::uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     static uno::Sequence<sal_Int8> aId;
     if (aId.getLength() == 0)
@@ -702,7 +702,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotButton::getImplementationI
 ::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleName(void)
         throw (::com::sun::star::uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (mpDPFieldWindow)
         return mpDPFieldWindow->GetFieldText(getAccessibleIndexInParent());
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index e27e135499b2..ae1d1b590350 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -36,7 +36,6 @@
 #include "AccessibilityHints.hxx"
 #include "document.hxx"
 #include "drwlayer.hxx"
-#include "unoguard.hxx"
 #include "shapeuno.hxx"
 #include "DrawModelBroadcaster.hxx"
 #include "drawview.hxx"
@@ -66,6 +65,7 @@
 #include <svx/unoshape.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <toolkit/helper/convert.hxx>
+#include <vcl/svapp.hxx>
 
 #include <list>
 #include <algorithm>
@@ -1277,7 +1277,7 @@ ScAccessibleDocument::~ScAccessibleDocument(void)
 
 void SAL_CALL ScAccessibleDocument::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     FreeAccessibleSpreadsheet();
     if (mpViewShell)
     {
@@ -1513,7 +1513,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocument::getAccessibleAtPoin
     uno::Reference<XAccessible> xAccessible = NULL;
     if (containsPoint(rPoint))
     {
-        ScUnoGuard aGuard;
+        SolarMutexGuard aGuard;
         IsObjectValid();
         if (mpChildrenShapes)
             xAccessible = mpChildrenShapes->GetAt(rPoint);
@@ -1540,7 +1540,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocument::getAccessibleAtPoin
 void SAL_CALL ScAccessibleDocument::grabFocus(  )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (getAccessibleParent().is())
     {
@@ -1566,7 +1566,7 @@ sal_Int32 SAL_CALL
     ScAccessibleDocument::getAccessibleChildCount(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     sal_Int32 nCount(1);
     if (mpChildrenShapes)
@@ -1584,7 +1584,7 @@ uno::Reference<XAccessible> SAL_CALL
     throw (uno::RuntimeException,
         lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     uno::Reference<XAccessible> xAccessible;
     if (nIndex >= 0)
@@ -1615,7 +1615,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
     ScAccessibleDocument::getAccessibleStateSet(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
     if (getAccessibleParent().is())
     {
@@ -1645,7 +1645,7 @@ void SAL_CALL
     ScAccessibleDocument::selectAccessibleChild( sal_Int32 nChildIndex )
         throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     if (mpChildrenShapes)
@@ -1679,7 +1679,7 @@ sal_Bool SAL_CALL
     ScAccessibleDocument::isAccessibleChildSelected( sal_Int32 nChildIndex )
         throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     sal_Bool bResult(sal_False);
 
@@ -1712,7 +1712,7 @@ void SAL_CALL
     ScAccessibleDocument::clearAccessibleSelection(  )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     if (mpChildrenShapes)
@@ -1723,7 +1723,7 @@ void SAL_CALL
     ScAccessibleDocument::selectAllAccessibleChildren(  )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     if (mpChildrenShapes)
@@ -1740,7 +1740,7 @@ sal_Int32 SAL_CALL
     ScAccessibleDocument::getSelectedAccessibleChildCount(  )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     sal_Int32 nCount(0);
 
@@ -1760,7 +1760,7 @@ uno::Reference<XAccessible > SAL_CALL
     ScAccessibleDocument::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
         throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     uno::Reference<XAccessible> xAccessible;
     if (mpChildrenShapes)
@@ -1788,7 +1788,7 @@ void SAL_CALL
     ScAccessibleDocument::deselectAccessibleChild( sal_Int32 nChildIndex )
         throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     if (mpChildrenShapes)
@@ -1850,7 +1850,7 @@ uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleDocument::getImplementationId(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     static uno::Sequence<sal_Int8> aId;
     if (aId.getLength() == 0)
@@ -1865,7 +1865,7 @@ uno::Sequence<sal_Int8> SAL_CALL
 
 sal_Bool ScAccessibleDocument::IsValid (void) const
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     return (!ScAccessibleContextBase::IsDefunc() && !rBHelper.bInDispose);
 }
@@ -1888,14 +1888,14 @@ Rectangle ScAccessibleDocument::GetVisibleArea_Impl() const
 
 Rectangle ScAccessibleDocument::GetVisibleArea() const
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     return maVisArea;
 }
 
 Point ScAccessibleDocument::LogicToPixel (const Point& rPoint) const
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     Point aPoint;
     ScGridWindow* pWin = static_cast<ScGridWindow*>(mpViewShell->GetWindowByPos(meSplitPos));
@@ -1909,7 +1909,7 @@ Point ScAccessibleDocument::LogicToPixel (const Point& rPoint) const
 
 Size ScAccessibleDocument::LogicToPixel (const Size& rSize) const
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     Size aSize;
     ScGridWindow* pWin = static_cast<ScGridWindow*>(mpViewShell->GetWindowByPos(meSplitPos));
@@ -1920,7 +1920,7 @@ Size ScAccessibleDocument::LogicToPixel (const Size& rSize) const
 
 Point ScAccessibleDocument::PixelToLogic (const Point& rPoint) const
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     Point aPoint;
     ScGridWindow* pWin = static_cast<ScGridWindow*>(mpViewShell->GetWindowByPos(meSplitPos));
@@ -1934,7 +1934,7 @@ Point ScAccessibleDocument::PixelToLogic (const Point& rPoint) const
 
 Size ScAccessibleDocument::PixelToLogic (const Size& rSize) const
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     Size aSize;
     ScGridWindow* pWin = static_cast<ScGridWindow*>(mpViewShell->GetWindowByPos(meSplitPos));
@@ -1965,7 +1965,7 @@ utl::AccessibleRelationSetHelper* ScAccessibleDocument::GetRelationSet(const ScA
     ScAccessibleDocument::createAccessibleName(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     rtl::OUString sName = String(ScResId(STR_ACC_DOC_NAME));
     sal_Int32 nNumber(sal_Int32(meSplitPos) + 1);
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 9f2f0cab1749..f1ffe5dbd580 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -37,7 +37,6 @@
 #include "document.hxx"
 #include "prevwsh.hxx"
 #include "prevloc.hxx"
-#include "unoguard.hxx"
 #include "drwlayer.hxx"
 #include "editsrc.hxx"
 #include "scresid.hxx"
@@ -63,6 +62,7 @@
 #include <toolkit/helper/convert.hxx>
 #include <svx/unoshape.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
+#include <vcl/svapp.hxx>
 
 #include <vector>
 #include <list>
@@ -568,13 +568,13 @@ ScIAccessibleViewForwarder::~ScIAccessibleViewForwarder()
 
 sal_Bool ScIAccessibleViewForwarder::IsValid (void) const
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     return mbValid;
 }
 
 Rectangle ScIAccessibleViewForwarder::GetVisibleArea() const
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     Rectangle aVisRect;
     Window* pWin = mpViewShell->GetWindow();
     if (pWin)
@@ -590,7 +590,7 @@ Rectangle ScIAccessibleViewForwarder::GetVisibleArea() const
 
 Point ScIAccessibleViewForwarder::LogicToPixel (const Point& rPoint) const
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     Point aPoint;
     Window* pWin = mpViewShell->GetWindow();
     if (pWin && mpAccDoc)
@@ -604,7 +604,7 @@ Point ScIAccessibleViewForwarder::LogicToPixel (const Point& rPoint) const
 
 Size ScIAccessibleViewForwarder::LogicToPixel (const Size& rSize) const
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     Size aSize;
     Window* pWin = mpViewShell->GetWindow();
     if (pWin)
@@ -614,7 +614,7 @@ Size ScIAccessibleViewForwarder::LogicToPixel (const Size& rSize) const
 
 Point ScIAccessibleViewForwarder::PixelToLogic (const Point& rPoint) const
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     Point aPoint;
     Window* pWin = mpViewShell->GetWindow();
     if (pWin && mpAccDoc)
@@ -627,7 +627,7 @@ Point ScIAccessibleViewForwarder::PixelToLogic (const Point& rPoint) const
 
 Size ScIAccessibleViewForwarder::PixelToLogic (const Size& rSize) const
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     Size aSize;
     Window* pWin = mpViewShell->GetWindow();
     if (pWin)
@@ -1448,7 +1448,7 @@ ScAccessibleDocumentPagePreview::~ScAccessibleDocumentPagePreview(void)
 
 void SAL_CALL ScAccessibleDocumentPagePreview::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     if (mpTable)
     {
         mpTable->release();
@@ -1581,7 +1581,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces
     uno::Reference<XAccessible> xAccessible;
     if (containsPoint(rPoint))
     {
-        ScUnoGuard aGuard;
+        SolarMutexGuard aGuard;
         IsObjectValid();
 
         if ( mpViewShell )
@@ -1655,7 +1655,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces
 
 void SAL_CALL ScAccessibleDocumentPagePreview::grabFocus() throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (getAccessibleParent().is())
     {
@@ -1672,7 +1672,7 @@ void SAL_CALL ScAccessibleDocumentPagePreview::grabFocus() throw (uno::RuntimeEx
 
 sal_Int32 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChildCount(void) throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     long nRet = 0;
@@ -1688,7 +1688,7 @@ sal_Int32 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChildCount(void
 uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChild(sal_Int32 nIndex)
                 throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     uno::Reference<XAccessible> xAccessible;
 
@@ -1754,7 +1754,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi
 uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleStateSet(void)
                         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
     if (getAccessibleParent().is())
     {
@@ -1804,7 +1804,7 @@ uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleDocumentPagePreview::getImplementationId(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     static uno::Sequence<sal_Int8> aId;
     if (aId.getLength() == 0)
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index e91abb2524e9..6df608748c3a 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -31,7 +31,6 @@
 #include "AccessibleEditObject.hxx"
 #include "scitems.hxx"
 #include <editeng/eeitem.hxx>
-#include "unoguard.hxx"
 #include "AccessibleText.hxx"
 #include "editsrc.hxx"
 #include "scmod.hxx"
@@ -46,6 +45,7 @@
 #include <editeng/editview.hxx>
 #include <editeng/editeng.hxx>
 #include <svx/svdmodel.hxx>
+#include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
@@ -82,7 +82,7 @@ ScAccessibleEditObject::~ScAccessibleEditObject()
 
 void SAL_CALL ScAccessibleEditObject::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     if (mpTextHelper)
         DELETEZ(mpTextHelper);
 
@@ -114,7 +114,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleEditObject::getAccessibleAtPo
     uno::Reference<XAccessible> xRet;
     if (containsPoint(rPoint))
     {
-         ScUnoGuard aGuard;
+         SolarMutexGuard aGuard;
         IsObjectValid();
 
         if(!mpTextHelper)
@@ -193,7 +193,7 @@ sal_Int32 SAL_CALL
     ScAccessibleEditObject::getAccessibleChildCount(void)
                     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (!mpTextHelper)
         CreateTextHelper();
@@ -205,7 +205,7 @@ uno::Reference< XAccessible > SAL_CALL
         throw (uno::RuntimeException,
         lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (!mpTextHelper)
         CreateTextHelper();
@@ -216,7 +216,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
     ScAccessibleEditObject::getAccessibleStateSet(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
     if (getAccessibleParent().is())
     {
@@ -296,7 +296,7 @@ uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleEditObject::getImplementationId(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     static uno::Sequence<sal_Int8> aId;
     if (aId.getLength() == 0)
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
index 89dd008480a7..b4948460be42 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
@@ -32,7 +32,6 @@
 #include "AccessibleGlobal.hxx"
 #include "AccessibleFilterMenu.hxx"
 #include "AccessibleFilterMenuItem.hxx"
-#include "unoguard.hxx"
 #include "global.hxx"
 #include "document.hxx"
 #include "docpool.hxx"
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index 9912f3180aac..20e50119d680 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -33,7 +33,6 @@
 #include "AccessiblePageHeaderArea.hxx"
 #include "AccessibilityHints.hxx"
 #include "prevwsh.hxx"
-#include "unoguard.hxx"
 #include "miscuno.hxx"
 #include "prevloc.hxx"
 #include "document.hxx"
@@ -49,6 +48,7 @@
 
 #include <vcl/window.hxx>
 #include <svl/smplhint.hxx>
+#include <vcl/svapp.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <svl/style.hxx>
 #include <svl/itempool.hxx>
@@ -120,7 +120,7 @@ ScAccessiblePageHeader::~ScAccessiblePageHeader()
 
 void SAL_CALL ScAccessiblePageHeader::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     if (mpViewShell)
     {
         mpViewShell->RemoveAccessibilityObject(*this);
@@ -194,7 +194,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleAtPo
 
     if (containsPoint(aPoint))
     {
-        ScUnoGuard aGuard;
+        SolarMutexGuard aGuard;
         IsObjectValid();
 
         sal_Int32 nCount(getAccessibleChildCount()); // fill the areas
@@ -218,7 +218,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleAtPo
 
 void SAL_CALL ScAccessiblePageHeader::grabFocus() throw (uno::RuntimeException)
 {
-     ScUnoGuard aGuard;
+     SolarMutexGuard aGuard;
     IsObjectValid();
     if (getAccessibleParent().is())
     {
@@ -232,7 +232,7 @@ void SAL_CALL ScAccessiblePageHeader::grabFocus() throw (uno::RuntimeException)
 
 sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     if((mnChildCount < 0) && mpViewShell)
@@ -266,7 +266,7 @@ sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() throw (uno:
 uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleChild( sal_Int32 nIndex )
                                 throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     uno::Reference<XAccessible> xRet;
@@ -303,7 +303,7 @@ sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleIndexInParent() throw (u
 uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePageHeader::getAccessibleStateSet()
                                 throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
     if (getAccessibleParent().is())
     {
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index e4849bd5e8f3..37eac80cec14 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -32,7 +32,6 @@
 #include "AccessiblePageHeaderArea.hxx"
 #include "AccessibleText.hxx"
 #include "AccessibilityHints.hxx"
-#include "unoguard.hxx"
 #include "editsrc.hxx"
 #include "prevwsh.hxx"
 #include "prevloc.hxx"
@@ -48,6 +47,7 @@
 #include <unotools/accessiblestatesethelper.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <toolkit/helper/convert.hxx>
+#include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
@@ -83,7 +83,7 @@ ScAccessiblePageHeaderArea::~ScAccessiblePageHeaderArea(void)
 
 void SAL_CALL ScAccessiblePageHeaderArea::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     if (mpViewShell)
     {
         mpViewShell->RemoveAccessibilityObject(*this);
@@ -127,7 +127,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeaderArea::getAccessible
     uno::Reference<XAccessible> xRet;
     if (containsPoint(rPoint))
     {
-         ScUnoGuard aGuard;
+         SolarMutexGuard aGuard;
         IsObjectValid();
 
         if(!mpTextHelper)
@@ -145,7 +145,7 @@ sal_Int32 SAL_CALL
     ScAccessiblePageHeaderArea::getAccessibleChildCount(void)
                     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (!mpTextHelper)
         CreateTextHelper();
@@ -157,7 +157,7 @@ uno::Reference< XAccessible > SAL_CALL
         throw (uno::RuntimeException,
         lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (!mpTextHelper)
         CreateTextHelper();
@@ -168,7 +168,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
     ScAccessiblePageHeaderArea::getAccessibleStateSet(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
     if (getAccessibleParent().is())
     {
@@ -219,7 +219,7 @@ uno::Sequence<sal_Int8> SAL_CALL
     ScAccessiblePageHeaderArea::getImplementationId(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     static uno::Sequence<sal_Int8> aId;
     if (aId.getLength() == 0)
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index 5ab74a176339..bf99d3d26951 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -36,13 +36,13 @@
 #include "AccessiblePreviewCell.hxx"
 #include "AccessibilityHints.hxx"
 #include "prevwsh.hxx"
-#include "unoguard.hxx"
 #include "prevloc.hxx"
 #include "document.hxx"
 #include <svx/AccessibleTextHelper.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <editeng/brshitem.hxx>
 #include <vcl/window.hxx>
+#include <vcl/svapp.hxx>
 #include <toolkit/helper/convert.hxx>
 
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -77,7 +77,7 @@ ScAccessiblePreviewCell::~ScAccessiblePreviewCell()
 
 void SAL_CALL ScAccessiblePreviewCell::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     if (mpViewShell)
     {
         mpViewShell->RemoveAccessibilityObject(*this);
@@ -113,7 +113,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleAtP
     uno::Reference<XAccessible> xRet;
     if (containsPoint(rPoint))
     {
-         ScUnoGuard aGuard;
+         SolarMutexGuard aGuard;
         IsObjectValid();
 
         if(!mpTextHelper)
@@ -127,7 +127,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleAtP
 
 void SAL_CALL ScAccessiblePreviewCell::grabFocus() throw (uno::RuntimeException)
 {
-     ScUnoGuard aGuard;
+     SolarMutexGuard aGuard;
     IsObjectValid();
     if (getAccessibleParent().is())
     {
@@ -141,7 +141,7 @@ void SAL_CALL ScAccessiblePreviewCell::grabFocus() throw (uno::RuntimeException)
 
 sal_Int32 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() throw(uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (!mpTextHelper)
         CreateTextHelper();
@@ -151,7 +151,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() throw(uno:
 uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleChild(sal_Int32 nIndex)
                             throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (!mpTextHelper)
         CreateTextHelper();
@@ -161,7 +161,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleChi
 uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewCell::getAccessibleStateSet()
                             throw(uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
 
     uno::Reference<XAccessibleStateSet> xParentStates;
     if (getAccessibleParent().is())
@@ -215,7 +215,7 @@ uno::Sequence<sal_Int8> SAL_CALL
     ScAccessiblePreviewCell::getImplementationId(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     static uno::Sequence<sal_Int8> aId;
     if (aId.getLength() == 0)
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index b71bbf92936a..d55fcdd3aac3 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -37,7 +37,6 @@
 #include "AccessiblePreviewHeaderCell.hxx"
 #include "AccessibilityHints.hxx"
 #include "prevwsh.hxx"
-#include "unoguard.hxx"
 #include "miscuno.hxx"
 #include "prevloc.hxx"
 #include "scresid.hxx"
@@ -47,6 +46,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 
 #include <vcl/window.hxx>
+#include <vcl/svapp.hxx>
 #include <svl/smplhint.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <comphelper/sequence.hxx>
@@ -83,7 +83,7 @@ ScAccessiblePreviewHeaderCell::~ScAccessiblePreviewHeaderCell()
 
 void SAL_CALL ScAccessiblePreviewHeaderCell::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     if (mpViewShell)
     {
         mpViewShell->RemoveAccessibilityObject(*this);
@@ -145,7 +145,7 @@ void SAL_CALL ScAccessiblePreviewHeaderCell::release()
 
 uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getCurrentValue() throw (uno::RuntimeException)
 {
-     ScUnoGuard aGuard;
+     SolarMutexGuard aGuard;
     IsObjectValid();
 
     double fValue(0.0);
@@ -168,7 +168,7 @@ sal_Bool SAL_CALL ScAccessiblePreviewHeaderCell::setCurrentValue( const uno::Any
 
 uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMaximumValue() throw (uno::RuntimeException)
 {
-     ScUnoGuard aGuard;
+     SolarMutexGuard aGuard;
     IsObjectValid();
 
     double fValue(0.0);
@@ -197,7 +197,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessi
     uno::Reference<XAccessible> xRet;
     if (containsPoint(rPoint))
     {
-         ScUnoGuard aGuard;
+         SolarMutexGuard aGuard;
         IsObjectValid();
 
         if(!mpTextHelper)
@@ -211,7 +211,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessi
 
 void SAL_CALL ScAccessiblePreviewHeaderCell::grabFocus() throw (uno::RuntimeException)
 {
-     ScUnoGuard aGuard;
+     SolarMutexGuard aGuard;
     IsObjectValid();
     if (getAccessibleParent().is())
     {
@@ -225,7 +225,7 @@ void SAL_CALL ScAccessiblePreviewHeaderCell::grabFocus() throw (uno::RuntimeExce
 
 sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() throw(uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (!mpTextHelper)
         CreateTextHelper();
@@ -235,7 +235,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() thro
 uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChild(sal_Int32 nIndex)
                             throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (!mpTextHelper)
         CreateTextHelper();
@@ -250,7 +250,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleIndexInParent() t
 uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleStateSet()
                             throw(uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
 
     uno::Reference<XAccessibleStateSet> xParentStates;
     if (getAccessibleParent().is())
@@ -306,7 +306,7 @@ uno::Sequence<sal_Int8> SAL_CALL
     ScAccessiblePreviewHeaderCell::getImplementationId(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     static uno::Sequence<sal_Int8> aId;
     if (aId.getLength() == 0)
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index 8a8167d95fed..fd98a67dbd7e 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -35,7 +35,6 @@
 #include "AccessiblePreviewHeaderCell.hxx"
 #include "AccessibilityHints.hxx"
 #include "prevwsh.hxx"
-#include "unoguard.hxx"
 #include "miscuno.hxx"
 #include "prevloc.hxx"
 #include "attrib.hxx"
@@ -48,6 +47,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 
 #include <vcl/window.hxx>
+#include <vcl/svapp.hxx>
 #include <svl/smplhint.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <comphelper/sequence.hxx>
@@ -81,7 +81,7 @@ ScAccessiblePreviewTable::~ScAccessiblePreviewTable()
 
 void SAL_CALL ScAccessiblePreviewTable::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     if (mpViewShell)
     {
         mpViewShell->RemoveAccessibilityObject(*this);
@@ -145,7 +145,7 @@ void SAL_CALL ScAccessiblePreviewTable::release()
 
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowCount() throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     FillTableInfo();
@@ -158,7 +158,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowCount() throw (uno:
 
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnCount() throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     FillTableInfo();
@@ -173,7 +173,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sa
                                 throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
     // is not supported or specified so not implemented
-/*  ScUnoGuard aGuard;
+/*  SolarMutexGuard aGuard;
     IsObjectValid();
 
     FillTableInfo();
@@ -197,7 +197,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sa
     else
         throw lang::IndexOutOfBoundsException();*/
 
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     FillTableInfo();
     if ( nRow < 0 || (mpTableInfo && nRow >= mpTableInfo->GetRows()) )
         throw lang::IndexOutOfBoundsException();
@@ -209,7 +209,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription(
                                 throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
     // is not supported or specified so not implemented
-/*  ScUnoGuard aGuard;
+/*  SolarMutexGuard aGuard;
     IsObjectValid();
 
     FillTableInfo();
@@ -233,7 +233,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription(
     else
         throw lang::IndexOutOfBoundsException();*/
 
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     FillTableInfo();
     if ( nColumn < 0 || (mpTableInfo && nColumn >= mpTableInfo->GetCols()) )
         throw lang::IndexOutOfBoundsException();
@@ -244,7 +244,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription(
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
                                 throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     FillTableInfo();
@@ -278,7 +278,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowExtentAt( sal_Int32
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
                                 throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     FillTableInfo();
@@ -338,7 +338,7 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleRowSelected( sal_Int32 n
 {
     //  in the page preview, there is no selection
 
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     FillTableInfo();
     if ( nRow < 0 || (mpTableInfo && nRow >= mpTableInfo->GetRows()) )
         throw lang::IndexOutOfBoundsException();
@@ -351,7 +351,7 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleColumnSelected( sal_Int3
 {
     //  in the page preview, there is no selection
 
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     FillTableInfo();
     if ( nColumn < 0 || (mpTableInfo && nColumn >= mpTableInfo->GetCols()) )
         throw lang::IndexOutOfBoundsException();
@@ -362,7 +362,7 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleColumnSelected( sal_Int3
 uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
                                 throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     FillTableInfo();
@@ -414,7 +414,7 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleSelected( sal_Int32 nRow
                                 throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
     //  in the page preview, there is no selection
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     FillTableInfo();
@@ -432,7 +432,7 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleSelected( sal_Int32 nRow
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
                                 throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     FillTableInfo();
@@ -452,7 +452,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndex( sal_Int32 nRow,
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRow( sal_Int32 nChildIndex )
                                 throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     FillTableInfo();
@@ -471,7 +471,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRow( sal_Int32 nChildI
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumn( sal_Int32 nChildIndex )
                                 throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     FillTableInfo();
@@ -495,7 +495,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleAt
     uno::Reference<XAccessible> xRet;
     if (containsPoint(aPoint))
     {
-        ScUnoGuard aGuard;
+        SolarMutexGuard aGuard;
         IsObjectValid();
 
         FillTableInfo();
@@ -540,7 +540,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleAt
 
 void SAL_CALL ScAccessiblePreviewTable::grabFocus() throw (uno::RuntimeException)
 {
-     ScUnoGuard aGuard;
+     SolarMutexGuard aGuard;
     IsObjectValid();
     if (getAccessibleParent().is())
     {
@@ -554,7 +554,7 @@ void SAL_CALL ScAccessiblePreviewTable::grabFocus() throw (uno::RuntimeException
 
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleChildCount() throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     FillTableInfo();
@@ -568,7 +568,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleChildCount() throw (un
 uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleChild( sal_Int32 nIndex )
                                 throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     FillTableInfo();
@@ -601,7 +601,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndexInParent() throw
 uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePreviewTable::getAccessibleStateSet()
                                 throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
     if (getAccessibleParent().is())
     {
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 106d68ec4a43..5d18beb574b4 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -36,7 +36,6 @@
 #include "AccessibleDocument.hxx"
 #include "tabvwsh.hxx"
 #include "document.hxx"
-#include "unoguard.hxx"
 #include "hints.hxx"
 #include "scmod.hxx"
 
@@ -49,6 +48,7 @@
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
 #include <svtools/colorcfg.hxx>
+#include <vcl/svapp.hxx>
 
 #include <algorithm>
 
@@ -122,7 +122,7 @@ void ScAccessibleSpreadsheet::ConstructScAccessibleSpreadsheet(
 
 void SAL_CALL ScAccessibleSpreadsheet::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     if (mpViewShell)
     {
         mpViewShell->RemoveAccessibilityObject(*this);
@@ -376,7 +376,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
 uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessibleRowHeaders(  )
                     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     uno::Reference< XAccessibleTable > xAccessibleTable;
     if( mpDoc && mbIsSpreadsheet )
@@ -395,7 +395,7 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessib
 uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessibleColumnHeaders(  )
                     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     uno::Reference< XAccessibleTable > xAccessibleTable;
     if( mpDoc && mbIsSpreadsheet )
@@ -414,7 +414,7 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessib
 uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessibleRows(  )
                     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     uno::Sequence<sal_Int32> aSequence;
     if (mpViewShell && mpViewShell->GetViewData())
@@ -441,7 +441,7 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessib
 uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessibleColumns(  )
                     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     uno::Sequence<sal_Int32> aSequence;
     if (mpViewShell && mpViewShell->GetViewData())
@@ -468,7 +468,7 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessib
 sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleRowSelected( sal_Int32 nRow )
     throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     if ((nRow > (maRange.aEnd.Row() - maRange.aStart.Row())) || (nRow < 0))
@@ -486,7 +486,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleRowSelected( sal_Int32 nR
 sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleColumnSelected( sal_Int32 nColumn )
     throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     if ((nColumn > (maRange.aEnd.Col() - maRange.aStart.Col())) || (nColumn < 0))
@@ -519,7 +519,7 @@ ScAccessibleCell* ScAccessibleSpreadsheet::GetAccessibleCellAt(sal_Int32 nRow, s
 uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
                     throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (nRow > (maRange.aEnd.Row() - maRange.aStart.Row()) ||
         nRow < 0 ||
@@ -537,7 +537,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleCel
 sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
     throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     if ((nColumn > (maRange.aEnd.Col() - maRange.aStart.Col())) || (nColumn < 0) ||
@@ -562,7 +562,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleAtP
     uno::Reference< XAccessible > xAccessible;
     if (containsPoint(rPoint))
     {
-        ScUnoGuard aGuard;
+        SolarMutexGuard aGuard;
         IsObjectValid();
         if (mpViewShell)
         {
@@ -595,7 +595,7 @@ sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getForeground(  )
 sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getBackground(  )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     return SC_MOD()->GetColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor;
 }
@@ -617,7 +617,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
     ScAccessibleSpreadsheet::getAccessibleStateSet(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
     if (getAccessibleParent().is())
     {
@@ -655,7 +655,7 @@ void SAL_CALL
         ScAccessibleSpreadsheet::selectAccessibleChild( sal_Int32 nChildIndex )
         throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount())
         throw lang::IndexOutOfBoundsException();
@@ -673,7 +673,7 @@ void SAL_CALL
         ScAccessibleSpreadsheet::clearAccessibleSelection(  )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (mpViewShell)
     {
@@ -685,7 +685,7 @@ void SAL_CALL
         ScAccessibleSpreadsheet::selectAllAccessibleChildren(  )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     if (mpViewShell)
     {
@@ -697,7 +697,7 @@ sal_Int32 SAL_CALL
         ScAccessibleSpreadsheet::getSelectedAccessibleChildCount(  )
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     sal_Int32 nResult(0);
     if (mpViewShell)
@@ -720,7 +720,7 @@ uno::Reference<XAccessible > SAL_CALL
         ScAccessibleSpreadsheet::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
         throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     uno::Reference < XAccessible > xAccessible;
     if (mpViewShell)
@@ -751,7 +751,7 @@ void SAL_CALL
         ScAccessibleSpreadsheet::deselectAccessibleChild( sal_Int32 nChildIndex )
         throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount())
@@ -850,7 +850,7 @@ uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleSpreadsheet::getImplementationId(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     static uno::Sequence<sal_Int8> aId;
     if (aId.getLength() == 0)
@@ -866,7 +866,7 @@ uno::Sequence<sal_Int8> SAL_CALL
 void SAL_CALL ScAccessibleSpreadsheet::addEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
         throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     ScAccessibleTableBase::addEventListener(xListener);
 
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index 48b04220d834..e998fd7fd4fa 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -33,7 +33,6 @@
 #include "AccessibleTableBase.hxx"
 #include "miscuno.hxx"
 #include "document.hxx"
-#include "unoguard.hxx"
 #include "scresid.hxx"
 #include "sc.hrc"
 
@@ -43,6 +42,7 @@
 #include <rtl/uuid.h>
 #include <tools/debug.hxx>
 #include <comphelper/sequence.hxx>
+#include <vcl/svapp.hxx>
 
 
 using namespace ::com::sun::star;
@@ -67,7 +67,7 @@ ScAccessibleTableBase::~ScAccessibleTableBase()
 
 void SAL_CALL ScAccessibleTableBase::disposing()
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     mpDoc = NULL;
 
     ScAccessibleContextBase::disposing();
@@ -99,7 +99,7 @@ void SAL_CALL ScAccessibleTableBase::release()
 sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowCount(  )
                     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     return maRange.aEnd.Row() - maRange.aStart.Row() + 1;
 }
@@ -107,7 +107,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowCount(  )
 sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount(  )
                     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     return maRange.aEnd.Col() - maRange.aStart.Col() + 1;
 }
@@ -139,7 +139,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount(  )
 sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
     throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     if ((nColumn > (maRange.aEnd.Col() - maRange.aStart.Col())) || (nColumn < 0) ||
@@ -168,7 +168,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowExtentAt( sal_Int32 nR
 sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
     throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     if ((nColumn > (maRange.aEnd.Col() - maRange.aStart.Col())) || (nColumn < 0) ||
@@ -280,7 +280,7 @@ sal_Bool SAL_CALL ScAccessibleTableBase::isAccessibleSelected( sal_Int32 /* nRow
 sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
     throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     if (nRow > (maRange.aEnd.Row() - maRange.aStart.Row()) ||
@@ -297,7 +297,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow, sa
 sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRow( sal_Int32 nChildIndex )
     throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     if (nChildIndex >= getAccessibleChildCount() || nChildIndex < 0)
@@ -309,7 +309,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRow( sal_Int32 nChildInde
 sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumn( sal_Int32 nChildIndex )
     throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     if (nChildIndex >= getAccessibleChildCount() || nChildIndex < 0)
@@ -324,7 +324,7 @@ sal_Int32 SAL_CALL
     ScAccessibleTableBase::getAccessibleChildCount(void)
                     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     return static_cast<sal_Int32>(maRange.aEnd.Row() - maRange.aStart.Row() + 1) *
             (maRange.aEnd.Col() - maRange.aStart.Col() + 1);
@@ -336,7 +336,7 @@ uno::Reference< XAccessible > SAL_CALL
         throw (uno::RuntimeException,
         lang::IndexOutOfBoundsException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
 
     if (nIndex >= getAccessibleChildCount() || nIndex < 0)
@@ -403,7 +403,7 @@ sal_Bool SAL_CALL
         throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
     // I don't need to guard, because the called funtions have a guard
-//    ScUnoGuard aGuard;
+//    SolarMutexGuard aGuard;
     if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount())
         throw lang::IndexOutOfBoundsException();
     return isAccessibleSelected(getAccessibleRow(nChildIndex), getAccessibleColumn(nChildIndex));
@@ -463,7 +463,7 @@ uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleTableBase::getImplementationId(void)
     throw (uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     IsObjectValid();
     static uno::Sequence<sal_Int8> aId;
     if (aId.getLength() == 0)
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 0ee57b63deb2..a4c470093398 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -43,7 +43,6 @@
 #include "prevwsh.hxx"
 #include "docsh.hxx"
 #include "prevloc.hxx"
-#include "unoguard.hxx"
 #include "patattr.hxx"
 #include "inputwin.hxx"
 #include <editeng/unofored.hxx>
@@ -55,6 +54,7 @@
 #include <editeng/justifyitem.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/algitem.hxx>
+#include <vcl/svapp.hxx>
 
 
 // ============================================================================
@@ -1522,7 +1522,7 @@ ScAccessibleHeaderTextData::ScAccessibleHeaderTextData(ScPreviewShell* pViewShel
 
 ScAccessibleHeaderTextData::~ScAccessibleHeaderTextData()
 {
-    ScUnoGuard aGuard;      //  needed for EditEngine dtor
+    SolarMutexGuard aGuard;     //  needed for EditEngine dtor
 
     if (mpDocSh)
         mpDocSh->GetDocument()->RemoveUnoObject(*this);
@@ -1636,7 +1636,7 @@ ScAccessibleNoteTextData::ScAccessibleNoteTextData(ScPreviewShell* pViewShell,
 
 ScAccessibleNoteTextData::~ScAccessibleNoteTextData()
 {
-    ScUnoGuard aGuard;      //  needed for EditEngine dtor
+    SolarMutexGuard aGuard;     //  needed for EditEngine dtor
 
     if (mpDocSh)
         mpDocSh->GetDocument()->RemoveUnoObject(*this);
author	Norbert Thiebaud <nthiebaud@gmail.com>	2010-10-14 22:18:02 -0500
committer	Norbert Thiebaud <nthiebaud@gmail.com>	2010-10-25 17:57:35 -0500
commit	2622a457404ff6593535219aab8e3cba1cb07c9e (patch)
tree	c0252373576c4ae240a27e54ce22239532038774 /sc/source/ui/Accessibility
parent	defa3490b432f331b0f27a9ab14795f476cd3990 (diff)