diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:45:27 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:45:27 +0000 |
| commit | d71cb0cca6a313262dcfd27a96e827e237c53bf5 (patch) | |
| tree | da0cef9c04cb28508e7b57e7c69867e074482c52 /desktop | |
| parent | 675580f35f8c7b11790aac79a12d17793f87d580 (diff) | |
INTEGRATION: CWS sb83 (1.2.4); FILE MERGED
2008/03/17 09:02:13 sb 1.2.4.2: RESYNC: (1.2-1.3); FILE MERGED
2008/02/14 12:11:08 sb 1.2.4.1: #i84200# license files have moved from basis to brand layer
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/appfirststart.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx index d086f2b24210..223601d80106 100644 --- a/desktop/source/app/appfirststart.cxx +++ b/desktop/source/app/appfirststart.cxx @@ -4,9 +4,9 @@ * * $RCSfile: appfirststart.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: obo $ $Date: 2008-02-25 16:47:14 $ + * last change: $Author: vg $ $Date: 2008-03-18 13:45:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -73,13 +73,8 @@ OUString Desktop::GetLicensePath() if (aLicensePath.getLength() > 0) return aLicensePath; - OUString aBaseInstallPath; - ::utl::Bootstrap::PathStatus aBaseLocateResult = - ::utl::Bootstrap::locateBaseInstallation(aBaseInstallPath); - if (aBaseLocateResult != ::utl::Bootstrap::PATH_EXISTS) - { - // yuck! no license :/ - } + OUString aBaseInstallPath(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR")); + rtl::Bootstrap::expandMacros(aBaseInstallPath); // determine the filename of the license to show OUString aLangString; |