diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 10:52:28 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 10:52:28 +0000 |
| commit | 2394673a128d0fb324c3b62598792bd5a4dad94d (patch) | |
| tree | b63722473bcb81f00536c73008b1b4e02d6de783 /cppuhelper/source | |
| parent | e70236cf48cb3a49764905849c9dfc8ba68b2b07 (diff) | |
INTEGRATION: CWS sb71 (1.28.26); FILE MERGED
2007/10/01 17:12:33 sb 1.28.26.3: RESYNC: (1.28-1.29); FILE MERGED
2007/04/27 14:08:20 sb 1.28.26.2: #i75466# Removed URE_UNORC again.
2007/04/16 13:25:38 sb 1.28.26.1: #i75466# Adapted to new URE_UNORC; new bootstrap_expandUri helper.
Diffstat (limited to 'cppuhelper/source')
| -rw-r--r-- | cppuhelper/source/bootstrap.cxx | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index 2d3cd2f9c304..4a63c04ed4b0 100644 --- a/cppuhelper/source/bootstrap.cxx +++ b/cppuhelper/source/bootstrap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bootstrap.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: hr $ $Date: 2007-09-27 12:50:59 $ + * last change: $Author: vg $ $Date: 2007-10-15 11:52:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -73,6 +73,8 @@ #include "com/sun/star/bridge/UnoUrlResolver.hpp" #include "com/sun/star/bridge/XUnoUrlResolver.hpp" +#include "macro_expander.hxx" + #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define ARLEN(x) sizeof (x) / sizeof *(x) @@ -625,4 +627,14 @@ Reference< XComponentContext > SAL_CALL bootstrap() return xRemoteContext; } +OUString bootstrap_expandUri(OUString const & uri) { + static char const PREFIX[] = "vnd.sun.star.expand:"; + return uri.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(PREFIX)) + ? cppuhelper::detail::expandMacros( + rtl::Uri::decode( + uri.copy(RTL_CONSTASCII_LENGTH(PREFIX)), + rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8)) + : uri; +} + } // namespace cppu |