ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Get rid of some macros

Browse Source 
Change-Id: I9bbb1e41a687b62b32ed00f1c7cf5d82d66b4915
Reviewed-on: https://gerrit.libreoffice.org/67360
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2019-02-04 15:54:22 +01:00
parent 313ef29fd3
commit 91fcd99922
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+14 -14
View File
@@ -34,25 +34,25 @@ namespace jfw_plugin
the string contains an a umlaut then it must be expressed
by "\xXX\xXX"
*/
BEGIN_VENDOR_MAP()
VendorSupportMapEntry const gVendorMap[] ={
// For macOS, don't bother with implementations that aren't relevant (or have never existed)
#ifdef MACOSX
VENDOR_MAP_ENTRY("Apple Inc.", OtherInfo)
VENDOR_MAP_ENTRY("Apple Computer, Inc.", OtherInfo)
VENDOR_MAP_ENTRY<OtherInfo>("Apple Inc."),
VENDOR_MAP_ENTRY<OtherInfo>("Apple Computer, Inc."),
#endif
VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo)
VENDOR_MAP_ENTRY("Amazon.com Inc.", SunInfo)
VENDOR_MAP_ENTRY<SunInfo>("Sun Microsystems Inc."),
VENDOR_MAP_ENTRY<SunInfo>("Oracle Corporation"),
VENDOR_MAP_ENTRY<SunInfo>("AdoptOpenJdk"),
VENDOR_MAP_ENTRY<SunInfo>("Amazon.com Inc."),
#ifndef MACOSX
VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)
VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo)
VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo)
VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
VENDOR_MAP_ENTRY<OtherInfo>("IBM Corporation"),
VENDOR_MAP_ENTRY<OtherInfo>("Blackdown Java-Linux Team"),
VENDOR_MAP_ENTRY<OtherInfo>("BEA Systems, Inc."),
VENDOR_MAP_ENTRY<GnuInfo>("Free Software Foundation, Inc."),
VENDOR_MAP_ENTRY<OtherInfo>("The FreeBSD Foundation"),
#endif
VENDOR_MAP_ENTRY("Azul Systems, Inc.", OtherInfo)
END_VENDOR_MAP()
VENDOR_MAP_ENTRY<OtherInfo>("Azul Systems, Inc."),
{nullptr, nullptr, nullptr} };
bool isVendorSupported(const OUString& sVendor)
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
+3 -8
View File
@@ -37,14 +37,9 @@ struct VendorSupportMapEntry
extern VendorSupportMapEntry const gVendorMap[];
#define BEGIN_VENDOR_MAP() \
VendorSupportMapEntry const gVendorMap[] ={
#define VENDOR_MAP_ENTRY(x,y) \
{x, & y::getJavaExePaths, & y::createInstance},
#define END_VENDOR_MAP() \
{nullptr, nullptr, nullptr} };
template<typename y> constexpr VendorSupportMapEntry VENDOR_MAP_ENTRY(char const * x) {
return {x, & y::getJavaExePaths, & y::createInstance};
}
/* Examines if the vendor supplied in parameter sVendor is part of the
list of supported vendors. That is the arry of VendorSupportMapEntry