diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2018-01-22 22:02:56 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-25 18:30:11 +0200 |
| commit | 1d4d71ba33b210db58bb1c3637e8388f720c2ff7 (patch) | |
| tree | f2abfc9b57306d16bb10a8648059c508bdb2a942 /cppuhelper | |
| parent | 27b208c5f945b06d308fede54523f77dbea5445b (diff) | |
Pre-load key UNO mappings.
Change-Id: I415e07d737c734d63ac969783464babcbb9ea884
Reviewed-on: https://gerrit.libreoffice.org/48365
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 720759ad342000f2729a6c983523af931f01dbef)
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/servicemanager.cxx | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index b7f8b04557f4..891cf5a60904 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -43,6 +43,7 @@ #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <uno/environment.hxx> +#include <uno/mapping.hxx> #include "loadsharedlibcomponentfactory.hxx" @@ -1992,6 +1993,25 @@ void cppuhelper::ServiceManager::preloadImplementations() { } } std::cerr << std::endl; + + // Various rather important uno mappings. + struct { + const char *mpFrom; + const char *mpTo; + const char *mpPurpose; + } aMappingLoad[] = { + { "gcc3", "uno", "" }, + { "uno", "gcc3", "" }, + }; + + static std::vector<css::uno::Mapping> maMaps; + for (auto &it : aMappingLoad) + { + maMaps.push_back(css::uno::Mapping( + OUString::createFromAscii(it.mpFrom), + OUString::createFromAscii(it.mpTo), + OUString::createFromAscii(it.mpPurpose))); + } #endif } |