summaryrefslogtreecommitdiff
path: root/comphelper/source
diff options
context:
space:
mode:
Diffstat (limited to 'comphelper/source')
-rw-r--r--comphelper/source/misc/makefile.mk3
-rw-r--r--comphelper/source/misc/sharedmutex.cxx65
-rw-r--r--comphelper/source/property/ChainablePropertySet.cxx16
-rw-r--r--comphelper/source/property/ChainablePropertySetInfo.cxx2
-rw-r--r--comphelper/source/property/MasterPropertySet.cxx16
-rw-r--r--comphelper/source/property/MasterPropertySetInfo.cxx2
-rw-r--r--comphelper/source/property/composedprops.cxx4
-rw-r--r--comphelper/source/property/genericpropertyset.cxx4
-rw-r--r--comphelper/source/property/propertycontainerhelper.cxx2
-rw-r--r--comphelper/source/property/propertysethelper.cxx16
-rw-r--r--comphelper/source/property/propertysetinfo.cxx2
11 files changed, 99 insertions, 33 deletions
diff --git a/comphelper/source/misc/makefile.mk b/comphelper/source/misc/makefile.mk
index fd6afba00a80..78f79c806511 100644
--- a/comphelper/source/misc/makefile.mk
+++ b/comphelper/source/misc/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.48 $
+# $Revision: 1.48.16.3 $
#
# This file is part of OpenOffice.org.
#
@@ -81,6 +81,7 @@ SLOFILES= \
$(SLO)$/sequenceashashmap.obj \
$(SLO)$/sequence.obj \
$(SLO)$/servicedecl.obj \
+ $(SLO)$/sharedmutex.obj \
$(SLO)$/synchronousdispatch.obj \
$(SLO)$/storagehelper.obj \
$(SLO)$/string.obj \
diff --git a/comphelper/source/misc/sharedmutex.cxx b/comphelper/source/misc/sharedmutex.cxx
new file mode 100644
index 000000000000..a3ede5b71821
--- /dev/null
+++ b/comphelper/source/misc/sharedmutex.cxx
@@ -0,0 +1,65 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: sharedmutex.cxx,v $
+*
+* $Revision: 1.1.2.4 $
+*
+* 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_comphelper.hxx"
+
+#include "comphelper/sharedmutex.hxx"
+
+//........................................................................
+namespace comphelper
+{
+//........................................................................
+
+ //========================================================================
+ //= SharedMutex
+ //========================================================================
+ //------------------------------------------------------------------------
+ SharedMutex::SharedMutex()
+ :m_pMutexImpl( new ::osl::Mutex )
+ {
+ }
+
+ //------------------------------------------------------------------------
+ SharedMutex::SharedMutex( const SharedMutex& _rhs )
+ :m_pMutexImpl()
+ {
+ *this = _rhs;
+ }
+
+ //------------------------------------------------------------------------
+ SharedMutex& SharedMutex::operator=( const SharedMutex& _rhs )
+ {
+ m_pMutexImpl = _rhs.m_pMutexImpl;
+ return *this;
+ }
+
+//........................................................................
+} // namespace comphelper
+//........................................................................
diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx
index a5c207d25018..567db83d1626 100644
--- a/comphelper/source/property/ChainablePropertySet.cxx
+++ b/comphelper/source/property/ChainablePropertySet.cxx
@@ -88,7 +88,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPr
PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
if( aIter == mpInfo->maMap.end())
- throw UnknownPropertyException();
+ throw UnknownPropertyException( rPropertyName, static_cast< XPropertySet* >( this ) );
_preSetValues();
_setSingleValue( *((*aIter).second), rValue );
@@ -106,7 +106,7 @@ Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPro
PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
if( aIter == mpInfo->maMap.end())
- throw UnknownPropertyException();
+ throw UnknownPropertyException( rPropertyName, static_cast< XPropertySet* >( this ) );
Any aAny;
_preGetValues ();
@@ -166,7 +166,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OU
{
aIter = mpInfo->maMap.find ( *pString );
if ( aIter == aEnd )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( *pString, static_cast< XPropertySet* >( this ) );
_setSingleValue ( *((*aIter).second), *pAny );
}
@@ -199,7 +199,7 @@ Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence
{
aIter = mpInfo->maMap.find ( *pString );
if ( aIter == aEnd )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( *pString, static_cast< XPropertySet* >( this ) );
_getSingleValue ( *((*aIter).second), *pAny );
}
@@ -233,7 +233,7 @@ PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const ::rtl::OUSt
{
PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find( PropertyName );
if( aIter == mpInfo->maMap.end())
- throw UnknownPropertyException();
+ throw UnknownPropertyException( PropertyName, static_cast< XPropertySet* >( this ) );
PropertyState aState;
@@ -261,7 +261,7 @@ Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( cons
{
aIter = mpInfo->maMap.find ( *pString );
if ( aIter == aEnd )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( *pString, static_cast< XPropertySet* >( this ) );
_getPropertyState ( *((*aIter).second), *pState );
}
@@ -276,7 +276,7 @@ void SAL_CALL ChainablePropertySet::setPropertyToDefault( const ::rtl::OUString&
PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
if( aIter == mpInfo->maMap.end())
- throw UnknownPropertyException();
+ throw UnknownPropertyException( rPropertyName, static_cast< XPropertySet* >( this ) );
_setPropertyToDefault( *((*aIter).second) );
}
@@ -286,7 +286,7 @@ Any SAL_CALL ChainablePropertySet::getPropertyDefault( const ::rtl::OUString& rP
PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
if( aIter == mpInfo->maMap.end())
- throw UnknownPropertyException();
+ throw UnknownPropertyException( rPropertyName, static_cast< XPropertySet* >( this ) );
return _getPropertyDefault( *((*aIter).second) );
}
diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx
index dd7c18532e85..b27cef88319c 100644
--- a/comphelper/source/property/ChainablePropertySetInfo.cxx
+++ b/comphelper/source/property/ChainablePropertySetInfo.cxx
@@ -125,7 +125,7 @@ Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const ::rtl::OUSt
PropertyInfoHash::iterator aIter = maMap.find( rName );
if ( maMap.end() == aIter )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( rName, *this );
PropertyInfo *pInfo = (*aIter).second;
Property aProperty;
diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx
index b93025556d81..884f3d635628 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -141,7 +141,7 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPrope
PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
if( aIter == mpInfo->maMap.end())
- throw UnknownPropertyException();
+ throw UnknownPropertyException( rPropertyName, static_cast< XPropertySet* >( this ) );
if ( (*aIter).second->mnMapId == 0 ) // 0 means it's one of ours !
{
@@ -175,7 +175,7 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rProper
PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
if( aIter == mpInfo->maMap.end())
- throw UnknownPropertyException();
+ throw UnknownPropertyException( rPropertyName, static_cast< XPropertySet* >( this ) );
Any aAny;
if ( (*aIter).second->mnMapId == 0 ) // 0 means it's one of ours !
@@ -257,7 +257,7 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUStr
{
aIter = mpInfo->maMap.find ( *pString );
if ( aIter == aEnd )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( *pString, static_cast< XPropertySet* >( this ) );
if ( (*aIter).second->mnMapId == 0 ) // 0 means it's one of ours !
_setSingleValue( *((*aIter).second->mpInfo), *pAny );
@@ -322,7 +322,7 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< :
{
aIter = mpInfo->maMap.find ( *pString );
if ( aIter == aEnd )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( *pString, static_cast< XPropertySet* >( this ) );
if ( (*aIter).second->mnMapId == 0 ) // 0 means it's one of ours !
_getSingleValue( *((*aIter).second->mpInfo), *pAny );
@@ -381,7 +381,7 @@ PropertyState SAL_CALL MasterPropertySet::getPropertyState( const ::rtl::OUStrin
{
PropertyDataHash::const_iterator aIter = mpInfo->maMap.find( PropertyName );
if( aIter == mpInfo->maMap.end())
- throw UnknownPropertyException();
+ throw UnknownPropertyException( PropertyName, static_cast< XPropertySet* >( this ) );
PropertyState aState;
@@ -425,7 +425,7 @@ Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const S
{
aIter = mpInfo->maMap.find ( *pString );
if ( aIter == aEnd )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( *pString, static_cast< XPropertySet* >( this ) );
if ( (*aIter).second->mnMapId == 0 ) // 0 means it's one of ours !
_getPropertyState( *((*aIter).second->mpInfo), *pState );
@@ -461,7 +461,7 @@ void SAL_CALL MasterPropertySet::setPropertyToDefault( const ::rtl::OUString& rP
PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
if( aIter == mpInfo->maMap.end())
- throw UnknownPropertyException();
+ throw UnknownPropertyException( rPropertyName, static_cast< XPropertySet* >( this ) );
_setPropertyToDefault( *((*aIter).second->mpInfo) );
}
@@ -471,7 +471,7 @@ Any SAL_CALL MasterPropertySet::getPropertyDefault( const ::rtl::OUString& rProp
PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
if( aIter == mpInfo->maMap.end())
- throw UnknownPropertyException();
+ throw UnknownPropertyException( rPropertyName, static_cast< XPropertySet* >( this ) );
return _getPropertyDefault( *((*aIter).second->mpInfo) );
}
diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx
index ac9f553270f7..e74d21b2d755 100644
--- a/comphelper/source/property/MasterPropertySetInfo.cxx
+++ b/comphelper/source/property/MasterPropertySetInfo.cxx
@@ -152,7 +152,7 @@ Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const ::rtl::OUStrin
PropertyDataHash::iterator aIter = maMap.find( rName );
if ( maMap.end() == aIter )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( rName, *this );
PropertyInfo *pInfo = (*aIter).second->mpInfo;
Property aProperty;
diff --git a/comphelper/source/property/composedprops.cxx b/comphelper/source/property/composedprops.cxx
index 1d7fd18e2818..fe41319ebccc 100644
--- a/comphelper/source/property/composedprops.cxx
+++ b/comphelper/source/property/composedprops.cxx
@@ -225,7 +225,7 @@ namespace comphelper
}
else
{
- throw UnknownPropertyException(::rtl::OUString(), static_cast< XPropertySet* >(this));
+ throw UnknownPropertyException( _rPropertyName, *this );
}
return eState;
@@ -335,7 +335,7 @@ namespace comphelper
return *pProps;
}
- throw UnknownPropertyException(::rtl::OUString(), static_cast< XPropertySetInfo* >(this));
+ throw UnknownPropertyException( _rName, *this );
}
//------------------------------------------------------------------------------
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index be9b898f30b4..08dd26dcf0ec 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -134,7 +134,7 @@ void SAL_CALL GenericPropertySet::addPropertyChangeListener( const ::rtl::OUStri
else if ( xInfo->hasPropertyByName(aPropertyName) )
m_aListener.addInterface(aPropertyName,xListener);
else
- throw UnknownPropertyException();
+ throw UnknownPropertyException( aPropertyName, *this );
}
}
@@ -158,7 +158,7 @@ void SAL_CALL GenericPropertySet::removePropertyChangeListener( const ::rtl::OUS
else if ( xInfo->hasPropertyByName(aPropertyName) )
m_aListener.removeInterface(aPropertyName,xListener);
else
- throw UnknownPropertyException();
+ throw UnknownPropertyException( aPropertyName, *this );
}
}
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index e0c87545e33f..9d1662d1ecf2 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.cxx
@@ -492,7 +492,7 @@ const Property& OPropertyContainerHelper::getProperty( const ::rtl::OUString& _r
PropertyDescriptionNameMatch( _rName )
);
if ( pos == m_aProperties.end() )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( _rName, NULL );
return pos->aProperty;
}
diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx
index 7b186beef2fe..7996585eb915 100644
--- a/comphelper/source/property/propertysethelper.cxx
+++ b/comphelper/source/property/propertysethelper.cxx
@@ -118,7 +118,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue( const ::rtl::OUString& aPrope
aEntries[0] = mp->find( aPropertyName );
if( NULL == aEntries[0] )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( aPropertyName, static_cast< XPropertySet* >( this ) );
aEntries[1] = NULL;
@@ -131,7 +131,7 @@ Any SAL_CALL PropertySetHelper::getPropertyValue( const ::rtl::OUString& Propert
aEntries[0] = mp->find( PropertyName );
if( NULL == aEntries[0] )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( PropertyName, static_cast< XPropertySet* >( this ) );
aEntries[1] = NULL;
@@ -189,7 +189,7 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< ::rtl::OUStr
delete[] pEntries;
if( bUnknown )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( *pNames, static_cast< XPropertySet* >( this ) );
}
}
@@ -221,7 +221,7 @@ Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< :
delete[] pEntries;
if( bUnknown )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( *pNames, static_cast< XPropertySet* >( this ) );
}
return aValues;
@@ -249,7 +249,7 @@ PropertyState SAL_CALL PropertySetHelper::getPropertyState( const ::rtl::OUStrin
aEntries[0] = mp->find( PropertyName );
if( aEntries[0] == NULL )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( PropertyName, static_cast< XPropertySet* >( this ) );
aEntries[1] = NULL;
@@ -288,7 +288,7 @@ Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const S
delete[] pEntries;
if( bUnknown )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( *pNames, static_cast< XPropertySet* >( this ) );
}
return aStates;
@@ -298,7 +298,7 @@ void SAL_CALL PropertySetHelper::setPropertyToDefault( const ::rtl::OUString& Pr
{
PropertyMapEntry *pEntry = mp->find( PropertyName );
if( NULL == pEntry )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( PropertyName, static_cast< XPropertySet* >( this ) );
_setPropertyToDefault( pEntry );
}
@@ -307,7 +307,7 @@ Any SAL_CALL PropertySetHelper::getPropertyDefault( const ::rtl::OUString& aProp
{
PropertyMapEntry* pEntry = mp->find( aPropertyName );
if( NULL == pEntry )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( aPropertyName, static_cast< XPropertySet* >( this ) );
return _getPropertyDefault( pEntry );
}
diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx
index 11900fa71190..e155d695e2c9 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.cxx
@@ -151,7 +151,7 @@ Property PropertyMapImpl::getPropertyByName( const OUString& aName ) throw( Unkn
PropertyMap::iterator aIter = maPropertyMap.find( aName );
if( maPropertyMap.end() == aIter )
- throw UnknownPropertyException();
+ throw UnknownPropertyException( aName, NULL );
PropertyMapEntry* pEntry = (*aIter).second;
generated by cgit (git 2.34.1) at 2024-07-30 23:25:46 +0000