mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary jfw_plugin::getVendorNames

Browse Source 
Change-Id: I3c134c27db4c1496fcacc519da68af10ab3ce574
This commit is contained in:
Stephan Bergmann
2014-10-21 08:52:43 +02:00
parent a8c24b25fd
commit 42a05b4b2a
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
View File

@@ -53,27 +53,12 @@ BEGIN_VENDOR_MAP()
END_VENDOR_MAP() END_VENDOR_MAP()
Sequence<OUString> getVendorNames()
{
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) bool isVendorSupported(const OUString& sVendor)
{ {
Sequence<OUString> seqNames = getVendorNames(); const size_t count = sizeof(gVendorMap) / sizeof (VendorSupportMapEntry) - 1;
const OUString * arNames = seqNames.getConstArray(); for ( size_t pos = 0; pos < count; ++pos )
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; return true;
} }
#if OSL_DEBUG_LEVEL >= 2 #if OSL_DEBUG_LEVEL >= 2

3
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
View File

@@ -45,9 +45,6 @@ VendorSupportMapEntry gVendorMap[] ={
#define END_VENDOR_MAP() \ #define END_VENDOR_MAP() \
{NULL, NULL, NULL} }; {NULL, NULL, NULL} };
com::sun::star::uno::Sequence<OUString> getVendorNames();
/* Examines if the vendor supplied in parameter sVendor is part of the /* Examines if the vendor supplied in parameter sVendor is part of the
list of supported vendors. That is the arry of VendorSupportMapEntry list of supported vendors. That is the arry of VendorSupportMapEntry
is search for an respective entry. is search for an respective entry.