diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-01-06 15:12:12 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-01-06 15:30:04 +0200 |
| commit | 4427bb0c588382d56d5368e691a29c4c0bbdf944 (patch) | |
| tree | 68d81e2b9db9159c93df16b43b6909fdd8c5d6fb /unotools | |
| parent | f79da8fa288fbbe4742ad416844aad53ee8d00f5 (diff) | |
The "ProductSource" (MWS name) makes no sense any more
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/inc/unotools/bootstrap.hxx | 3 | ||||
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 14 |
2 files changed, 1 insertions, 16 deletions
diff --git a/unotools/inc/unotools/bootstrap.hxx b/unotools/inc/unotools/bootstrap.hxx index 4555390a3d39..23418dea9a4b 100644 --- a/unotools/inc/unotools/bootstrap.hxx +++ b/unotools/inc/unotools/bootstrap.hxx @@ -46,9 +46,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 source (MWS name) - static rtl::OUString getProductSource(rtl::OUString const& _sDefault); - /// retrieve the BUILDID information item; uses the given default, if not found static rtl::OUString getBuildIdData(rtl::OUString const& _sDefault); diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index f8e40a1b3880..4c7b0e168990 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -42,7 +42,6 @@ #define BOOTSTRAP_DATA_NAME SAL_CONFIGFILE("bootstrap") #define BOOTSTRAP_ITEM_PRODUCT_KEY "ProductKey" -#define BOOTSTRAP_ITEM_PRODUCT_SOURCE "ProductSource" #define BOOTSTRAP_ITEM_VERSIONFILE "Location" #define BOOTSTRAP_ITEM_BUILDID "buildid" #define BOOTSTRAP_ITEM_BUILDVERSION "BuildVersion" @@ -586,23 +585,12 @@ OUString Bootstrap::getProductKey(OUString const& _sDefault) } // --------------------------------------------------------------------------------------- -OUString Bootstrap::getProductSource(OUString const& _sDefault) -{ - OUString const csProductSourceItem(RTL_CONSTASCII_USTRINGPARAM(BOOTSTRAP_ITEM_PRODUCT_SOURCE)); - - OUString sProductSource; - // read ProductSource from version.ini (versionrc) - data().getVersionValue( csProductSourceItem, sProductSource, _sDefault ); - return sProductSource; -} -// --------------------------------------------------------------------------------------- - OUString Bootstrap::getBuildVersion(OUString const& _sDefault) { OUString const csBuildVersionItem(BOOTSTRAP_ITEM_BUILDVERSION); OUString sBuildVersion; - // read ProductSource from version.ini (versionrc) + // read BuildVersion from version.ini (versionrc) data().getVersionValue( csBuildVersionItem, sBuildVersion, _sDefault ); return sBuildVersion; } |