diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 16:38:00 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 16:38:00 +0000 |
| commit | ea0c9ab6fe1e8ee59c2b287aa700f667216dbbff (patch) | |
| tree | 0fabe35f726957f5ae0c5b688f47a78afe93d8ed /cppuhelper | |
| parent | 5f410a225a9cea57320d0e6f938ed3c07783396d (diff) | |
INTEGRATION: CWS tune04 (1.5.28); FILE MERGED
2004/06/15 08:53:11 cmc 1.5.28.1: #i29636# turn global objects into local static data protected with swishy double-locked templated template
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/macro_expander.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index bd8fb3d6317a..b3cb4f4c170f 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -2,9 +2,9 @@ * * $RCSfile: macro_expander.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2004-06-04 03:21:29 $ + * last change: $Author: hjs $ $Date: 2004-06-25 17:38:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,9 +90,7 @@ Bootstrap const & get_unorc() SAL_THROW( () ); namespace { - -// static stuff initialized when loading lib -static OUString s_impl_name = OUSTR(IMPL_NAME); +inline OUString s_impl_name() { return OUSTR(IMPL_NAME); } static Sequence< OUString > const & s_get_service_names() { static Sequence< OUString > const * s_pnames = 0; @@ -173,7 +171,7 @@ Bootstrap_MacroExpander::~Bootstrap_MacroExpander() SAL_THROW( () ) OUString Bootstrap_MacroExpander::getImplementationName() throw (RuntimeException) { - return s_impl_name; + return s_impl_name(); } //__________________________________________________________________________________________________ sal_Bool Bootstrap_MacroExpander::supportsService( OUString const & serviceName ) @@ -277,7 +275,7 @@ Reference< lang::XSingleComponentFactory > create_boostrap_macro_expander_factor { return ::cppu::createSingleComponentFactory( service_create, - s_impl_name, + s_impl_name(), s_get_service_names() ); } |