summaryrefslogtreecommitdiff
path: root/sc/source/ui/unoobj/styleuno.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/unoobj/styleuno.cxx')
-rw-r--r--sc/source/ui/unoobj/styleuno.cxx72
1 files changed, 36 insertions, 36 deletions
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
generated by cgit (git 2.34.1) at 2025-01-10 17:55:31 +0000