diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-04-13 09:57:12 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-04-13 09:57:12 +0000 |
| commit | 14cbc6a5d4d10b4e28539a1c23c5bbd13f98b99f (patch) | |
| tree | e6e85dc8578a082389a040718a45ec15c8baf0b3 /svx | |
| parent | 7b1ab72c8823db88ca1034a34038cc70ecfcf230 (diff) | |
INTEGRATION: CWS frmcontrols02 (1.3.546); FILE MERGED
2004/01/22 10:37:09 fs 1.3.546.1: removed the usage of the OImplementationId* during +i24411
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmdpage.cxx | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index 3b0ee5da046c..a357b5808556 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fmdpage.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: oj $ $Date: 2002-10-31 13:06:27 $ + * last change: $Author: hr $ $Date: 2004-04-13 10:57:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,8 +83,8 @@ #ifndef _CPPUHELPER_QUERYINTERFACE_HXX_ #include <cppuhelper/queryinterface.hxx> #endif -#ifndef _FM_IMPLEMENTATION_IDS_HXX_ -#include "fmimplids.hxx" +#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ +#include <cppuhelper/typeprovider.hxx> #endif DBG_NAME(SvxFmDrawPage); @@ -92,18 +92,26 @@ SvxFmDrawPage::SvxFmDrawPage( SdrPage* pInPage ) : SvxDrawPage( pInPage ) { DBG_CTOR(SvxFmDrawPage,NULL); - m_pHoldImplIdHelper = new ::form::OImplementationIdsRef(); } SvxFmDrawPage::~SvxFmDrawPage() throw () { - delete m_pHoldImplIdHelper; DBG_DTOR(SvxFmDrawPage,NULL); } ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId() throw(::com::sun::star::uno::RuntimeException) { - return ::form::OImplementationIds::getImplementationId(getTypes()); + static ::cppu::OImplementationId* pId = 0; + if (! pId) + { + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); + if (! pId) + { + static ::cppu::OImplementationId aId; + pId = &aId; + } + } + return pId->getImplementationId(); } ::com::sun::star::uno::Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException) |