summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2018-01-22 22:02:56 +0000
committerMichael Meeks <michael.meeks@collabora.com>2018-02-11 00:09:33 +0100
commit720759ad342000f2729a6c983523af931f01dbef (patch)
treef7a12937ae639e4c70734ed593010185023d32a5 /cppuhelper
parentf215096c24429fe69e7e5ab37898d0f0beeff0ab (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>
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/source/servicemanager.cxx20
1 files changed, 20 insertions, 0 deletions
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index 014b8ea91817..420316c2a5a3 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
}