diff options
Diffstat (limited to 'svtools/source/uno/unoimap.cxx')
| -rw-r--r-- | svtools/source/uno/unoimap.cxx | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index e6a7626b8f4a..6c8527ffedc7 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,8 +43,7 @@ #include <cppuhelper/weakagg.hxx> #include <cppuhelper/implbase3.hxx> #include <list> -#include <rtl/uuid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svtools/unoevent.hxx> #include <svtools/unoimap.hxx> @@ -382,18 +382,15 @@ uno::Sequence< uno::Type > SAL_CALL SvUnoImageMapObject::getTypes() return aTypes; } +namespace +{ + class theSvUnoImageMapObjectImplementationId : public rtl::Static< UnoTunnelIdInit, theSvUnoImageMapObjectImplementationId > {}; +} + uno::Sequence< sal_Int8 > SAL_CALL SvUnoImageMapObject::getImplementationId() throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); - - static uno::Sequence< sal_Int8 > aId; - if( aId.getLength() == 0 ) - { - aId.realloc( 16 ); - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - } - return aId; + return theSvUnoImageMapObjectImplementationId::get().getSeq(); } // XServiceInfo @@ -487,7 +484,7 @@ void SvUnoImageMapObject::_setPropertyValues( const PropertyMapEntry** ppEntries bOk = *pValues >>= maPolygon; break; default: - DBG_ERROR( "SvUnoImageMapObject::_setPropertyValues: unexpected property handle" ); + OSL_FAIL( "SvUnoImageMapObject::_setPropertyValues: unexpected property handle" ); break; } @@ -537,7 +534,7 @@ void SvUnoImageMapObject::_getPropertyValues( const PropertyMapEntry** ppEntries *pValues <<= maPolygon; break; default: - DBG_ERROR( "SvUnoImageMapObject::_getPropertyValues: unexpected property handle" ); + OSL_FAIL( "SvUnoImageMapObject::_getPropertyValues: unexpected property handle" ); break; } @@ -655,7 +652,7 @@ void SAL_CALL SvUnoImageMap::insertByIndex( sal_Int32 Index, const Any& Element { std::list< SvUnoImageMapObject* >::iterator aIter = maObjectList.begin(); for( sal_Int32 n = 0; n < Index; n++ ) - aIter++; + ++aIter; maObjectList.insert( aIter, pObject ); } @@ -676,7 +673,7 @@ void SAL_CALL SvUnoImageMap::removeByIndex( sal_Int32 Index ) throw(IndexOutOfBo { std::list< SvUnoImageMapObject* >::iterator aIter = maObjectList.begin(); for( sal_Int32 n = 0; n < Index; n++ ) - aIter++; + ++aIter; (*aIter)->release(); maObjectList.erase( aIter ); @@ -693,7 +690,7 @@ void SAL_CALL SvUnoImageMap::replaceByIndex( sal_Int32 Index, const Any& Element std::list< SvUnoImageMapObject* >::iterator aIter = maObjectList.begin(); for( sal_Int32 n = 0; n < Index; n++ ) - aIter++; + ++aIter; (*aIter)->release(); *aIter = pObject; @@ -714,7 +711,7 @@ Any SAL_CALL SvUnoImageMap::getByIndex( sal_Int32 Index ) throw(IndexOutOfBounds std::list< SvUnoImageMapObject* >::iterator aIter = maObjectList.begin(); for( sal_Int32 n = 0; n < Index; n++ ) - aIter++; + ++aIter; Reference< XPropertySet > xObj( *aIter ); return makeAny( xObj ); @@ -773,7 +770,7 @@ sal_Bool SvUnoImageMap::fillImageMap( ImageMap& rMap ) const rMap.InsertIMapObject( *pNewMapObject ); delete pNewMapObject; - aIter++; + ++aIter; } return sal_True; @@ -816,3 +813,5 @@ sal_Bool SvUnoImageMap_fillImageMap( Reference< XInterface > xImageMap, ImageMap return pUnoImageMap->fillImageMap( rMap ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |