diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 12:49:56 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 12:49:56 +0000 |
| commit | 98ef4c9093bb107f874108980a83394a76a291a6 (patch) | |
| tree | 9f67bbc9e83a6c94f9d0d2f8ced3b2e836d739f1 /cppu/source | |
| parent | 941d1a150dc9a1542baafb7d1ee614a0209fcb1a (diff) | |
INTEGRATION: CWS sb49 (1.23.38); FILE MERGED
2006/03/22 10:14:07 sb 1.23.38.1: #i63397# Keep objects alive long enough so that threads still running while atexit handlers are processed do not access dead objects.
Diffstat (limited to 'cppu/source')
| -rw-r--r-- | cppu/source/uno/lbmap.cxx | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index a22a9d72bdc6..bbaf56f02c50 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: lbmap.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: rt $ $Date: 2005-09-08 08:53:22 $ + * last change: $Author: hr $ $Date: 2006-04-19 13:49:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,10 +67,6 @@ class Mapping uno_Mapping * _pMapping; public: - inline Mapping( - uno_Environment * pFrom, uno_Environment * pTo, - const ::rtl::OUString & rAddPurpose = ::rtl::OUString() ) - SAL_THROW( () ); inline Mapping( uno_Mapping * pMapping = 0 ) SAL_THROW( () ); inline Mapping( const Mapping & rMapping ) SAL_THROW( () ); inline ~Mapping() SAL_THROW( () ); @@ -83,14 +79,6 @@ public: { return (_pMapping != 0); } }; //__________________________________________________________________________________________________ -inline Mapping::Mapping( - uno_Environment * pFrom, uno_Environment * pTo, const ::rtl::OUString & rAddPurpose ) - SAL_THROW( () ) - : _pMapping( 0 ) -{ - uno_getMapping( &_pMapping, pFrom, pTo, rAddPurpose.pData ); -} -//__________________________________________________________________________________________________ inline Mapping::Mapping( uno_Mapping * pMapping ) SAL_THROW( () ) : _pMapping( pMapping ) { @@ -204,8 +192,9 @@ static MappingsData & getMappingsData() SAL_THROW( () ) MutexGuard aGuard( Mutex::getGlobalMutex() ); if (! s_p) { - static MappingsData s_obj; - s_p = &s_obj; + //TODO This memory is leaked; see #i63473# for when this should be + // changed again: + s_p = new MappingsData; } } return *s_p; |