INTEGRATION: CWS fwk88 (1.25.6); FILE MERGED
2008/05/26 11:38:29 pb 1.25.6.1: fix: #i89054# new: getProductSource()
This commit is contained in:
parent
6ee5334b5a
commit
0f0d5b6511
@ -7,7 +7,7 @@
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
*
|
||||
* $RCSfile: bootstrap.cxx,v $
|
||||
* $Revision: 1.26 $
|
||||
* $Revision: 1.27 $
|
||||
*
|
||||
* This file is part of OpenOffice.org.
|
||||
*
|
||||
@ -54,6 +54,7 @@
|
||||
#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_LOGO "Logo"
|
||||
#define BOOTSTRAP_ITEM_BUILDID "buildid"
|
||||
@ -656,6 +657,17 @@ 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::getLogoData(OUString const& _sDefault)
|
||||
{
|
||||
OUString const csLogoItem(RTL_CONSTASCII_USTRINGPARAM(BOOTSTRAP_ITEM_LOGO));
|
||||
|
Loading…
x
Reference in New Issue
Block a user