diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-05-16 21:51:36 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-05-20 15:23:39 +0100 |
| commit | 1155685c5368e40f4390558f4456f1095bc2fb25 (patch) | |
| tree | d3821fe77400a63fad934dd72003050905c15958 /unotools | |
| parent | 12dd16959f11336ac2829151a401d46655ddc6a8 (diff) | |
set initialize result as part of initialize
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 660da1ec3a20..8f19fd273578 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -129,10 +129,10 @@ namespace utl public: // construction and initialization Impl() : m_aImplName(makeImplName()) { - status_ = initialize(); + initialize(); } - Status initialize(); + void initialize(); // access helper OUString getBootstrapValue(OUString const& _sName, OUString const& _sDefault) const; @@ -841,19 +841,17 @@ bool Bootstrap::Impl::initUserInstallationData(rtl::Bootstrap& _rData) } // --------------------------------------------------------------------------------------- -Bootstrap::Status Bootstrap::Impl::initialize() +void Bootstrap::Impl::initialize() { - Bootstrap::Status result; - rtl::Bootstrap aData( m_aImplName ); if (!initBaseInstallationData(aData)) { - result = INVALID_BASE_INSTALL; + status_ = INVALID_BASE_INSTALL; } else if (!initUserInstallationData(aData)) { - result = INVALID_USER_INSTALL; + status_ = INVALID_USER_INSTALL; if (aUserInstall_.status >= DATA_MISSING) { @@ -861,12 +859,12 @@ Bootstrap::Status Bootstrap::Impl::initialize() { case PATH_EXISTS: case PATH_VALID: - result = MISSING_USER_INSTALL; + status_ = MISSING_USER_INSTALL; break; case DATA_INVALID: case DATA_MISSING: - result = INVALID_BASE_INSTALL; + status_ = INVALID_BASE_INSTALL; break; default: break; @@ -875,9 +873,8 @@ Bootstrap::Status Bootstrap::Impl::initialize() } else { - result = DATA_OK; + status_ = DATA_OK; } - return result; } // --------------------------------------------------------------------------------------- |