diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-05 12:51:23 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-05 12:54:46 +0100 |
| commit | e6aa6daccf14827d92fd50a300738dda68527eb5 (patch) | |
| tree | e6acecccc5ac38a6cc7931ee7f24bbf4aa5b86d2 /sal/rtl | |
| parent | 0cb6a92f86e02f6342be5e8f931dc1849114230c (diff) | |
[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 827430c8c0417396b3c1d2a049ccddb818c89646 "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
Diffstat (limited to 'sal/rtl')
| -rw-r--r-- | sal/rtl/bootstrap.cxx | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 39b7665a0be4..01f533132251 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -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 * >( |