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

[API CHANGE] Remove .link feature from bootstrap variables

This feature had never been documented in include/rtl/bootstrap.h and had only
been used internally in LO on Windows for the multi-layer installations (thus is
unused since 827430c8 "Fold URE: Windows"), so
it should not hurt to remove it even if it could be considered part of the
stable URE interface.

Change-Id: If0f59f30dad8b2c3ff5f7931c19cd254073ccf80
üst 0cb6a92f
......@@ -930,31 +930,6 @@ rtl::OUString expandMacros(
}
if (n == 1) {
buf.append(lookup(file, mode, false, seg[0], requestStack));
} else if (n == 2 && seg[0] == ".link") {
osl::File f(seg[1]);
rtl::ByteSequence seq;
rtl::OUString line;
rtl::OUString url;
// Silently ignore any errors (is that good?):
if ((f.open(osl_File_OpenFlag_Read) ==
osl::FileBase::E_None) &&
f.readLine(seq) == osl::FileBase::E_None &&
rtl_convertStringToUString(
&line.pData,
reinterpret_cast< char const * >(
seq.getConstArray()),
seq.getLength(), RTL_TEXTENCODING_UTF8,
(RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR |
RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR |
RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)) &&
(osl::File::getFileURLFromSystemPath(line, url) ==
osl::FileBase::E_None))
{
try {
buf.append(
rtl::Uri::convertRelToAbs(seg[1], url));
} catch (const rtl::MalformedUriException &) {}
}
} else if (n == 3 && seg[0] == ".override") {
rtl::Bootstrap b(seg[1]);
Bootstrap_Impl * f = static_cast< Bootstrap_Impl * >(
......
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