diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-15 18:18:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-15 18:29:47 +0100 |
| commit | 16aa2c1dd66d6ac8f26c460a7287a1ad6139eed3 (patch) | |
| tree | 99a194b6e1892a17825003a6b7cb45698b2cc8f9 /unotools | |
| parent | 240dc332ad59fc2c45eccb4b2f4923fde09a784b (diff) | |
Removed obsolete OOOBASEVERSION, OOOPACKAGEVERSION.
With the basis/brand split undone, they are always the same as
PRODUCTVERSION and ABOUTBOXPRODUCTVERSION, respectively.
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/inc/unotools/bootstrap.hxx | 3 | ||||
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 9 |
2 files changed, 0 insertions, 12 deletions
diff --git a/unotools/inc/unotools/bootstrap.hxx b/unotools/inc/unotools/bootstrap.hxx index f596d63d0a02..2c9d17ff607a 100644 --- a/unotools/inc/unotools/bootstrap.hxx +++ b/unotools/inc/unotools/bootstrap.hxx @@ -55,9 +55,6 @@ namespace utl /// retrieve the product key; uses the given default, if not found static rtl::OUString getProductKey(rtl::OUString const& _sDefault); - /// retrieve the product version - static rtl::OUString getProductVersion(); - /// retrieve the product source (MWS name) static ::rtl::OUString getProductSource(rtl::OUString const& _sDefault); diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 1f960cff3315..157f869460de 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -53,7 +53,6 @@ #define BOOTSTRAP_DATA_NAME SAL_CONFIGFILE("bootstrap") #define BOOTSTRAP_ITEM_PRODUCT_KEY "ProductKey" -#define BOOTSTRAP_ITEM_PRODUCT_VERSION "OOOBaseVersion" #define BOOTSTRAP_ITEM_PRODUCT_SOURCE "ProductSource" #define BOOTSTRAP_ITEM_VERSIONFILE "Location" #define BOOTSTRAP_ITEM_BUILDID "buildid" @@ -634,14 +633,6 @@ OUString Bootstrap::getProductKey(OUString const& _sDefault) } // --------------------------------------------------------------------------------------- -OUString Bootstrap::getProductVersion() -{ - // read OOOBaseVersion from version.ini (versionrc) - OUString sVersion; - data().getVersionValue( OUString( RTL_CONSTASCII_USTRINGPARAM( BOOTSTRAP_ITEM_PRODUCT_VERSION ) ), sVersion, OUString() ); - return sVersion; -} - OUString Bootstrap::getProductSource(OUString const& _sDefault) { OUString const csProductSourceItem(RTL_CONSTASCII_USTRINGPARAM(BOOTSTRAP_ITEM_PRODUCT_SOURCE)); |