diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-11-07 13:42:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-11-07 13:42:49 +0000 |
| commit | b4f30184daf878c1a299efd3c572e776f219fc93 (patch) | |
| tree | 1382da691ec9e350dcc807175049d8fc6d115d23 | |
| parent | c95ae24ecbc27f9b6425ac2fbb461e4f29c96a8e (diff) | |
INTEGRATION: CWS networker (1.15.4); FILE MERGED
2003/09/12 15:15:44 lo 1.15.4.2: #110340# move install code to desktop project and allow reload of path data
2003/06/24 15:34:46 lo 1.15.4.1: #110340# create user dir from scratch if not found
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index bac83db8d225..507178811687 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bootstrap.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: vg $ $Date: 2003-05-28 13:32:11 $ + * last change: $Author: hr $ $Date: 2003-11-07 14:42:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -182,22 +182,32 @@ namespace utl // --------------------------------------------------------------------------------------- static OUString getExecutableDirectory(); // --------------------------------------------------------------------------------------- + + static Bootstrap::Impl* s_pData = NULL; + Bootstrap::Impl const& Bootstrap::data() { - static Impl* s_pData = NULL; if (!s_pData) { using namespace osl; MutexGuard aGuard( Mutex::getGlobalMutex() ); - static Impl s_theData(getExecutableDirectory() + OUString(RTL_CONSTASCII_USTRINGPARAM("/"BOOTSTRAP_DATA_NAME))); - - s_pData = &s_theData; + // static Impl s_theData(getExecutableDirectory() + OUString(RTL_CONSTASCII_USTRINGPARAM("/"BOOTSTRAP_DATA_NAME))); + // s_pData = &s_theData; + s_pData = new Impl(getExecutableDirectory() + OUString(RTL_CONSTASCII_USTRINGPARAM("/"BOOTSTRAP_DATA_NAME))); } return *s_pData; } + void Bootstrap::reloadData() + { + if (s_pData != NULL) { + delete s_pData; + s_pData = NULL; + } + } + // --------------------------------------------------------------------------------------- // helper // --------------------------------------------------------------------------------------- |