jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 19 ++----------------- jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx | 3 --- 2 files changed, 2 insertions(+), 20 deletions(-)
New commits: commit 42a05b4b2aa980cc8443813e6ab903034f9f4dbc Author: Stephan Bergmann <[email protected]> Date: Tue Oct 21 08:52:43 2014 +0200 Remove unnecessary jfw_plugin::getVendorNames Change-Id: I3c134c27db4c1496fcacc519da68af10ab3ce574 diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx index 3f23ff3..ee4d6d0 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx @@ -53,27 +53,12 @@ BEGIN_VENDOR_MAP() END_VENDOR_MAP() -Sequence<OUString> getVendorNames() +bool isVendorSupported(const OUString& sVendor) { const size_t count = sizeof(gVendorMap) / sizeof (VendorSupportMapEntry) - 1; - OUString arNames[count]; for ( size_t pos = 0; pos < count; ++pos ) { - OString sVendor(gVendorMap[pos].sVendorName); - arNames[pos] = OStringToOUString(sVendor, RTL_TEXTENCODING_UTF8); - } - return Sequence<OUString>(arNames, count); -} - -bool isVendorSupported(const OUString& sVendor) -{ - Sequence<OUString> seqNames = getVendorNames(); - const OUString * arNames = seqNames.getConstArray(); - sal_Int32 count = seqNames.getLength(); - - for (int i = 0; i < count; i++) - { - if (sVendor.equals(arNames[i])) + if (sVendor.equalsAscii(gVendorMap[pos].sVendorName)) return true; } #if OSL_DEBUG_LEVEL >= 2 diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx index 72fd317..5709e79 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx @@ -45,9 +45,6 @@ VendorSupportMapEntry gVendorMap[] ={ #define END_VENDOR_MAP() \ {NULL, NULL, NULL} }; - -com::sun::star::uno::Sequence<OUString> getVendorNames(); - /* Examines if the vendor supplied in parameter sVendor is part of the list of supported vendors. That is the arry of VendorSupportMapEntry is search for an respective entry. _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
