diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-12 10:28:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-12 10:28:21 +0100 |
| commit | f2d535b9f5478144047434cf97701eb505143b46 (patch) | |
| tree | e04206be751d5b4b20cf47d04b4701be905fa662 /unotools | |
| parent | 73510ca8b343a0eac0b808abd000ff9e3735e212 (diff) | |
Keep concatenating adjacent string literals via juxtaposition instead of +
Change-Id: I098a8d657ed5ac1976013e1ee370ef76ed2242db
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index a37f6ae41233..505cf240b8ae 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -38,9 +38,6 @@ // #define this to a non-zero value, if remembering defaults is not supported properly #define RTL_BOOTSTRAP_DEFAULTS_BROKEN 1 -// --------------------------------------------------------------------------------------- -#define BOOTSTRAP_DATA_NAME SAL_CONFIGFILE("bootstrap") - #define BOOTSTRAP_ITEM_PRODUCT_KEY "ProductKey" #define BOOTSTRAP_ITEM_VERSIONFILE "Location" #define BOOTSTRAP_ITEM_BUILDID "buildid" @@ -76,7 +73,7 @@ namespace utl { OUString uri; rtl::Bootstrap::get( OUString("BRAND_BASE_DIR"), uri); - return uri + "/program/" + BOOTSTRAP_DATA_NAME; + return uri + "/program/" SAL_CONFIGFILE("bootstrap"); } } @@ -789,7 +786,7 @@ sal_Bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rVa // try to open version.ini (versionrc) OUString uri; rtl::Bootstrap::get( OUString("BRAND_BASE_DIR"), uri); - rtl::Bootstrap aData( uri + "/program/" + SAL_CONFIGFILE("version") ); + rtl::Bootstrap aData( uri + "/program/" SAL_CONFIGFILE("version") ); if ( aData.getHandle() == NULL ) // version.ini (versionrc) doesn't exist return sal_False; |