Kaydet (Commit) c6d03e72 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Some white-space clean-up

Change-Id: Ice25e13891865c2c7a223a3708d200272645140d
üst 7705a50b
...@@ -291,14 +291,14 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName ) ...@@ -291,14 +291,14 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
line.copy(nIndex+1).trim(), RTL_TEXTENCODING_UTF8 ); line.copy(nIndex+1).trim(), RTL_TEXTENCODING_UTF8 );
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OString name_tmp = OUStringToOString(sName, RTL_TEXTENCODING_ASCII_US); OString name_tmp = OUStringToOString(sName, RTL_TEXTENCODING_ASCII_US);
OString value_tmp = OUStringToOString(sValue, RTL_TEXTENCODING_UTF8); OString value_tmp = OUStringToOString(sValue, RTL_TEXTENCODING_UTF8);
OSL_TRACE( OSL_TRACE(
"pushing: name=%s value=%s", "pushing: name=%s value=%s",
name_tmp.getStr(), value_tmp.getStr() ); name_tmp.getStr(), value_tmp.getStr() );
#endif /* OSL_DEBUG_LEVEL > 1 */ #endif /* OSL_DEBUG_LEVEL > 1 */
map_[sName] = sValue; map_[sName] = sValue;
} }
} }
osl_closeFile(handle); osl_closeFile(handle);
...@@ -473,24 +473,24 @@ bool Bootstrap_Impl::getValue( ...@@ -473,24 +473,24 @@ bool Bootstrap_Impl::getValue(
if (override && getDirectValue(key, value, mode, requestStack)) { if (override && getDirectValue(key, value, mode, requestStack)) {
return true; return true;
} }
if ( key == "_OS" ) { if (key == "_OS") {
rtl_uString_assign( rtl_uString_assign(
value, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(RTL_OS)).pData); value, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(RTL_OS)).pData);
return true; return true;
} }
if ( key == "_ARCH" ) { if (key == "_ARCH") {
rtl_uString_assign( rtl_uString_assign(
value, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(RTL_ARCH)).pData); value, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(RTL_ARCH)).pData);
return true; return true;
} }
if ( key == "_CPPU_ENV" ) { if (key == "_CPPU_ENV") {
rtl_uString_assign( rtl_uString_assign(
value, value,
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_STRING(CPPU_ENV))). (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MY_STRING(CPPU_ENV))).
pData)); pData));
return true; return true;
} }
if ( key == "ORIGIN" ) { if (key == "ORIGIN") {
rtl_uString_assign( rtl_uString_assign(
value, value,
_iniName.copy( _iniName.copy(
...@@ -500,21 +500,21 @@ bool Bootstrap_Impl::getValue( ...@@ -500,21 +500,21 @@ bool Bootstrap_Impl::getValue(
if (getAmbienceValue(key, value, mode, requestStack)) { if (getAmbienceValue(key, value, mode, requestStack)) {
return true; return true;
} }
if ( key == "SYSUSERCONFIG" ) { if (key == "SYSUSERCONFIG") {
rtl::OUString v; rtl::OUString v;
bool b = osl::Security().getConfigDir(v); bool b = osl::Security().getConfigDir(v);
EnsureNoFinalSlash(v); EnsureNoFinalSlash(v);
rtl_uString_assign(value, v.pData); rtl_uString_assign(value, v.pData);
return b; return b;
} }
if ( key == "SYSUSERHOME" ) { if (key == "SYSUSERHOME") {
rtl::OUString v; rtl::OUString v;
bool b = osl::Security().getHomeDir(v); bool b = osl::Security().getHomeDir(v);
EnsureNoFinalSlash(v); EnsureNoFinalSlash(v);
rtl_uString_assign(value, v.pData); rtl_uString_assign(value, v.pData);
return b; return b;
} }
if ( key == "SYSBINDIR" ) { if (key == "SYSBINDIR") {
getExecutableDirectory_Impl(value); getExecutableDirectory_Impl(value);
return true; return true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment