diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-02-07 13:47:22 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2013-02-07 13:47:22 +0000 |
| commit | 94763a569193246d24935fb28f0cf10bffcea2b4 (patch) | |
| tree | 5f0e2390c454b5c222c3a15ea54d93df2e0457c5 /unotools/source | |
| parent | f1499b86d92dca538e3f05bdbd94b851a69e011b (diff) | |
fix build for compilers supporting user-defined literals
User defined literals (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2378.pdf)
are already available in gcc 4.7 and clang 3.1 and this results in problems in code
where literal strings are concatenated without any whitespace inbetween.
Notes
Notes:
prefer: f958657cc5a179a2bccff06f88cd36f80b779184
Diffstat (limited to 'unotools/source')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index a333e4bf588b..f89732d3d532 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -149,7 +149,7 @@ namespace utl rtl::OUString uri; rtl::Bootstrap::get( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri); - s_pData = new Impl(uri + OUString(RTL_CONSTASCII_USTRINGPARAM("/program/"BOOTSTRAP_DATA_NAME))); + s_pData = new Impl(uri + OUString(RTL_CONSTASCII_USTRINGPARAM( "/program/" BOOTSTRAP_DATA_NAME))); } return *s_pData; } @@ -693,7 +693,7 @@ OUString Bootstrap::getAllUsersValue(OUString const& _sDefault) { OUString const csAllUsersItem(RTL_CONSTASCII_USTRINGPARAM(SETUP_ITEM_ALLUSERS)); - rtl::Bootstrap aData( getExecutableDirectory() + OUString( RTL_CONSTASCII_USTRINGPARAM( "/"SETUP_DATA_NAME ) ) ); + rtl::Bootstrap aData( getExecutableDirectory() + OUString( RTL_CONSTASCII_USTRINGPARAM( "/" SETUP_DATA_NAME ) ) ); OUString sResult; aData.getFrom( csAllUsersItem, sResult, _sDefault ); return sResult; @@ -910,7 +910,7 @@ sal_Bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rVa rtl::Bootstrap::get( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri); rtl::Bootstrap aData( uri + - OUString(RTL_CONSTASCII_USTRINGPARAM("/program/"SAL_CONFIGFILE("version"))) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE("version"))) ); if ( aData.getHandle() == NULL ) // version.ini (versionrc) doesn't exist return sal_False; |