diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-02-08 11:10:30 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-02-08 11:10:30 +0100 |
| commit | 3b53a4cdb57667b0c7495ad6aef19312edba2d5d (patch) | |
| tree | f9f1279f48651ded7b9c18d8e795ef048fa4abdf /cppuhelper | |
| parent | 88692a2d244b7e85a20b6b1782873347326cba03 (diff) | |
Blind fix for apparently buggy GCC 4.8
cf. <http://ci.libreoffice.org/job/lo_tb_master_linux_dbg/10952/console>
Change-Id: If947e338be0ab17f41f74f8e70e6281f46a7f57c
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/typemanager.cxx | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx index 123a4fa5493c..44bf14eab1b7 100644 --- a/cppuhelper/source/typemanager.cxx +++ b/cppuhelper/source/typemanager.cxx @@ -1815,21 +1815,23 @@ css::uno::Any cppuhelper::TypeManager::find(rtl::OUString const & name) { css::uno::TypeClass typeClass; }; static Simple const simple[] = { - { "void", css::uno::TypeClass_VOID }, - { "boolean", css::uno::TypeClass_BOOLEAN }, - { "byte", css::uno::TypeClass_BYTE }, - { "short", css::uno::TypeClass_SHORT }, - { "unsigned short", css::uno::TypeClass_UNSIGNED_SHORT }, - { "long", css::uno::TypeClass_LONG }, - { "unsigned long", css::uno::TypeClass_UNSIGNED_LONG }, - { "hyper", css::uno::TypeClass_HYPER }, - { "unsigned hyper", css::uno::TypeClass_UNSIGNED_HYPER }, - { "float", css::uno::TypeClass_FLOAT }, - { "double", css::uno::TypeClass_DOUBLE }, - { "char", css::uno::TypeClass_CHAR }, - { "string", css::uno::TypeClass_STRING }, - { "type", css::uno::TypeClass_TYPE }, - { "any", css::uno::TypeClass_ANY } }; + { OUStringLiteral("void"), css::uno::TypeClass_VOID }, + { OUStringLiteral("boolean"), css::uno::TypeClass_BOOLEAN }, + { OUStringLiteral("byte"), css::uno::TypeClass_BYTE }, + { OUStringLiteral("short"), css::uno::TypeClass_SHORT }, + { OUStringLiteral("unsigned short"), + css::uno::TypeClass_UNSIGNED_SHORT }, + { OUStringLiteral("long"), css::uno::TypeClass_LONG }, + { OUStringLiteral("unsigned long"), css::uno::TypeClass_UNSIGNED_LONG }, + { OUStringLiteral("hyper"), css::uno::TypeClass_HYPER }, + { OUStringLiteral("unsigned hyper"), + css::uno::TypeClass_UNSIGNED_HYPER }, + { OUStringLiteral("float"), css::uno::TypeClass_FLOAT }, + { OUStringLiteral("double"), css::uno::TypeClass_DOUBLE }, + { OUStringLiteral("char"), css::uno::TypeClass_CHAR }, + { OUStringLiteral("string"), css::uno::TypeClass_STRING }, + { OUStringLiteral("type"), css::uno::TypeClass_TYPE }, + { OUStringLiteral("any"), css::uno::TypeClass_ANY } }; for (std::size_t i = 0; i != SAL_N_ELEMENTS(simple); ++i) { if (name == simple[i].name) { return css::uno::makeAny< |