diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 08:38:57 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 08:38:57 +0000 |
| commit | d174d2048120cf1715e6af1abba39552cdddedd6 (patch) | |
| tree | a74aadba76667449ea6bb0aac96c1ea50e370bd6 /unotools | |
| parent | 9964a76ef58786bba47d409970512d7ded6c8889 (diff) | |
INTEGRATION: CWS sb90 (1.46.12); FILE MERGED
2008/06/26 11:28:55 sb 1.46.12.2: #157787# to allow for cross-platform edition data, consistently name the ini-file edition.ini (not editionrc)
2008/06/25 12:16:34 sb 1.46.12.1: #157787# as something of a hack (ultimately to avoid having to change resource strings after localization freeze), for now EDITIONNAME from potential editionrc overrides PRODUCTEXTENSION
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 491462e3605d..a2965b91a6ef 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: configmgr.cxx,v $ - * $Revision: 1.46 $ + * $Revision: 1.47 $ * * This file is part of OpenOffice.org. * @@ -40,6 +40,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <osl/diagnose.h> +#include <rtl/bootstrap.hxx> #include <rtl/instance.hxx> #if OSL_DEBUG_LEVEL > 0 #include <rtl/strbuf.hxx> @@ -468,6 +469,20 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) return aRet; } + if (eProp == PRODUCTEXTENSION) { + rtl::OUString name( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "${BRAND_BASE_DIR}/program/edition/edition.ini"))); + rtl::Bootstrap::expandMacros(name); + if (rtl::Bootstrap(name).getFrom( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EDITIONNAME")), + rProductExtension)) + { + return com::sun::star::uno::Any(rProductExtension); + } + } + OUString sPath = C2U(cConfigBaseURL); switch(eProp) { |