diff options
58 files changed, 1326 insertions, 1430 deletions
diff --git a/sc/inc/unoguard.hxx b/sc/inc/unoguard.hxx deleted file mode 100644 index 0768eada24d7..000000000000 --- a/sc/inc/unoguard.hxx +++ /dev/null @@ -1,42 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SC_UNOGUARD_HXX -#define SC_UNOGUARD_HXX - -#include <vos/mutex.hxx> - -class ScUnoGuard : public NAMESPACE_VOS(OGuard) -{ -public: - ScUnoGuard(); - ~ScUnoGuard() {} -}; - - -#endif - diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 0902ec4bbbaf..9cf0be4b3feb 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -74,7 +74,6 @@ #include "sc.hrc" // SID_LINK #include "hints.hxx" #include "dpobject.hxx" -#include "unoguard.hxx" #include "drwlayer.hxx" #include "unoreflist.hxx" #include "listenercalls.hxx" diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 97dbdb9b14a6..4b9adca7e9c3 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -44,6 +44,7 @@ #include <rtl/math.hxx> #include <svl/itemprop.hxx> #include <svl/intitem.hxx> +#include <vcl/svapp.hxx> #include "scitems.hxx" #include "document.hxx" @@ -57,7 +58,6 @@ #include "global.hxx" #include "collect.hxx" #include "datauno.hxx" // ScDataUnoConversion -#include "unoguard.hxx" #include "miscuno.hxx" #include "unonames.hxx" @@ -1141,7 +1141,7 @@ const uno::Sequence<sheet::MemberResult>* ScDPSource::GetMemberResults( ScDPLeve uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; using beans::PropertyAttribute::READONLY; static SfxItemPropertyMapEntry aDPSourceMap_Impl[] = @@ -1554,7 +1554,7 @@ BOOL ScDPDimension::IsVisible( const ScDPItemData& rData ) uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static SfxItemPropertyMapEntry aDPDimensionMap_Impl[] = { @@ -2289,7 +2289,7 @@ void ScDPLevel::setShowEmpty(BOOL bSet) uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPLevel::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static SfxItemPropertyMapEntry aDPLevelMap_Impl[] = { @@ -2794,7 +2794,7 @@ void ScDPMember::setPosition(sal_Int32 nNew) uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static SfxItemPropertyMapEntry aDPMemberMap_Impl[] = { diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx index 8a4e992b5119..4133e1f4dd9e 100644 --- a/sc/source/core/tool/addinlis.cxx +++ b/sc/source/core/tool/addinlis.cxx @@ -33,13 +33,13 @@ #include <tools/debug.hxx> #include <sfx2/objsh.hxx> +#include <vcl/svapp.hxx> #include "addinlis.hxx" #include "miscuno.hxx" // SC_IMPL_SERVICE_INFO #include "document.hxx" #include "brdcst.hxx" -#include "unoguard.hxx" #include "sc.hrc" using namespace com::sun::star; @@ -136,7 +136,7 @@ void ScAddInListener::RemoveDocument( ScDocument* pDocumentP ) void SAL_CALL ScAddInListener::modified( const ::com::sun::star::sheet::ResultEvent& aEvent ) throw(::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; //! or generate a UserEvent + SolarMutexGuard aGuard; //! or generate a UserEvent aResult = aEvent.Value; // store result diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 9f6a57cd7615..2f31b209d375 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -58,7 +58,6 @@ #include "docuno.hxx" #include "textuno.hxx" #include "chartlis.hxx" -#include "unoguard.hxx" #include "scitems.hxx" #include "docpool.hxx" #include "userdat.hxx" @@ -4459,7 +4458,7 @@ sal_uInt32 ScXMLExport::exportDoc( enum XMLTokenEnum eClass ) void SAL_CALL ScXMLExport::setSourceDocument( const uno::Reference<lang::XComponent>& xComponent ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SvXMLExport::setSourceDocument( xComponent ); pDoc = ScXMLConverter::GetScDocument( GetModel() ); @@ -4489,7 +4488,7 @@ void SAL_CALL ScXMLExport::setSourceDocument( const uno::Reference<lang::XCompon sal_Bool SAL_CALL ScXMLExport::filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw(::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDoc) pDoc->DisableIdle(TRUE); sal_Bool bReturn(SvXMLExport::filter(aDescriptor)); @@ -4501,7 +4500,7 @@ sal_Bool SAL_CALL ScXMLExport::filter( const ::com::sun::star::uno::Sequence< :: void SAL_CALL ScXMLExport::cancel() throw(::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDoc) pDoc->DisableIdle(FALSE); SvXMLExport::cancel(); @@ -4511,7 +4510,7 @@ void SAL_CALL ScXMLExport::cancel() void SAL_CALL ScXMLExport::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SvXMLExport::initialize(aArguments); } @@ -4519,7 +4518,7 @@ void SAL_CALL ScXMLExport::initialize( const ::com::sun::star::uno::Sequence< :: ::rtl::OUString SAL_CALL ScXMLExport::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_uInt16 nFlags = getExportFlags(); if (nFlags & EXPORT_OASIS) @@ -4567,14 +4566,14 @@ void SAL_CALL ScXMLExport::initialize( const ::com::sun::star::uno::Sequence< :: sal_Bool SAL_CALL ScXMLExport::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return SvXMLExport::supportsService( ServiceName ); } ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ScXMLExport::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return SvXMLExport::getSupportedServiceNames(); } @@ -4582,7 +4581,7 @@ sal_Bool SAL_CALL ScXMLExport::supportsService( const ::rtl::OUString& ServiceNa sal_Int64 SAL_CALL ScXMLExport::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return SvXMLExport::getSomething(aIdentifier); } diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 826edfac6895..b204e05b8e3c 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -60,7 +60,6 @@ #include "nameuno.hxx" #include "xmlbodyi.hxx" #include "xmlstyli.hxx" -#include "unoguard.hxx" #include "ViewSettingsSequenceDefines.hxx" #include "patattr.hxx" @@ -1742,7 +1741,7 @@ ScXMLImport::ScXMLImport( pMyLabelRanges(NULL), pValidations(NULL), pDetectiveOpArray(NULL), - pScUnoGuard(NULL), + pSolarMutexGuard(NULL), pNumberFormatAttributesExportHelper(NULL), pStyleNumberFormats(NULL), sPrevStyleName(), @@ -1873,8 +1872,8 @@ ScXMLImport::~ScXMLImport() throw() if (pStylesImportHelper) delete pStylesImportHelper; - if (pScUnoGuard) - delete pScUnoGuard; + if (pSolarMutexGuard) + delete pSolarMutexGuard; if (pMyNamedExpressions) delete pMyNamedExpressions; @@ -2914,7 +2913,7 @@ void ScXMLImport::DisposingModel() void ScXMLImport::LockSolarMutex() { // #i62677# When called from DocShell/Wrapper, the SolarMutex is already locked, - // so there's no need to allocate (and later delete) the ScUnoGuard. + // so there's no need to allocate (and later delete) the SolarMutexGuard. if (bFromWrapper) { DBG_TESTSOLARMUTEX(); @@ -2923,8 +2922,8 @@ void ScXMLImport::LockSolarMutex() if (nSolarMutexLocked == 0) { - DBG_ASSERT(!pScUnoGuard, "Solar Mutex is locked"); - pScUnoGuard = new ScUnoGuard(); + DBG_ASSERT(!pSolarMutexGuard, "Solar Mutex is locked"); + pSolarMutexGuard = new SolarMutexGuard(); } ++nSolarMutexLocked; } @@ -2937,9 +2936,9 @@ void ScXMLImport::UnlockSolarMutex() nSolarMutexLocked--; if (nSolarMutexLocked == 0) { - DBG_ASSERT(pScUnoGuard, "Solar Mutex is always unlocked"); - delete pScUnoGuard; - pScUnoGuard = NULL; + DBG_ASSERT(pSolarMutexGuard, "Solar Mutex is always unlocked"); + delete pSolarMutexGuard; + pSolarMutexGuard = NULL; } } } diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index e3d9d9378213..552900da3d8c 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -609,7 +609,7 @@ class SfxItemSet; class SvXMLNumFmtHelper; class XMLShapeImportHelper; class ScXMLChangeTrackingImportHelper; -class ScUnoGuard; +class SolarMutexGuard; struct tScMyCellRange { @@ -767,7 +767,7 @@ class ScXMLImport: public SvXMLImport ScMyLabelRanges* pMyLabelRanges; ScMyImportValidations* pValidations; ScMyImpDetectiveOpArray* pDetectiveOpArray; - ScUnoGuard* pScUnoGuard; + SolarMutexGuard* pSolarMutexGuard; std::vector<rtl::OUString> aTableStyles; XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper; 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); diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index 854b0d67b81c..e9618d43210c 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -35,10 +35,10 @@ #include <com/sun/star/table/CellRangeAddress.hpp> #include <svl/itemprop.hxx> +#include <vcl/svapp.hxx> #include "docsh.hxx" #include "unonames.hxx" -#include "unoguard.hxx" #include "miscuno.hxx" #include "convuno.hxx" #include "addruno.hxx" @@ -109,7 +109,7 @@ sal_Bool ScAddressConversionObj::ParseUIString( const String& rUIString, ::formu uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( bIsRange ) { diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 81c7e0624521..bd1991203887 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -36,6 +36,7 @@ #include <tools/debug.hxx> #include <tools/shl.hxx> #include <svl/poolitem.hxx> +#include <vcl/svapp.hxx> #include <svx/unomid.hxx> #include "unowids.hxx" #include <rtl/uuid.h> @@ -68,7 +69,6 @@ #include "afmtuno.hxx" #include "miscuno.hxx" #include "autoform.hxx" -#include "unoguard.hxx" #include "scdll.hxx" #include "unonames.hxx" #include "cellsuno.hxx" @@ -201,7 +201,7 @@ ScAutoFormatsObj::~ScAutoFormatsObj() uno::Reference<uno::XInterface> SAL_CALL ScAutoFormatsObj_CreateInstance( const uno::Reference<lang::XMultiServiceFactory>& ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDLL::Init(); static uno::Reference< uno::XInterface > xInst((::cppu::OWeakObject*) new ScAutoFormatsObj); return xInst; @@ -250,7 +250,7 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const rtl::OUString& aName, const throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Bool bDone = sal_False; // Reflection muss nicht uno::XInterface sein, kann auch irgendein Interface sein... uno::Reference< uno::XInterface > xInterface(aElement, uno::UNO_QUERY); @@ -305,7 +305,7 @@ void SAL_CALL ScAutoFormatsObj::replaceByName( const rtl::OUString& aName, const throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! zusammenfassen? removeByName( aName ); insertByName( aName, aElement ); @@ -315,7 +315,7 @@ void SAL_CALL ScAutoFormatsObj::removeByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameStr(aName); ScAutoFormat* pFormats = ScGlobal::GetAutoFormat(); @@ -338,7 +338,7 @@ void SAL_CALL ScAutoFormatsObj::removeByName( const rtl::OUString& aName ) uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatsObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableAutoFormatEnumeration"))); } @@ -346,7 +346,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatsObj::createEnumera sal_Int32 SAL_CALL ScAutoFormatsObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetAutoFormat(); if (pFormats) return pFormats->GetCount(); @@ -358,7 +358,7 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference< container::XNamed > xFormat(GetObjectByIndex_Impl((sal_uInt16)nIndex)); if (!xFormat.is()) throw lang::IndexOutOfBoundsException(); @@ -367,13 +367,13 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScAutoFormatsObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ::getCppuType((const uno::Reference< container::XNamed >*)0); // muss zu getByIndex passen } sal_Bool SAL_CALL ScAutoFormatsObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -383,7 +383,7 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference< container::XNamed > xFormat(GetObjectByName_Impl(aName)); if (!xFormat.is()) throw container::NoSuchElementException(); @@ -393,7 +393,7 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByName( const rtl::OUString& aName ) uno::Sequence<rtl::OUString> SAL_CALL ScAutoFormatsObj::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetAutoFormat(); if (pFormats) { @@ -414,7 +414,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAutoFormatsObj::getElementNames() sal_Bool SAL_CALL ScAutoFormatsObj::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetAutoFormat(); if (pFormats) { @@ -518,7 +518,7 @@ ScAutoFormatFieldObj* ScAutoFormatObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableAutoFormatEnumeration"))); } @@ -526,7 +526,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatObj::createEnumerat sal_Int32 SAL_CALL ScAutoFormatObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (IsInserted()) return SC_AF_FIELD_COUNT; // immer 16 Elemente else @@ -537,7 +537,7 @@ uno::Any SAL_CALL ScAutoFormatObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( nIndex < 0 || nIndex >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -549,13 +549,13 @@ uno::Any SAL_CALL ScAutoFormatObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScAutoFormatObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); // muss zu getByIndex passen } sal_Bool SAL_CALL ScAutoFormatObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -563,7 +563,7 @@ sal_Bool SAL_CALL ScAutoFormatObj::hasElements() throw(uno::RuntimeException) rtl::OUString SAL_CALL ScAutoFormatObj::getName() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetAutoFormat(); if (pFormats && IsInserted() && nFormatIndex < pFormats->GetCount()) { @@ -577,7 +577,7 @@ rtl::OUString SAL_CALL ScAutoFormatObj::getName() throw(uno::RuntimeException) void SAL_CALL ScAutoFormatObj::setName( const rtl::OUString& aNewName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNewString(aNewName); ScAutoFormat* pFormats = ScGlobal::GetAutoFormat(); @@ -618,7 +618,7 @@ void SAL_CALL ScAutoFormatObj::setName( const rtl::OUString& aNewName ) uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); return aRef; } @@ -629,7 +629,7 @@ void SAL_CALL ScAutoFormatObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetAutoFormat(); if (pFormats && IsInserted() && nFormatIndex < pFormats->GetCount()) { @@ -662,7 +662,7 @@ uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const rtl::OUString& aPrope throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Any aAny; ScAutoFormat* pFormats = ScGlobal::GetAutoFormat(); @@ -723,7 +723,7 @@ void ScAutoFormatFieldObj::Notify( SfxBroadcaster& /* rBC */, const SfxHint& /* uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatFieldObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); return aRef; } @@ -734,7 +734,7 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetAutoFormat(); const SfxItemPropertySimpleEntry* pEntry = aPropSet.getPropertyMap()->getByName( aPropertyName ); @@ -822,7 +822,7 @@ uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const rtl::OUString& a throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Any aVal; ScAutoFormat* pFormats = ScGlobal::GetAutoFormat(); diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 338996a86ede..6db804e0bb9f 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -46,7 +46,6 @@ #include "printopt.hxx" #include "userlist.hxx" #include "sc.hrc" // VAR_ARGS -#include "unoguard.hxx" #include "unonames.hxx" #include "funcdesc.hxx" #include <com/sun/star/sheet/FunctionArgument.hpp> @@ -497,7 +496,7 @@ ScSpreadsheetSettings::~ScSpreadsheetSettings() uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance( const uno::Reference<lang::XMultiServiceFactory>& /* rSMgr */ ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDLL::Init(); static uno::Reference<uno::XInterface> xInst((cppu::OWeakObject*)new ScSpreadsheetSettings()); return xInst; @@ -521,7 +520,7 @@ uno::Sequence<rtl::OUString> ScSpreadsheetSettings::getSupportedServiceNames_Sta uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettings::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); return aRef; @@ -533,7 +532,7 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString(aPropertyName); ScModule* pScMod = SC_MOD(); @@ -680,7 +679,7 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const rtl::OUString& throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString = aPropertyName; uno::Any aRet; @@ -760,7 +759,7 @@ ScRecentFunctionsObj::~ScRecentFunctionsObj() uno::Reference<uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance( const uno::Reference<lang::XMultiServiceFactory>& /* rSMgr */ ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDLL::Init(); static uno::Reference<uno::XInterface> xInst((cppu::OWeakObject*)new ScRecentFunctionsObj()); return xInst; @@ -784,7 +783,7 @@ uno::Sequence<rtl::OUString> ScRecentFunctionsObj::getSupportedServiceNames_Stat uno::Sequence<sal_Int32> SAL_CALL ScRecentFunctionsObj::getRecentFunctionIds() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScAppOptions& rOpt = SC_MOD()->GetAppOptions(); USHORT nCount = rOpt.GetLRUFuncListCount(); const USHORT* pFuncs = rOpt.GetLRUFuncList(); @@ -803,7 +802,7 @@ void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds( const uno::Sequence<sal_Int32>& aRecentFunctionIds ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = (USHORT) Min( aRecentFunctionIds.getLength(), (INT32) LRU_MAX ); const INT32* pAry = aRecentFunctionIds.getConstArray(); @@ -841,7 +840,7 @@ ScFunctionListObj::~ScFunctionListObj() uno::Reference<uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance( const uno::Reference<lang::XMultiServiceFactory>& /* rSMgr */ ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDLL::Init(); static uno::Reference<uno::XInterface> xInst((cppu::OWeakObject*)new ScFunctionListObj()); return xInst; @@ -922,7 +921,7 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co uno::Sequence<beans::PropertyValue> SAL_CALL ScFunctionListObj::getById( sal_Int32 nId ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) { @@ -952,7 +951,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameStr(aName); const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) @@ -982,7 +981,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByName( const rtl::OUString& aName ) sal_Int32 SAL_CALL ScFunctionListObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = 0; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) @@ -994,7 +993,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) { @@ -1022,7 +1021,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByIndex( sal_Int32 nIndex ) uno::Reference<container::XEnumeration> SAL_CALL ScFunctionListObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.FunctionDescriptionEnumeration"))); } @@ -1030,19 +1029,19 @@ uno::Reference<container::XEnumeration> SAL_CALL ScFunctionListObj::createEnumer uno::Type SAL_CALL ScFunctionListObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Sequence<beans::PropertyValue>*)0); } sal_Bool SAL_CALL ScFunctionListObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() > 0 ); } uno::Sequence<rtl::OUString> SAL_CALL ScFunctionListObj::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) { @@ -1063,7 +1062,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScFunctionListObj::getElementNames() throw sal_Bool SAL_CALL ScFunctionListObj::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameStr(aName); const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 640d1f0b53d1..8514810406df 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -116,7 +116,6 @@ #include "validat.hxx" #include "sc.hrc" #include "brdcst.hxx" -#include "unoguard.hxx" #include "cellform.hxx" #include "globstr.hrc" #include "unonames.hxx" @@ -1772,7 +1771,7 @@ void ScCellRangesBase::PaintRanges_Impl( USHORT nPart ) double SAL_CALL ScCellRangesBase::computeFunction( sheet::GeneralFunction nFunction ) throw(uno::Exception, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScMarkData aMark(*GetMarkData()); aMark.MarkToSimple(); if (!aMark.IsMarked()) @@ -1792,7 +1791,7 @@ double SAL_CALL ScCellRangesBase::computeFunction( sheet::GeneralFunction nFunct void SAL_CALL ScCellRangesBase::clearContents( sal_Int32 nContentFlags ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( aRanges.Count() ) { // only for clearContents: EDITATTR is only used if no contents are deleted @@ -1899,7 +1898,7 @@ beans::PropertyState ScCellRangesBase::GetOnePropertyState( USHORT nItemWhich, c beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const rtl::OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( aRanges.Count() == 0 ) throw uno::RuntimeException(); @@ -1914,7 +1913,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScCellRangesBase::getPropertyStates const uno::Sequence<rtl::OUString>& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap(); // from derived class @@ -1933,7 +1932,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScCellRangesBase::getPropertyStates void SAL_CALL ScCellRangesBase::setPropertyToDefault( const rtl::OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( pDocShell ) { const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap(); // from derived class @@ -1984,7 +1983,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPr { //! mit getPropertyValue zusammenfassen - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Any aAny; if ( pDocShell ) @@ -2085,7 +2084,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPr uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangesBase::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( pPropSet->getPropertyMap() )); return aRef; @@ -2208,7 +2207,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !pDocShell || aRanges.Count() == 0 ) throw uno::RuntimeException(); @@ -2359,7 +2358,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const rtl::OUString& aProp throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !pDocShell || aRanges.Count() == 0 ) throw uno::RuntimeException(); @@ -2517,7 +2516,7 @@ void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const rtl::OUString& throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( aRanges.Count() == 0 ) throw uno::RuntimeException(); @@ -2529,7 +2528,7 @@ void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const rtl::OUStrin throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( aRanges.Count() == 0 ) throw uno::RuntimeException(); @@ -2561,7 +2560,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Int32 nCount(aPropertyNames.getLength()); sal_Int32 nValues(aValues.getLength()); @@ -2655,7 +2654,7 @@ uno::Sequence<uno::Any> SAL_CALL ScCellRangesBase::getPropertyValues( const uno::Sequence< rtl::OUString >& aPropertyNames ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap(); // from derived class @@ -2708,7 +2707,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set const uno::Sequence< uno::Any >& aValues ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Int32 nCount(aPropertyNames.getLength()); sal_Int32 nValues(aValues.getLength()); @@ -2834,7 +2833,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::getPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Int32 nCount(aPropertyNames.getLength()); uno::Sequence < beans::GetPropertyTolerantResult > aReturns(nCount); @@ -2864,7 +2863,7 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::get uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBase::getDirectPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Int32 nCount(aPropertyNames.getLength()); uno::Sequence < beans::GetDirectPropertyTolerantResult > aReturns(nCount); @@ -2903,7 +2902,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBas void SAL_CALL ScCellRangesBase::decrementIndent() throw(::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( pDocShell && aRanges.Count() ) // leer = nichts zu tun { ScDocFunc aFunc(*pDocShell); @@ -2916,7 +2915,7 @@ void SAL_CALL ScCellRangesBase::decrementIndent() throw(::com::sun::star::uno::R void SAL_CALL ScCellRangesBase::incrementIndent() throw(::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( pDocShell && aRanges.Count() ) // leer = nichts zu tun { ScDocFunc aFunc(*pDocShell); @@ -2981,7 +2980,7 @@ ScMemChart* ScCellRangesBase::CreateMemChart_Impl() const uno::Sequence< uno::Sequence<double> > SAL_CALL ScCellRangesBase::getData() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScMemChart* pMemChart = CreateMemChart_Impl(); if ( pMemChart ) { @@ -3043,7 +3042,7 @@ ScRangeListRef ScCellRangesBase::GetLimitedChartRanges_Impl( long nDataColumns, void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<double> >& aData ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; long nRowCount = aData.getLength(); long nColCount = nRowCount ? aData[0].getLength() : 0; @@ -3096,7 +3095,7 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesBase::getRowDescriptions() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScMemChart* pMemChart = CreateMemChart_Impl(); if ( pMemChart ) { @@ -3116,7 +3115,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions( const uno::Sequence<rtl::OUString>& aRowDescriptions ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; if ( bChartColAsHdr ) { @@ -3164,7 +3163,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions( uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesBase::getColumnDescriptions() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScMemChart* pMemChart = CreateMemChart_Impl(); if ( pMemChart ) { @@ -3184,7 +3183,7 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions( const uno::Sequence<rtl::OUString>& aColumnDescriptions ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; if ( bChartRowAsHdr ) { @@ -3277,7 +3276,7 @@ void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Refe chart::XChartDataChangeEventListener >& aListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( pDocShell && aRanges.Count() ) { //! auf doppelte testen? @@ -3298,7 +3297,7 @@ void SAL_CALL ScCellRangesBase::removeChartDataChangeEventListener( const uno::R chart::XChartDataChangeEventListener >& aListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( pDocShell && aRanges.Count() ) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -3324,7 +3323,7 @@ sal_Bool SAL_CALL ScCellRangesBase::isNotANumber( double nNumber ) throw(uno::Ru void SAL_CALL ScCellRangesBase::addModifyListener( const uno::Reference<util::XModifyListener>& aListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( aRanges.Count() == 0 ) throw uno::RuntimeException(); @@ -3350,7 +3349,7 @@ void SAL_CALL ScCellRangesBase::removeModifyListener( const uno::Reference<util: throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( aRanges.Count() == 0 ) throw uno::RuntimeException(); @@ -3384,7 +3383,7 @@ void SAL_CALL ScCellRangesBase::removeModifyListener( const uno::Reference<util: uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleCells() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { //! fuer alle Tabellen getrennt, wenn Markierungen pro Tabelle getrennt sind! @@ -3424,7 +3423,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleC uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCells() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -3466,7 +3465,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC sal_Int16 nContentFlags ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -3555,7 +3554,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaC sal_Int32 nResultFlags ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -3708,21 +3707,21 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl( uno::Reference<sheet::XSheetCellRanges > SAL_CALL ScCellRangesBase::queryColumnDifferences( const table::CellAddress& aCompare ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return QueryDifferences_Impl( aCompare, TRUE ); } uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryRowDifferences( const table::CellAddress& aCompare ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return QueryDifferences_Impl( aCompare, FALSE ); } uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryIntersection( const table::CellRangeAddress& aRange ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScRange aMask( (SCCOL)aRange.StartColumn, (SCROW)aRange.StartRow, aRange.Sheet, (SCCOL)aRange.EndColumn, (SCROW)aRange.EndRow, aRange.Sheet ); @@ -3748,7 +3747,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryIntersec uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPrecedents( sal_Bool bRecursive ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( pDocShell ) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -3802,7 +3801,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPreceden uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependents( sal_Bool bRecursive ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( pDocShell ) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -3867,7 +3866,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependen uno::Reference<util::XSearchDescriptor> SAL_CALL ScCellRangesBase::createSearchDescriptor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScCellSearchObj; } @@ -3960,7 +3959,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findFirst( const uno::Reference<util::XSearchDescriptor>& xDesc ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return Find_Impl( xDesc, NULL ); } @@ -3969,7 +3968,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findNext( const uno::Reference<util::XSearchDescriptor >& xDesc ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( xStartAt.is() ) { ScCellRangesBase* pRangesImp = ScCellRangesBase::getImplementation( xStartAt ); @@ -3991,14 +3990,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findNext( uno::Reference<util::XReplaceDescriptor> SAL_CALL ScCellRangesBase::createReplaceDescriptor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScCellSearchObj; } sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSearchDescriptor>& xDesc ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; INT32 nReplaced = 0; if ( pDocShell && xDesc.is() ) { @@ -4211,7 +4210,7 @@ ScCellRangeObj* ScCellRangesObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const uno::Sequence<table::CellRangeAddress> SAL_CALL ScCellRangesObj::getRangeAddresses() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); const ScRangeList& rRanges = GetRangeList(); ULONG nCount = rRanges.Count(); @@ -4234,7 +4233,7 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScCellRangesObj::getRangeAddress uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellRangesObj::getCells() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // getCells with empty range list is possible (no exception), // the resulting enumeration just has no elements @@ -4251,7 +4250,7 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellRangesObj::getCells rtl::OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString; ScDocShell* pDocSh = GetDocShell(); const ScRangeList& rRanges = GetRangeList(); @@ -4266,7 +4265,7 @@ void SAL_CALL ScCellRangesObj::addRangeAddress( const table::CellRangeAddress& r sal_Bool bMergeRanges ) throw(::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScRange aRange(static_cast<SCCOL>(rRange.StartColumn), static_cast<SCROW>(rRange.StartRow), static_cast<SCTAB>(rRange.Sheet), @@ -4288,7 +4287,7 @@ void SAL_CALL ScCellRangesObj::removeRangeAddress( const table::CellRangeAddress throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); ScRangeList aSheetRanges; @@ -4336,7 +4335,7 @@ void SAL_CALL ScCellRangesObj::addRangeAddresses( const uno::Sequence<table::Cel sal_Bool bMergeRanges ) throw(::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Int32 nCount(rRanges.getLength()); if (nCount) { @@ -4359,7 +4358,7 @@ void SAL_CALL ScCellRangesObj::removeRangeAddresses( const uno::Sequence<table:: ::com::sun::star::uno::RuntimeException) { // with this implementation not needed -// ScUnoGuard aGuard; +// SolarMutexGuard aGuard; // use sometimes a better/faster implementation @@ -4388,7 +4387,7 @@ void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const u throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); BOOL bDone = FALSE; @@ -4516,7 +4515,7 @@ void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; String aNameStr(aName); ScDocShell* pDocSh = GetDocShell(); @@ -4583,7 +4582,7 @@ void SAL_CALL ScCellRangesObj::replaceByName( const rtl::OUString& aName, const throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! zusammenfassen? removeByName( aName ); insertByName( aName, aElement ); @@ -4595,7 +4594,7 @@ uno::Any SAL_CALL ScCellRangesObj::getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Any aRet; String aNameStr(aName); @@ -4632,7 +4631,7 @@ BOOL lcl_FindEntryName( const ScNamedEntryArr_Impl& rNamedEntries, uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); const ScRangeList& rRanges = GetRangeList(); @@ -4660,7 +4659,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getElementNames() sal_Bool SAL_CALL ScCellRangesObj::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameStr(aName); ScDocShell* pDocSh = GetDocShell(); const ScRangeList& rRanges = GetRangeList(); @@ -4673,7 +4672,7 @@ sal_Bool SAL_CALL ScCellRangesObj::hasByName( const rtl::OUString& aName ) uno::Reference<container::XEnumeration> SAL_CALL ScCellRangesObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRangesEnumeration"))); } @@ -4681,7 +4680,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellRangesObj::createEnumerat sal_Int32 SAL_CALL ScCellRangesObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); return rRanges.Count(); } @@ -4690,7 +4689,7 @@ uno::Any SAL_CALL ScCellRangesObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xRange(GetObjectByIndex_Impl(nIndex)); if (xRange.is()) return uno::makeAny(xRange); @@ -4701,13 +4700,13 @@ uno::Any SAL_CALL ScCellRangesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScCellRangesObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<table::XCellRange>*)0); } sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); return rRanges.Count() != 0; } @@ -4896,7 +4895,7 @@ uno::Reference<table::XCell> SAL_CALL ScCellRangeObj::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw(lang::IndexOutOfBoundsException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetCellByPosition_Impl(nColumn, nRow); } @@ -4905,7 +4904,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByPositio sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw(lang::IndexOutOfBoundsException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if (!pDocSh) @@ -4944,7 +4943,7 @@ uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName( // name refers to the whole document (with the range's table as default), // valid only if the range is within this range - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -4995,7 +4994,7 @@ uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName( uno::Reference<table::XTableColumns> SAL_CALL ScCellRangeObj::getColumns() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if (pDocSh) return new ScTableColumnsObj( pDocSh, aRange.aStart.Tab(), @@ -5007,7 +5006,7 @@ uno::Reference<table::XTableColumns> SAL_CALL ScCellRangeObj::getColumns() throw uno::Reference<table::XTableRows> SAL_CALL ScCellRangeObj::getRows() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if (pDocSh) return new ScTableRowsObj( pDocSh, aRange.aStart.Tab(), @@ -5021,7 +5020,7 @@ uno::Reference<table::XTableRows> SAL_CALL ScCellRangeObj::getRows() throw(uno:: table::CellRangeAddress SAL_CALL ScCellRangeObj::getRangeAddress() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; table::CellRangeAddress aRet; ScUnoConversion::FillApiRange( aRet, aRange ); return aRet; @@ -5032,7 +5031,7 @@ table::CellRangeAddress SAL_CALL ScCellRangeObj::getRangeAddress() throw(uno::Ru uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellRangeObj::getSpreadsheet() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if (pDocSh) return new ScTableSheetObj( pDocSh, aRange.aStart.Tab() ); @@ -5045,7 +5044,7 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellRangeObj::getSpreadsheet() rtl::OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // Matrix-Formel, wenn eindeutig Teil einer Matrix, // also wenn Anfang und Ende des Blocks zur selben Matrix gehoeren. @@ -5106,7 +5105,7 @@ void ScCellRangeObj::SetArrayFormula_Impl( const rtl::OUString& rFormula, void SAL_CALL ScCellRangeObj::setArrayFormula( const rtl::OUString& aFormula ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // GRAM_PODF_A1 for API compatibility. SetArrayFormula_Impl( aFormula, ::rtl::OUString(), formula::FormulaGrammar::GRAM_PODF_A1); } @@ -5114,7 +5113,7 @@ void SAL_CALL ScCellRangeObj::setArrayFormula( const rtl::OUString& aFormula ) void ScCellRangeObj::SetArrayFormulaWithGrammar( const rtl::OUString& rFormula, const rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SetArrayFormula_Impl( rFormula, rFormulaNmsp, eGrammar); } @@ -5122,7 +5121,7 @@ void ScCellRangeObj::SetArrayFormulaWithGrammar( const rtl::OUString& rFormula, uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellRangeObj::getArrayTokens() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // same cell logic as in getArrayFormula @@ -5156,7 +5155,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellRangeObj::getArrayTokens() thr void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -5193,7 +5192,7 @@ void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::Formula uno::Sequence< uno::Sequence<uno::Any> > SAL_CALL ScCellRangeObj::getDataArray() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( ScTableSheetObj::getImplementation( (cppu::OWeakObject*)this ) ) { @@ -5222,7 +5221,7 @@ void SAL_CALL ScCellRangeObj::setDataArray( const uno::Sequence< uno::Sequence<uno::Any> >& aArray ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; ScDocShell* pDocSh = GetDocShell(); @@ -5241,7 +5240,7 @@ void SAL_CALL ScCellRangeObj::setDataArray( uno::Sequence< uno::Sequence<rtl::OUString> > SAL_CALL ScCellRangeObj::getFormulaArray() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( ScTableSheetObj::getImplementation( (cppu::OWeakObject*)this ) ) { @@ -5284,7 +5283,7 @@ void SAL_CALL ScCellRangeObj::setFormulaArray( const uno::Sequence< uno::Sequence<rtl::OUString> >& aArray ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; ScDocShell* pDocSh = GetDocShell(); @@ -5308,7 +5307,7 @@ void SAL_CALL ScCellRangeObj::setTableOperation( const table::CellRangeAddress& const table::CellAddress& aRowCell ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if (pDocSh) { @@ -5353,7 +5352,7 @@ void SAL_CALL ScCellRangeObj::setTableOperation( const table::CellRangeAddress& void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -5373,7 +5372,7 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeExcepti sal_Bool SAL_CALL ScCellRangeObj::getIsMerged() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); return pDocSh && pDocSh->GetDocument()->HasAttrib( aRange, HASATTR_MERGED ); } @@ -5384,7 +5383,7 @@ void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFillMode, sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -5462,7 +5461,7 @@ void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection, void SAL_CALL ScCellRangeObj::fillAuto( sheet::FillDirection nFillDirection, sal_Int32 nSourceCount ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh && nSourceCount ) { @@ -5511,7 +5510,7 @@ void SAL_CALL ScCellRangeObj::fillAuto( sheet::FillDirection nFillDirection, void SAL_CALL ScCellRangeObj::autoFormat( const rtl::OUString& aName ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScAutoFormat* pAutoFormat = ScGlobal::GetAutoFormat(); ScDocShell* pDocSh = GetDocShell(); if ( pDocSh && pAutoFormat ) @@ -5541,7 +5540,7 @@ void SAL_CALL ScCellRangeObj::autoFormat( const rtl::OUString& aName ) uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createSortDescriptor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScSortParam aParam; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) @@ -5572,7 +5571,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createSortDescripto void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& aDescriptor ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if (pDocSh) { @@ -5619,7 +5618,7 @@ void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& a uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFilterDescriptor( sal_Bool bEmpty ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); ScFilterDescriptor* pNew = new ScFilterDescriptor(pDocSh); if ( !bEmpty && pDocSh ) @@ -5652,7 +5651,7 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDescriptor>& xDescriptor ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // das koennte theoretisch ein fremdes Objekt sein, also nur das // oeffentliche XSheetFilterDescriptor Interface benutzen, um @@ -5725,7 +5724,7 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil const uno::Reference<sheet::XSheetFilterable>& xObject ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // this ist hier nicht der Bereich, der gefiltert wird, sondern der // Bereich mit der Abfrage... @@ -5788,7 +5787,7 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil uno::Reference<sheet::XSubTotalDescriptor> SAL_CALL ScCellRangeObj::createSubTotalDescriptor( sal_Bool bEmpty ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScSubTotalDescriptor* pNew = new ScSubTotalDescriptor; ScDocShell* pDocSh = GetDocShell(); if ( !bEmpty && pDocSh ) @@ -5824,7 +5823,7 @@ void SAL_CALL ScCellRangeObj::applySubTotals( const uno::Reference<sheet::XSubTotalDescriptor>& xDescriptor, sal_Bool bReplace ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!xDescriptor.is()) return; @@ -5866,7 +5865,7 @@ void SAL_CALL ScCellRangeObj::applySubTotals( void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if (pDocSh) @@ -5894,7 +5893,7 @@ void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException) uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createImportDescriptor( sal_Bool bEmpty ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScImportParam aParam; ScDocShell* pDocSh = GetDocShell(); if ( !bEmpty && pDocSh ) @@ -5913,7 +5912,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createImportDescrip void SAL_CALL ScCellRangeObj::doImport( const uno::Sequence<beans::PropertyValue>& aDescriptor ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if (pDocSh) { @@ -5941,7 +5940,7 @@ void SAL_CALL ScCellRangeObj::doImport( const uno::Sequence<beans::PropertyValue uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getCellFormatRanges() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) return new ScCellFormatsObj( pDocSh, aRange ); @@ -5953,7 +5952,7 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getCellFormatRa uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getUniqueCellFormatRanges() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) return new ScUniqueCellFormatsObj( pDocSh, aRange ); @@ -5965,7 +5964,7 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getUniqueCellFo uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangeObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( pRangePropSet->getPropertyMap() )); return aRef; @@ -6297,7 +6296,7 @@ void ScCellObj::SetFormulaWithGrammar( const ::rtl::OUString& rFormula, uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScCellTextCursor( *this ); } @@ -6305,7 +6304,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursorByRange( const uno::Reference<text::XTextRange>& aTextPosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SvxUnoTextCursor* pCursor = new ScCellTextCursor( *this ); uno::Reference<text::XTextCursor> xCursor(pCursor); @@ -6326,13 +6325,13 @@ uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursorByRange( rtl::OUString SAL_CALL ScCellObj::getString() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetOutputString_Impl(); } void SAL_CALL ScCellObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString(aText); SetString_Impl(aString, FALSE, FALSE); // immer Text @@ -6348,7 +6347,7 @@ void SAL_CALL ScCellObj::insertString( const uno::Reference<text::XTextRange>& x // special handling for ScCellTextCursor is no longer needed, // SvxUnoText::insertString checks for SvxUnoTextRangeBase instead of SvxUnoTextRange - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetUnoText().insertString(xRange, aString, bAbsorb); } @@ -6356,7 +6355,7 @@ void SAL_CALL ScCellObj::insertControlCharacter( const uno::Reference<text::XTex sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetUnoText().insertControlCharacter(xRange, nControlCharacter, bAbsorb); } @@ -6365,7 +6364,7 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang sal_Bool bAbsorb ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh && xContent.is() ) { @@ -6413,7 +6412,7 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang void SAL_CALL ScCellObj::removeTextContent( const uno::Reference<text::XTextContent>& xContent ) throw(container::NoSuchElementException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( xContent.is() ) { ScCellFieldObj* pCellField = ScCellFieldObj::getImplementation( xContent ); @@ -6429,38 +6428,38 @@ void SAL_CALL ScCellObj::removeTextContent( const uno::Reference<text::XTextCont uno::Reference<text::XText> SAL_CALL ScCellObj::getText() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return this; } uno::Reference<text::XTextRange> SAL_CALL ScCellObj::getStart() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().getStart(); } uno::Reference<text::XTextRange> SAL_CALL ScCellObj::getEnd() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().getEnd(); } uno::Reference<container::XEnumeration> SAL_CALL ScCellObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().createEnumeration(); } uno::Type SAL_CALL ScCellObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().getElementType(); } sal_Bool SAL_CALL ScCellObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().hasElements(); } @@ -6468,33 +6467,33 @@ sal_Bool SAL_CALL ScCellObj::hasElements() throw(uno::RuntimeException) rtl::OUString SAL_CALL ScCellObj::getFormula() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // TRUE = englisch return GetInputString_Impl(TRUE); } void SAL_CALL ScCellObj::setFormula( const rtl::OUString& aFormula ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString(aFormula); SetString_Impl(aString, TRUE, TRUE); // englisch interpretieren } double SAL_CALL ScCellObj::getValue() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetValue_Impl(); } void SAL_CALL ScCellObj::setValue( double nValue ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SetValue_Impl(nValue); } table::CellContentType SAL_CALL ScCellObj::getType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; table::CellContentType eRet = table::CellContentType_EMPTY; ScDocShell* pDocSh = GetDocShell(); if (pDocSh) @@ -6541,7 +6540,7 @@ table::CellContentType ScCellObj::GetResultType_Impl() sal_Int32 SAL_CALL ScCellObj::getError() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nError = 0; ScDocShell* pDocSh = GetDocShell(); if (pDocSh) @@ -6563,7 +6562,7 @@ sal_Int32 SAL_CALL ScCellObj::getError() throw(uno::RuntimeException) uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellObj::getTokens() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Sequence<sheet::FormulaToken> aSequence; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) @@ -6582,7 +6581,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellObj::getTokens() throw(uno::Ru void SAL_CALL ScCellObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -6600,7 +6599,7 @@ void SAL_CALL ScCellObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rT table::CellAddress SAL_CALL ScCellObj::getCellAddress() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; table::CellAddress aAdr; aAdr.Sheet = aCellPos.Tab(); aAdr.Column = aCellPos.Col(); @@ -6613,7 +6612,7 @@ table::CellAddress SAL_CALL ScCellObj::getCellAddress() throw(uno::RuntimeExcept uno::Reference<sheet::XSheetAnnotation> SAL_CALL ScCellObj::getAnnotation() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) return new ScAnnotationObj( pDocSh, aCellPos ); @@ -6627,7 +6626,7 @@ uno::Reference<sheet::XSheetAnnotation> SAL_CALL ScCellObj::getAnnotation() uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellObj::getTextFields() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) return new ScCellFieldsObj( pDocSh, aCellPos ); @@ -6647,7 +6646,7 @@ uno::Reference<container::XNameAccess> SAL_CALL ScCellObj::getTextFieldMasters() uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( pCellPropSet->getPropertyMap() )); return aRef; @@ -6744,13 +6743,13 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellObj::getSupportedServiceNames() sal_Bool SAL_CALL ScCellObj::isActionLocked() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return nActionLockCount != 0; } void SAL_CALL ScCellObj::addActionLock() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!nActionLockCount) { if (pUnoText) @@ -6766,7 +6765,7 @@ void SAL_CALL ScCellObj::addActionLock() throw(uno::RuntimeException) void SAL_CALL ScCellObj::removeActionLock() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (nActionLockCount > 0) { nActionLockCount--; @@ -6789,7 +6788,7 @@ void SAL_CALL ScCellObj::removeActionLock() throw(uno::RuntimeException) void SAL_CALL ScCellObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pUnoText) { ScSharedCellEditSource* pEditSource = @@ -6806,7 +6805,7 @@ void SAL_CALL ScCellObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeExc sal_Int16 SAL_CALL ScCellObj::resetActionLocks() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nRet(nActionLockCount); if (pUnoText) { @@ -6938,7 +6937,7 @@ SCTAB ScTableSheetObj::GetTab_Impl() const uno::Reference<table::XTableCharts> SAL_CALL ScTableSheetObj::getCharts() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) return new ScChartsObj( pDocSh, GetTab_Impl() ); @@ -6950,7 +6949,7 @@ uno::Reference<table::XTableCharts> SAL_CALL ScTableSheetObj::getCharts() throw( uno::Reference<sheet::XDataPilotTables> SAL_CALL ScTableSheetObj::getDataPilotTables() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) return new ScDataPilotTablesObj( pDocSh, GetTab_Impl() ); @@ -6961,7 +6960,7 @@ uno::Reference<sheet::XDataPilotTables> SAL_CALL ScTableSheetObj::getDataPilotTa uno::Reference<sheet::XScenarios> SAL_CALL ScTableSheetObj::getScenarios() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) @@ -6974,7 +6973,7 @@ uno::Reference<sheet::XScenarios> SAL_CALL ScTableSheetObj::getScenarios() throw uno::Reference<sheet::XSheetAnnotations> SAL_CALL ScTableSheetObj::getAnnotations() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) @@ -6987,14 +6986,14 @@ uno::Reference<sheet::XSheetAnnotations> SAL_CALL ScTableSheetObj::getAnnotation uno::Reference<table::XCellRange> SAL_CALL ScTableSheetObj::getCellRangeByName( const rtl::OUString& rRange ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByName( rRange ); } uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7009,7 +7008,7 @@ uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursorBy const uno::Reference<sheet::XSheetCellRange>& xCellRange ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh && xCellRange.is() ) { @@ -7029,7 +7028,7 @@ uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursorBy uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTableSheetObj::getSpreadsheet() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return this; //!??? } @@ -7039,7 +7038,7 @@ uno::Reference<table::XCell> SAL_CALL ScTableSheetObj::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw(lang::IndexOutOfBoundsException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ScCellRangeObj::GetCellByPosition_Impl(nColumn, nRow); } @@ -7047,14 +7046,14 @@ uno::Reference<table::XCellRange> SAL_CALL ScTableSheetObj::getCellRangeByPositi sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw(lang::IndexOutOfBoundsException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByPosition(nLeft,nTop,nRight,nBottom); } uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPageBreaks() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7100,7 +7099,7 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getRowPageBreaks() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7123,7 +7122,7 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getRowPageBre void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7155,7 +7154,7 @@ void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeExc rtl::OUString SAL_CALL ScTableSheetObj::getName() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aName; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) @@ -7166,7 +7165,7 @@ rtl::OUString SAL_CALL ScTableSheetObj::getName() throw(uno::RuntimeException) void SAL_CALL ScTableSheetObj::setName( const rtl::OUString& aNewName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7181,7 +7180,7 @@ void SAL_CALL ScTableSheetObj::setName( const rtl::OUString& aNewName ) uno::Reference<drawing::XDrawPage> SAL_CALL ScTableSheetObj::getDrawPage() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7205,7 +7204,7 @@ uno::Reference<drawing::XDrawPage> SAL_CALL ScTableSheetObj::getDrawPage() void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRangeAddress, sheet::CellInsertMode nMode ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7237,7 +7236,7 @@ void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRang void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& rRangeAddress, sheet::CellDeleteMode nMode ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7270,7 +7269,7 @@ void SAL_CALL ScTableSheetObj::moveRange( const table::CellAddress& aDestination const table::CellRangeAddress& aSource ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7287,7 +7286,7 @@ void SAL_CALL ScTableSheetObj::copyRange( const table::CellAddress& aDestination const table::CellRangeAddress& aSource ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7335,7 +7334,7 @@ void ScTableSheetObj::PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges ) uno::Sequence<table::CellRangeAddress> SAL_CALL ScTableSheetObj::getPrintAreas() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7366,7 +7365,7 @@ void SAL_CALL ScTableSheetObj::setPrintAreas( const uno::Sequence<table::CellRangeAddress>& aPrintAreas ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7394,7 +7393,7 @@ void SAL_CALL ScTableSheetObj::setPrintAreas( sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleColumns() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7408,7 +7407,7 @@ sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleColumns() throw(uno::RuntimeExce void SAL_CALL ScTableSheetObj::setPrintTitleColumns( sal_Bool bPrintTitleColumns ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7436,7 +7435,7 @@ void SAL_CALL ScTableSheetObj::setPrintTitleColumns( sal_Bool bPrintTitleColumns table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleColumns() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; table::CellRangeAddress aRet; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) @@ -7456,7 +7455,7 @@ table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleColumns() throw(uno::R void SAL_CALL ScTableSheetObj::setTitleColumns( const table::CellRangeAddress& aTitleColumns ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7475,7 +7474,7 @@ void SAL_CALL ScTableSheetObj::setTitleColumns( const table::CellRangeAddress& a sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleRows() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7489,7 +7488,7 @@ sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleRows() throw(uno::RuntimeExcepti void SAL_CALL ScTableSheetObj::setPrintTitleRows( sal_Bool bPrintTitleRows ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7517,7 +7516,7 @@ void SAL_CALL ScTableSheetObj::setPrintTitleRows( sal_Bool bPrintTitleRows ) table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleRows() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; table::CellRangeAddress aRet; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) @@ -7537,7 +7536,7 @@ table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleRows() throw(uno::Runt void SAL_CALL ScTableSheetObj::setTitleRows( const table::CellRangeAddress& aTitleRows ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7558,7 +7557,7 @@ void SAL_CALL ScTableSheetObj::setTitleRows( const table::CellRangeAddress& aTit sheet::SheetLinkMode SAL_CALL ScTableSheetObj::getLinkMode() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sheet::SheetLinkMode eRet = sheet::SheetLinkMode_NONE; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) @@ -7575,7 +7574,7 @@ sheet::SheetLinkMode SAL_CALL ScTableSheetObj::getLinkMode() throw(uno::RuntimeE void SAL_CALL ScTableSheetObj::setLinkMode( sheet::SheetLinkMode nLinkMode ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! Filter und Options aus altem Link suchen @@ -7588,7 +7587,7 @@ void SAL_CALL ScTableSheetObj::setLinkMode( sheet::SheetLinkMode nLinkMode ) rtl::OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aFile; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) @@ -7599,7 +7598,7 @@ rtl::OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException void SAL_CALL ScTableSheetObj::setLinkUrl( const rtl::OUString& aLinkUrl ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! Filter und Options aus altem Link suchen @@ -7612,7 +7611,7 @@ void SAL_CALL ScTableSheetObj::setLinkUrl( const rtl::OUString& aLinkUrl ) rtl::OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aSheet; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) @@ -7623,7 +7622,7 @@ rtl::OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeExc void SAL_CALL ScTableSheetObj::setLinkSheetName( const rtl::OUString& aLinkSheetName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! Filter und Options aus altem Link suchen @@ -7638,7 +7637,7 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr const rtl::OUString& aFilterName, const rtl::OUString& aFilterOptions, sheet::SheetLinkMode nMode ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7704,7 +7703,7 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr sal_Bool SAL_CALL ScTableSheetObj::hideDependents( const table::CellAddress& aPosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7720,7 +7719,7 @@ sal_Bool SAL_CALL ScTableSheetObj::hideDependents( const table::CellAddress& aPo sal_Bool SAL_CALL ScTableSheetObj::hidePrecedents( const table::CellAddress& aPosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7736,7 +7735,7 @@ sal_Bool SAL_CALL ScTableSheetObj::hidePrecedents( const table::CellAddress& aPo sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& aPosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7752,7 +7751,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& aPo sal_Bool SAL_CALL ScTableSheetObj::showPrecedents( const table::CellAddress& aPosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7768,7 +7767,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showPrecedents( const table::CellAddress& aPo sal_Bool SAL_CALL ScTableSheetObj::showErrors( const table::CellAddress& aPosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7783,7 +7782,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showErrors( const table::CellAddress& aPositi sal_Bool SAL_CALL ScTableSheetObj::showInvalid() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7795,7 +7794,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showInvalid() throw(uno::RuntimeException) void SAL_CALL ScTableSheetObj::clearArrows() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7810,7 +7809,7 @@ void SAL_CALL ScTableSheetObj::group( const table::CellRangeAddress& rGroupRange table::TableOrientation nOrientation ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7826,7 +7825,7 @@ void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress& rGroupRan table::TableOrientation nOrientation ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7841,7 +7840,7 @@ void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress& rGroupRan void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& rCellRange ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7854,7 +7853,7 @@ void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& rCell void SAL_CALL ScTableSheetObj::clearOutline() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7867,7 +7866,7 @@ void SAL_CALL ScTableSheetObj::clearOutline() throw(uno::RuntimeException) void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& rCellRange ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7881,7 +7880,7 @@ void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& rCellR void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& rCellRange ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7895,7 +7894,7 @@ void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& rCellR void SAL_CALL ScTableSheetObj::showLevel( sal_Int16 nLevel, table::TableOrientation nOrientation ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7911,7 +7910,7 @@ void SAL_CALL ScTableSheetObj::showLevel( sal_Int16 nLevel, table::TableOrientat void SAL_CALL ScTableSheetObj::protect( const rtl::OUString& aPassword ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); // #i108245# if already protected, don't change anything if ( pDocSh && !pDocSh->GetDocument()->IsTabProtected( GetTab_Impl() ) ) @@ -7925,7 +7924,7 @@ void SAL_CALL ScTableSheetObj::protect( const rtl::OUString& aPassword ) void SAL_CALL ScTableSheetObj::unprotect( const rtl::OUString& aPassword ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7939,7 +7938,7 @@ void SAL_CALL ScTableSheetObj::unprotect( const rtl::OUString& aPassword ) sal_Bool SAL_CALL ScTableSheetObj::isProtected() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) return pDocSh->GetDocument()->IsTabProtected( GetTab_Impl() ); @@ -7952,7 +7951,7 @@ sal_Bool SAL_CALL ScTableSheetObj::isProtected() throw(uno::RuntimeException) sal_Bool SAL_CALL ScTableSheetObj::getIsScenario() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) return pDocSh->GetDocument()->IsScenario( GetTab_Impl() ); @@ -7962,7 +7961,7 @@ sal_Bool SAL_CALL ScTableSheetObj::getIsScenario() throw(uno::RuntimeException) rtl::OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -7978,7 +7977,7 @@ rtl::OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeE void SAL_CALL ScTableSheetObj::setScenarioComment( const rtl::OUString& aScenarioComment ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -8001,7 +8000,7 @@ void SAL_CALL ScTableSheetObj::setScenarioComment( const rtl::OUString& aScenari void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAddress>& rScenRanges ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -8082,7 +8081,7 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -8107,7 +8106,7 @@ void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException) uno::Sequence< table::CellRangeAddress > SAL_CALL ScTableSheetObj::getRanges( ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -8140,7 +8139,7 @@ uno::Sequence< table::CellRangeAddress > SAL_CALL ScTableSheetObj::getRanges( ) void ScTableSheetObj::setExternalName( const ::rtl::OUString& aUrl, const ::rtl::OUString& aSheetName ) throw (container::ElementExistException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -8162,7 +8161,7 @@ void ScTableSheetObj::setExternalName( const ::rtl::OUString& aUrl, const ::rtl: uno::Reference<container::XNameReplace> SAL_CALL ScTableSheetObj::getEvents() throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) return new ScSheetEventsObj( pDocSh, GetTab_Impl() ); @@ -8175,7 +8174,7 @@ uno::Reference<container::XNameReplace> SAL_CALL ScTableSheetObj::getEvents() th uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableSheetObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( pSheetPropSet->getPropertyMap() )); return aRef; @@ -8798,7 +8797,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScTableColumnObj::getImplementationId() throw(u rtl::OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScRange& rRange = GetRange(); DBG_ASSERT(rRange.aStart.Col() == rRange.aEnd.Col(), "too many columns"); @@ -8810,7 +8809,7 @@ rtl::OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException) void SAL_CALL ScTableColumnObj::setName( const rtl::OUString& /* aNewName */ ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; throw uno::RuntimeException(); // read-only } @@ -8819,7 +8818,7 @@ void SAL_CALL ScTableColumnObj::setName( const rtl::OUString& /* aNewName */ ) uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( pColPropSet->getPropertyMap() )); return aRef; @@ -8963,7 +8962,7 @@ ScTableRowObj::~ScTableRowObj() uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( pRowPropSet->getPropertyMap() )); return aRef; @@ -9141,7 +9140,7 @@ void ScCellsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Reference<container::XEnumeration> SAL_CALL ScCellsObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) return new ScCellsEnumeration( pDocShell, aRanges ); return NULL; @@ -9149,13 +9148,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellsObj::createEnumeration() uno::Type SAL_CALL ScCellsObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<table::XCell>*)0); } sal_Bool SAL_CALL ScCellsObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bHas = FALSE; if ( pDocShell ) { @@ -9278,14 +9277,14 @@ void ScCellsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint ) sal_Bool SAL_CALL ScCellsEnumeration::hasMoreElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return !bAtEnd; } uno::Any SAL_CALL ScCellsEnumeration::nextElement() throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell && !bAtEnd) { // Interface-Typ muss zu ScCellsObj::getElementType passen @@ -9366,7 +9365,7 @@ ScCellRangeObj* ScCellFormatsObj::GetObjectByIndex_Impl(long nIndex) const sal_Int32 SAL_CALL ScCellFormatsObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! direkt auf die AttrArrays zugreifen !!!! @@ -9389,7 +9388,7 @@ uno::Any SAL_CALL ScCellFormatsObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xRange(GetObjectByIndex_Impl(nIndex)); if (xRange.is()) @@ -9401,13 +9400,13 @@ uno::Any SAL_CALL ScCellFormatsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScCellFormatsObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<table::XCellRange>*)0); } sal_Bool SAL_CALL ScCellFormatsObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); //! immer groesser 0 ?? } @@ -9416,7 +9415,7 @@ sal_Bool SAL_CALL ScCellFormatsObj::hasElements() throw(uno::RuntimeException) uno::Reference<container::XEnumeration> SAL_CALL ScCellFormatsObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) return new ScCellFormatsEnumeration( pDocShell, aTotalRange ); return NULL; @@ -9513,14 +9512,14 @@ void ScCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint ) sal_Bool SAL_CALL ScCellFormatsEnumeration::hasMoreElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return !bAtEnd; } uno::Any SAL_CALL ScCellFormatsEnumeration::nextElement() throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( bAtEnd || !pDocShell ) throw container::NoSuchElementException(); // no more elements @@ -9760,7 +9759,7 @@ void ScUniqueCellFormatsObj::GetObjects_Impl() sal_Int32 SAL_CALL ScUniqueCellFormatsObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return aRangeLists.size(); } @@ -9769,7 +9768,7 @@ uno::Any SAL_CALL ScUniqueCellFormatsObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if(static_cast<sal_uInt32>(nIndex) < aRangeLists.size()) return uno::makeAny(uno::Reference<sheet::XSheetCellRangeContainer>(new ScCellRangesObj(pDocShell, aRangeLists[nIndex]))); @@ -9780,13 +9779,13 @@ uno::Any SAL_CALL ScUniqueCellFormatsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScUniqueCellFormatsObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<sheet::XSheetCellRangeContainer>*)0); } sal_Bool SAL_CALL ScUniqueCellFormatsObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( aRangeLists.size() != 0 ); } @@ -9795,7 +9794,7 @@ sal_Bool SAL_CALL ScUniqueCellFormatsObj::hasElements() throw(uno::RuntimeExcept uno::Reference<container::XEnumeration> SAL_CALL ScUniqueCellFormatsObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) return new ScUniqueCellFormatsEnumeration( pDocShell, aRangeLists ); return NULL; @@ -9835,14 +9834,14 @@ void ScUniqueCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHi sal_Bool SAL_CALL ScUniqueCellFormatsEnumeration::hasMoreElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return static_cast<sal_uInt32>(nCurrentPosition) < aRangeLists.size(); } uno::Any SAL_CALL ScUniqueCellFormatsEnumeration::nextElement() throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !hasMoreElements() || !pDocShell ) throw container::NoSuchElementException(); // no more elements diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index a9825771155f..227869efe48e 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -32,7 +32,6 @@ #include "chart2uno.hxx" #include "miscuno.hxx" #include "document.hxx" -#include "unoguard.hxx" #include "cell.hxx" #include "chartpos.hxx" #include "unonames.hxx" @@ -47,6 +46,7 @@ #include <sfx2/objsh.hxx> #include <tools/table.hxx> +#include <vcl/svapp.hxx> #include <com/sun/star/beans/UnknownPropertyException.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> @@ -1030,7 +1030,7 @@ void ScChart2DataProvider::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ::sal_Bool SAL_CALL ScChart2DataProvider::createDataSourcePossible( const uno::Sequence< beans::PropertyValue >& aArguments ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if( ! m_pDocument ) return false; @@ -1365,7 +1365,7 @@ ScChart2DataProvider::createDataSource( const uno::Sequence< beans::PropertyValue >& aArguments ) throw( lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( ! m_pDocument ) throw uno::RuntimeException(); @@ -1690,7 +1690,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum // parse given data source and collect infos { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; DBG_ASSERT( m_pDocument, "No Document -> no detectArguments" ); if(!m_pDocument ||!xDataSource.is()) return lcl_VectorToSequence( aResult ); @@ -1943,7 +1943,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum ::sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentationPossible( const ::rtl::OUString& aRangeRepresentation ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if( ! m_pDocument ) return false; @@ -1958,7 +1958,7 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL throw (lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference< chart2::data::XDataSequence > xResult; DBG_ASSERT( m_pDocument, "No Document -> no createDataSequenceByRangeRepresentation" ); @@ -2077,7 +2077,7 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const rtl::OUS uno::Reference< beans::XPropertySetInfo> SAL_CALL ScChart2DataProvider::getPropertySetInfo() throw( uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef = new SfxItemPropertySetInfo( m_aPropSet.getPropertyMap() ); return aRef; @@ -2184,7 +2184,7 @@ void ScChart2DataSource::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint) uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence> > SAL_CALL ScChart2DataSource::getDataSequences() throw ( uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; LabeledList::const_iterator aItr(m_aLabeledSequences.begin()); LabeledList::const_iterator aEndItr(m_aLabeledSequences.end()); @@ -2298,7 +2298,7 @@ void ScChart2LabeledDataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; m_pDocument = NULL; } } @@ -2308,7 +2308,7 @@ void ScChart2LabeledDataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint uno::Reference< chart2::data::XDataSequence > SAL_CALL ScChart2LabeledDataSequence::getValues() throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return m_aData; } @@ -2316,14 +2316,14 @@ void SAL_CALL ScChart2LabeledDataSequence::setValues( const uno::Reference< chart2::data::XDataSequence >& xSequence ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; m_aData = xSequence; } uno::Reference< chart2::data::XDataSequence > SAL_CALL ScChart2LabeledDataSequence::getLabel() throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return m_aLabel; } @@ -2331,7 +2331,7 @@ void SAL_CALL ScChart2LabeledDataSequence::setLabel( const uno::Reference< chart2::data::XDataSequence >& xSequence ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; m_aLabel = xSequence; } @@ -2340,7 +2340,7 @@ void SAL_CALL ScChart2LabeledDataSequence::setLabel( uno::Reference< util::XCloneable > SAL_CALL ScChart2LabeledDataSequence::createClone() throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference< util::XCloneable > xToClone(m_aData, uno::UNO_QUERY); if (xToClone.is()) { @@ -2969,7 +2969,7 @@ const hash_set<sal_uInt16>& ScChart2DataSequence::ExternalRefListener::getAllFil uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData() throw ( uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !m_pDocument) throw uno::RuntimeException(); @@ -2999,7 +2999,7 @@ uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData() uno::Sequence< double > SAL_CALL ScChart2DataSequence::getNumericalData() throw ( uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !m_pDocument) throw uno::RuntimeException(); @@ -3022,7 +3022,7 @@ uno::Sequence< double > SAL_CALL ScChart2DataSequence::getNumericalData() uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !m_pDocument) throw uno::RuntimeException(); @@ -3041,7 +3041,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) ::rtl::OUString SAL_CALL ScChart2DataSequence::getSourceRangeRepresentation() throw ( uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; OUString aStr; DBG_ASSERT( m_pDocument, "No Document -> no SourceRangeRepresentation" ); if (m_pDocument && m_pTokens.get()) @@ -3160,7 +3160,7 @@ private: uno::Sequence< ::rtl::OUString > SAL_CALL ScChart2DataSequence::generateLabel(chart2::data::LabelOrigin eOrigin) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !m_pDocument) throw uno::RuntimeException(); @@ -3213,7 +3213,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ScChart2DataSequence::generateLabel(ch bool bGetSeriesFormat = (nIndex == -1); sal_Int32 nResult = 0; - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !m_pDocument || !m_pTokens.get()) return nResult; @@ -3285,7 +3285,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ScChart2DataSequence::generateLabel(ch uno::Reference< util::XCloneable > SAL_CALL ScChart2DataSequence::createClone() throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; auto_ptr< vector<ScSharedTokenRef> > pTokensNew; if (m_pTokens.get()) @@ -3314,7 +3314,7 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti throw (uno::RuntimeException) { // like ScCellRangesBase::addModifyListener - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!m_pTokens.get() || m_pTokens->empty()) return; @@ -3357,7 +3357,7 @@ void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference< { // like ScCellRangesBase::removeModifyListener - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!m_pTokens.get() || m_pTokens->empty()) return; @@ -3398,7 +3398,7 @@ void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference< uno::Reference< beans::XPropertySetInfo> SAL_CALL ScChart2DataSequence::getPropertySetInfo() throw( uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef = new SfxItemPropertySetInfo( m_aPropSet.getPropertyMap() ); return aRef; @@ -3598,7 +3598,7 @@ void ScChart2EmptyDataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& uno::Sequence< uno::Any> SAL_CALL ScChart2EmptyDataSequence::getData() throw ( uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !m_pDocument) throw uno::RuntimeException(); return uno::Sequence< uno::Any>(); @@ -3608,7 +3608,7 @@ uno::Sequence< uno::Any> SAL_CALL ScChart2EmptyDataSequence::getData() uno::Sequence< rtl::OUString > SAL_CALL ScChart2EmptyDataSequence::getTextualData( ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !m_pDocument) throw uno::RuntimeException(); @@ -3655,7 +3655,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2EmptyDataSequence::getTextualDat ::rtl::OUString SAL_CALL ScChart2EmptyDataSequence::getSourceRangeRepresentation() throw ( uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aStr; DBG_ASSERT( m_pDocument, "No Document -> no SourceRangeRepresentation" ); if( m_pDocument ) @@ -3666,7 +3666,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2EmptyDataSequence::getTextualDat uno::Sequence< ::rtl::OUString > SAL_CALL ScChart2EmptyDataSequence::generateLabel(chart2::data::LabelOrigin /*nOrigin*/) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Sequence< ::rtl::OUString > aRet; return aRet; } @@ -3677,7 +3677,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ScChart2EmptyDataSequence::generateLab { sal_Int32 nResult = 0; - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !m_pDocument) return nResult; @@ -3689,7 +3689,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ScChart2EmptyDataSequence::generateLab uno::Reference< util::XCloneable > SAL_CALL ScChart2EmptyDataSequence::createClone() throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (m_xDataProvider.is()) { // copy properties @@ -3726,7 +3726,7 @@ void SAL_CALL ScChart2EmptyDataSequence::removeModifyListener( const uno::Refere uno::Reference< beans::XPropertySetInfo> SAL_CALL ScChart2EmptyDataSequence::getPropertySetInfo() throw( uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef = new SfxItemPropertySetInfo( m_aPropSet.getPropertyMap() ); return aRef; diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index dd3a0c098229..0212ea15dff3 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -55,7 +55,6 @@ #include "undodat.hxx" #include "chartarr.hxx" #include "chartlis.hxx" -#include "unoguard.hxx" #include "chart2uno.hxx" #include "convuno.hxx" @@ -186,7 +185,7 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) throw(::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pDocShell) return; @@ -310,7 +309,7 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, void SAL_CALL ScChartsObj::removeByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameString(aName); SdrOle2Obj* pObj = lcl_FindChartObj( pDocShell, nTab, aNameString ); if (pObj) @@ -331,7 +330,7 @@ void SAL_CALL ScChartsObj::removeByName( const rtl::OUString& aName ) uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.TableChartsEnumeration"))); } @@ -339,7 +338,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration( sal_Int32 SAL_CALL ScChartsObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; INT32 nCount = 0; if ( pDocShell ) { @@ -369,7 +368,7 @@ uno::Any SAL_CALL ScChartsObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<table::XTableChart> xChart(GetObjectByIndex_Impl(nIndex)); if (xChart.is()) return uno::makeAny(xChart); @@ -380,13 +379,13 @@ uno::Any SAL_CALL ScChartsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScChartsObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<table::XTableChart>*)0); } sal_Bool SAL_CALL ScChartsObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCount() != 0; } @@ -394,7 +393,7 @@ uno::Any SAL_CALL ScChartsObj::getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<table::XTableChart> xChart(GetObjectByName_Impl(aName)); if (xChart.is()) return uno::makeAny(xChart); @@ -405,7 +404,7 @@ uno::Any SAL_CALL ScChartsObj::getByName( const rtl::OUString& aName ) uno::Sequence<rtl::OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -450,7 +449,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno:: sal_Bool SAL_CALL ScChartsObj::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameString(aName); return ( lcl_FindChartObj( pDocShell, nTab, aNameString ) != NULL ); } @@ -680,7 +679,7 @@ void ScChartObj::disposing() sal_Bool SAL_CALL ScChartObj::getHasColumnHeaders() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScRangeListRef xRanges = new ScRangeList; bool bColHeaders, bRowHeaders; GetData_Impl( xRanges, bColHeaders, bRowHeaders ); @@ -690,7 +689,7 @@ sal_Bool SAL_CALL ScChartObj::getHasColumnHeaders() throw(uno::RuntimeException) void SAL_CALL ScChartObj::setHasColumnHeaders( sal_Bool bHasColumnHeaders ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScRangeListRef xRanges = new ScRangeList; bool bOldColHeaders, bOldRowHeaders; GetData_Impl( xRanges, bOldColHeaders, bOldRowHeaders ); @@ -700,7 +699,7 @@ void SAL_CALL ScChartObj::setHasColumnHeaders( sal_Bool bHasColumnHeaders ) sal_Bool SAL_CALL ScChartObj::getHasRowHeaders() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScRangeListRef xRanges = new ScRangeList; bool bColHeaders, bRowHeaders; GetData_Impl( xRanges, bColHeaders, bRowHeaders ); @@ -710,7 +709,7 @@ sal_Bool SAL_CALL ScChartObj::getHasRowHeaders() throw(uno::RuntimeException) void SAL_CALL ScChartObj::setHasRowHeaders( sal_Bool bHasRowHeaders ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScRangeListRef xRanges = new ScRangeList; bool bOldColHeaders, bOldRowHeaders; GetData_Impl( xRanges, bOldColHeaders, bOldRowHeaders ); @@ -720,7 +719,7 @@ void SAL_CALL ScChartObj::setHasRowHeaders( sal_Bool bHasRowHeaders ) uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScRangeListRef xRanges = new ScRangeList; bool bColHeaders, bRowHeaders; GetData_Impl( xRanges, bColHeaders, bRowHeaders ); @@ -753,7 +752,7 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() throw(un void SAL_CALL ScChartObj::setRanges( const uno::Sequence<table::CellRangeAddress>& aRanges ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScRangeListRef xOldRanges = new ScRangeList; bool bColHeaders, bRowHeaders; GetData_Impl( xOldRanges, bColHeaders, bRowHeaders ); @@ -780,7 +779,7 @@ void SAL_CALL ScChartObj::setRanges( const uno::Sequence<table::CellRangeAddress uno::Reference<lang::XComponent> SAL_CALL ScChartObj::getEmbeddedObject() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SdrOle2Obj* pObject = lcl_FindChartObj( pDocShell, nTab, aChartName ); if ( pObject && svt::EmbeddedObjectRef::TryRunningState( pObject->GetObjRef() ) ) { @@ -795,13 +794,13 @@ uno::Reference<lang::XComponent> SAL_CALL ScChartObj::getEmbeddedObject() throw( rtl::OUString SAL_CALL ScChartObj::getName() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return aChartName; } void SAL_CALL ScChartObj::setName( const rtl::OUString& /* aName */ ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; throw uno::RuntimeException(); // name cannot be changed } diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 2b513d2b2e71..a00d65061007 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -33,7 +33,6 @@ #include "confuno.hxx" #include "unonames.hxx" -#include "unoguard.hxx" #include "scdll.hxx" #include "docsh.hxx" #include "miscuno.hxx" @@ -46,6 +45,7 @@ #include <sfx2/printer.hxx> #include <xmloff/xmluconv.hxx> #include <rtl/ustrbuf.hxx> +#include <vcl/svapp.hxx> using namespace com::sun::star; @@ -126,7 +126,7 @@ void ScDocumentConfiguration::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocumentConfiguration::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); return aRef; @@ -138,7 +138,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if(pDocShell) { @@ -337,7 +337,7 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const rtl::OUString throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Any aRet; if(pDocShell) diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index 344ca2c71ebd..4685a4137c15 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -34,6 +34,7 @@ #include "scitems.hxx" #include <svl/intitem.hxx> #include <svl/zforlist.hxx> +#include <vcl/svapp.hxx> #include <rtl/uuid.h> #include "cursuno.hxx" @@ -42,7 +43,6 @@ #include "hints.hxx" #include "markdata.hxx" #include "dociter.hxx" -#include "unoguard.hxx" #include "miscuno.hxx" using namespace com::sun::star; @@ -118,7 +118,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellCursorObj::getImplementationId() throw(un void SAL_CALL ScCellCursorObj::collapseToCurrentRegion() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" ); ScRange aOneRange(*rRanges.GetObject(0)); @@ -143,7 +143,7 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentRegion() throw(uno::RuntimeExcep void SAL_CALL ScCellCursorObj::collapseToCurrentArray() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" ); ScRange aOneRange(*rRanges.GetObject(0)); @@ -175,7 +175,7 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentArray() throw(uno::RuntimeExcept void SAL_CALL ScCellCursorObj::collapseToMergedArea() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -193,7 +193,7 @@ void SAL_CALL ScCellCursorObj::collapseToMergedArea() throw(uno::RuntimeExceptio void SAL_CALL ScCellCursorObj::expandToEntireColumns() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" ); ScRange aNewRange(*rRanges.GetObject(0)); @@ -206,7 +206,7 @@ void SAL_CALL ScCellCursorObj::expandToEntireColumns() throw(uno::RuntimeExcepti void SAL_CALL ScCellCursorObj::expandToEntireRows() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" ); ScRange aNewRange(*rRanges.GetObject(0)); @@ -220,7 +220,7 @@ void SAL_CALL ScCellCursorObj::expandToEntireRows() throw(uno::RuntimeException) void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRows ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( nColumns <= 0 || nRows <= 0 ) { DBG_ERROR("leerer Range geht nicht"); @@ -256,7 +256,7 @@ void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRo void SAL_CALL ScCellCursorObj::gotoStartOfUsedArea( sal_Bool bExpand ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -284,7 +284,7 @@ void SAL_CALL ScCellCursorObj::gotoStartOfUsedArea( sal_Bool bExpand ) void SAL_CALL ScCellCursorObj::gotoEndOfUsedArea( sal_Bool bExpand ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { @@ -316,7 +316,7 @@ void SAL_CALL ScCellCursorObj::gotoStart() throw(uno::RuntimeException) // this is similar to collapseToCurrentRegion //! something like gotoEdge with 4 possible directions is needed - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" ); ScRange aOneRange(*rRanges.GetObject(0)); @@ -344,7 +344,7 @@ void SAL_CALL ScCellCursorObj::gotoEnd() throw(uno::RuntimeException) // this is similar to collapseToCurrentRegion //! something like gotoEdge with 4 possible directions is needed - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" ); ScRange aOneRange(*rRanges.GetObject(0)); @@ -369,7 +369,7 @@ void SAL_CALL ScCellCursorObj::gotoEnd() throw(uno::RuntimeException) void SAL_CALL ScCellCursorObj::gotoNext() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" ); ScRange aOneRange(*rRanges.GetObject(0)); @@ -391,7 +391,7 @@ void SAL_CALL ScCellCursorObj::gotoNext() throw(uno::RuntimeException) void SAL_CALL ScCellCursorObj::gotoPrevious() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" ); ScRange aOneRange(*rRanges.GetObject(0)); @@ -414,7 +414,7 @@ void SAL_CALL ScCellCursorObj::gotoPrevious() throw(uno::RuntimeException) void SAL_CALL ScCellCursorObj::gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nRowOffset ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" ); ScRange aOneRange(*rRanges.GetObject(0)); @@ -440,7 +440,7 @@ void SAL_CALL ScCellCursorObj::gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nR uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellCursorObj::getSpreadsheet() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ScCellRangeObj::getSpreadsheet(); } @@ -450,7 +450,7 @@ uno::Reference<table::XCell> SAL_CALL ScCellCursorObj::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw(lang::IndexOutOfBoundsException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ScCellRangeObj::getCellByPosition(nColumn,nRow); } @@ -458,14 +458,14 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByPositi sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw(lang::IndexOutOfBoundsException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByPosition(nLeft,nTop,nRight,nBottom); } uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName( const rtl::OUString& rRange ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByName(rRange); } diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 4d5286c302a1..fc3aa7583552 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -31,6 +31,7 @@ #include <algorithm> #include <svl/smplhint.hxx> +#include <vcl/svapp.hxx> #include <rtl/uuid.h> #include "dapiuno.hxx" @@ -41,7 +42,6 @@ #include "tabvwsh.hxx" #include "pivot.hxx" #include "rangeutl.hxx" -#include "unoguard.hxx" #include "dpobject.hxx" #include "dpshttab.hxx" #include "dpsdbtab.hxx" @@ -376,7 +376,7 @@ ScDataPilotTableObj* ScDataPilotTablesObj::GetObjectByName_Impl(const OUString& Reference<XDataPilotDescriptor> SAL_CALL ScDataPilotTablesObj::createDataPilotDescriptor() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) return new ScDataPilotDescriptor(pDocShell); return NULL; @@ -424,7 +424,7 @@ void SAL_CALL ScDataPilotTablesObj::insertNewByName( const OUString& aNewName, const Reference<XDataPilotDescriptor>& xDescriptor ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!xDescriptor.is()) return; // inserting with already existing name? @@ -463,7 +463,7 @@ void SAL_CALL ScDataPilotTablesObj::insertNewByName( const OUString& aNewName, void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameStr(aName); ScDPObject* pDPObj = lcl_GetDPObject( pDocShell, nTab, aNameStr ); if (pDPObj && pDocShell) @@ -479,7 +479,7 @@ void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName ) Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DataPilotTablesEnumeration"))); } @@ -487,7 +487,7 @@ Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration() thr sal_Int32 SAL_CALL ScDataPilotTablesObj::getCount() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( pDocShell ) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -516,7 +516,7 @@ sal_Int32 SAL_CALL ScDataPilotTablesObj::getCount() throw(RuntimeException) Any SAL_CALL ScDataPilotTablesObj::getByIndex( sal_Int32 nIndex ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Reference<XDataPilotTable2> xTable(GetObjectByIndex_Impl(nIndex)); if (!xTable.is()) throw IndexOutOfBoundsException(); @@ -525,13 +525,13 @@ Any SAL_CALL ScDataPilotTablesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScDataPilotTablesObj::getElementType() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((Reference<XDataPilotTable2>*)0); } sal_Bool SAL_CALL ScDataPilotTablesObj::hasElements() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -540,7 +540,7 @@ sal_Bool SAL_CALL ScDataPilotTablesObj::hasElements() throw(RuntimeException) Any SAL_CALL ScDataPilotTablesObj::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Reference<XDataPilotTable2> xTable(GetObjectByName_Impl(aName)); if (!xTable.is()) throw NoSuchElementException(); @@ -550,7 +550,7 @@ Any SAL_CALL ScDataPilotTablesObj::getByName( const OUString& aName ) Sequence<OUString> SAL_CALL ScDataPilotTablesObj::getElementNames() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -590,7 +590,7 @@ Sequence<OUString> SAL_CALL ScDataPilotTablesObj::getElementNames() sal_Bool SAL_CALL ScDataPilotTablesObj::hasByName( const OUString& aName ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -699,7 +699,7 @@ void ScDataPilotDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) CellRangeAddress SAL_CALL ScDataPilotDescriptorBase::getSourceRange() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObject(GetDPObject()); if (!pDPObject) @@ -713,7 +713,7 @@ CellRangeAddress SAL_CALL ScDataPilotDescriptorBase::getSourceRange() void SAL_CALL ScDataPilotDescriptorBase::setSourceRange( const CellRangeAddress& aSourceRange ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObject = GetDPObject(); if (!pDPObject) @@ -730,49 +730,49 @@ void SAL_CALL ScDataPilotDescriptorBase::setSourceRange( const CellRangeAddress& Reference<XSheetFilterDescriptor> SAL_CALL ScDataPilotDescriptorBase::getFilterDescriptor() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScDataPilotFilterDescriptor( pDocShell, this ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getDataPilotFields() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getColumnFields() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_COLUMN ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getRowFields() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_ROW ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getPageFields() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_PAGE ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getDataFields() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_DATA ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getHiddenFields() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_HIDDEN ); } @@ -780,7 +780,7 @@ Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getHiddenFields() Reference< XPropertySetInfo > SAL_CALL ScDataPilotDescriptorBase::getPropertySetInfo( ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static Reference<XPropertySetInfo> aRef = new SfxItemPropertySetInfo( maPropSet.getPropertyMap() ); return aRef; @@ -790,7 +790,7 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObject = GetDPObject(); if (pDPObject) { @@ -931,7 +931,7 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Any aRet; ScDPObject* pDPObject(GetDPObject()); @@ -1061,7 +1061,7 @@ void SAL_CALL ScDataPilotDescriptorBase::removeVetoableChangeListener( Reference< XDataPilotField > SAL_CALL ScDataPilotDescriptorBase::getDataLayoutField() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if( ScDPObject* pDPObject = GetDPObject() ) { if( ScDPSaveData* pSaveData = pDPObject->GetSaveData() ) @@ -1207,7 +1207,7 @@ void ScDataPilotTableObj::SetDPObject( ScDPObject* pDPObject ) OUString SAL_CALL ScDataPilotTableObj::getName() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); if (pDPObj) return pDPObj->GetName(); @@ -1217,7 +1217,7 @@ OUString SAL_CALL ScDataPilotTableObj::getName() throw(RuntimeException) void SAL_CALL ScDataPilotTableObj::setName( const OUString& aNewName ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); if (pDPObj) { @@ -1234,7 +1234,7 @@ void SAL_CALL ScDataPilotTableObj::setName( const OUString& aNewName ) OUString SAL_CALL ScDataPilotTableObj::getTag() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); if (pDPObj) return pDPObj->GetTag(); @@ -1244,7 +1244,7 @@ OUString SAL_CALL ScDataPilotTableObj::getTag() throw(RuntimeException) void SAL_CALL ScDataPilotTableObj::setTag( const OUString& aNewTag ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); if (pDPObj) { @@ -1260,7 +1260,7 @@ void SAL_CALL ScDataPilotTableObj::setTag( const OUString& aNewTag ) CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRange() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; CellRangeAddress aRet; ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); if (pDPObj) @@ -1279,7 +1279,7 @@ ULONG RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh, void SAL_CALL ScDataPilotTableObj::refresh() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if( ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName) ) RefreshDPObject( pDPObj, NULL, GetDocShell(), TRUE, TRUE ); //if (pDPObj) @@ -1295,7 +1295,7 @@ void SAL_CALL ScDataPilotTableObj::refresh() throw(RuntimeException) Sequence< Sequence<Any> > SAL_CALL ScDataPilotTableObj::getDrillDownData(const CellAddress& aAddr) throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Sequence< Sequence<Any> > aTabData; ScAddress aAddr2(static_cast<SCCOL>(aAddr.Column), static_cast<SCROW>(aAddr.Row), aAddr.Sheet); ScDPObject* pObj = GetDPObject(); @@ -1309,7 +1309,7 @@ Sequence< Sequence<Any> > SAL_CALL ScDataPilotTableObj::getDrillDownData(const C DataPilotTablePositionData SAL_CALL ScDataPilotTableObj::getPositionData(const CellAddress& aAddr) throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; DataPilotTablePositionData aPosData; ScAddress aAddr2(static_cast<SCCOL>(aAddr.Column), static_cast<SCROW>(aAddr.Row), aAddr.Sheet); ScDPObject* pObj = GetDPObject(); @@ -1323,7 +1323,7 @@ DataPilotTablePositionData SAL_CALL ScDataPilotTableObj::getPositionData(const C void SAL_CALL ScDataPilotTableObj::insertDrillDownSheet(const CellAddress& aAddr) throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = GetDPObject(); if (!pDPObj) throw RuntimeException(); @@ -1337,7 +1337,7 @@ void SAL_CALL ScDataPilotTableObj::insertDrillDownSheet(const CellAddress& aAddr CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRangeByType( sal_Int32 nType ) throw (IllegalArgumentException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (nType < 0 || nType > DataPilotOutputRangeType::RESULT) throw IllegalArgumentException(); @@ -1350,7 +1350,7 @@ CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRangeByType( sal_Int32 n void SAL_CALL ScDataPilotTableObj::addModifyListener( const uno::Reference<util::XModifyListener>& aListener ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<util::XModifyListener> *pObj = new uno::Reference<util::XModifyListener>( aListener ); aModifyListeners.Insert( pObj, aModifyListeners.Count() ); @@ -1364,7 +1364,7 @@ void SAL_CALL ScDataPilotTableObj::addModifyListener( const uno::Reference<util: void SAL_CALL ScDataPilotTableObj::removeModifyListener( const uno::Reference<util::XModifyListener>& aListener ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; acquire(); // in case the listeners have the last ref - released below @@ -1454,27 +1454,27 @@ void ScDataPilotDescriptor::SetDPObject( ScDPObject* pDPObject ) OUString SAL_CALL ScDataPilotDescriptor::getName() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return mpDPObject->GetName(); } void SAL_CALL ScDataPilotDescriptor::setName( const OUString& aNewName ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; mpDPObject->SetName( aNewName ); } OUString SAL_CALL ScDataPilotDescriptor::getTag() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return mpDPObject->GetTag(); } void SAL_CALL ScDataPilotDescriptor::setTag( const OUString& aNewTag ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; mpDPObject->SetTag( aNewTag ); } @@ -1740,7 +1740,7 @@ ScDataPilotFieldObj* ScDataPilotFieldsObj::GetObjectByName_Impl(const OUString& Reference<XEnumeration> SAL_CALL ScDataPilotFieldsObj::createEnumeration() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DataPilotFieldsEnumeration"))); } @@ -1748,7 +1748,7 @@ Reference<XEnumeration> SAL_CALL ScDataPilotFieldsObj::createEnumeration() sal_Int32 SAL_CALL ScDataPilotFieldsObj::getCount() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // TODO ScDPObject* pDPObj = GetDPObject(); return pDPObj ? lcl_GetFieldCount( pDPObj->GetSource(), maOrient ) : 0; @@ -1757,7 +1757,7 @@ sal_Int32 SAL_CALL ScDataPilotFieldsObj::getCount() throw(RuntimeException) Any SAL_CALL ScDataPilotFieldsObj::getByIndex( sal_Int32 nIndex ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Reference< XPropertySet > xField( GetObjectByIndex_Impl( nIndex ) ); if (!xField.is()) throw IndexOutOfBoundsException(); @@ -1766,20 +1766,20 @@ Any SAL_CALL ScDataPilotFieldsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScDataPilotFieldsObj::getElementType() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((Reference<XPropertySet>*)0); } sal_Bool SAL_CALL ScDataPilotFieldsObj::hasElements() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } Any SAL_CALL ScDataPilotFieldsObj::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Reference<XPropertySet> xField(GetObjectByName_Impl(aName)); if (!xField.is()) throw NoSuchElementException(); @@ -1789,7 +1789,7 @@ Any SAL_CALL ScDataPilotFieldsObj::getByName( const OUString& aName ) Sequence<OUString> SAL_CALL ScDataPilotFieldsObj::getElementNames() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // TODO if (ScDPObject* pDPObj = GetDPObject()) { @@ -1814,7 +1814,7 @@ Sequence<OUString> SAL_CALL ScDataPilotFieldsObj::getElementNames() sal_Bool SAL_CALL ScDataPilotFieldsObj::hasByName( const OUString& aName ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetObjectByName_Impl(aName) != NULL; } @@ -1844,7 +1844,7 @@ ScDataPilotFieldObj::~ScDataPilotFieldObj() OUString SAL_CALL ScDataPilotFieldObj::getName() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; OUString aName; if( ScDPSaveDimension* pDim = GetDPDimension() ) { @@ -1863,7 +1863,7 @@ OUString SAL_CALL ScDataPilotFieldObj::getName() throw(RuntimeException) void SAL_CALL ScDataPilotFieldObj::setName( const OUString& rName ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = 0; ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ); if( pDim && !pDim->IsDataLayout() ) @@ -1879,7 +1879,7 @@ void SAL_CALL ScDataPilotFieldObj::setName( const OUString& rName ) throw(Runtim Reference<XPropertySetInfo> SAL_CALL ScDataPilotFieldObj::getPropertySetInfo() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static Reference<XPropertySetInfo> aRef( new SfxItemPropertySetInfo( maPropSet.getPropertyMap() )); return aRef; @@ -1888,7 +1888,7 @@ Reference<XPropertySetInfo> SAL_CALL ScDataPilotFieldObj::getPropertySetInfo() void SAL_CALL ScDataPilotFieldObj::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameString(aPropertyName); if ( aNameString.EqualsAscii( SC_UNONAME_FUNCTION ) ) { @@ -1984,7 +1984,7 @@ void SAL_CALL ScDataPilotFieldObj::setPropertyValue( const OUString& aPropertyNa Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameString(aPropertyName); Any aRet; @@ -2047,7 +2047,7 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam Reference<XIndexAccess> SAL_CALL ScDataPilotFieldObj::getItems() throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!mxItems.is()) mxItems.set( new ScDataPilotItemsObj( mrParent, maFieldId ) ); return mxItems; @@ -2057,14 +2057,14 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDataPilotFieldObj ) DataPilotFieldOrientation ScDataPilotFieldObj::getOrientation() const { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPSaveDimension* pDim = GetDPDimension(); return pDim ? static_cast< DataPilotFieldOrientation >( pDim->GetOrientation() ) : DataPilotFieldOrientation_HIDDEN; } void ScDataPilotFieldObj::setOrientation(DataPilotFieldOrientation eNew) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (maOrient.hasValue() && (eNew == maOrient.get< DataPilotFieldOrientation >())) return; @@ -2121,7 +2121,7 @@ void ScDataPilotFieldObj::setOrientation(DataPilotFieldOrientation eNew) GeneralFunction ScDataPilotFieldObj::getFunction() const { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GeneralFunction eRet = GeneralFunction_NONE; if( ScDPSaveDimension* pDim = GetDPDimension() ) { @@ -2141,7 +2141,7 @@ GeneralFunction ScDataPilotFieldObj::getFunction() const void ScDataPilotFieldObj::setFunction(GeneralFunction eNewFunc) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = 0; if( ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ) ) { @@ -2164,7 +2164,7 @@ void ScDataPilotFieldObj::setFunction(GeneralFunction eNewFunc) Sequence< GeneralFunction > ScDataPilotFieldObj::getSubtotals() const { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Sequence< GeneralFunction > aRet; if( ScDPSaveDimension* pDim = GetDPDimension() ) { @@ -2185,7 +2185,7 @@ Sequence< GeneralFunction > ScDataPilotFieldObj::getSubtotals() const void ScDataPilotFieldObj::setSubtotals( const Sequence< GeneralFunction >& rSubtotals ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = 0; if( ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ) ) { @@ -2231,7 +2231,7 @@ void ScDataPilotFieldObj::setSubtotals( const Sequence< GeneralFunction >& rSubt OUString ScDataPilotFieldObj::getCurrentPage() const { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPSaveDimension* pDim = GetDPDimension(); if( pDim && pDim->HasCurrentPage() ) return pDim->GetCurrentPage(); @@ -2240,7 +2240,7 @@ OUString ScDataPilotFieldObj::getCurrentPage() const void ScDataPilotFieldObj::setCurrentPage( const OUString& rPage ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = 0; if( ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ) ) { @@ -2252,14 +2252,14 @@ void ScDataPilotFieldObj::setCurrentPage( const OUString& rPage ) sal_Bool ScDataPilotFieldObj::getUseCurrentPage() const { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPSaveDimension* pDim = GetDPDimension(); return pDim && pDim->HasCurrentPage(); } void ScDataPilotFieldObj::setUseCurrentPage( sal_Bool bUse ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = 0; if( ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ) ) { @@ -2281,14 +2281,14 @@ void ScDataPilotFieldObj::setUseCurrentPage( sal_Bool bUse ) const DataPilotFieldAutoShowInfo* ScDataPilotFieldObj::getAutoShowInfo() { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPSaveDimension* pDim = GetDPDimension(); return pDim ? pDim->GetAutoShowInfo() : 0; } void ScDataPilotFieldObj::setAutoShowInfo( const DataPilotFieldAutoShowInfo* pInfo ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = 0; if( ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ) ) { @@ -2299,14 +2299,14 @@ void ScDataPilotFieldObj::setAutoShowInfo( const DataPilotFieldAutoShowInfo* pIn const DataPilotFieldLayoutInfo* ScDataPilotFieldObj::getLayoutInfo() { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPSaveDimension* pDim = GetDPDimension(); return pDim ? pDim->GetLayoutInfo() : 0; } void ScDataPilotFieldObj::setLayoutInfo( const DataPilotFieldLayoutInfo* pInfo ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = 0; if( ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ) ) { @@ -2317,14 +2317,14 @@ void ScDataPilotFieldObj::setLayoutInfo( const DataPilotFieldLayoutInfo* pInfo ) const DataPilotFieldReference* ScDataPilotFieldObj::getReference() { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPSaveDimension* pDim = GetDPDimension(); return pDim ? pDim->GetReferenceValue() : 0; } void ScDataPilotFieldObj::setReference( const DataPilotFieldReference* pInfo ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = 0; if( ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ) ) { @@ -2335,14 +2335,14 @@ void ScDataPilotFieldObj::setReference( const DataPilotFieldReference* pInfo ) const DataPilotFieldSortInfo* ScDataPilotFieldObj::getSortInfo() { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPSaveDimension* pDim = GetDPDimension(); return pDim ? pDim->GetSortInfo() : 0; } void ScDataPilotFieldObj::setSortInfo( const DataPilotFieldSortInfo* pInfo ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = 0; if( ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ) ) { @@ -2353,14 +2353,14 @@ void ScDataPilotFieldObj::setSortInfo( const DataPilotFieldSortInfo* pInfo ) sal_Bool ScDataPilotFieldObj::getShowEmpty() const { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPSaveDimension* pDim = GetDPDimension(); return pDim && pDim->GetShowEmpty(); } void ScDataPilotFieldObj::setShowEmpty( sal_Bool bShow ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = 0; if( ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ) ) { @@ -2371,7 +2371,7 @@ void ScDataPilotFieldObj::setShowEmpty( sal_Bool bShow ) sal_Bool ScDataPilotFieldObj::hasGroupInfo() { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = 0; if( ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ) ) if( const ScDPDimensionSaveData* pDimData = pDPObj->GetSaveData()->GetExistingDimensionData() ) @@ -2381,7 +2381,7 @@ sal_Bool ScDataPilotFieldObj::hasGroupInfo() DataPilotFieldGroupInfo ScDataPilotFieldObj::getGroupInfo() { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; DataPilotFieldGroupInfo aInfo; ScDPObject* pDPObj = 0; if( ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ) ) @@ -2442,7 +2442,7 @@ DataPilotFieldGroupInfo ScDataPilotFieldObj::getGroupInfo() void ScDataPilotFieldObj::setGroupInfo( const DataPilotFieldGroupInfo* pInfo ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = 0; if( /*ScDPSaveDimension* pDim =*/ GetDPDimension( &pDPObj ) ) { @@ -2551,7 +2551,7 @@ sal_Bool ScDataPilotFieldObj::HasString(const Sequence< OUString >& rItems, cons Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( const Sequence< OUString >& rItems ) throw (RuntimeException, IllegalArgumentException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Reference< XDataPilotField > xRet; OUString sNewDim; @@ -2715,7 +2715,7 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( cons Reference < XDataPilotField > SAL_CALL ScDataPilotFieldObj::createDateGroup( const DataPilotFieldGroupInfo& rInfo ) throw (RuntimeException, IllegalArgumentException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; using namespace ::com::sun::star::sheet::DataPilotFieldGroupBy; // check min/max/step, HasDateValues must be set always @@ -2884,7 +2884,7 @@ ScDataPilotFieldGroupsObj::~ScDataPilotFieldGroupsObj() Any SAL_CALL ScDataPilotFieldGroupsObj::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if( implFindByName( rName ) == maGroups.end() ) throw NoSuchElementException(); return Any( Reference< XNameAccess >( new ScDataPilotFieldGroupObj( *this, rName ) ) ); @@ -2892,7 +2892,7 @@ Any SAL_CALL ScDataPilotFieldGroupsObj::getByName( const OUString& rName ) Sequence< OUString > SAL_CALL ScDataPilotFieldGroupsObj::getElementNames() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Sequence< OUString > aSeq; if( !maGroups.empty() ) { @@ -2906,7 +2906,7 @@ Sequence< OUString > SAL_CALL ScDataPilotFieldGroupsObj::getElementNames() throw sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasByName( const OUString& rName ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return implFindByName( rName ) != maGroups.end(); } @@ -2915,7 +2915,7 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasByName( const OUString& rName ) void SAL_CALL ScDataPilotFieldGroupsObj::replaceByName( const OUString& rName, const Any& rElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if( rName.getLength() == 0 ) throw IllegalArgumentException(); @@ -2938,7 +2938,7 @@ void SAL_CALL ScDataPilotFieldGroupsObj::replaceByName( const OUString& rName, c void SAL_CALL ScDataPilotFieldGroupsObj::insertByName( const OUString& rName, const Any& rElement ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if( rName.getLength() == 0 ) throw IllegalArgumentException(); @@ -2962,7 +2962,7 @@ void SAL_CALL ScDataPilotFieldGroupsObj::insertByName( const OUString& rName, co void SAL_CALL ScDataPilotFieldGroupsObj::removeByName( const OUString& rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if( rName.getLength() == 0 ) throw IllegalArgumentException(); @@ -2978,14 +2978,14 @@ void SAL_CALL ScDataPilotFieldGroupsObj::removeByName( const OUString& rName ) sal_Int32 SAL_CALL ScDataPilotFieldGroupsObj::getCount() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return static_cast< sal_Int32 >( maGroups.size() ); } Any SAL_CALL ScDataPilotFieldGroupsObj::getByIndex( sal_Int32 nIndex ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ((nIndex < 0) || (nIndex >= static_cast< sal_Int32 >( maGroups.size() ))) throw IndexOutOfBoundsException(); return Any( Reference< XNameAccess >( new ScDataPilotFieldGroupObj( *this, maGroups[ nIndex ].maName ) ) ); @@ -2995,7 +2995,7 @@ Any SAL_CALL ScDataPilotFieldGroupsObj::getByIndex( sal_Int32 nIndex ) Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration( this, OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.DataPilotFieldGroupsEnumeration" ) ) ); } @@ -3003,13 +3003,13 @@ Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration() uno::Type SAL_CALL ScDataPilotFieldGroupsObj::getElementType() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType( (Reference< XNameAccess >*)0 ); } sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasElements() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return !maGroups.empty(); } @@ -3017,7 +3017,7 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasElements() throw(RuntimeExceptio ScFieldGroup& ScDataPilotFieldGroupsObj::getFieldGroup( const OUString& rName ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScFieldGroups::iterator aIt = implFindByName( rName ); if( aIt == maGroups.end() ) throw RuntimeException(); @@ -3026,7 +3026,7 @@ ScFieldGroup& ScDataPilotFieldGroupsObj::getFieldGroup( const OUString& rName ) void ScDataPilotFieldGroupsObj::renameFieldGroup( const OUString& rOldName, const OUString& rNewName ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScFieldGroups::iterator aOldIt = implFindByName( rOldName ); ScFieldGroups::iterator aNewIt = implFindByName( rNewName ); // new name must not exist yet @@ -3082,7 +3082,7 @@ ScDataPilotFieldGroupObj::~ScDataPilotFieldGroupObj() Any SAL_CALL ScDataPilotFieldGroupObj::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScFieldGroupMembers& rMembers = mrParent.getFieldGroup( maGroupName ).maMembers; ScFieldGroupMembers::iterator aIt = ::std::find( rMembers.begin(), rMembers.end(), rName ); if( aIt == rMembers.end() ) @@ -3092,13 +3092,13 @@ Any SAL_CALL ScDataPilotFieldGroupObj::getByName( const OUString& rName ) Sequence< OUString > SAL_CALL ScDataPilotFieldGroupObj::getElementNames() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ::comphelper::containerToSequence( mrParent.getFieldGroup( maGroupName ).maMembers ); } sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasByName( const OUString& rName ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScFieldGroupMembers& rMembers = mrParent.getFieldGroup( maGroupName ).maMembers; return ::std::find( rMembers.begin(), rMembers.end(), rName ) != rMembers.end(); } @@ -3108,7 +3108,7 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasByName( const OUString& rName ) t void SAL_CALL ScDataPilotFieldGroupObj::replaceByName( const OUString& rName, const Any& rElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // it should be possible to quickly rename an item -> accept string or XNamed OUString aNewName = lclExtractMember( rElement ); @@ -3134,7 +3134,7 @@ void SAL_CALL ScDataPilotFieldGroupObj::replaceByName( const OUString& rName, co void SAL_CALL ScDataPilotFieldGroupObj::insertByName( const OUString& rName, const Any& /*rElement*/ ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // we will ignore the passed element and just try to insert the name if( rName.getLength() == 0 ) @@ -3151,7 +3151,7 @@ void SAL_CALL ScDataPilotFieldGroupObj::insertByName( const OUString& rName, con void SAL_CALL ScDataPilotFieldGroupObj::removeByName( const OUString& rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if( rName.getLength() == 0 ) throw IllegalArgumentException(); @@ -3167,14 +3167,14 @@ void SAL_CALL ScDataPilotFieldGroupObj::removeByName( const OUString& rName ) sal_Int32 SAL_CALL ScDataPilotFieldGroupObj::getCount() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return static_cast< sal_Int32 >( mrParent.getFieldGroup( maGroupName ).maMembers.size() ); } Any SAL_CALL ScDataPilotFieldGroupObj::getByIndex( sal_Int32 nIndex ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScFieldGroupMembers& rMembers = mrParent.getFieldGroup( maGroupName ).maMembers; if ((nIndex < 0) || (nIndex >= static_cast< sal_Int32 >( rMembers.size() ))) throw IndexOutOfBoundsException(); @@ -3185,7 +3185,7 @@ Any SAL_CALL ScDataPilotFieldGroupObj::getByIndex( sal_Int32 nIndex ) Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration( this, OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.DataPilotFieldGroupEnumeration" ) ) ); } @@ -3193,13 +3193,13 @@ Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration() uno::Type SAL_CALL ScDataPilotFieldGroupObj::getElementType() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType( (Reference< XNamed >*)0 ); } sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasElements() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return !mrParent.getFieldGroup( maGroupName ).maMembers.empty(); } @@ -3207,13 +3207,13 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasElements() throw(RuntimeException OUString SAL_CALL ScDataPilotFieldGroupObj::getName() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return maGroupName; } void SAL_CALL ScDataPilotFieldGroupObj::setName( const OUString& rName ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; mrParent.renameFieldGroup( maGroupName, rName ); // if call to renameFieldGroup() did not throw, remember the new name maGroupName = rName; @@ -3237,13 +3237,13 @@ ScDataPilotFieldGroupItemObj::~ScDataPilotFieldGroupItemObj() OUString SAL_CALL ScDataPilotFieldGroupItemObj::getName() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return maName; } void SAL_CALL ScDataPilotFieldGroupItemObj::setName( const OUString& rName ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; mrParent.replaceByName( maName, Any( rName ) ); // if call to replaceByName() did not throw, remember the new name maName = rName; @@ -3273,7 +3273,7 @@ ScDataPilotItemObj* ScDataPilotItemsObj::GetObjectByIndex_Impl( sal_Int32 nIndex Any SAL_CALL ScDataPilotItemsObj::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Reference<XNameAccess> xMembers = GetMembers(); if (xMembers.is()) { @@ -3297,7 +3297,7 @@ Any SAL_CALL ScDataPilotItemsObj::getByName( const OUString& aName ) Sequence<OUString> SAL_CALL ScDataPilotItemsObj::getElementNames() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Sequence< OUString > aSeq; if( ScDPObject* pDPObj = GetDPObject() ) pDPObj->GetMemberNames( lcl_GetObjectIndex( pDPObj, maFieldId ), aSeq ); @@ -3307,7 +3307,7 @@ Sequence<OUString> SAL_CALL ScDataPilotItemsObj::getElementNames() sal_Bool SAL_CALL ScDataPilotItemsObj::hasByName( const OUString& aName ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Bool bFound = sal_False; Reference<XNameAccess> xMembers = GetMembers(); if (xMembers.is()) @@ -3332,7 +3332,7 @@ sal_Bool SAL_CALL ScDataPilotItemsObj::hasByName( const OUString& aName ) Reference<XEnumeration> SAL_CALL ScDataPilotItemsObj::createEnumeration() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DataPilotItemsEnumeration"))); } @@ -3340,14 +3340,14 @@ Reference<XEnumeration> SAL_CALL ScDataPilotItemsObj::createEnumeration() sal_Int32 SAL_CALL ScDataPilotItemsObj::getCount() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetMemberCount(); } Any SAL_CALL ScDataPilotItemsObj::getByIndex( sal_Int32 nIndex ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Reference< XPropertySet > xItem( GetObjectByIndex_Impl( nIndex ) ); if (!xItem.is()) throw IndexOutOfBoundsException(); @@ -3356,13 +3356,13 @@ Any SAL_CALL ScDataPilotItemsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScDataPilotItemsObj::getElementType() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((Reference<XPropertySet>*)0); } sal_Bool SAL_CALL ScDataPilotItemsObj::hasElements() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -3382,7 +3382,7 @@ ScDataPilotItemObj::~ScDataPilotItemObj() // XNamed OUString SAL_CALL ScDataPilotItemObj::getName() throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; OUString sRet; Reference<XNameAccess> xMembers = GetMembers(); if (xMembers.is()) @@ -3408,7 +3408,7 @@ Reference< XPropertySetInfo > SAL_CALL ScDataPilotItemObj::getPropertySetInfo( ) throw(RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static Reference<XPropertySetInfo> aRef = new SfxItemPropertySetInfo( maPropSet.getPropertyMap() ); return aRef; @@ -3417,7 +3417,7 @@ Reference< XPropertySetInfo > void SAL_CALL ScDataPilotItemObj::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDPObject* pDPObj = 0; if( ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ) ) { @@ -3470,7 +3470,7 @@ void SAL_CALL ScDataPilotItemObj::setPropertyValue( const OUString& aPropertyNam Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Any aRet; if( ScDPSaveDimension* pDim = GetDPDimension() ) { diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index a1026fc4f325..8cc00f714eab 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -35,6 +35,7 @@ #include <svl/smplhint.hxx> #include <svl/zforlist.hxx> #include <rtl/uuid.h> +#include <vcl/svapp.hxx> #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/util/SortField.hpp> @@ -55,7 +56,6 @@ #include "dbcolect.hxx" #include "docsh.hxx" #include "dbdocfun.hxx" -#include "unoguard.hxx" #include "unonames.hxx" #include "globstr.hrc" #ifndef SC_CONVUNO_HXX @@ -533,7 +533,7 @@ ScSubTotalFieldObj::~ScSubTotalFieldObj() sal_Int32 SAL_CALL ScSubTotalFieldObj::getGroupColumn() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScSubTotalParam aParam; rParent.GetData(aParam); @@ -542,7 +542,7 @@ sal_Int32 SAL_CALL ScSubTotalFieldObj::getGroupColumn() throw(uno::RuntimeExcept void SAL_CALL ScSubTotalFieldObj::setGroupColumn( sal_Int32 nGroupColumn ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScSubTotalParam aParam; rParent.GetData(aParam); @@ -554,7 +554,7 @@ void SAL_CALL ScSubTotalFieldObj::setGroupColumn( sal_Int32 nGroupColumn ) throw uno::Sequence<sheet::SubTotalColumn> SAL_CALL ScSubTotalFieldObj::getSubTotalColumns() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScSubTotalParam aParam; rParent.GetData(aParam); @@ -574,7 +574,7 @@ void SAL_CALL ScSubTotalFieldObj::setSubTotalColumns( const uno::Sequence<sheet::SubTotalColumn>& aSubTotalColumns ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScSubTotalParam aParam; rParent.GetData(aParam); @@ -641,7 +641,7 @@ ScSubTotalFieldObj* ScSubTotalDescriptorBase::GetObjectByIndex_Impl(USHORT nInde void SAL_CALL ScSubTotalDescriptorBase::clear() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScSubTotalParam aParam; GetData(aParam); @@ -657,7 +657,7 @@ void SAL_CALL ScSubTotalDescriptorBase::addNew( const uno::Sequence<sheet::SubTotalColumn>& aSubTotalColumns, sal_Int32 nGroupColumn ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScSubTotalParam aParam; GetData(aParam); @@ -709,7 +709,7 @@ void SAL_CALL ScSubTotalDescriptorBase::addNew( uno::Reference<container::XEnumeration> SAL_CALL ScSubTotalDescriptorBase::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SubTotalFieldsEnumeration"))); } @@ -717,7 +717,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSubTotalDescriptorBase::creat sal_Int32 SAL_CALL ScSubTotalDescriptorBase::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScSubTotalParam aParam; GetData(aParam); @@ -731,7 +731,7 @@ uno::Any SAL_CALL ScSubTotalDescriptorBase::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XSubTotalField> xField(GetObjectByIndex_Impl((USHORT)nIndex)); if (xField.is()) return uno::makeAny(xField); @@ -742,13 +742,13 @@ uno::Any SAL_CALL ScSubTotalDescriptorBase::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScSubTotalDescriptorBase::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<sheet::XSubTotalField>*)0); } sal_Bool SAL_CALL ScSubTotalDescriptorBase::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -757,7 +757,7 @@ sal_Bool SAL_CALL ScSubTotalDescriptorBase::hasElements() throw(uno::RuntimeExce uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSubTotalDescriptorBase::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); return aRef; @@ -769,7 +769,7 @@ void SAL_CALL ScSubTotalDescriptorBase::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScSubTotalParam aParam; GetData(aParam); @@ -811,7 +811,7 @@ uno::Any SAL_CALL ScSubTotalDescriptorBase::getPropertyValue( const rtl::OUStrin throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScSubTotalParam aParam; GetData(aParam); @@ -955,21 +955,21 @@ void ScConsolidationDescriptor::SetParam( const ScConsolidateParam& rNew ) sheet::GeneralFunction SAL_CALL ScConsolidationDescriptor::getFunction() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ScDataUnoConversion::SubTotalToGeneral(aParam.eFunction); } void SAL_CALL ScConsolidationDescriptor::setFunction( sheet::GeneralFunction nFunction ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; aParam.eFunction = ScDataUnoConversion::GeneralToSubTotal(nFunction); } uno::Sequence<table::CellRangeAddress> SAL_CALL ScConsolidationDescriptor::getSources() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = aParam.nDataAreaCount; if (!aParam.ppDataAreas) nCount = 0; @@ -996,7 +996,7 @@ void SAL_CALL ScConsolidationDescriptor::setSources( const uno::Sequence<table::CellRangeAddress>& aSources ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = (USHORT)aSources.getLength(); if (nCount) { @@ -1021,7 +1021,7 @@ void SAL_CALL ScConsolidationDescriptor::setSources( table::CellAddress SAL_CALL ScConsolidationDescriptor::getStartOutputPosition() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; table::CellAddress aPos; aPos.Column = aParam.nCol; aPos.Row = aParam.nRow; @@ -1033,7 +1033,7 @@ void SAL_CALL ScConsolidationDescriptor::setStartOutputPosition( const table::CellAddress& aStartOutputPosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; aParam.nCol = (SCCOL)aStartOutputPosition.Column; aParam.nRow = (SCROW)aStartOutputPosition.Row; aParam.nTab = aStartOutputPosition.Sheet; @@ -1041,40 +1041,40 @@ void SAL_CALL ScConsolidationDescriptor::setStartOutputPosition( sal_Bool SAL_CALL ScConsolidationDescriptor::getUseColumnHeaders() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return aParam.bByCol; } void SAL_CALL ScConsolidationDescriptor::setUseColumnHeaders( sal_Bool bUseColumnHeaders ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; aParam.bByCol = bUseColumnHeaders; } sal_Bool SAL_CALL ScConsolidationDescriptor::getUseRowHeaders() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return aParam.bByRow; } void SAL_CALL ScConsolidationDescriptor::setUseRowHeaders( sal_Bool bUseRowHeaders ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; aParam.bByRow = bUseRowHeaders; } sal_Bool SAL_CALL ScConsolidationDescriptor::getInsertLinks() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return aParam.bReferenceData; } void SAL_CALL ScConsolidationDescriptor::setInsertLinks( sal_Bool bInsertLinks ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; aParam.bReferenceData = bInsertLinks; } @@ -1111,7 +1111,7 @@ void ScFilterDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Sequence<sheet::TableFilterField> SAL_CALL ScFilterDescriptorBase::getFilterFields() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScQueryParam aParam; GetData(aParam); @@ -1180,7 +1180,7 @@ uno::Sequence<sheet::TableFilterField> SAL_CALL ScFilterDescriptorBase::getFilte uno::Sequence<sheet::TableFilterField2> SAL_CALL ScFilterDescriptorBase::getFilterFields2() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScQueryParam aParam; GetData(aParam); @@ -1255,7 +1255,7 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields( const uno::Sequence<sheet::TableFilterField>& aFilterFields ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScQueryParam aParam; GetData(aParam); @@ -1329,7 +1329,7 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields2( const uno::Sequence<sheet::TableFilterField2>& aFilterFields ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScQueryParam aParam; GetData(aParam); @@ -1412,7 +1412,7 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields2( uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFilterDescriptorBase::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); return aRef; @@ -1424,7 +1424,7 @@ void SAL_CALL ScFilterDescriptorBase::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScQueryParam aParam; GetData(aParam); @@ -1474,7 +1474,7 @@ uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const rtl::OUString& throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScQueryParam aParam; GetData(aParam); @@ -1667,14 +1667,14 @@ ScDBData* ScDatabaseRangeObj::GetDBData_Impl() const rtl::OUString SAL_CALL ScDatabaseRangeObj::getName() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return aName; } void SAL_CALL ScDatabaseRangeObj::setName( const rtl::OUString& aNewName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScDBDocFunc aFunc(*pDocShell); @@ -1689,7 +1689,7 @@ void SAL_CALL ScDatabaseRangeObj::setName( const rtl::OUString& aNewName ) table::CellRangeAddress SAL_CALL ScDatabaseRangeObj::getDataArea() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; table::CellRangeAddress aAddress; ScDBData* pData = GetDBData_Impl(); if (pData) @@ -1708,7 +1708,7 @@ table::CellRangeAddress SAL_CALL ScDatabaseRangeObj::getDataArea() throw(uno::Ru void SAL_CALL ScDatabaseRangeObj::setDataArea( const table::CellRangeAddress& aDataArea ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDBData* pData = GetDBData_Impl(); if ( pDocShell && pData ) { @@ -1724,7 +1724,7 @@ void SAL_CALL ScDatabaseRangeObj::setDataArea( const table::CellRangeAddress& aD uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getSortDescriptor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScSortParam aParam; const ScDBData* pData = GetDBData_Impl(); if (pData) @@ -1796,7 +1796,7 @@ void ScDatabaseRangeObj::SetQueryParam(const ScQueryParam& rQueryParam) uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScDatabaseRangeObj::getFilterDescriptor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScRangeFilterDescriptor(pDocShell, this); } @@ -1856,14 +1856,14 @@ void ScDatabaseRangeObj::SetSubTotalParam(const ScSubTotalParam& rSubTotalParam) uno::Reference<sheet::XSubTotalDescriptor> SAL_CALL ScDatabaseRangeObj::getSubTotalDescriptor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScRangeSubTotalDescriptor(this); } uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getImportDescriptor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScImportParam aParam; const ScDBData* pData = GetDBData_Impl(); if (pData) @@ -1878,7 +1878,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getImportDescri void SAL_CALL ScDatabaseRangeObj::refresh() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDBData* pData = GetDBData_Impl(); if ( pDocShell && pData ) { @@ -1908,7 +1908,7 @@ void SAL_CALL ScDatabaseRangeObj::addRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<util::XRefreshListener>* pObj = new uno::Reference<util::XRefreshListener>( xListener ); aRefreshListeners.Insert( pObj, aRefreshListeners.Count() ); @@ -1922,7 +1922,7 @@ void SAL_CALL ScDatabaseRangeObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = aRefreshListeners.Count(); for ( USHORT n=nCount; n--; ) { @@ -1950,7 +1950,7 @@ void ScDatabaseRangeObj::Refreshed_Impl() uno::Reference<table::XCellRange> SAL_CALL ScDatabaseRangeObj::getReferredCells() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScRange aRange; ScDBData* pData = GetDBData_Impl(); if ( pData ) @@ -1971,7 +1971,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScDatabaseRangeObj::getReferredCells( uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDatabaseRangeObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); return aRef; @@ -1983,7 +1983,7 @@ void SAL_CALL ScDatabaseRangeObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDBData* pData = GetDBData_Impl(); if ( pDocShell && pData ) { @@ -2074,7 +2074,7 @@ uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const rtl::OUString& aPr throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Any aRet; ScDBData* pData = GetDBData_Impl(); if ( pData ) @@ -2222,7 +2222,7 @@ void SAL_CALL ScDatabaseRangesObj::addNewByName( const rtl::OUString& aName, const table::CellRangeAddress& aRange ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; if (pDocShell) { @@ -2240,7 +2240,7 @@ void SAL_CALL ScDatabaseRangesObj::addNewByName( const rtl::OUString& aName, void SAL_CALL ScDatabaseRangesObj::removeByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; if (pDocShell) { @@ -2257,7 +2257,7 @@ void SAL_CALL ScDatabaseRangesObj::removeByName( const rtl::OUString& aName ) uno::Reference<container::XEnumeration> SAL_CALL ScDatabaseRangesObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DatabaseRangesEnumeration"))); } @@ -2265,7 +2265,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDatabaseRangesObj::createEnum sal_Int32 SAL_CALL ScDatabaseRangesObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! "unbenannt" weglassen ? @@ -2282,7 +2282,7 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XDatabaseRange> xRange(GetObjectByIndex_Impl((USHORT)nIndex)); if (xRange.is()) return uno::makeAny(xRange); @@ -2293,13 +2293,13 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScDatabaseRangesObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<sheet::XDatabaseRange>*)0); } sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -2309,7 +2309,7 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XDatabaseRange> xRange(GetObjectByName_Impl(aName)); if (xRange.is()) return uno::makeAny(xRange); @@ -2321,7 +2321,7 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const rtl::OUString& aName ) uno::Sequence<rtl::OUString> SAL_CALL ScDatabaseRangesObj::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! "unbenannt" weglassen ? @@ -2346,7 +2346,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDatabaseRangesObj::getElementNames() sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! "unbenannt" weglassen ? diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index 1a5fd7fca33d..68ad542e3ec0 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -34,6 +34,7 @@ #include <svl/smplhint.hxx> #include <svl/itemprop.hxx> #include <svx/unomid.hxx> +#include <vcl/svapp.hxx> #include <i18npool/mslangid.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -43,7 +44,6 @@ #include "miscuno.hxx" #include "docsh.hxx" #include "docpool.hxx" -#include "unoguard.hxx" #include "unonames.hxx" #include "docoptio.hxx" @@ -129,7 +129,7 @@ void ScDocDefaultsObj::ItemsChanged() uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocDefaultsObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef = new SfxItemPropertySetInfo( &aPropertyMap ); return aRef; @@ -141,7 +141,7 @@ void SAL_CALL ScDocDefaultsObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !pDocShell ) throw uno::RuntimeException(); @@ -235,7 +235,7 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const rtl::OUString& aProp { // use pool default if set - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !pDocShell ) throw uno::RuntimeException(); @@ -292,7 +292,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocDefaultsObj ) beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const rtl::OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !pDocShell ) throw uno::RuntimeException(); @@ -329,7 +329,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScDocDefaultsObj::getPropertyStates { // the simple way: call getPropertyState - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const rtl::OUString* pNames = aPropertyNames.getConstArray(); uno::Sequence<beans::PropertyState> aRet(aPropertyNames.getLength()); beans::PropertyState* pStates = aRet.getArray(); @@ -341,7 +341,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScDocDefaultsObj::getPropertyStates void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const rtl::OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !pDocShell ) throw uno::RuntimeException(); @@ -365,7 +365,7 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const rtl::OUString& aPr { // always use static default - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !pDocShell ) throw uno::RuntimeException(); diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index 6c0d7375edc1..3420281600aa 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -35,13 +35,13 @@ #include <comphelper/uno3.hxx> #include <svx/dataaccessdescriptor.hxx> #include <svl/smplhint.hxx> +#include <vcl/svapp.hxx> #include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include "dispuno.hxx" -#include "unoguard.hxx" #include "tabvwsh.hxx" #include "dbdocfun.hxx" #include "dbcolect.hxx" @@ -120,7 +120,7 @@ uno::Reference<frame::XDispatch> SAL_CALL ScDispatchProviderInterceptor::queryDi sal_Int32 nSearchFlags ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<frame::XDispatch> xResult; // create some dispatch ... @@ -145,7 +145,7 @@ uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL const uno::Sequence<frame::DispatchDescriptor>& aDescripts ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Sequence< uno::Reference< frame::XDispatch> > aReturn(aDescripts.getLength()); uno::Reference< frame::XDispatch>* pReturn = aReturn.getArray(); @@ -164,7 +164,7 @@ uno::Reference<frame::XDispatchProvider> SAL_CALL ScDispatchProviderInterceptor::getSlaveDispatchProvider() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return m_xSlaveDispatcher; } @@ -172,7 +172,7 @@ void SAL_CALL ScDispatchProviderInterceptor::setSlaveDispatchProvider( const uno::Reference<frame::XDispatchProvider>& xNewDispatchProvider ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; m_xSlaveDispatcher.set(xNewDispatchProvider); } @@ -180,7 +180,7 @@ uno::Reference<frame::XDispatchProvider> SAL_CALL ScDispatchProviderInterceptor::getMasterDispatchProvider() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return m_xMasterDispatcher; } @@ -188,7 +188,7 @@ void SAL_CALL ScDispatchProviderInterceptor::setMasterDispatchProvider( const uno::Reference<frame::XDispatchProvider>& xNewSupplier ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; m_xMasterDispatcher.set(xNewSupplier); } @@ -197,7 +197,7 @@ void SAL_CALL ScDispatchProviderInterceptor::setMasterDispatchProvider( void SAL_CALL ScDispatchProviderInterceptor::disposing( const lang::EventObject& /* Source */ ) throw(::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (m_xIntercepted.is()) { @@ -248,7 +248,7 @@ void SAL_CALL ScDispatch::dispatch( const util::URL& aURL, const uno::Sequence<beans::PropertyValue>& aArgs ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; if ( pViewShell && !aURL.Complete.compareToAscii(cURLInsertColumns) ) @@ -297,7 +297,7 @@ void SAL_CALL ScDispatch::addStatusListener( const util::URL& aURL ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pViewShell) throw uno::RuntimeException(); @@ -337,7 +337,7 @@ void SAL_CALL ScDispatch::removeStatusListener( const util::URL& aURL ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( !aURL.Complete.compareToAscii(cURLDocDataSource) ) { diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index feb4c048e952..3bb6c0bcf6a4 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -88,7 +88,6 @@ #include "rangeutl.hxx" #include "markdata.hxx" #include "docoptio.hxx" -#include "unoguard.hxx" #include "unonames.hxx" #include "shapeuno.hxx" #include "viewuno.hxx" @@ -610,7 +609,7 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) uno::Reference<sheet::XSpreadsheets> SAL_CALL ScModelObj::getSheets() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) return new ScTableSheetsObj(pDocShell); return NULL; @@ -621,7 +620,7 @@ uno::Reference<sheet::XSpreadsheets> SAL_CALL ScModelObj::getSheets() throw(uno: uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getStyleFamilies() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) return new ScStyleFamiliesObj(pDocShell); return NULL; @@ -905,7 +904,7 @@ sal_Int32 SAL_CALL ScModelObj::getRendererCount( const uno::Any& aSelection, const uno::Sequence<beans::PropertyValue>& rOptions ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pDocShell) throw uno::RuntimeException(); @@ -957,7 +956,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 const uno::Any& aSelection, const uno::Sequence<beans::PropertyValue>& rOptions ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pDocShell) throw uno::RuntimeException(); @@ -1062,7 +1061,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec const uno::Sequence<beans::PropertyValue>& rOptions ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pDocShell) throw uno::RuntimeException(); @@ -1257,7 +1256,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getLinks() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) return new ScLinkTargetTypesObj(pDocShell); return NULL; @@ -1267,7 +1266,7 @@ uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getLinks() throw(uno sal_Bool SAL_CALL ScModelObj::isActionLocked() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bLocked = FALSE; if (pDocShell) bLocked = ( pDocShell->GetLockCount() != 0 ); @@ -1276,28 +1275,28 @@ sal_Bool SAL_CALL ScModelObj::isActionLocked() throw(uno::RuntimeException) void SAL_CALL ScModelObj::addActionLock() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) pDocShell->LockDocument(); } void SAL_CALL ScModelObj::removeActionLock() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) pDocShell->UnlockDocument(); } void SAL_CALL ScModelObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) pDocShell->SetLockCount(nLock); } sal_Int16 SAL_CALL ScModelObj::resetActionLocks() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nRet = 0; if (pDocShell) { @@ -1309,7 +1308,7 @@ sal_Int16 SAL_CALL ScModelObj::resetActionLocks() throw(uno::RuntimeException) void SAL_CALL ScModelObj::lockControllers() throw (::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SfxBaseModel::lockControllers(); if (pDocShell) pDocShell->LockPaint(); @@ -1317,7 +1316,7 @@ void SAL_CALL ScModelObj::lockControllers() throw (::com::sun::star::uno::Runtim void SAL_CALL ScModelObj::unlockControllers() throw (::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (hasControllersLocked()) { SfxBaseModel::unlockControllers(); @@ -1330,7 +1329,7 @@ void SAL_CALL ScModelObj::unlockControllers() throw (::com::sun::star::uno::Runt void SAL_CALL ScModelObj::calculate() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) pDocShell->DoRecalc(TRUE); else @@ -1341,7 +1340,7 @@ void SAL_CALL ScModelObj::calculate() throw(uno::RuntimeException) void SAL_CALL ScModelObj::calculateAll() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) pDocShell->DoHardRecalc(TRUE); else @@ -1352,7 +1351,7 @@ void SAL_CALL ScModelObj::calculateAll() throw(uno::RuntimeException) sal_Bool SAL_CALL ScModelObj::isAutomaticCalculationEnabled() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) return pDocShell->GetDocument()->GetAutoCalc(); @@ -1363,7 +1362,7 @@ sal_Bool SAL_CALL ScModelObj::isAutomaticCalculationEnabled() throw(uno::Runtime void SAL_CALL ScModelObj::enableAutomaticCalculation( sal_Bool bEnabled ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -1383,7 +1382,7 @@ void SAL_CALL ScModelObj::enableAutomaticCalculation( sal_Bool bEnabled ) void SAL_CALL ScModelObj::protect( const rtl::OUString& aPassword ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // #i108245# if already protected, don't change anything if ( pDocShell && !pDocShell->GetDocument()->IsDocProtected() ) { @@ -1397,7 +1396,7 @@ void SAL_CALL ScModelObj::protect( const rtl::OUString& aPassword ) throw(uno::R void SAL_CALL ScModelObj::unprotect( const rtl::OUString& aPassword ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { String aString(aPassword); @@ -1411,7 +1410,7 @@ void SAL_CALL ScModelObj::unprotect( const rtl::OUString& aPassword ) sal_Bool SAL_CALL ScModelObj::isProtected() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) return pDocShell->GetDocument()->IsDocProtected(); @@ -1423,7 +1422,7 @@ sal_Bool SAL_CALL ScModelObj::isProtected() throw(uno::RuntimeException) uno::Reference<drawing::XDrawPages> SAL_CALL ScModelObj::getDrawPages() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) return new ScDrawPagesObj(pDocShell); @@ -1439,7 +1438,7 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal( const ::rtl::OUString& aGoalValue ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sheet::GoalResult aResult; aResult.Divergence = DBL_MAX; // nichts gefunden if (pDocShell) @@ -1464,7 +1463,7 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal( uno::Reference<sheet::XConsolidationDescriptor> SAL_CALL ScModelObj::createConsolidationDescriptor( sal_Bool bEmpty ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScConsolidationDescriptor* pNew = new ScConsolidationDescriptor; if ( pDocShell && !bEmpty ) { @@ -1480,7 +1479,7 @@ void SAL_CALL ScModelObj::consolidate( const uno::Reference<sheet::XConsolidationDescriptor>& xDescriptor ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // das koennte theoretisch ein fremdes Objekt sein, also nur das // oeffentliche XConsolidationDescriptor Interface benutzen, um // die Daten in ein ScConsolidationDescriptor Objekt zu kopieren: @@ -1506,7 +1505,7 @@ void SAL_CALL ScModelObj::consolidate( void SAL_CALL ScModelObj::refreshArrows() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScDocFunc aFunc(*pDocShell); @@ -1522,7 +1521,7 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( ) if( !xRet.is() ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell && pDocShell->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED) { xRet.set(uno::Reference < container::XIndexAccess >::query(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.IndexedPropertyValues"))))); @@ -1552,7 +1551,7 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( ) uno::Reference<beans::XPropertySetInfo> SAL_CALL ScModelObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); return aRef; @@ -1564,7 +1563,7 @@ void SAL_CALL ScModelObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString(aPropertyName); if (pDocShell) @@ -1697,7 +1696,7 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString(aPropertyName); uno::Any aRet; @@ -1872,7 +1871,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance( const rtl::OUString& aServiceSpecifier ) throw(uno::Exception, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<uno::XInterface> xRet; String aNameStr(aServiceSpecifier); USHORT nType = ScServiceProvider::GetProviderType(aNameStr); @@ -1952,7 +1951,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstanceWithArguments { //! unterscheiden zwischen eigenen Services und denen vom Drawing-Layer? - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<uno::XInterface> xInt(createInstance(ServiceSpecifier)); if ( aArgs.getLength() ) @@ -1970,7 +1969,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstanceWithArguments uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! warum sind die Parameter bei concatServiceNames nicht const ??? //! return concatServiceNames( ScServiceProvider::GetAllServiceNames(), @@ -2081,14 +2080,14 @@ ScModelObj* ScModelObj::getImplementation( const uno::Reference<uno::XInterface> void ScModelObj::addChangesListener( const uno::Reference< util::XChangesListener >& aListener ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; maChangesListeners.addInterface( aListener ); } void ScModelObj::removeChangesListener( const uno::Reference< util::XChangesListener >& aListener ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; maChangesListeners.removeInterface( aListener ); } @@ -2292,7 +2291,7 @@ uno::Reference<drawing::XDrawPage> ScDrawPagesObj::GetObjectByIndex_Impl(INT32 n uno::Reference<drawing::XDrawPage> SAL_CALL ScDrawPagesObj::insertNewByIndex( sal_Int32 nPos ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<drawing::XDrawPage> xRet; if (pDocShell) { @@ -2308,7 +2307,7 @@ uno::Reference<drawing::XDrawPage> SAL_CALL ScDrawPagesObj::insertNewByIndex( sa void SAL_CALL ScDrawPagesObj::remove( const uno::Reference<drawing::XDrawPage>& xPage ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SvxDrawPage* pImp = SvxDrawPage::getImplementation( xPage ); if ( pDocShell && pImp ) { @@ -2326,7 +2325,7 @@ void SAL_CALL ScDrawPagesObj::remove( const uno::Reference<drawing::XDrawPage>& sal_Int32 SAL_CALL ScDrawPagesObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) return pDocShell->GetDocument()->GetTableCount(); return 0; @@ -2336,7 +2335,7 @@ uno::Any SAL_CALL ScDrawPagesObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<drawing::XDrawPage> xPage(GetObjectByIndex_Impl(nIndex)); if (xPage.is()) return uno::makeAny(xPage); @@ -2347,13 +2346,13 @@ uno::Any SAL_CALL ScDrawPagesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScDrawPagesObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<drawing::XDrawPage>*)0); } sal_Bool SAL_CALL ScDrawPagesObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -2407,7 +2406,7 @@ ScTableSheetObj* ScTableSheetsObj::GetObjectByName_Impl(const rtl::OUString& aNa void SAL_CALL ScTableSheetsObj::insertNewByName( const rtl::OUString& aName, sal_Int16 nPosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; if (pDocShell) { @@ -2422,7 +2421,7 @@ void SAL_CALL ScTableSheetsObj::insertNewByName( const rtl::OUString& aName, sal void SAL_CALL ScTableSheetsObj::moveByName( const rtl::OUString& aName, sal_Int16 nDestination ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; if (pDocShell) { @@ -2439,7 +2438,7 @@ void SAL_CALL ScTableSheetsObj::copyByName( const rtl::OUString& aName, const rtl::OUString& aCopy, sal_Int16 nDestination ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; if (pDocShell) { @@ -2470,7 +2469,7 @@ void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; BOOL bIllArg = FALSE; @@ -2522,7 +2521,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; BOOL bIllArg = FALSE; @@ -2575,7 +2574,7 @@ void SAL_CALL ScTableSheetsObj::removeByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; if (pDocShell) { @@ -2602,7 +2601,7 @@ void SAL_CALL ScTableSheetsObj::removeByName( const rtl::OUString& aName ) uno::Reference< table::XCell > SAL_CALL ScTableSheetsObj::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow, sal_Int32 nSheet ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xSheet(static_cast<ScCellRangeObj*>(GetObjectByIndex_Impl((USHORT)nSheet))); if (! xSheet.is()) throw lang::IndexOutOfBoundsException(); @@ -2613,7 +2612,7 @@ uno::Reference< table::XCell > SAL_CALL ScTableSheetsObj::getCellByPosition( sal uno::Reference< table::XCellRange > SAL_CALL ScTableSheetsObj::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom, sal_Int32 nSheet ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xSheet(static_cast<ScCellRangeObj*>(GetObjectByIndex_Impl((USHORT)nSheet))); if (! xSheet.is()) throw lang::IndexOutOfBoundsException(); @@ -2624,7 +2623,7 @@ uno::Reference< table::XCellRange > SAL_CALL ScTableSheetsObj::getCellRangeByPos uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj::getCellRangesByName( const rtl::OUString& aRange ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Sequence < uno::Reference < table::XCellRange > > xRet; ScRangeList aRangeList; @@ -2655,7 +2654,7 @@ uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj: uno::Reference<container::XEnumeration> SAL_CALL ScTableSheetsObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetsEnumeration"))); } @@ -2663,7 +2662,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableSheetsObj::createEnumera sal_Int32 SAL_CALL ScTableSheetsObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) return pDocShell->GetDocument()->GetTableCount(); return 0; @@ -2673,7 +2672,7 @@ uno::Any SAL_CALL ScTableSheetsObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XSpreadsheet> xSheet(GetObjectByIndex_Impl(nIndex)); if (xSheet.is()) return uno::makeAny(xSheet); @@ -2684,13 +2683,13 @@ uno::Any SAL_CALL ScTableSheetsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScTableSheetsObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<sheet::XSpreadsheet>*)0); } sal_Bool SAL_CALL ScTableSheetsObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -2700,7 +2699,7 @@ uno::Any SAL_CALL ScTableSheetsObj::getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XSpreadsheet> xSheet(GetObjectByName_Impl(aName)); if (xSheet.is()) return uno::makeAny(xSheet); @@ -2712,7 +2711,7 @@ uno::Any SAL_CALL ScTableSheetsObj::getByName( const rtl::OUString& aName ) uno::Sequence<rtl::OUString> SAL_CALL ScTableSheetsObj::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -2733,7 +2732,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScTableSheetsObj::getElementNames() sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { SCTAB nIndex; @@ -2800,7 +2799,7 @@ ScTableColumnObj* ScTableColumnsObj::GetObjectByName_Impl(const rtl::OUString& a void SAL_CALL ScTableColumnsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCount ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; if ( pDocShell && nCount > 0 && nPosition >= 0 && nStartCol+nPosition <= nEndCol && nStartCol+nPosition+nCount-1 <= MAXCOL ) @@ -2817,7 +2816,7 @@ void SAL_CALL ScTableColumnsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 n void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; // Der zu loeschende Bereich muss innerhalb des Objekts liegen if ( pDocShell && nCount > 0 && nIndex >= 0 && nStartCol+nIndex+nCount-1 <= nEndCol ) @@ -2836,7 +2835,7 @@ void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCou uno::Reference<container::XEnumeration> SAL_CALL ScTableColumnsObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.TableColumnsEnumeration"))); } @@ -2844,7 +2843,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableColumnsObj::createEnumer sal_Int32 SAL_CALL ScTableColumnsObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return nEndCol - nStartCol + 1; } @@ -2852,7 +2851,7 @@ uno::Any SAL_CALL ScTableColumnsObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xColumn(GetObjectByIndex_Impl(nIndex)); if (xColumn.is()) return uno::makeAny(xColumn); @@ -2863,13 +2862,13 @@ uno::Any SAL_CALL ScTableColumnsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScTableColumnsObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<table::XCellRange>*)0); } sal_Bool SAL_CALL ScTableColumnsObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -2877,7 +2876,7 @@ uno::Any SAL_CALL ScTableColumnsObj::getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xColumn(GetObjectByName_Impl(aName)); if (xColumn.is()) return uno::makeAny(xColumn); @@ -2889,7 +2888,7 @@ uno::Any SAL_CALL ScTableColumnsObj::getByName( const rtl::OUString& aName ) uno::Sequence<rtl::OUString> SAL_CALL ScTableColumnsObj::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SCCOL nCount = nEndCol - nStartCol + 1; uno::Sequence<rtl::OUString> aSeq(nCount); rtl::OUString* pAry = aSeq.getArray(); @@ -2902,7 +2901,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScTableColumnsObj::getElementNames() sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SCCOL nCol = 0; String aString(aName); if ( ::AlphaToCol( nCol, aString) ) @@ -2917,7 +2916,7 @@ sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const rtl::OUString& aName ) uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnsObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( lcl_GetColumnsPropertyMap() )); return aRef; @@ -2929,7 +2928,7 @@ void SAL_CALL ScTableColumnsObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pDocShell) throw uno::RuntimeException(); @@ -2977,7 +2976,7 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const rtl::OUString& aPro throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pDocShell) throw uno::RuntimeException(); @@ -3066,7 +3065,7 @@ ScTableRowObj* ScTableRowsObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const void SAL_CALL ScTableRowsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCount ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; if ( pDocShell && nCount > 0 && nPosition >= 0 && nStartRow+nPosition <= nEndRow && nStartRow+nPosition+nCount-1 <= MAXROW ) @@ -3083,7 +3082,7 @@ void SAL_CALL ScTableRowsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCou void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; // Der zu loeschende Bereich muss innerhalb des Objekts liegen if ( pDocShell && nCount > 0 && nIndex >= 0 && nStartRow+nIndex+nCount-1 <= nEndRow ) @@ -3102,7 +3101,7 @@ void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount uno::Reference<container::XEnumeration> SAL_CALL ScTableRowsObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.TableRowsEnumeration"))); } @@ -3110,7 +3109,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableRowsObj::createEnumerati sal_Int32 SAL_CALL ScTableRowsObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return nEndRow - nStartRow + 1; } @@ -3118,7 +3117,7 @@ uno::Any SAL_CALL ScTableRowsObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xRow(GetObjectByIndex_Impl(nIndex)); if (xRow.is()) return uno::makeAny(xRow); @@ -3129,13 +3128,13 @@ uno::Any SAL_CALL ScTableRowsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScTableRowsObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<table::XCellRange>*)0); } sal_Bool SAL_CALL ScTableRowsObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -3144,7 +3143,7 @@ sal_Bool SAL_CALL ScTableRowsObj::hasElements() throw(uno::RuntimeException) uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowsObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( lcl_GetRowsPropertyMap() )); return aRef; @@ -3156,7 +3155,7 @@ void SAL_CALL ScTableRowsObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pDocShell) throw uno::RuntimeException(); @@ -3239,7 +3238,7 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const rtl::OUString& aProper throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pDocShell) throw uno::RuntimeException(); @@ -3409,7 +3408,7 @@ void SAL_CALL ScAnnotationsObj::insertNew( const table::CellAddress& aPosition, const ::rtl::OUString& rText ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { DBG_ASSERT( aPosition.Sheet == nTab, "addAnnotation mit falschem Sheet" ); @@ -3422,7 +3421,7 @@ void SAL_CALL ScAnnotationsObj::insertNew( void SAL_CALL ScAnnotationsObj::removeByIndex( sal_Int32 nIndex ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScAddress aPos; @@ -3445,7 +3444,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumera { //! iterate directly (more efficiently)? - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.CellAnnotationsEnumeration"))); } @@ -3453,7 +3452,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumera sal_Int32 SAL_CALL ScAnnotationsObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ULONG nCount = 0; if (pDocShell) { @@ -3469,7 +3468,7 @@ uno::Any SAL_CALL ScAnnotationsObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XSheetAnnotation> xAnnotation(GetObjectByIndex_Impl(nIndex)); if (xAnnotation.is()) return uno::makeAny(xAnnotation); @@ -3480,13 +3479,13 @@ uno::Any SAL_CALL ScAnnotationsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScAnnotationsObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<sheet::XSheetAnnotation>*)0); } sal_Bool SAL_CALL ScAnnotationsObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -3568,7 +3567,7 @@ void SAL_CALL ScScenariosObj::addNewByName( const rtl::OUString& aName, const rtl::OUString& aComment ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( pDocShell ) { ScMarkData aMarkData; @@ -3601,7 +3600,7 @@ void SAL_CALL ScScenariosObj::addNewByName( const rtl::OUString& aName, void SAL_CALL ScScenariosObj::removeByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SCTAB nIndex; if ( pDocShell && GetScenarioIndex_Impl( aName, nIndex ) ) { @@ -3615,7 +3614,7 @@ void SAL_CALL ScScenariosObj::removeByName( const rtl::OUString& aName ) uno::Reference<container::XEnumeration> SAL_CALL ScScenariosObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.ScenariosEnumeration"))); } @@ -3623,7 +3622,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScScenariosObj::createEnumerati sal_Int32 SAL_CALL ScScenariosObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SCTAB nCount = 0; if ( pDocShell ) { @@ -3646,7 +3645,7 @@ uno::Any SAL_CALL ScScenariosObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XScenario> xScen(GetObjectByIndex_Impl(nIndex)); if (xScen.is()) return uno::makeAny(xScen); @@ -3657,13 +3656,13 @@ uno::Any SAL_CALL ScScenariosObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScScenariosObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<sheet::XScenario>*)0); } sal_Bool SAL_CALL ScScenariosObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -3671,7 +3670,7 @@ uno::Any SAL_CALL ScScenariosObj::getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XScenario> xScen(GetObjectByName_Impl(aName)); if (xScen.is()) return uno::makeAny(xScen); @@ -3683,7 +3682,7 @@ uno::Any SAL_CALL ScScenariosObj::getByName( const rtl::OUString& aName ) uno::Sequence<rtl::OUString> SAL_CALL ScScenariosObj::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SCTAB nCount = (SCTAB)getCount(); uno::Sequence<rtl::OUString> aSeq(nCount); @@ -3703,7 +3702,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScScenariosObj::getElementNames() sal_Bool SAL_CALL ScScenariosObj::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SCTAB nIndex; return GetScenarioIndex_Impl( aName, nIndex ); } diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx index aca36831415d..5e891ea37174 100644 --- a/sc/source/ui/unoobj/editsrc.cxx +++ b/sc/source/ui/unoobj/editsrc.cxx @@ -34,6 +34,7 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> #include <editeng/unofored.hxx> +#include <vcl/svapp.hxx> #include <svx/svdpage.hxx> #include <svx/svditer.hxx> #include <svx/svdocapt.hxx> @@ -46,7 +47,6 @@ #include "docfunc.hxx" #include "hints.hxx" #include "patattr.hxx" -#include "unoguard.hxx" #include "drwlayer.hxx" #include "userdat.hxx" #include "postit.hxx" @@ -205,7 +205,7 @@ ScAnnotationEditSource::ScAnnotationEditSource(ScDocShell* pDocSh, const ScAddre ScAnnotationEditSource::~ScAnnotationEditSource() { - ScUnoGuard aGuard; // needed for EditEngine dtor + SolarMutexGuard aGuard; // needed for EditEngine dtor if (pDocShell) pDocShell->GetDocument()->RemoveUnoObject(*this); diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index c5e86135319b..8f0b38c0eed9 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -34,10 +34,10 @@ #include "eventuno.hxx" #include "miscuno.hxx" -#include "unoguard.hxx" #include "docsh.hxx" #include "sheetevents.hxx" #include "unonames.hxx" +#include <vcl/svapp.hxx> using namespace ::com::sun::star; @@ -85,7 +85,7 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const rtl::OUString& aName, const throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!mpDocShell) throw uno::RuntimeException(); @@ -137,7 +137,7 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const rtl::OUString& aName, const uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Int32 nEvent = lcl_GetEventFromName(aName); if (nEvent < 0) throw container::NoSuchElementException(); @@ -168,7 +168,7 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) uno::Sequence<rtl::OUString> SAL_CALL ScSheetEventsObj::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Sequence<rtl::OUString> aNames(SC_SHEETEVENT_COUNT); for (sal_Int32 nEvent=0; nEvent<SC_SHEETEVENT_COUNT; ++nEvent) aNames[nEvent] = ScSheetEvents::GetEventName(nEvent); @@ -177,7 +177,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScSheetEventsObj::getElementNames() throw( sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const ::rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Int32 nEvent = lcl_GetEventFromName(aName); return (nEvent >= 0); } @@ -186,13 +186,13 @@ sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const ::rtl::OUString& aName ) th uno::Type SAL_CALL ScSheetEventsObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Sequence<beans::PropertyValue>*)0); } sal_Bool SAL_CALL ScSheetEventsObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (mpDocShell) return sal_True; return sal_False; diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 7b118eb7c0ad..3af71007dfcf 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -29,6 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" #include <svl/smplhint.hxx> +#include <vcl/svapp.hxx> #include <editeng/eeitem.hxx> @@ -51,7 +52,6 @@ #include "editsrc.hxx" #include "cellsuno.hxx" #include "servuno.hxx" // fuer IDs -#include "unoguard.hxx" #include "unonames.hxx" #include "editutil.hxx" @@ -310,7 +310,7 @@ ScCellFieldObj* ScCellFieldsObj::GetObjectByIndex_Impl(INT32 Index) const sal_Int32 SAL_CALL ScCellFieldsObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! Feld-Funktionen muessen an den Forwarder !!! ScEditEngineDefaulter* pEditEngine = ((ScCellEditSource*)pEditSource)->GetEditEngine(); @@ -323,7 +323,7 @@ uno::Any SAL_CALL ScCellFieldsObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<text::XTextField> xField(GetObjectByIndex_Impl(nIndex)); if (xField.is()) return uno::makeAny(xField); @@ -334,20 +334,20 @@ uno::Any SAL_CALL ScCellFieldsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScCellFieldsObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<text::XTextField>*)0); } sal_Bool SAL_CALL ScCellFieldsObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } uno::Reference<container::XEnumeration> SAL_CALL ScCellFieldsObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFieldEnumeration"))); } @@ -410,7 +410,7 @@ void SAL_CALL ScCellFieldsObj::addRefreshListener( const uno::Reference< util::X { if (xListener.is()) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!mpRefreshListeners) mpRefreshListeners = new cppu::OInterfaceContainerHelper(aMutex); mpRefreshListeners->addInterface(xListener); @@ -422,7 +422,7 @@ void SAL_CALL ScCellFieldsObj::removeRefreshListener( const uno::Reference<util: { if (xListener.is()) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (mpRefreshListeners) mpRefreshListeners->removeInterface(xListener); } @@ -591,7 +591,7 @@ void ScCellFieldObj::DeleteField() rtl::OUString SAL_CALL ScCellFieldObj::getPresentation( sal_Bool bShowCommand ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aRet; if (pEditSource) @@ -621,7 +621,7 @@ rtl::OUString SAL_CALL ScCellFieldObj::getPresentation( sal_Bool bShowCommand ) void SAL_CALL ScCellFieldObj::attach( const uno::Reference<text::XTextRange>& xTextRange ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (xTextRange.is()) { uno::Reference<text::XText> xText(xTextRange->getText()); @@ -634,7 +634,7 @@ void SAL_CALL ScCellFieldObj::attach( const uno::Reference<text::XTextRange>& xT uno::Reference<text::XTextRange> SAL_CALL ScCellFieldObj::getAnchor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) return new ScCellObj( pDocShell, aCellPos ); return NULL; @@ -666,7 +666,7 @@ void SAL_CALL ScCellFieldObj::removeEventListener( uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellFieldObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef = pPropSet->getPropertySetInfo(); return aRef; } @@ -677,7 +677,7 @@ void SAL_CALL ScCellFieldObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameString(aPropertyName); rtl::OUString aStrVal; if (pEditSource) @@ -743,7 +743,7 @@ uno::Any SAL_CALL ScCellFieldObj::getPropertyValue( const rtl::OUString& aProper throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Any aRet; String aNameString(aPropertyName); @@ -948,7 +948,7 @@ ScHeaderFieldObj* ScHeaderFieldsObj::GetObjectByIndex_Impl(INT32 Index) const sal_Int32 SAL_CALL ScHeaderFieldsObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! Feld-Funktionen muessen an den Forwarder !!! ScEditEngineDefaulter* pEditEngine = ((ScHeaderFooterEditSource*)pEditSource)->GetEditEngine(); @@ -972,7 +972,7 @@ uno::Any SAL_CALL ScHeaderFieldsObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<text::XTextField> xField(GetObjectByIndex_Impl(nIndex)); if (xField.is()) return uno::makeAny(xField); @@ -983,20 +983,20 @@ uno::Any SAL_CALL ScHeaderFieldsObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScHeaderFieldsObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<text::XTextField>*)0); } sal_Bool SAL_CALL ScHeaderFieldsObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFieldsObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFieldEnumeration"))); } @@ -1059,7 +1059,7 @@ void SAL_CALL ScHeaderFieldsObj::addRefreshListener( const uno::Reference< util: { if (xListener.is()) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!mpRefreshListeners) mpRefreshListeners = new cppu::OInterfaceContainerHelper(aMutex); mpRefreshListeners->addInterface(xListener); @@ -1071,7 +1071,7 @@ void SAL_CALL ScHeaderFieldsObj::removeRefreshListener( const uno::Reference<uti { if (xListener.is()) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (mpRefreshListeners) mpRefreshListeners->removeInterface(xListener); } @@ -1283,7 +1283,7 @@ void ScHeaderFieldObj::DeleteField() rtl::OUString SAL_CALL ScHeaderFieldObj::getPresentation( sal_Bool /* bShowCommand */ ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aRet; if (pEditSource) @@ -1302,7 +1302,7 @@ rtl::OUString SAL_CALL ScHeaderFieldObj::getPresentation( sal_Bool /* bShowComma void SAL_CALL ScHeaderFieldObj::attach( const uno::Reference<text::XTextRange>& xTextRange ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (xTextRange.is()) { uno::Reference<text::XText> xText(xTextRange->getText()); @@ -1315,7 +1315,7 @@ void SAL_CALL ScHeaderFieldObj::attach( const uno::Reference<text::XTextRange>& uno::Reference<text::XTextRange> SAL_CALL ScHeaderFieldObj::getAnchor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pContentObj) { uno::Reference<text::XText> xText; @@ -1356,7 +1356,7 @@ void SAL_CALL ScHeaderFieldObj::removeEventListener( uno::Reference<beans::XPropertySetInfo> SAL_CALL ScHeaderFieldObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (nType == SC_SERVICE_FILEFIELD) { // file field has different properties @@ -1376,7 +1376,7 @@ void SAL_CALL ScHeaderFieldObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameString(aPropertyName); if ( nType == SC_SERVICE_FILEFIELD && aNameString.EqualsAscii( SC_UNONAME_FILEFORM ) ) { @@ -1409,7 +1409,7 @@ uno::Any SAL_CALL ScHeaderFieldObj::getPropertyValue( const rtl::OUString& aProp throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! Properties? uno::Any aRet; diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index bcbd3a4c4a93..ed1880380089 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -34,12 +34,12 @@ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> +#include <vcl/svapp.hxx> #include <unotools/ucbstreamhelper.hxx> #include "editutil.hxx" #include "filtuno.hxx" #include "miscuno.hxx" -#include "unoguard.hxx" #include "scdll.hxx" #include "imoptdlg.hxx" #include "asciiopt.hxx" @@ -84,7 +84,7 @@ ScFilterOptionsObj::~ScFilterOptionsObj() uno::Reference<uno::XInterface> SAL_CALL ScFilterOptionsObj_CreateInstance( const uno::Reference<lang::XMultiServiceFactory>& ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDLL::Init(); return (::cppu::OWeakObject*) new ScFilterOptionsObj; } diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index b1397b3067ce..72c10ee29c62 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -33,6 +33,7 @@ #include <tools/debug.hxx> #include <rtl/uuid.h> +#include <vcl/svapp.hxx> #include <com/sun/star/sheet/ValidationAlertStyle.hpp> #include <com/sun/star/sheet/ValidationType.hpp> @@ -42,7 +43,6 @@ #include "miscuno.hxx" #include "validat.hxx" #include "document.hxx" -#include "unoguard.hxx" #include "unonames.hxx" #include "styleuno.hxx" // ScStyleNameConversion #include "tokenarray.hxx" @@ -258,7 +258,7 @@ void SAL_CALL ScTableConditionalFormat::addNew( const uno::Sequence<beans::PropertyValue >& aConditionalEntry ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScCondFormatEntryItem aEntry; aEntry.meMode = SC_COND_NONE; @@ -355,7 +355,7 @@ void SAL_CALL ScTableConditionalFormat::addNew( void SAL_CALL ScTableConditionalFormat::removeByIndex( sal_Int32 nIndex ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTableConditionalEntry* pEntry = (ScTableConditionalEntry*)aEntries.GetObject(nIndex); if (pEntry) { @@ -367,7 +367,7 @@ void SAL_CALL ScTableConditionalFormat::removeByIndex( sal_Int32 nIndex ) void SAL_CALL ScTableConditionalFormat::clear() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTableConditionalEntry* pEntry; aEntries.First(); while ( ( pEntry = (ScTableConditionalEntry*)aEntries.Remove() ) != NULL ) @@ -381,7 +381,7 @@ void SAL_CALL ScTableConditionalFormat::clear() throw(uno::RuntimeException) uno::Reference<container::XEnumeration> SAL_CALL ScTableConditionalFormat::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableConditionalEntryEnumeration"))); } @@ -389,7 +389,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableConditionalFormat::creat sal_Int32 SAL_CALL ScTableConditionalFormat::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return aEntries.Count(); } @@ -397,7 +397,7 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XSheetConditionalEntry> xEntry(GetObjectByIndex_Impl((USHORT)nIndex)); if (xEntry.is()) return uno::makeAny(xEntry); @@ -408,13 +408,13 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScTableConditionalFormat::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<sheet::XSheetConditionalEntry>*)0); } sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -432,7 +432,7 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByName( const rtl::OUString& aNam throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XSheetConditionalEntry> xEntry; long nCount = aEntries.Count(); @@ -453,7 +453,7 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByName( const rtl::OUString& aNam uno::Sequence<rtl::OUString> SAL_CALL ScTableConditionalFormat::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; long nCount = aEntries.Count(); uno::Sequence<rtl::OUString> aNames(nCount); @@ -467,7 +467,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScTableConditionalFormat::getElementNames( sal_Bool SAL_CALL ScTableConditionalFormat::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; long nCount = aEntries.Count(); for (long i=0; i<nCount; i++) @@ -546,14 +546,14 @@ void ScTableConditionalEntry::GetData(ScCondFormatEntryItem& rData) const sheet::ConditionOperator SAL_CALL ScTableConditionalEntry::getOperator() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return lcl_ConditionModeToOperator( aData.meMode ); } void SAL_CALL ScTableConditionalEntry::setOperator( sheet::ConditionOperator nOperator ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; aData.meMode = lcl_ConditionOperatorToMode( nOperator ); if (pParent) pParent->DataChanged(); @@ -561,14 +561,14 @@ void SAL_CALL ScTableConditionalEntry::setOperator( sheet::ConditionOperator nOp rtl::OUString SAL_CALL ScTableConditionalEntry::getFormula1() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return aData.maExpr1; } void SAL_CALL ScTableConditionalEntry::setFormula1( const rtl::OUString& aFormula1 ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; aData.maExpr1 = String( aFormula1 ); if (pParent) pParent->DataChanged(); @@ -576,14 +576,14 @@ void SAL_CALL ScTableConditionalEntry::setFormula1( const rtl::OUString& aFormul rtl::OUString SAL_CALL ScTableConditionalEntry::getFormula2() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return aData.maExpr2; } void SAL_CALL ScTableConditionalEntry::setFormula2( const rtl::OUString& aFormula2 ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; aData.maExpr2 = String( aFormula2 ); if (pParent) pParent->DataChanged(); @@ -591,7 +591,7 @@ void SAL_CALL ScTableConditionalEntry::setFormula2( const rtl::OUString& aFormul table::CellAddress SAL_CALL ScTableConditionalEntry::getSourcePosition() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; table::CellAddress aRet; aRet.Column = aData.maPos.Col(); aRet.Row = aData.maPos.Row(); @@ -602,7 +602,7 @@ table::CellAddress SAL_CALL ScTableConditionalEntry::getSourcePosition() throw(u void SAL_CALL ScTableConditionalEntry::setSourcePosition( const table::CellAddress& aSourcePosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; aData.maPos.Set( (SCCOL)aSourcePosition.Column, (SCROW)aSourcePosition.Row, aSourcePosition.Sheet ); if (pParent) pParent->DataChanged(); @@ -612,14 +612,14 @@ void SAL_CALL ScTableConditionalEntry::setSourcePosition( const table::CellAddre rtl::OUString SAL_CALL ScTableConditionalEntry::getStyleName() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ScStyleNameConversion::DisplayToProgrammaticName( aData.maStyle, SFX_STYLE_FAMILY_PARA ); } void SAL_CALL ScTableConditionalEntry::setStyleName( const rtl::OUString& aStyleName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; aData.maStyle = ScStyleNameConversion::ProgrammaticToDisplayName( aStyleName, SFX_STYLE_FAMILY_PARA ); if (pParent) pParent->DataChanged(); @@ -745,49 +745,49 @@ void ScTableValidationObj::DataChanged() sheet::ConditionOperator SAL_CALL ScTableValidationObj::getOperator() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return lcl_ConditionModeToOperator( (ScConditionMode)nMode ); } void SAL_CALL ScTableValidationObj::setOperator( sheet::ConditionOperator nOperator ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; nMode = sal::static_int_cast<USHORT>( lcl_ConditionOperatorToMode( nOperator ) ); DataChanged(); } rtl::OUString SAL_CALL ScTableValidationObj::getFormula1() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return aExpr1; } void SAL_CALL ScTableValidationObj::setFormula1( const rtl::OUString& aFormula1 ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; aExpr1 = String( aFormula1 ); DataChanged(); } rtl::OUString SAL_CALL ScTableValidationObj::getFormula2() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return aExpr2; } void SAL_CALL ScTableValidationObj::setFormula2( const rtl::OUString& aFormula2 ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; aExpr2 = String( aFormula2 ); DataChanged(); } table::CellAddress SAL_CALL ScTableValidationObj::getSourcePosition() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; table::CellAddress aRet; aRet.Column = aSrcPos.Col(); aRet.Row = aSrcPos.Row(); @@ -798,7 +798,7 @@ table::CellAddress SAL_CALL ScTableValidationObj::getSourcePosition() throw(uno: void SAL_CALL ScTableValidationObj::setSourcePosition( const table::CellAddress& aSourcePosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; aSrcPos.Set( (SCCOL)aSourcePosition.Column, (SCROW)aSourcePosition.Row, aSourcePosition.Sheet ); DataChanged(); } @@ -806,7 +806,7 @@ void SAL_CALL ScTableValidationObj::setSourcePosition( const table::CellAddress& uno::Sequence<sheet::FormulaToken> SAL_CALL ScTableValidationObj::getTokens( sal_Int32 nIndex ) throw(uno::RuntimeException,lang::IndexOutOfBoundsException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (nIndex >= 2 || nIndex < 0) throw lang::IndexOutOfBoundsException(); @@ -816,7 +816,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScTableValidationObj::getTokens( sal void SAL_CALL ScTableValidationObj::setTokens( sal_Int32 nIndex, const uno::Sequence<sheet::FormulaToken>& aTokens ) throw(uno::RuntimeException,lang::IndexOutOfBoundsException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (nIndex >= 2 || nIndex < 0) throw lang::IndexOutOfBoundsException(); @@ -840,7 +840,7 @@ sal_Int32 SAL_CALL ScTableValidationObj::getCount() throw(uno::RuntimeException) uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableValidationObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); return aRef; @@ -852,7 +852,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString(aPropertyName); if ( aString.EqualsAscii( SC_UNONAME_SHOWINP ) ) bShowInput = ScUnoHelpFunctions::GetBoolFromAny( aValue ); @@ -967,7 +967,7 @@ uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const rtl::OUString& a throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString(aPropertyName); uno::Any aRet; diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index a4b107492e54..7b1efbd8e20f 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -39,7 +39,6 @@ #include "funcuno.hxx" #include "miscuno.hxx" #include "cellsuno.hxx" -#include "unoguard.hxx" #include "scdll.hxx" #include "document.hxx" #include "compiler.hxx" @@ -255,7 +254,7 @@ void ScFunctionAccess::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance( const uno::Reference<lang::XMultiServiceFactory>& ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDLL::Init(); static uno::Reference< uno::XInterface > xInst((::cppu::OWeakObject*) new ScFunctionAccess); return xInst; @@ -304,7 +303,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFunctionAccess::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( &aPropertyMap )); return aRef; @@ -316,7 +315,7 @@ void SAL_CALL ScFunctionAccess::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsArrayFunction" ) ) ) { @@ -340,7 +339,7 @@ uno::Any SAL_CALL ScFunctionAccess::getPropertyValue( const rtl::OUString& aProp throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsArrayFunction" ) ) ) return uno::Any( mbArray ); @@ -536,7 +535,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, throw(container::NoSuchElementException, lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!mbValid) throw uno::RuntimeException(); diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 02bb69a412b9..9f5d7a5dd1c2 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -33,6 +33,7 @@ #include <svl/smplhint.hxx> #include <sfx2/linkmgr.hxx> +#include <vcl/svapp.hxx> #include "linkuno.hxx" #include "miscuno.hxx" @@ -42,7 +43,6 @@ #include "collect.hxx" #include "tablink.hxx" #include "arealink.hxx" -#include "unoguard.hxx" #include "hints.hxx" #include "unonames.hxx" #include "rangeseq.hxx" @@ -149,13 +149,13 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const rtl::OUString SAL_CALL ScSheetLinkObj::getName() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getFileName(); // Name ist der Dateiname (URL) } void SAL_CALL ScSheetLinkObj::setName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; setFileName(aName); // Name ist der Dateiname (URL) } @@ -163,7 +163,7 @@ void SAL_CALL ScSheetLinkObj::setName( const rtl::OUString& aName ) throw(uno::R void SAL_CALL ScSheetLinkObj::refresh() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); if (pLink) pLink->Refresh( pLink->GetFileName(), pLink->GetFilterName(), NULL, pLink->GetRefreshDelay() ); @@ -173,7 +173,7 @@ void SAL_CALL ScSheetLinkObj::addRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<util::XRefreshListener>* pObj = new uno::Reference<util::XRefreshListener>( xListener ); aRefreshListeners.Insert( pObj, aRefreshListeners.Count() ); @@ -187,7 +187,7 @@ void SAL_CALL ScSheetLinkObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = aRefreshListeners.Count(); for ( USHORT n=nCount; n--; ) { @@ -222,7 +222,7 @@ void ScSheetLinkObj::ModifyRefreshDelay_Impl( sal_Int32 nRefresh ) uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSheetLinkObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); return aRef; @@ -234,7 +234,7 @@ void SAL_CALL ScSheetLinkObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameString(aPropertyName); rtl::OUString aValStr; if ( aNameString.EqualsAscii( SC_UNONAME_LINKURL ) ) @@ -270,7 +270,7 @@ uno::Any SAL_CALL ScSheetLinkObj::getPropertyValue( const rtl::OUString& aProper throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameString(aPropertyName); uno::Any aRet; if ( aNameString.EqualsAscii( SC_UNONAME_LINKURL ) ) @@ -292,13 +292,13 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSheetLinkObj ) rtl::OUString ScSheetLinkObj::getFileName(void) const { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return aFileName; } void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); if (pLink) { @@ -335,7 +335,7 @@ void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName) rtl::OUString ScSheetLinkObj::getFilter(void) const { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; rtl::OUString aRet; ScTableLink* pLink = GetLink_Impl(); if (pLink) @@ -345,7 +345,7 @@ rtl::OUString ScSheetLinkObj::getFilter(void) const void ScSheetLinkObj::setFilter(const rtl::OUString& Filter) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); if (pLink) { @@ -356,7 +356,7 @@ void ScSheetLinkObj::setFilter(const rtl::OUString& Filter) rtl::OUString ScSheetLinkObj::getFilterOptions(void) const { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; rtl::OUString aRet; ScTableLink* pLink = GetLink_Impl(); if (pLink) @@ -366,7 +366,7 @@ rtl::OUString ScSheetLinkObj::getFilterOptions(void) const void ScSheetLinkObj::setFilterOptions(const rtl::OUString& FilterOptions) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); if (pLink) { @@ -377,7 +377,7 @@ void ScSheetLinkObj::setFilterOptions(const rtl::OUString& FilterOptions) sal_Int32 ScSheetLinkObj::getRefreshDelay(void) const { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Int32 nRet = 0; ScTableLink* pLink = GetLink_Impl(); if (pLink) @@ -387,7 +387,7 @@ sal_Int32 ScSheetLinkObj::getRefreshDelay(void) const void ScSheetLinkObj::setRefreshDelay(sal_Int32 nRefreshDelay) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ModifyRefreshDelay_Impl( nRefreshDelay ); } @@ -472,7 +472,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const rtl::OUString& aName uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetLinksEnumeration"))); } @@ -480,7 +480,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumerat sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; INT32 nCount = 0; if (pDocShell) { @@ -505,7 +505,7 @@ uno::Any SAL_CALL ScSheetLinksObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<beans::XPropertySet> xLink(GetObjectByIndex_Impl(nIndex)); if (xLink.is()) return uno::makeAny(xLink); @@ -516,13 +516,13 @@ uno::Any SAL_CALL ScSheetLinksObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScSheetLinksObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<beans::XPropertySet>*)0); } sal_Bool SAL_CALL ScSheetLinksObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -530,7 +530,7 @@ uno::Any SAL_CALL ScSheetLinksObj::getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<beans::XPropertySet> xLink(GetObjectByName_Impl(aName)); if (xLink.is()) return uno::makeAny(xLink); @@ -542,7 +542,7 @@ uno::Any SAL_CALL ScSheetLinksObj::getByName( const rtl::OUString& aName ) sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // Name ist der Dateiname if (pDocShell) @@ -565,7 +565,7 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const rtl::OUString& aName ) uno::Sequence<rtl::OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // Name ist der Dateiname if (pDocShell) @@ -714,7 +714,7 @@ void ScAreaLinkObj::ModifyRefreshDelay_Impl( sal_Int32 nRefresh ) void SAL_CALL ScAreaLinkObj::refresh() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) pLink->Refresh( pLink->GetFile(), pLink->GetFilter(), pLink->GetSource(), pLink->GetRefreshDelay() ); @@ -724,7 +724,7 @@ void SAL_CALL ScAreaLinkObj::addRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<util::XRefreshListener>* pObj = new uno::Reference<util::XRefreshListener>( xListener ); aRefreshListeners.Insert( pObj, aRefreshListeners.Count() ); @@ -738,7 +738,7 @@ void SAL_CALL ScAreaLinkObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = aRefreshListeners.Count(); for ( USHORT n=nCount; n--; ) { @@ -766,7 +766,7 @@ void ScAreaLinkObj::Refreshed_Impl() uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAreaLinkObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); return aRef; @@ -778,7 +778,7 @@ void SAL_CALL ScAreaLinkObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameString(aPropertyName); rtl::OUString aValStr; if ( aNameString.EqualsAscii( SC_UNONAME_LINKURL ) ) @@ -814,7 +814,7 @@ uno::Any SAL_CALL ScAreaLinkObj::getPropertyValue( const rtl::OUString& aPropert throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameString(aPropertyName); uno::Any aRet; if ( aNameString.EqualsAscii( SC_UNONAME_LINKURL ) ) @@ -836,7 +836,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAreaLinkObj ) rtl::OUString ScAreaLinkObj::getFileName(void) const { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; rtl::OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) @@ -846,13 +846,13 @@ rtl::OUString ScAreaLinkObj::getFileName(void) const void ScAreaLinkObj::setFileName(const rtl::OUString& rNewName) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Modify_Impl( &rNewName, NULL, NULL, NULL, NULL ); } rtl::OUString ScAreaLinkObj::getFilter(void) const { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; rtl::OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) @@ -862,13 +862,13 @@ rtl::OUString ScAreaLinkObj::getFilter(void) const void ScAreaLinkObj::setFilter(const rtl::OUString& Filter) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Modify_Impl( NULL, &Filter, NULL, NULL, NULL ); } rtl::OUString ScAreaLinkObj::getFilterOptions(void) const { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; rtl::OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) @@ -878,13 +878,13 @@ rtl::OUString ScAreaLinkObj::getFilterOptions(void) const void ScAreaLinkObj::setFilterOptions(const rtl::OUString& FilterOptions) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Modify_Impl( NULL, NULL, &FilterOptions, NULL, NULL ); } sal_Int32 ScAreaLinkObj::getRefreshDelay(void) const { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Int32 nRet = 0; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) @@ -894,7 +894,7 @@ sal_Int32 ScAreaLinkObj::getRefreshDelay(void) const void ScAreaLinkObj::setRefreshDelay(sal_Int32 nRefreshDelay) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ModifyRefreshDelay_Impl( nRefreshDelay ); } @@ -902,7 +902,7 @@ void ScAreaLinkObj::setRefreshDelay(sal_Int32 nRefreshDelay) rtl::OUString SAL_CALL ScAreaLinkObj::getSourceArea() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; rtl::OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) @@ -913,13 +913,13 @@ rtl::OUString SAL_CALL ScAreaLinkObj::getSourceArea() throw(uno::RuntimeExceptio void SAL_CALL ScAreaLinkObj::setSourceArea( const rtl::OUString& aSourceArea ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Modify_Impl( NULL, NULL, NULL, &aSourceArea, NULL ); } table::CellRangeAddress SAL_CALL ScAreaLinkObj::getDestArea() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; table::CellRangeAddress aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) @@ -930,7 +930,7 @@ table::CellRangeAddress SAL_CALL ScAreaLinkObj::getDestArea() throw(uno::Runtime void SAL_CALL ScAreaLinkObj::setDestArea( const table::CellRangeAddress& aDestArea ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Modify_Impl( NULL, NULL, NULL, NULL, &aDestArea ); } @@ -976,7 +976,7 @@ void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestP const rtl::OUString& aFilterOptions ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { String aFileStr (aFileName); @@ -996,7 +996,7 @@ void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestP void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, (USHORT)nIndex); if (pLink) { @@ -1012,7 +1012,7 @@ void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Runti uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.CellAreaLinksEnumeration"))); } @@ -1020,7 +1020,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumerati sal_Int32 SAL_CALL ScAreaLinksObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; INT32 nAreaCount = 0; if (pDocShell) { @@ -1040,7 +1040,7 @@ uno::Any SAL_CALL ScAreaLinksObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XAreaLink> xLink(GetObjectByIndex_Impl(nIndex)); if (xLink.is()) return uno::makeAny(xLink); @@ -1051,13 +1051,13 @@ uno::Any SAL_CALL ScAreaLinksObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScAreaLinksObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<sheet::XAreaLink>*)0); } sal_Bool SAL_CALL ScAreaLinksObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -1115,7 +1115,7 @@ String lcl_BuildDDEName( const String& rAppl, const String& rTopic, const String rtl::OUString SAL_CALL ScDDELinkObj::getName() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return lcl_BuildDDEName( aAppl, aTopic, aItem ); } @@ -1129,7 +1129,7 @@ void SAL_CALL ScDDELinkObj::setName( const rtl::OUString& /* aName */ ) throw(un rtl::OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? return aAppl; @@ -1137,7 +1137,7 @@ rtl::OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeExceptio rtl::OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? return aTopic; @@ -1145,7 +1145,7 @@ rtl::OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException) rtl::OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? return aItem; @@ -1155,7 +1155,7 @@ rtl::OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException) void SAL_CALL ScDDELinkObj::refresh() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -1168,7 +1168,7 @@ void SAL_CALL ScDDELinkObj::addRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<util::XRefreshListener>* pObj = new uno::Reference<util::XRefreshListener>( xListener ); aRefreshListeners.Insert( pObj, aRefreshListeners.Count() ); @@ -1182,7 +1182,7 @@ void SAL_CALL ScDDELinkObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = aRefreshListeners.Count(); for ( USHORT n=nCount; n--; ) { @@ -1202,7 +1202,7 @@ void SAL_CALL ScDDELinkObj::removeRefreshListener( uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults( ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Sequence< uno::Sequence< uno::Any > > aReturn; bool bSuccess = false; @@ -1241,7 +1241,7 @@ uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults( ) void ScDDELinkObj::setResults( const uno::Sequence< uno::Sequence< uno::Any > >& aResults ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; bool bSuccess = false; if ( pDocShell ) @@ -1339,7 +1339,7 @@ ScDDELinkObj* ScDDELinksObj::GetObjectByName_Impl(const rtl::OUString& aName) uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DDELinksEnumeration"))); } @@ -1347,7 +1347,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeratio sal_Int32 SAL_CALL ScDDELinksObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; INT32 nAreaCount = 0; if (pDocShell) nAreaCount = pDocShell->GetDocument()->GetDdeLinkCount(); @@ -1358,7 +1358,7 @@ uno::Any SAL_CALL ScDDELinksObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XDDELink> xLink(GetObjectByIndex_Impl(nIndex)); if (xLink.is()) return uno::makeAny(xLink); @@ -1369,13 +1369,13 @@ uno::Any SAL_CALL ScDDELinksObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScDDELinksObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<sheet::XDDELink>*)0); } sal_Bool SAL_CALL ScDDELinksObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -1383,7 +1383,7 @@ uno::Any SAL_CALL ScDDELinksObj::getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XDDELink> xLink(GetObjectByName_Impl(aName)); if (xLink.is()) return uno::makeAny(xLink); @@ -1394,7 +1394,7 @@ uno::Any SAL_CALL ScDDELinksObj::getByName( const rtl::OUString& aName ) uno::Sequence<rtl::OUString> SAL_CALL ScDDELinksObj::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { String aAppl, aTopic, aItem; @@ -1417,7 +1417,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDDELinksObj::getElementNames() throw(uno sal_Bool SAL_CALL ScDDELinksObj::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { String aNamStr(aName); @@ -1442,7 +1442,7 @@ uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( const ::rtl::OUString& aItem, ::com::sun::star::sheet::DDELinkMode nMode ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference< sheet::XDDELink > xLink; if ( pDocShell ) @@ -1507,7 +1507,7 @@ ScExternalSheetCacheObj::~ScExternalSheetCacheObj() void SAL_CALL ScExternalSheetCacheObj::setCellValue(sal_Int32 nCol, sal_Int32 nRow, const Any& rValue) throw (IllegalArgumentException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (nRow < 0 || nCol < 0) throw IllegalArgumentException(); @@ -1528,7 +1528,7 @@ void SAL_CALL ScExternalSheetCacheObj::setCellValue(sal_Int32 nCol, sal_Int32 nR Any SAL_CALL ScExternalSheetCacheObj::getCellValue(sal_Int32 nCol, sal_Int32 nRow) throw (IllegalArgumentException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (nRow < 0 || nCol < 0) throw IllegalArgumentException(); @@ -1560,7 +1560,7 @@ Any SAL_CALL ScExternalSheetCacheObj::getCellValue(sal_Int32 nCol, sal_Int32 nRo Sequence< sal_Int32 > SAL_CALL ScExternalSheetCacheObj::getAllRows() throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; vector<SCROW> aRows; mpTable->getAllRows(aRows); size_t nSize = aRows.size(); @@ -1574,7 +1574,7 @@ Sequence< sal_Int32 > SAL_CALL ScExternalSheetCacheObj::getAllRows() Sequence< sal_Int32 > SAL_CALL ScExternalSheetCacheObj::getAllColumns(sal_Int32 nRow) throw (IllegalArgumentException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (nRow < 0) throw IllegalArgumentException(); @@ -1609,7 +1609,7 @@ Reference< sheet::XExternalSheetCache > SAL_CALL ScExternalDocLinkObj::addSheetC const OUString& aSheetName, sal_Bool bDynamicCache ) throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; size_t nIndex = 0; ScExternalRefCache::TableTypeRef pTable = mpRefMgr->getCacheTable(mnFileId, aSheetName, true, &nIndex); if (!bDynamicCache) @@ -1623,7 +1623,7 @@ Reference< sheet::XExternalSheetCache > SAL_CALL ScExternalDocLinkObj::addSheetC Any SAL_CALL ScExternalDocLinkObj::getByName(const::rtl::OUString &aName) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; size_t nIndex = 0; ScExternalRefCache::TableTypeRef pTable = mpRefMgr->getCacheTable(mnFileId, aName, false, &nIndex); if (!pTable) @@ -1639,7 +1639,7 @@ Any SAL_CALL ScExternalDocLinkObj::getByName(const::rtl::OUString &aName) Sequence< OUString > SAL_CALL ScExternalDocLinkObj::getElementNames() throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; vector<String> aTabNames; mpRefMgr->getAllCachedTableNames(mnFileId, aTabNames); size_t n = aTabNames.size(); @@ -1652,21 +1652,21 @@ Sequence< OUString > SAL_CALL ScExternalDocLinkObj::getElementNames() sal_Bool SAL_CALL ScExternalDocLinkObj::hasByName(const OUString &aName) throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return static_cast<sal_Bool>(mpRefMgr->hasCacheTable(mnFileId, aName)); } sal_Int32 SAL_CALL ScExternalDocLinkObj::getCount() throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return static_cast<sal_Int32>(mpRefMgr->getCacheTableCount(mnFileId)); } Any SAL_CALL ScExternalDocLinkObj::getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; size_t nTabCount = mpRefMgr->getCacheTableCount(mnFileId); if (nIndex < 0 || nIndex >= static_cast<sal_Int32>(nTabCount)) throw lang::IndexOutOfBoundsException(); @@ -1685,7 +1685,7 @@ Any SAL_CALL ScExternalDocLinkObj::getByIndex(sal_Int32 nIndex) Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumeration() throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( new ScIndexEnumeration(this, OUString::createFromAscii( "com.sun.star.sheet.ExternalDocLink"))); @@ -1695,14 +1695,14 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumer uno::Type SAL_CALL ScExternalDocLinkObj::getElementType() throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType(static_cast<Reference<sheet::XExternalDocLink>*>(0)); } sal_Bool SAL_CALL ScExternalDocLinkObj::hasElements() throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return static_cast<sal_Bool>(mpRefMgr->getCacheTableCount(mnFileId) > 0); } @@ -1728,7 +1728,7 @@ Reference< sheet::XExternalDocLink > SAL_CALL ScExternalDocLinksObj::addDocLink( const OUString& aDocName ) throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_uInt16 nFileId = mpRefMgr->getExternalFileId(aDocName); Reference< sheet::XExternalDocLink > aDocLink(new ScExternalDocLinkObj(mpRefMgr, nFileId)); return aDocLink; @@ -1737,7 +1737,7 @@ Reference< sheet::XExternalDocLink > SAL_CALL ScExternalDocLinksObj::addDocLink( Any SAL_CALL ScExternalDocLinksObj::getByName(const::rtl::OUString &aName) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!mpRefMgr->hasExternalFile(aName)) throw container::NoSuchElementException(); @@ -1752,7 +1752,7 @@ Any SAL_CALL ScExternalDocLinksObj::getByName(const::rtl::OUString &aName) Sequence< OUString > SAL_CALL ScExternalDocLinksObj::getElementNames() throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_uInt16 n = mpRefMgr->getExternalFileCount(); Sequence<OUString> aSeq(n); for (sal_uInt16 i = 0; i < n; ++i) @@ -1767,21 +1767,21 @@ Sequence< OUString > SAL_CALL ScExternalDocLinksObj::getElementNames() sal_Bool SAL_CALL ScExternalDocLinksObj::hasByName(const OUString &aName) throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return mpRefMgr->hasExternalFile(aName); } sal_Int32 SAL_CALL ScExternalDocLinksObj::getCount() throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return mpRefMgr->getExternalFileCount(); } Any SAL_CALL ScExternalDocLinksObj::getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (nIndex > ::std::numeric_limits<sal_uInt16>::max() || nIndex < ::std::numeric_limits<sal_uInt16>::min()) throw lang::IndexOutOfBoundsException(); @@ -1799,7 +1799,7 @@ Any SAL_CALL ScExternalDocLinksObj::getByIndex(sal_Int32 nIndex) Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnumeration() throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( new ScIndexEnumeration(this, OUString::createFromAscii( "com.sun.star.sheet.ExternalDocLinks"))); @@ -1809,14 +1809,14 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnume uno::Type SAL_CALL ScExternalDocLinksObj::getElementType() throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType(static_cast<Reference<sheet::XExternalDocLinks>*>(0)); } sal_Bool SAL_CALL ScExternalDocLinksObj::hasElements() throw (RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return mpRefMgr->getExternalFileCount() > 0; } diff --git a/sc/source/ui/unoobj/makefile.mk b/sc/source/ui/unoobj/makefile.mk index 45b11634b8a9..f80f74f513cb 100644 --- a/sc/source/ui/unoobj/makefile.mk +++ b/sc/source/ui/unoobj/makefile.mk @@ -72,7 +72,6 @@ SLO1FILES = \ $(SLO)$/targuno.obj \ $(SLO)$/convuno.obj \ $(SLO)$/editsrc.obj \ - $(SLO)$/unoguard.obj \ $(SLO)$/confuno.obj \ $(SLO)$/filtuno.obj \ $(SLO)$/unodoc.obj \ diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index 57e45f7fc73a..f0c1798e8c73 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -32,9 +32,9 @@ #include <tools/debug.hxx> +#include <vcl/svapp.hxx> #include "miscuno.hxx" -#include "unoguard.hxx" using namespace com::sun::star; using ::com::sun::star::uno::Reference; @@ -228,14 +228,14 @@ ScIndexEnumeration::~ScIndexEnumeration() sal_Bool SAL_CALL ScIndexEnumeration::hasMoreElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( nPos < xIndex->getCount() ); } uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Any aReturn; try { diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 1b5bc50766fe..55f03a3bec4a 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -32,6 +32,7 @@ #include <svl/smplhint.hxx> +#include <vcl/svapp.hxx> #include <com/sun/star/sheet/NamedRangeFlag.hpp> #include <com/sun/star/awt/XBitmap.hpp> @@ -50,7 +51,6 @@ using namespace ::com::sun::star; #include "docsh.hxx" #include "docfunc.hxx" #include "rangenam.hxx" -#include "unoguard.hxx" #include "unonames.hxx" #include "scui_def.hxx" @@ -191,14 +191,14 @@ void ScNamedRangeObj::Modify_Impl( const String* pNewName, const ScTokenArray* p rtl::OUString SAL_CALL ScNamedRangeObj::getName() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return aName; } void SAL_CALL ScNamedRangeObj::setName( const rtl::OUString& aNewName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! Formeln anpassen ????? String aNewStr(aNewName); @@ -211,7 +211,7 @@ void SAL_CALL ScNamedRangeObj::setName( const rtl::OUString& aNewName ) rtl::OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aContent; ScRangeData* pData = GetRangeData_Impl(); if (pData) @@ -223,7 +223,7 @@ rtl::OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException void SAL_CALL ScNamedRangeObj::setContent( const rtl::OUString& aContent ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aContStr(aContent); // GRAM_PODF_A1 for API compatibility. Modify_Impl( NULL, NULL, &aContStr, NULL, NULL,formula::FormulaGrammar::GRAM_PODF_A1 ); @@ -240,7 +240,7 @@ void ScNamedRangeObj::SetContentWithGrammar( const ::rtl::OUString& aContent, table::CellAddress SAL_CALL ScNamedRangeObj::getReferencePosition() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScAddress aPos; ScRangeData* pData = GetRangeData_Impl(); if (pData) @@ -266,7 +266,7 @@ table::CellAddress SAL_CALL ScNamedRangeObj::getReferencePosition() void SAL_CALL ScNamedRangeObj::setReferencePosition( const table::CellAddress& aReferencePosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScAddress aPos( (SCCOL)aReferencePosition.Column, (SCROW)aReferencePosition.Row, aReferencePosition.Sheet ); // GRAM_PODF_A1 for API compatibility. Modify_Impl( NULL, NULL, NULL, &aPos, NULL,formula::FormulaGrammar::GRAM_PODF_A1 ); @@ -274,7 +274,7 @@ void SAL_CALL ScNamedRangeObj::setReferencePosition( const table::CellAddress& a sal_Int32 SAL_CALL ScNamedRangeObj::getType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Int32 nType=0; ScRangeData* pData = GetRangeData_Impl(); if (pData) @@ -292,7 +292,7 @@ sal_Int32 SAL_CALL ScNamedRangeObj::getType() throw(uno::RuntimeException) void SAL_CALL ScNamedRangeObj::setType( sal_Int32 nUnoType ) throw(uno::RuntimeException) { // see property 'IsSharedFormula' for RT_SHARED - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_uInt16 nNewType = RT_NAME; if ( nUnoType & sheet::NamedRangeFlag::FILTER_CRITERIA ) nNewType |= RT_CRITERIA; if ( nUnoType & sheet::NamedRangeFlag::PRINT_AREA ) nNewType |= RT_PRINTAREA; @@ -307,7 +307,7 @@ void SAL_CALL ScNamedRangeObj::setType( sal_Int32 nUnoType ) throw(uno::RuntimeE uno::Sequence<sheet::FormulaToken> SAL_CALL ScNamedRangeObj::getTokens() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Sequence<sheet::FormulaToken> aSequence; ScRangeData* pData = GetRangeData_Impl(); if (pData && pDocShell) @@ -321,7 +321,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScNamedRangeObj::getTokens() throw(u void SAL_CALL ScNamedRangeObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if( pDocShell ) { ScTokenArray aTokenArray; @@ -337,7 +337,7 @@ void SAL_CALL ScNamedRangeObj::setTokens( const uno::Sequence<sheet::FormulaToke uno::Reference<table::XCellRange> SAL_CALL ScNamedRangeObj::getReferredCells() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScRange aRange; ScRangeData* pData = GetRangeData_Impl(); if ( pData && pData->IsValidReference( aRange ) ) @@ -357,7 +357,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScNamedRangeObj::getReferredCells() uno::Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangeObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( lcl_GetNamedRangeMap() )); return aRef; } @@ -368,7 +368,7 @@ void SAL_CALL ScNamedRangeObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( rPropertyName.equalsAscii( SC_UNONAME_ISSHAREDFMLA ) ) { bool bIsShared = false; @@ -384,7 +384,7 @@ uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const rtl::OUString& rPrope throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Any aRet; if ( rPropertyName.equalsAscii( SC_UNO_LINKDISPBIT ) ) { @@ -537,7 +537,7 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const rtl::OUString& aName, const rtl::OUString& aContent, const table::CellAddress& aPosition, sal_Int32 nUnoType ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameStr(aName); String aContStr(aContent); ScAddress aPos( (SCCOL)aPosition.Column, (SCROW)aPosition.Row, aPosition.Sheet ); @@ -581,7 +581,7 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const rtl::OUString& aName, void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress& aSource, sheet::Border aBorder ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! das darf kein enum sein, weil mehrere Bits gesetzt sein koennen !!! sal_Bool bTop = ( aBorder == sheet::Border_TOP ); @@ -608,7 +608,7 @@ void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress& void SAL_CALL ScNamedRangesObj::removeByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; if (pDocShell) { @@ -636,7 +636,7 @@ void SAL_CALL ScNamedRangesObj::removeByName( const rtl::OUString& aName ) void SAL_CALL ScNamedRangesObj::outputList( const table::CellAddress& aOutputPosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScAddress aPos( (SCCOL)aOutputPosition.Column, (SCROW)aOutputPosition.Row, aOutputPosition.Sheet ); if (pDocShell) { @@ -650,7 +650,7 @@ void SAL_CALL ScNamedRangesObj::outputList( const table::CellAddress& aOutputPos uno::Reference<container::XEnumeration> SAL_CALL ScNamedRangesObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.NamedRangesEnumeration"))); } @@ -658,7 +658,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScNamedRangesObj::createEnumera sal_Int32 SAL_CALL ScNamedRangesObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; long nRet = 0; if (pDocShell) { @@ -678,7 +678,7 @@ uno::Any SAL_CALL ScNamedRangesObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference< sheet::XNamedRange > xRange(GetObjectByIndex_Impl((sal_uInt16)nIndex)); if ( xRange.is() ) return uno::makeAny(xRange); @@ -689,13 +689,13 @@ uno::Any SAL_CALL ScNamedRangesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScNamedRangesObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ::getCppuType((const uno::Reference< sheet::XNamedRange >*)0); // muss zu getByIndex passen } sal_Bool SAL_CALL ScNamedRangesObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -703,7 +703,7 @@ uno::Any SAL_CALL ScNamedRangesObj::getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference< sheet::XNamedRange > xRange(GetObjectByName_Impl(aName)); if ( xRange.is() ) return uno::makeAny(xRange); @@ -715,7 +715,7 @@ uno::Any SAL_CALL ScNamedRangesObj::getByName( const rtl::OUString& aName ) uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangesObj::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScRangeName* pNames = pDocShell->GetDocument()->GetRangeName(); @@ -743,7 +743,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangesObj::getElementNames() sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScRangeName* pNames = pDocShell->GetDocument()->GetRangeName(); @@ -774,13 +774,13 @@ void ScNamedRangesObj::unlock() sal_Bool ScNamedRangesObj::isActionLocked() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return pDocShell->GetDocument()->GetNamedRangesLockCount() != 0; } void ScNamedRangesObj::addActionLock() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocument* pDoc = pDocShell->GetDocument(); sal_Int16 nLockCount = pDoc->GetNamedRangesLockCount(); ++nLockCount; @@ -793,7 +793,7 @@ void ScNamedRangesObj::addActionLock() throw(uno::RuntimeException) void ScNamedRangesObj::removeActionLock() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocument* pDoc = pDocShell->GetDocument(); sal_Int16 nLockCount = pDoc->GetNamedRangesLockCount(); if ( nLockCount > 0 ) @@ -809,7 +809,7 @@ void ScNamedRangesObj::removeActionLock() throw(uno::RuntimeException) void ScNamedRangesObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( nLock >= 0 ) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -828,7 +828,7 @@ void ScNamedRangesObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeExcep sal_Int16 ScNamedRangesObj::resetActionLocks() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocument* pDoc = pDocShell->GetDocument(); sal_Int16 nLockCount = pDoc->GetNamedRangesLockCount(); if ( nLockCount > 0 ) @@ -923,7 +923,7 @@ void ScLabelRangeObj::Modify_Impl( const ScRange* pLabel, const ScRange* pData ) table::CellRangeAddress SAL_CALL ScLabelRangeObj::getLabelArea() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; table::CellRangeAddress aRet; ScRangePair* pData = GetData_Impl(); if (pData) @@ -934,7 +934,7 @@ table::CellRangeAddress SAL_CALL ScLabelRangeObj::getLabelArea() void SAL_CALL ScLabelRangeObj::setLabelArea( const table::CellRangeAddress& aLabelArea ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScRange aLabelRange; ScUnoConversion::FillScRange( aLabelRange, aLabelArea ); Modify_Impl( &aLabelRange, NULL ); @@ -943,7 +943,7 @@ void SAL_CALL ScLabelRangeObj::setLabelArea( const table::CellRangeAddress& aLab table::CellRangeAddress SAL_CALL ScLabelRangeObj::getDataArea() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; table::CellRangeAddress aRet; ScRangePair* pData = GetData_Impl(); if (pData) @@ -954,7 +954,7 @@ table::CellRangeAddress SAL_CALL ScLabelRangeObj::getDataArea() void SAL_CALL ScLabelRangeObj::setDataArea( const table::CellRangeAddress& aDataArea ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScRange aDataRange; ScUnoConversion::FillScRange( aDataRange, aDataArea ); Modify_Impl( NULL, &aDataRange ); @@ -1008,7 +1008,7 @@ void SAL_CALL ScLabelRangesObj::addNew( const table::CellRangeAddress& aLabelAre const table::CellRangeAddress& aDataArea ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -1040,7 +1040,7 @@ void SAL_CALL ScLabelRangesObj::addNew( const table::CellRangeAddress& aLabelAre void SAL_CALL ScLabelRangesObj::removeByIndex( sal_Int32 nIndex ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = FALSE; if (pDocShell) { @@ -1080,7 +1080,7 @@ void SAL_CALL ScLabelRangesObj::removeByIndex( sal_Int32 nIndex ) uno::Reference<container::XEnumeration> SAL_CALL ScLabelRangesObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.LabelRangesEnumeration"))); } @@ -1088,7 +1088,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScLabelRangesObj::createEnumera sal_Int32 SAL_CALL ScLabelRangesObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pDocShell) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -1103,7 +1103,7 @@ uno::Any SAL_CALL ScLabelRangesObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference< sheet::XLabelRange > xRange(GetObjectByIndex_Impl((sal_uInt16)nIndex)); if ( xRange.is() ) return uno::makeAny(xRange); @@ -1114,14 +1114,14 @@ uno::Any SAL_CALL ScLabelRangesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScLabelRangesObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ::getCppuType((const uno::Reference< sheet::XLabelRange >*)0); // muss zu getByIndex passen } sal_Bool SAL_CALL ScLabelRangesObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index 453baa96afa4..7860ba8fbde6 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -35,6 +35,7 @@ #include <editeng/unotext.hxx> #include <svx/svdpool.hxx> #include <svx/svdobj.hxx> +#include <vcl/svapp.hxx> #include "notesuno.hxx" #include "textuno.hxx" #include "cellsuno.hxx" // getParent @@ -49,7 +50,6 @@ #include "drwlayer.hxx" #include "detfunc.hxx" #include "undocell.hxx" -#include "unoguard.hxx" #include "userdat.hxx" #include <editeng/outlobj.hxx> #include <svx/unoshape.hxx> @@ -124,7 +124,7 @@ void ScAnnotationObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // Parent der Notiz ist die zugehoerige Zelle //! existierendes Objekt finden und zurueckgeben ??? @@ -147,7 +147,7 @@ void SAL_CALL ScAnnotationObj::setParent( const uno::Reference<uno::XInterface>& uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // Notizen brauchen keine Extrawurst return GetUnoText().createTextCursor(); } @@ -156,20 +156,20 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursorByRa const uno::Reference<text::XTextRange>& aTextPosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // Notizen brauchen keine Extrawurst return GetUnoText().createTextCursorByRange(aTextPosition); } rtl::OUString SAL_CALL ScAnnotationObj::getString() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().getString(); } void SAL_CALL ScAnnotationObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetUnoText().setString(aText); } @@ -177,7 +177,7 @@ void SAL_CALL ScAnnotationObj::insertString( const uno::Reference<text::XTextRan const rtl::OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetUnoText().insertString( xRange, aString, bAbsorb ); } @@ -185,25 +185,25 @@ void SAL_CALL ScAnnotationObj::insertControlCharacter( const uno::Reference<text sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetUnoText().insertControlCharacter( xRange, nControlCharacter, bAbsorb ); } uno::Reference<text::XText> SAL_CALL ScAnnotationObj::getText() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().getText(); } uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getStart() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().getStart(); } uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getEnd() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().getEnd(); } @@ -211,7 +211,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getEnd() throw(uno::R table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; table::CellAddress aAdr; aAdr.Sheet = aCellPos.Tab(); aAdr.Column = aCellPos.Col(); @@ -221,28 +221,28 @@ table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeExc rtl::OUString SAL_CALL ScAnnotationObj::getAuthor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScPostIt* pNote = ImplGetNote(); return pNote ? pNote->GetAuthor() : rtl::OUString(); } rtl::OUString SAL_CALL ScAnnotationObj::getDate() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScPostIt* pNote = ImplGetNote(); return pNote ? pNote->GetDate() : rtl::OUString(); } sal_Bool SAL_CALL ScAnnotationObj::getIsVisible() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScPostIt* pNote = ImplGetNote(); return pNote && pNote->IsCaptionShown(); } void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // show/hide note with undo action if( pDocShell ) pDocShell->GetDocFunc().ShowNote( aCellPos, bIsVisible ); @@ -252,7 +252,7 @@ void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible ) throw(uno::Ru uno::Reference < drawing::XShape > SAL_CALL ScAnnotationObj::getAnnotationShape() throw(::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScAnnotationShapeObj(pDocShell, aCellPos); } @@ -334,7 +334,7 @@ void ScAnnotationShapeObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Reference<uno::XInterface> SAL_CALL ScAnnotationShapeObj::getParent() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // Parent der Notiz ist die zugehoerige Zelle //! existierendes Objekt finden und zurueckgeben ??? @@ -355,14 +355,14 @@ void SAL_CALL ScAnnotationShapeObj::setParent( const uno::Reference<uno::XInterf // XElementAccess uno::Type SAL_CALL ScAnnotationShapeObj::getElementType( ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().getElementType(); } sal_Bool SAL_CALL ScAnnotationShapeObj::hasElements( ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().hasElements(); } @@ -370,7 +370,7 @@ sal_Bool SAL_CALL ScAnnotationShapeObj::hasElements( ) throw (uno::RuntimeExcep // XEnumerationAccess uno::Reference< container::XEnumeration > SAL_CALL ScAnnotationShapeObj::createEnumeration( ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().createEnumeration(); } @@ -379,7 +379,7 @@ uno::Reference< container::XEnumeration > SAL_CALL ScAnnotationShapeObj::createE void SAL_CALL ScAnnotationShapeObj::moveTextRange( const uno::Reference< text::XTextRange >& xRange, sal_Int16 nParagraphs ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetUnoText().moveTextRange( xRange, nParagraphs ); } @@ -390,7 +390,7 @@ void SAL_CALL ScAnnotationShapeObj::insertTextContent( const uno::Reference< tex throw (lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetUnoText().insertTextContent( xRange, xContent, bAbsorb ); } @@ -399,7 +399,7 @@ void SAL_CALL ScAnnotationShapeObj::removeTextContent( const uno::Reference< tex throw (container::NoSuchElementException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetUnoText().removeTextContent( xContent ); } @@ -409,7 +409,7 @@ void SAL_CALL ScAnnotationShapeObj::removeTextContent( const uno::Reference< tex uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationShapeObj::createTextCursor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // Notizen brauchen keine Extrawurst return GetUnoText().createTextCursor(); } @@ -418,20 +418,20 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationShapeObj::createTextCurso const uno::Reference<text::XTextRange>& aTextPosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // Notizen brauchen keine Extrawurst return GetUnoText().createTextCursorByRange(aTextPosition); } rtl::OUString SAL_CALL ScAnnotationShapeObj::getString() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().getString(); } void SAL_CALL ScAnnotationShapeObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetUnoText().setString(aText); } @@ -439,7 +439,7 @@ void SAL_CALL ScAnnotationShapeObj::insertString( const uno::Reference<text::XTe const rtl::OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetUnoText().insertString( xRange, aString, bAbsorb ); } @@ -447,25 +447,25 @@ void SAL_CALL ScAnnotationShapeObj::insertControlCharacter( const uno::Reference sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetUnoText().insertControlCharacter( xRange, nControlCharacter, bAbsorb ); } uno::Reference<text::XText> SAL_CALL ScAnnotationShapeObj::getText() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().getText(); } uno::Reference<text::XTextRange> SAL_CALL ScAnnotationShapeObj::getStart() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().getStart(); } uno::Reference<text::XTextRange> SAL_CALL ScAnnotationShapeObj::getEnd() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return GetUnoText().getEnd(); } @@ -473,7 +473,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScAnnotationShapeObj::getEnd() throw(u ::rtl::OUString SAL_CALL ScAnnotationShapeObj::getShapeType( ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < drawing::XShapeDescriptor > xDesc(GetXShape(), uno::UNO_QUERY); if (xDesc.is()) return xDesc->getShapeType(); @@ -484,7 +484,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScAnnotationShapeObj::getEnd() throw(u awt::Point SAL_CALL ScAnnotationShapeObj::getPosition( ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetXShape(); return xShape.is() ? xShape->getPosition() : awt::Point(); } @@ -492,7 +492,7 @@ awt::Point SAL_CALL ScAnnotationShapeObj::getPosition( ) void SAL_CALL ScAnnotationShapeObj::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetXShape(); if( xShape.is() ) xShape->setPosition(aPosition); @@ -501,7 +501,7 @@ void SAL_CALL ScAnnotationShapeObj::setPosition( const awt::Point& aPosition ) awt::Size SAL_CALL ScAnnotationShapeObj::getSize( ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetXShape(); return xShape.is() ? xShape->getSize() : awt::Size(); } @@ -509,7 +509,7 @@ awt::Size SAL_CALL ScAnnotationShapeObj::getSize( ) void SAL_CALL ScAnnotationShapeObj::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetXShape(); if( xShape.is() ) xShape->setSize(aSize); @@ -520,7 +520,7 @@ beans::PropertyState SAL_CALL ScAnnotationShapeObj::getPropertyState( const rtl: throw (beans::UnknownPropertyException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XPropertyState > xState (GetXShape(), uno::UNO_QUERY); if (xState.is()) return xState->getPropertyState( PropertyName ); @@ -532,7 +532,7 @@ uno::Sequence< beans::PropertyState > SAL_CALL ScAnnotationShapeObj::getProperty throw (beans::UnknownPropertyException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XPropertyState > xState (GetXShape(), uno::UNO_QUERY); if (xState.is()) return xState->getPropertyStates( aPropertyName ); @@ -543,7 +543,7 @@ void SAL_CALL ScAnnotationShapeObj::setPropertyToDefault( const ::rtl::OUString& throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XPropertyState > xState (GetXShape(), uno::UNO_QUERY); if (xState.is()) xState->setPropertyToDefault( PropertyName ); @@ -553,7 +553,7 @@ uno::Any SAL_CALL ScAnnotationShapeObj::getPropertyDefault( const rtl::OUString& throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XPropertyState > xState (GetXShape(), uno::UNO_QUERY); if (xState.is()) return xState->getPropertyDefault( aPropertyName ); @@ -564,7 +564,7 @@ uno::Any SAL_CALL ScAnnotationShapeObj::getPropertyDefault( const rtl::OUString& uno::Reference< beans::XPropertySetInfo > SAL_CALL ScAnnotationShapeObj::getPropertySetInfo( ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XPropertySet > xProp (GetXShape(), uno::UNO_QUERY); if (xProp.is()) return xProp->getPropertySetInfo(); @@ -578,7 +578,7 @@ void SAL_CALL ScAnnotationShapeObj::setPropertyValue( const rtl::OUString& aProp lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XPropertySet > xProp (GetXShape(), uno::UNO_QUERY); if (xProp.is()) xProp->setPropertyValue( aPropertyName, aValue ); @@ -589,7 +589,7 @@ uno::Any SAL_CALL ScAnnotationShapeObj::getPropertyValue( const rtl::OUString& P lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XPropertySet > xProp (GetXShape(), uno::UNO_QUERY); if (xProp.is()) return xProp->getPropertyValue( PropertyName ); @@ -602,7 +602,7 @@ void SAL_CALL ScAnnotationShapeObj::addPropertyChangeListener( const rtl::OUStri lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XPropertySet > xProp (GetXShape(), uno::UNO_QUERY); if (xProp.is()) return xProp->addPropertyChangeListener( aPropertyName, xListener ); @@ -614,7 +614,7 @@ void SAL_CALL ScAnnotationShapeObj::removePropertyChangeListener( const rtl::OUS lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XPropertySet > xProp (GetXShape(), uno::UNO_QUERY); if (xProp.is()) return xProp->removePropertyChangeListener( aPropertyName, aListener ); @@ -626,7 +626,7 @@ void SAL_CALL ScAnnotationShapeObj::addVetoableChangeListener( const rtl::OUStri lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XPropertySet > xProp (GetXShape(), uno::UNO_QUERY); if (xProp.is()) return xProp->addVetoableChangeListener( PropertyName, aListener ); @@ -638,7 +638,7 @@ void SAL_CALL ScAnnotationShapeObj::removeVetoableChangeListener( const rtl::OUS lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XPropertySet > xProp (GetXShape(), uno::UNO_QUERY); if (xProp.is()) return xProp->removeVetoableChangeListener( PropertyName, aListener ); @@ -652,7 +652,7 @@ void SAL_CALL ScAnnotationShapeObj::setPropertyValues( const uno::Sequence< rtl: lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XMultiPropertySet > xProp (GetXShape(), uno::UNO_QUERY); if (xProp.is()) xProp->setPropertyValues( aPropertyNames, aValues ); @@ -662,7 +662,7 @@ uno::Sequence< uno::Any > SAL_CALL ScAnnotationShapeObj::getPropertyValues( const uno::Sequence< rtl::OUString >& aPropertyNames ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XMultiPropertySet > xProp (GetXShape(), uno::UNO_QUERY); if (xProp.is()) return xProp->getPropertyValues( aPropertyNames ); @@ -673,7 +673,7 @@ void SAL_CALL ScAnnotationShapeObj::addPropertiesChangeListener( const uno::Sequ const uno::Reference< beans::XPropertiesChangeListener >& xListener ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XMultiPropertySet > xProp (GetXShape(), uno::UNO_QUERY); if (xProp.is()) xProp->addPropertiesChangeListener( aPropertyNames, xListener ); @@ -682,7 +682,7 @@ void SAL_CALL ScAnnotationShapeObj::addPropertiesChangeListener( const uno::Sequ void SAL_CALL ScAnnotationShapeObj::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& xListener ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XMultiPropertySet > xProp (GetXShape(), uno::UNO_QUERY); if (xProp.is()) xProp->removePropertiesChangeListener( xListener ); @@ -692,7 +692,7 @@ void SAL_CALL ScAnnotationShapeObj::firePropertiesChangeEvent( const uno::Sequen const uno::Reference< beans::XPropertiesChangeListener >& xListener ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < beans::XMultiPropertySet > xProp (GetXShape(), uno::UNO_QUERY); if (xProp.is()) xProp->firePropertiesChangeEvent( aPropertyNames, xListener ); @@ -701,7 +701,7 @@ void SAL_CALL ScAnnotationShapeObj::firePropertiesChangeEvent( const uno::Sequen // XComponent void SAL_CALL ScAnnotationShapeObj::dispose( ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < lang::XComponent > xComp (GetXShape(), uno::UNO_QUERY); if (xComp.is()) xComp->dispose(); @@ -712,7 +712,7 @@ void SAL_CALL ScAnnotationShapeObj::dispose( ) throw (uno::RuntimeException) void SAL_CALL ScAnnotationShapeObj::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < lang::XComponent > xComp (GetXShape(), uno::UNO_QUERY); if (xComp.is()) xComp->addEventListener( xListener ); @@ -721,7 +721,7 @@ void SAL_CALL ScAnnotationShapeObj::addEventListener( const uno::Reference< lang void SAL_CALL ScAnnotationShapeObj::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference < lang::XComponent > xComp (GetXShape(), uno::UNO_QUERY); if (xComp.is()) xComp->removeEventListener( aListener ); diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index 24da175d5834..bfd6e631bd31 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -39,7 +39,6 @@ #include "miscuno.hxx" #include "unonames.hxx" #include "docoptio.hxx" -#include "unoguard.hxx" using namespace com::sun::star; @@ -215,7 +214,7 @@ void SAL_CALL ScDocOptionsObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bDone = ScDocOptionsHelper::setPropertyValue( aOptions, *GetPropertySet().getPropertyMap(), aPropertyName, aValue ); @@ -227,7 +226,7 @@ uno::Any SAL_CALL ScDocOptionsObj::getPropertyValue( const rtl::OUString& aPrope throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Any aRet(ScDocOptionsHelper::getPropertyValue( aOptions, *GetPropertySet().getPropertyMap(), aPropertyName )); if ( !aRet.hasValue() ) diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 450c5f8c3ef1..b942c7dd9f11 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -40,7 +40,6 @@ #include <com/sun/star/container/XNameAccess.hpp> #include "servuno.hxx" -#include "unoguard.hxx" #include "unonames.hxx" #include "cellsuno.hxx" #include "fielduno.hxx" @@ -116,7 +115,7 @@ public: virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; maCachedObject = uno::Any(); // clear cached object String sName = aName; @@ -158,7 +157,7 @@ public: } ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; OSL_TRACE("ScVbaObjectForCodeNameProvider::getByName( %s )", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() ); if ( !hasByName( aName ) ) @@ -167,7 +166,7 @@ public: } virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDocument* pDoc = mpDocShell->GetDocument(); if ( !pDoc ) throw uno::RuntimeException(); @@ -197,7 +196,7 @@ public: // XCodeNameQuery rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; rtl::OUString sCodeName; if ( mpDocShell ) { diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index eafaf69df2f1..3f9ea0aabcab 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -35,6 +35,7 @@ #include <svtools/unoevent.hxx> #include <svtools/unoimap.hxx> #include <svx/svdobj.hxx> +#include <vcl/svapp.hxx> #include <svx/unoshape.hxx> #include <editeng/unofield.hxx> #include <svx/shapepropertynotifier.hxx> @@ -53,7 +54,6 @@ #include "drwlayer.hxx" #include "userdat.hxx" #include "unonames.hxx" -#include "unoguard.hxx" using namespace ::com::sun::star; @@ -244,7 +244,7 @@ uno::Reference<text::XTextRange> lcl_GetTextRange( const uno::Reference<uno::XAg uno::Reference<beans::XPropertySetInfo> SAL_CALL ScShapeObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // #i61527# cache property set info for this object if ( !mxPropSetInfo.is() ) @@ -356,7 +356,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameString(aPropertyName); if ( aNameString.EqualsAscii( SC_UNONAME_ANCHOR ) ) @@ -675,7 +675,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyNa throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameString = aPropertyName; uno::Any aAny; @@ -873,7 +873,7 @@ void SAL_CALL ScShapeObj::addPropertyChangeListener( const rtl::OUString& aPrope throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetShapePropertySet(); if (pShapePropertySet) @@ -897,7 +897,7 @@ void SAL_CALL ScShapeObj::removePropertyChangeListener( const rtl::OUString& aPr throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetShapePropertySet(); if (pShapePropertySet) @@ -909,7 +909,7 @@ void SAL_CALL ScShapeObj::addVetoableChangeListener( const rtl::OUString& aPrope throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetShapePropertySet(); if (pShapePropertySet) @@ -921,7 +921,7 @@ void SAL_CALL ScShapeObj::removeVetoableChangeListener( const rtl::OUString& aPr throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; GetShapePropertySet(); if (pShapePropertySet) @@ -933,7 +933,7 @@ void SAL_CALL ScShapeObj::removeVetoableChangeListener( const rtl::OUString& aPr beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const rtl::OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameString(aPropertyName); beans::PropertyState eRet = beans::PropertyState_DIRECT_VALUE; @@ -967,7 +967,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates( const uno::Sequence<rtl::OUString>& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // simple loop to get own and aggregated states @@ -982,7 +982,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates( void SAL_CALL ScShapeObj::setPropertyToDefault( const rtl::OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameString(aPropertyName); if ( aNameString.EqualsAscii( SC_UNONAME_IMAGEMAP ) ) @@ -1014,7 +1014,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const rtl::OUString& aProperty throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameString = aPropertyName; uno::Any aAny; @@ -1039,14 +1039,14 @@ uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const rtl::OUString& aProperty void SAL_CALL ScShapeObj::attach( const uno::Reference<text::XTextRange>& /* xTextRange */ ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; throw lang::IllegalArgumentException(); // anchor cannot be changed } uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<text::XTextRange> xRet; @@ -1087,7 +1087,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor() throw(uno::Run void SAL_CALL ScShapeObj::dispose() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<lang::XComponent> xAggComp(lcl_GetComponent(mxShapeAgg)); if ( xAggComp.is() ) @@ -1098,7 +1098,7 @@ void SAL_CALL ScShapeObj::addEventListener( const uno::Reference<lang::XEventListener>& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<lang::XComponent> xAggComp(lcl_GetComponent(mxShapeAgg)); if ( xAggComp.is() ) @@ -1109,7 +1109,7 @@ void SAL_CALL ScShapeObj::removeEventListener( const uno::Reference<lang::XEventListener>& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<lang::XComponent> xAggComp(lcl_GetComponent(mxShapeAgg)); if ( xAggComp.is() ) @@ -1137,7 +1137,7 @@ void SAL_CALL ScShapeObj::insertTextContent( const uno::Reference<text::XTextRan sal_Bool bAbsorb ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<text::XTextContent> xEffContent; @@ -1165,7 +1165,7 @@ void SAL_CALL ScShapeObj::insertTextContent( const uno::Reference<text::XTextRan void SAL_CALL ScShapeObj::removeTextContent( const uno::Reference<text::XTextContent>& xContent ) throw(container::NoSuchElementException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // ScCellFieldObj can't be used here. @@ -1180,7 +1180,7 @@ void SAL_CALL ScShapeObj::removeTextContent( const uno::Reference<text::XTextCon uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( mxShapeAgg.is() ) { @@ -1198,7 +1198,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursorByRange( const uno::Reference<text::XTextRange>& aTextPosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( mxShapeAgg.is() && aTextPosition.is() ) { @@ -1222,7 +1222,7 @@ void SAL_CALL ScShapeObj::insertString( const uno::Reference<text::XTextRange>& const rtl::OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<text::XSimpleText> xAggSimpleText(lcl_GetSimpleText(mxShapeAgg)); if ( xAggSimpleText.is() ) @@ -1235,7 +1235,7 @@ void SAL_CALL ScShapeObj::insertControlCharacter( const uno::Reference<text::XTe sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<text::XSimpleText> xAggSimpleText(lcl_GetSimpleText(mxShapeAgg)); if ( xAggSimpleText.is() ) @@ -1249,13 +1249,13 @@ void SAL_CALL ScShapeObj::insertControlCharacter( const uno::Reference<text::XTe uno::Reference<text::XText> SAL_CALL ScShapeObj::getText() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return this; } uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getStart() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<text::XTextRange> xAggTextRange(lcl_GetTextRange(mxShapeAgg)); if ( xAggTextRange.is() ) @@ -1268,7 +1268,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getStart() throw(uno::Runt uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<text::XTextRange> xAggTextRange(lcl_GetTextRange(mxShapeAgg)); if ( xAggTextRange.is() ) @@ -1281,7 +1281,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd() throw(uno::Runtim rtl::OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<text::XTextRange> xAggTextRange(lcl_GetTextRange(mxShapeAgg)); if ( xAggTextRange.is() ) @@ -1294,7 +1294,7 @@ rtl::OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException) void SAL_CALL ScShapeObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<text::XTextRange> xAggTextRange(lcl_GetTextRange(mxShapeAgg)); if ( xAggTextRange.is() ) @@ -1328,7 +1328,7 @@ uno::Sequence<uno::Type> SAL_CALL ScShapeObj::getTypes() throw(uno::RuntimeExcep uno::Sequence<sal_Int8> SAL_CALL ScShapeObj::getImplementationId() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // do we need to compute the implementation id for this instance? if( !pImplementationId && mxShapeAgg.is()) { diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index d1999ed7bd13..6402f60d91aa 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -33,6 +33,7 @@ #include "scitems.hxx" #include <svl/srchitem.hxx> +#include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <rtl/uuid.h> @@ -41,7 +42,6 @@ #include "undoblk.hxx" #include "hints.hxx" #include "markdata.hxx" -#include "unoguard.hxx" #include "miscuno.hxx" #include "unonames.hxx" @@ -115,14 +115,14 @@ ScCellSearchObj::~ScCellSearchObj() rtl::OUString SAL_CALL ScCellSearchObj::getSearchString() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return pSearchItem->GetSearchString(); } void SAL_CALL ScCellSearchObj::setSearchString( const rtl::OUString& aString ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; pSearchItem->SetSearchString( aString ); } @@ -130,14 +130,14 @@ void SAL_CALL ScCellSearchObj::setSearchString( const rtl::OUString& aString ) rtl::OUString SAL_CALL ScCellSearchObj::getReplaceString() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return pSearchItem->GetReplaceString(); } void SAL_CALL ScCellSearchObj::setReplaceString( const rtl::OUString& aReplaceString ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; pSearchItem->SetReplaceString( aReplaceString ); } @@ -146,7 +146,7 @@ void SAL_CALL ScCellSearchObj::setReplaceString( const rtl::OUString& aReplaceSt uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellSearchObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); return aRef; @@ -158,7 +158,7 @@ void SAL_CALL ScCellSearchObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString(aPropertyName); if (aString.EqualsAscii( SC_UNO_SRCHBACK )) pSearchItem->SetBackward( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); @@ -180,7 +180,7 @@ uno::Any SAL_CALL ScCellSearchObj::getPropertyValue( const rtl::OUString& aPrope throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString(aPropertyName); uno::Any aRet; diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index ea310e72a127..9383816528ab 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -44,6 +44,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/printer.hxx> #include <vcl/virdev.hxx> +#include <vcl/svapp.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <svl/intitem.hxx> @@ -70,7 +71,6 @@ #include "attrib.hxx" #include "stlpool.hxx" #include "docpool.hxx" -#include "unoguard.hxx" #include "miscuno.hxx" #include "convuno.hxx" #include "tablink.hxx" @@ -629,7 +629,7 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference< container::XNameContainer > xFamily(GetObjectByIndex_Impl(nIndex)); if (xFamily.is()) return uno::makeAny(xFamily); @@ -640,13 +640,13 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScStyleFamiliesObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ::getCppuType((const uno::Reference< container::XNameContainer >*)0); // muss zu getByIndex passen } sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -656,7 +656,7 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference< container::XNameContainer > xFamily(GetObjectByName_Impl(aName)); if (xFamily.is()) return uno::makeAny(xFamily); @@ -668,7 +668,7 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const rtl::OUString& aName ) uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamiliesObj::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Sequence<rtl::OUString> aNames(SC_STYLE_FAMILY_COUNT); rtl::OUString* pNames = aNames.getArray(); pNames[0] = rtl::OUString::createFromAscii( SC_FAMILYNAME_CELL ); @@ -679,7 +679,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamiliesObj::getElementNames() sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameStr( aName ); return ( aNameStr.EqualsAscii( SC_FAMILYNAME_CELL ) || aNameStr.EqualsAscii( SC_FAMILYNAME_PAGE ) ); } @@ -812,7 +812,7 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const rtl::OUString& aName, const throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Bool bDone = sal_False; // Reflection muss nicht uno::XInterface sein, kann auch irgendein Interface sein... uno::Reference< uno::XInterface > xInterface(aElement, uno::UNO_QUERY); @@ -858,7 +858,7 @@ void SAL_CALL ScStyleFamilyObj::replaceByName( const rtl::OUString& aName, const throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! zusammenfassen? removeByName( aName ); insertByName( aName, aElement ); @@ -868,7 +868,7 @@ void SAL_CALL ScStyleFamilyObj::removeByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; BOOL bFound = FALSE; if ( pDocShell ) { @@ -923,7 +923,7 @@ void SAL_CALL ScStyleFamilyObj::removeByName( const rtl::OUString& aName ) sal_Int32 SAL_CALL ScStyleFamilyObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( pDocShell ) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -939,7 +939,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference< style::XStyle > xObj(GetObjectByIndex_Impl(nIndex)); if (xObj.is()) return uno::makeAny(xObj); @@ -950,13 +950,13 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScStyleFamilyObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ::getCppuType((const uno::Reference< style::XStyle >*)0); // muss zu getByIndex passen } sal_Bool SAL_CALL ScStyleFamilyObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -966,7 +966,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference< style::XStyle > xObj( GetObjectByName_Impl( ScStyleNameConversion::ProgrammaticToDisplayName( aName, sal::static_int_cast<UINT16>(eFamily) ) )); if (xObj.is()) @@ -979,7 +979,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByName( const rtl::OUString& aName ) uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamilyObj::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( pDocShell ) { ScDocument* pDoc = pDocShell->GetDocument(); @@ -1009,7 +1009,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamilyObj::getElementNames() sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( pDocShell ) { String aString(ScStyleNameConversion::ProgrammaticToDisplayName( aName, sal::static_int_cast<UINT16>(eFamily) )); @@ -1041,7 +1041,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPr if ( sPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DisplayName") ) ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_uInt32 nResId = 0; switch ( eFamily ) { @@ -1186,7 +1186,7 @@ SfxStyleSheetBase* ScStyleObj::GetStyle_Impl() sal_Bool SAL_CALL ScStyleObj::isUserDefined() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) return pStyle->IsUserDefined(); @@ -1195,7 +1195,7 @@ sal_Bool SAL_CALL ScStyleObj::isUserDefined() throw(uno::RuntimeException) sal_Bool SAL_CALL ScStyleObj::isInUse() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) return pStyle->IsUsed(); @@ -1204,7 +1204,7 @@ sal_Bool SAL_CALL ScStyleObj::isInUse() throw(uno::RuntimeException) rtl::OUString SAL_CALL ScStyleObj::getParentStyle() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) return ScStyleNameConversion::DisplayToProgrammaticName( pStyle->GetParent(), sal::static_int_cast<UINT16>(eFamily) ); @@ -1214,7 +1214,7 @@ rtl::OUString SAL_CALL ScStyleObj::getParentStyle() throw(uno::RuntimeException) void SAL_CALL ScStyleObj::setParentStyle( const rtl::OUString& rParentStyle ) throw(container::NoSuchElementException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) { @@ -1260,7 +1260,7 @@ void SAL_CALL ScStyleObj::setParentStyle( const rtl::OUString& rParentStyle ) rtl::OUString SAL_CALL ScStyleObj::getName() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) return ScStyleNameConversion::DisplayToProgrammaticName( pStyle->GetName(), sal::static_int_cast<UINT16>(eFamily) ); @@ -1270,7 +1270,7 @@ rtl::OUString SAL_CALL ScStyleObj::getName() throw(uno::RuntimeException) void SAL_CALL ScStyleObj::setName( const rtl::OUString& aNewName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) { @@ -1352,7 +1352,7 @@ const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const ::rtl::OUString& rProp beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const rtl::OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; beans::PropertyState eRet = beans::PropertyState_DIRECT_VALUE; const SfxItemPropertySimpleEntry* pResultEntry = NULL; @@ -1396,7 +1396,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScStyleObj::getPropertyStates( // duemmliche Default-Implementierung: alles einzeln per getPropertyState holen //! sollte optimiert werden! - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const rtl::OUString* pNames = aPropertyNames.getConstArray(); uno::Sequence<beans::PropertyState> aRet(aPropertyNames.getLength()); beans::PropertyState* pStates = aRet.getArray(); @@ -1408,7 +1408,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScStyleObj::getPropertyStates( void SAL_CALL ScStyleObj::setPropertyToDefault( const rtl::OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const SfxItemPropertyMap* pMap = pPropSet->getPropertyMap(); const SfxItemPropertySimpleEntry* pEntry = pMap->getByName( aPropertyName ); @@ -1422,7 +1422,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const rtl::OUString& aProperty throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Any aAny; const SfxItemPropertySimpleEntry* pResultEntry = NULL; @@ -1516,7 +1516,7 @@ void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< rtl::OUString throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Int32 nCount = aPropertyNames.getLength(); if ( aValues.getLength() != nCount ) @@ -1540,7 +1540,7 @@ uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyValues( const uno::Sequence< rtl::OUString >& aPropertyNames ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! optimize @@ -1581,7 +1581,7 @@ void SAL_CALL ScStyleObj::firePropertiesChangeEvent( const uno::Sequence<rtl::OU void SAL_CALL ScStyleObj::setAllPropertiesToDefault() throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); if ( pStyle ) @@ -1628,7 +1628,7 @@ void SAL_CALL ScStyleObj::setAllPropertiesToDefault() throw (uno::RuntimeExcepti void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<rtl::OUString>& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Int32 nCount = aPropertyNames.getLength(); if ( nCount ) @@ -1649,7 +1649,7 @@ uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyDefaults( throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! optimize @@ -1669,7 +1669,7 @@ uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyDefaults( uno::Reference<beans::XPropertySetInfo> SAL_CALL ScStyleObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return pPropSet->getPropertySetInfo(); } @@ -1679,7 +1679,7 @@ void SAL_CALL ScStyleObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap()->getByName( aPropertyName ); if ( !pEntry ) @@ -1974,7 +1974,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Any aAny; if ( aPropertyName.equalsAscii( SC_UNONAME_DISPNAME ) ) // read-only diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index fa7d128b7f89..6509b03d864d 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -47,7 +47,6 @@ #include "nameuno.hxx" #include "docsh.hxx" #include "content.hxx" -#include "unoguard.hxx" #include "scresid.hxx" #include "sc.hrc" #include "unonames.hxx" @@ -209,7 +208,7 @@ uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks uno::Reference< beans::XPropertySetInfo > SAL_CALL ScLinkTargetTypeObj::getPropertySetInfo(void) throw( uno::RuntimeException ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( lcl_GetLinkTargetMap() )); return aRef; } diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index d64b4ad66061..d97cce02b426 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -43,6 +43,7 @@ #include <editeng/unofored.hxx> #include <rtl/uuid.h> #include <vcl/virdev.hxx> +#include <vcl/svapp.hxx> #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -53,7 +54,6 @@ #include "editsrc.hxx" #include "docsh.hxx" #include "editutil.hxx" -#include "unoguard.hxx" #include "miscuno.hxx" #include "cellsuno.hxx" #include "hints.hxx" @@ -168,21 +168,21 @@ void ScHeaderFooterContentObj::UpdateText( USHORT nPart, EditEngine& rSource ) uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getLeftText() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScHeaderFooterTextObj( *this, SC_HDFT_LEFT ); } uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getCenterText() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScHeaderFooterTextObj( *this, SC_HDFT_CENTER ); } uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getRightText() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScHeaderFooterTextObj( *this, SC_HDFT_RIGHT ); } @@ -246,7 +246,7 @@ ScHeaderFooterTextData::ScHeaderFooterTextData( ScHeaderFooterContentObj& rConte ScHeaderFooterTextData::~ScHeaderFooterTextData() { - ScUnoGuard aGuard; // needed for EditEngine dtor + SolarMutexGuard aGuard; // needed for EditEngine dtor rContentObj.RemoveListener( *this ); @@ -370,7 +370,7 @@ const SvxUnoText& ScHeaderFooterTextObj::GetUnoText() uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCursor() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScHeaderFooterTextCursor( *this ); } @@ -378,7 +378,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCurs const uno::Reference<text::XTextRange>& aTextPosition ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pUnoText) CreateUnoText_Impl(); return pUnoText->createTextCursorByRange(aTextPosition); @@ -398,7 +398,7 @@ void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) // s rtl::OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; rtl::OUString aRet; const EditTextObject* pData; @@ -428,7 +428,7 @@ rtl::OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeExce void SAL_CALL ScHeaderFooterTextObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString(aText); // for pure text, no font info is needed in pool defaults @@ -442,7 +442,7 @@ void SAL_CALL ScHeaderFooterTextObj::insertString( const uno::Reference<text::XT const rtl::OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pUnoText) CreateUnoText_Impl(); pUnoText->insertString( xRange, aString, bAbsorb ); @@ -453,7 +453,7 @@ void SAL_CALL ScHeaderFooterTextObj::insertControlCharacter( sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pUnoText) CreateUnoText_Impl(); pUnoText->insertControlCharacter( xRange, nControlCharacter, bAbsorb ); @@ -465,7 +465,7 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent( sal_Bool bAbsorb ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( xContent.is() && xRange.is() ) { ScHeaderFieldObj* pHeaderField = ScHeaderFieldObj::getImplementation( xContent ); @@ -518,7 +518,7 @@ void SAL_CALL ScHeaderFooterTextObj::removeTextContent( const uno::Reference<text::XTextContent>& xContent ) throw(container::NoSuchElementException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if ( xContent.is() ) { ScHeaderFieldObj* pHeaderField = ScHeaderFieldObj::getImplementation( xContent ); @@ -536,7 +536,7 @@ void SAL_CALL ScHeaderFooterTextObj::removeTextContent( uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextObj::getText() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pUnoText) CreateUnoText_Impl(); return pUnoText->getText(); @@ -544,7 +544,7 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextObj::getText() throw(uno: uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getStart() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pUnoText) CreateUnoText_Impl(); return pUnoText->getStart(); @@ -552,7 +552,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getStart() thro uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getEnd() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pUnoText) CreateUnoText_Impl(); return pUnoText->getEnd(); @@ -563,7 +563,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getEnd() throw( uno::Reference<container::XEnumerationAccess> SAL_CALL ScHeaderFooterTextObj::getTextFields() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // all fields return new ScHeaderFieldsObj( &aTextData.GetContentObj(), aTextData.GetPart(), SC_SERVICE_INVALID ); } @@ -582,7 +582,7 @@ void SAL_CALL ScHeaderFooterTextObj::moveTextRange( sal_Int16 nParagraphs ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pUnoText) CreateUnoText_Impl(); pUnoText->moveTextRange( xRange, nParagraphs ); @@ -593,7 +593,7 @@ void SAL_CALL ScHeaderFooterTextObj::moveTextRange( uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFooterTextObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pUnoText) CreateUnoText_Impl(); return pUnoText->createEnumeration(); @@ -603,7 +603,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFooterTextObj::createEn uno::Type SAL_CALL ScHeaderFooterTextObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pUnoText) CreateUnoText_Impl(); return pUnoText->getElementType(); @@ -611,7 +611,7 @@ uno::Type SAL_CALL ScHeaderFooterTextObj::getElementType() throw(uno::RuntimeExc sal_Bool SAL_CALL ScHeaderFooterTextObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!pUnoText) CreateUnoText_Impl(); return pUnoText->hasElements(); @@ -642,13 +642,13 @@ ScCellTextCursor::~ScCellTextCursor() throw() uno::Reference<text::XText> SAL_CALL ScCellTextCursor::getText() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return &rTextObj; } uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! use other object for range than cursor? @@ -665,7 +665,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart() throw(uno uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getEnd() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! use other object for range than cursor? @@ -746,13 +746,13 @@ ScHeaderFooterTextCursor::~ScHeaderFooterTextCursor() throw() uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextCursor::getText() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return &rTextObj; } uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! use other object for range than cursor? @@ -769,7 +769,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart() t uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getEnd() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! use other object for range than cursor? @@ -850,13 +850,13 @@ ScDrawTextCursor::~ScDrawTextCursor() throw() uno::Reference<text::XText> SAL_CALL ScDrawTextCursor::getText() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return xParentText; } uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! use other object for range than cursor? @@ -873,7 +873,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart() throw(uno uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; //! use other object for range than cursor? @@ -944,7 +944,7 @@ ScSimpleEditSourceHelper::ScSimpleEditSourceHelper() ScSimpleEditSourceHelper::~ScSimpleEditSourceHelper() { - ScUnoGuard aGuard; // needed for EditEngine dtor + SolarMutexGuard aGuard; // needed for EditEngine dtor delete pOriginalSource; delete pForwarder; @@ -993,7 +993,7 @@ ScCellTextData::ScCellTextData(ScDocShell* pDocSh, const ScAddress& rP) : ScCellTextData::~ScCellTextData() { - ScUnoGuard aGuard; // needed for EditEngine dtor + SolarMutexGuard aGuard; // needed for EditEngine dtor if (pDocShell) { diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index a2cb339db36c..fff4fe64d8ba 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -40,11 +40,11 @@ #include <com/sun/star/table/CellAddress.hpp> #include <svl/itemprop.hxx> +#include <vcl/svapp.hxx> #include "miscuno.hxx" #include "convuno.hxx" #include "unonames.hxx" -#include "unoguard.hxx" #include "token.hxx" #include "compiler.hxx" #include "tokenarray.hxx" @@ -138,7 +138,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScFormulaParserObj::parseFormula( const rtl::OUString& aFormula, const table::CellAddress& rReferencePos ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Sequence<sheet::FormulaToken> aRet; if (mpDocShell) @@ -164,7 +164,7 @@ rtl::OUString SAL_CALL ScFormulaParserObj::printFormula( const uno::Sequence<sheet::FormulaToken>& aTokens, const table::CellAddress& rReferencePos ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; rtl::OUString aRet; if (mpDocShell) @@ -191,7 +191,7 @@ rtl::OUString SAL_CALL ScFormulaParserObj::printFormula( uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFormulaParserObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( lcl_GetFormulaParserMap() )); return aRef; } @@ -202,7 +202,7 @@ void SAL_CALL ScFormulaParserObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString(aPropertyName); if ( aString.EqualsAscii( SC_UNO_COMPILEFAP ) ) { @@ -260,7 +260,7 @@ uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const rtl::OUString& aPr throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Any aRet; String aString(aPropertyName); if ( aString.EqualsAscii( SC_UNO_COMPILEFAP ) ) diff --git a/sc/source/ui/unoobj/unoguard.cxx b/sc/source/ui/unoobj/unoguard.cxx deleted file mode 100644 index 6f7a6bb9036a..000000000000 --- a/sc/source/ui/unoobj/unoguard.cxx +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sc.hxx" - - - -#include <vcl/svapp.hxx> -#include <tools/debug.hxx> - -#include "unoguard.hxx" - -//------------------------------------------------------------------------ - -ScUnoGuard::ScUnoGuard() : - OGuard( Application::GetSolarMutex() ) -{ -} - - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index bcb6dc6e2f07..297ae74b5de1 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -52,6 +52,7 @@ #include <sfx2/viewfrm.hxx> #include <rtl/uuid.h> #include <toolkit/helper/convert.hxx> +#include <vcl/svapp.hxx> #include "drawsh.hxx" #include "drtxtob.hxx" @@ -66,7 +67,6 @@ #include "drawview.hxx" #include "fupoor.hxx" #include "sc.hrc" -#include "unoguard.hxx" #include "unonames.hxx" #include "scmod.hxx" #include "appoptio.hxx" @@ -202,7 +202,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScViewPaneBase::getImplementationId() sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pViewShell) { ScViewData* pViewData = pViewShell->GetViewData(); @@ -220,7 +220,7 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn() throw(uno::RuntimeExc void SAL_CALL ScViewPaneBase::setFirstVisibleColumn( sal_Int32 nFirstVisibleColumn ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pViewShell) { ScViewData* pViewData = pViewShell->GetViewData(); @@ -236,7 +236,7 @@ void SAL_CALL ScViewPaneBase::setFirstVisibleColumn( sal_Int32 nFirstVisibleColu sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pViewShell) { ScViewData* pViewData = pViewShell->GetViewData(); @@ -254,7 +254,7 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow() throw(uno::RuntimeExcept void SAL_CALL ScViewPaneBase::setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pViewShell) { ScViewData* pViewData = pViewShell->GetViewData(); @@ -270,7 +270,7 @@ void SAL_CALL ScViewPaneBase::setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) table::CellRangeAddress SAL_CALL ScViewPaneBase::getVisibleRange() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; table::CellRangeAddress aAdr; if (pViewShell) { @@ -303,7 +303,7 @@ table::CellRangeAddress SAL_CALL ScViewPaneBase::getVisibleRange() throw(uno::Ru uno::Reference<table::XCellRange> SAL_CALL ScViewPaneBase::getReferredCells() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (pViewShell) { ScDocShell* pDocSh = pViewShell->GetViewData()->GetDocShell(); @@ -341,7 +341,7 @@ namespace // XFormLayerAccess uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFormController( const uno::Reference< form::XForm >& _Form ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference< form::runtime::XFormController > xController; @@ -356,7 +356,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFor ::sal_Bool SAL_CALL ScViewPaneBase::isFormDesignMode( ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Bool bIsFormDesignMode( sal_True ); @@ -369,7 +369,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFor void SAL_CALL ScViewPaneBase::setFormDesignMode( ::sal_Bool _DesignMode ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; Window* pWindow( NULL ); SdrView* pSdrView( NULL ); @@ -384,7 +384,7 @@ uno::Reference<awt::XControl> SAL_CALL ScViewPaneBase::getControl( const uno::Reference<awt::XControlModel>& xModel ) throw(container::NoSuchElementException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<awt::XControl> xRet; @@ -801,7 +801,7 @@ void lcl_ShowObject( ScTabViewShell& rViewSh, ScDrawView& rDrawView, SdrObject* sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); if ( !pViewSh ) @@ -984,7 +984,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); ScCellRangesBase* pObj = NULL; if (pViewSh) @@ -1092,7 +1092,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException) uno::Reference<container::XEnumeration> SAL_CALL ScTabViewObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetViewPanesEnumeration"))); } @@ -1100,7 +1100,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTabViewObj::createEnumeration sal_Int32 SAL_CALL ScTabViewObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); USHORT nPanes = 0; if (pViewSh) @@ -1119,7 +1119,7 @@ uno::Any SAL_CALL ScTabViewObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XViewPane> xPane(GetObjectByIndex_Impl((USHORT)nIndex)); if (xPane.is()) return uno::makeAny(xPane); @@ -1130,13 +1130,13 @@ uno::Any SAL_CALL ScTabViewObj::getByIndex( sal_Int32 nIndex ) uno::Type SAL_CALL ScTabViewObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Reference<sheet::XViewPane>*)0); } sal_Bool SAL_CALL ScTabViewObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() != 0 ); } @@ -1192,7 +1192,7 @@ ScViewPaneObj* ScTabViewObj::GetObjectByIndex_Impl(USHORT nIndex) const uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTabViewObj::getActiveSheet() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) { @@ -1215,7 +1215,7 @@ ScTabViewObj::selectSheet( const uno::Reference<sheet::XSpreadsheet>& xActiveShe sal_Bool bExpand) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; sal_Bool bNew = bExpand; ScTabViewShell* pViewSh = GetViewShell(); @@ -1483,7 +1483,7 @@ void ScTabViewObj::EndActivationListening() void SAL_CALL ScTabViewObj::addEnhancedMouseClickHandler( const uno::Reference< awt::XEnhancedMouseClickHandler >& aListener ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (aListener.is()) { @@ -1500,7 +1500,7 @@ void SAL_CALL ScTabViewObj::addEnhancedMouseClickHandler( const uno::Reference< void SAL_CALL ScTabViewObj::removeEnhancedMouseClickHandler( const uno::Reference< awt::XEnhancedMouseClickHandler >& aListener ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = aMouseClickHandlers.Count(); for ( USHORT n=nCount; n--; ) { @@ -1517,7 +1517,7 @@ void SAL_CALL ScTabViewObj::removeEnhancedMouseClickHandler( const uno::Referenc void SAL_CALL ScTabViewObj::addActivationEventListener( const uno::Reference< sheet::XActivationEventListener >& aListener ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (aListener.is()) { @@ -1534,7 +1534,7 @@ void SAL_CALL ScTabViewObj::addActivationEventListener( const uno::Reference< sh void SAL_CALL ScTabViewObj::removeActivationEventListener( const uno::Reference< sheet::XActivationEventListener >& aListener ) throw (uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = aActivationListeners.Count(); for ( USHORT n=nCount; n--; ) { @@ -1668,7 +1668,7 @@ void ScTabViewObj::SetZoomType(INT16 aZoomType) sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // wie Menue-Slot SID_WINDOW_SPLIT ScTabViewShell* pViewSh = GetViewShell(); @@ -1684,7 +1684,7 @@ sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit() throw(uno::RuntimeException) sal_Bool SAL_CALL ScTabViewObj::hasFrozenPanes() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; // wie Menue-Slot SID_WINDOW_FIX ScTabViewShell* pViewSh = GetViewShell(); @@ -1700,7 +1700,7 @@ sal_Bool SAL_CALL ScTabViewObj::hasFrozenPanes() throw(uno::RuntimeException) sal_Int32 SAL_CALL ScTabViewObj::getSplitHorizontal() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) { @@ -1713,7 +1713,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitHorizontal() throw(uno::RuntimeExceptio sal_Int32 SAL_CALL ScTabViewObj::getSplitVertical() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) { @@ -1726,7 +1726,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitVertical() throw(uno::RuntimeException) sal_Int32 SAL_CALL ScTabViewObj::getSplitColumn() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) { @@ -1751,7 +1751,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitColumn() throw(uno::RuntimeException) sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) { @@ -1774,7 +1774,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() throw(uno::RuntimeException) void SAL_CALL ScTabViewObj::splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) { @@ -1787,7 +1787,7 @@ void SAL_CALL ScTabViewObj::splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixel void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) { @@ -1814,7 +1814,7 @@ void SAL_CALL ScTabViewObj::addSelectionChangeListener( const uno::Reference<view::XSelectionChangeListener>& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<view::XSelectionChangeListener>* pObj = new uno::Reference<view::XSelectionChangeListener>( xListener ); aSelectionListeners.Insert( pObj, aSelectionListeners.Count() ); @@ -1824,7 +1824,7 @@ void SAL_CALL ScTabViewObj::removeSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener >& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = aSelectionListeners.Count(); for ( USHORT n=nCount; n--; ) { @@ -1875,7 +1875,7 @@ void ScTabViewObj::SelectionChanged() uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTabViewObj::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); return aRef; @@ -1887,7 +1887,7 @@ void SAL_CALL ScTabViewObj::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString(aPropertyName); if ( aString.EqualsAscii(SC_UNO_FILTERED_RANGE_SELECTION) ) @@ -2012,7 +2012,7 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const rtl::OUString& aProperty throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString(aPropertyName); uno::Any aRet; @@ -2065,7 +2065,7 @@ void SAL_CALL ScTabViewObj::addPropertyChangeListener( const ::rtl::OUString& /* lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<beans::XPropertyChangeListener>* pObj = new uno::Reference<beans::XPropertyChangeListener>( xListener ); aPropertyChgListeners.Insert( pObj, aPropertyChgListeners.Count() ); @@ -2077,7 +2077,7 @@ void SAL_CALL ScTabViewObj::removePropertyChangeListener( const ::rtl::OUString& lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = aPropertyChgListeners.Count(); for ( USHORT n=nCount; n--; ) { @@ -2120,7 +2120,7 @@ void SAL_CALL ScTabViewObj::startRangeSelection( const uno::Sequence<beans::PropertyValue>& aArguments ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) { @@ -2161,7 +2161,7 @@ void SAL_CALL ScTabViewObj::startRangeSelection( void SAL_CALL ScTabViewObj::abortRangeSelection() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) pViewSh->StopSimpleRefDialog(); @@ -2171,7 +2171,7 @@ void SAL_CALL ScTabViewObj::addRangeSelectionListener( const uno::Reference<sheet::XRangeSelectionListener>& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XRangeSelectionListener>* pObj = new uno::Reference<sheet::XRangeSelectionListener>( xListener ); aRangeSelListeners.Insert( pObj, aRangeSelListeners.Count() ); @@ -2181,7 +2181,7 @@ void SAL_CALL ScTabViewObj::removeRangeSelectionListener( const uno::Reference<sheet::XRangeSelectionListener>& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = aRangeSelListeners.Count(); for ( USHORT n=nCount; n--; ) { @@ -2198,7 +2198,7 @@ void SAL_CALL ScTabViewObj::addRangeSelectionChangeListener( const uno::Reference<sheet::XRangeSelectionChangeListener>& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; uno::Reference<sheet::XRangeSelectionChangeListener>* pObj = new uno::Reference<sheet::XRangeSelectionChangeListener>( xListener ); aRangeChgListeners.Insert( pObj, aRangeChgListeners.Count() ); @@ -2208,7 +2208,7 @@ void SAL_CALL ScTabViewObj::removeRangeSelectionChangeListener( const uno::Reference<sheet::XRangeSelectionChangeListener>& xListener ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = aRangeChgListeners.Count(); for ( USHORT n=nCount; n--; ) { @@ -2319,7 +2319,7 @@ ScTabViewObj* ScTabViewObj::getImplementation( const uno::Reference<uno::XInterf ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL ScTabViewObj::getTransferable( ) throw (::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScEditShell* pShell = PTR_CAST( ScEditShell, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); if (pShell) return pShell->GetEditView()->GetTransferable(); @@ -2345,7 +2345,7 @@ ScTabViewObj* ScTabViewObj::getImplementation( const uno::Reference<uno::XInterf void SAL_CALL ScTabViewObj::insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScEditShell* pShell = PTR_CAST( ScEditShell, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); if (pShell) pShell->GetEditView()->InsertText( xTrans, ::rtl::OUString(), FALSE ); |