From dac89858f63c0f9527f11ad3a6c8b5ea16053c85 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Fri, 16 Dec 2011 14:08:38 +0100 Subject: add version suffix (beta1) to about dialog configurable at build time via ABOUTBOXPRODUCTVERSIONSUFFIX in instsetoo_native/util/openoffice.lst configurable at runtime via registry/data/org/openoffice/Setup.xcu and ooSetupVersionAboutBoxSuffix property --- unotools/inc/unotools/configmgr.hxx | 2 ++ unotools/source/config/configmgr.cxx | 7 +++++++ 2 files changed, 9 insertions(+) (limited to 'unotools') diff --git a/unotools/inc/unotools/configmgr.hxx b/unotools/inc/unotools/configmgr.hxx index 1ac1868585d1..56a216a5392f 100644 --- a/unotools/inc/unotools/configmgr.hxx +++ b/unotools/inc/unotools/configmgr.hxx @@ -50,6 +50,8 @@ class UNOTOOLS_DLLPUBLIC ConfigManager: private boost::noncopyable { public: static rtl::OUString getAboutBoxProductVersion(); + static rtl::OUString getAboutBoxProductVersionSuffix(); + static rtl::OUString getDefaultCurrency(); static rtl::OUString getLocale(); diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 553e15aae54c..f761c5f0901f 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -114,6 +114,13 @@ rtl::OUString utl::ConfigManager::getAboutBoxProductVersion() { RTL_CONSTASCII_USTRINGPARAM("Product/ooSetupVersionAboutBox"))); } +rtl::OUString utl::ConfigManager::getAboutBoxProductVersionSuffix() { + return getConfigurationString( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")), + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("Product/ooSetupVersionAboutBoxSuffix"))); +} + rtl::OUString utl::ConfigManager::getDefaultCurrency() { return getConfigurationString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")), -- cgit