vcl/source/filter/graphicfilter.cxx | 84 ++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 42 deletions(-)
New commits: commit 5c3ccc9e4a749a6358d29d20533ff11fa48aa602 Author: Michael Stahl <mst...@redhat.com> Date: Fri Nov 6 13:42:31 2015 +0100 vcl: [loplugin:stringconstant] Change-Id: I973b6b68a225cc872aff2c0fe0e8a2e9108b3140 diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 2ed81cd..3dad87b 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -980,50 +980,50 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction() if( !mpfnImport ) { #ifndef DISABLE_DYNLOADING - if (maFormatName.equalsAscii("icd")) + if (maFormatName == "icd") mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("icdGraphicImport")); - else if (maFormatName.equalsAscii("idx")) + else if (maFormatName == "idx") mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("idxGraphicImport")); - else if (maFormatName.equalsAscii("ime")) + else if (maFormatName == "ime") mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("imeGraphicImport")); - else if (maFormatName.equalsAscii("ipb")) + else if (maFormatName == "ipb") mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("ipbGraphicImport")); - else if (maFormatName.equalsAscii("ipd")) + else if (maFormatName == "ipd") mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("ipdGraphicImport")); - else if (maFormatName.equalsAscii("ips")) + else if (maFormatName == "ips") mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("ipsGraphicImport")); - else if (maFormatName.equalsAscii("ipt")) + else if (maFormatName == "ipt") mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("iptGraphicImport")); - else if (maFormatName.equalsAscii("ipx")) + else if (maFormatName == "ipx") mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("ipxGraphicImport")); - else if (maFormatName.equalsAscii("ira")) + else if (maFormatName == "ira") mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("iraGraphicImport")); - else if (maFormatName.equalsAscii("itg")) + else if (maFormatName == "itg") mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("itgGraphicImport")); - else if (maFormatName.equalsAscii("iti")) + else if (maFormatName == "iti") mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("itiGraphicImport")); #else - if( maFiltername.equalsAscii( "icd" ) ) + if (maFiltername == "icd") mpfnImport = icdGraphicImport; - else if( maFiltername.equalsAscii( "idx" ) ) + else if (maFiltername == "idx") mpfnImport = idxGraphicImport; - else if( maFiltername.equalsAscii( "ime" ) ) + else if (maFiltername == "ime") mpfnImport = imeGraphicImport; - else if( maFiltername.equalsAscii( "ipb" ) ) + else if (maFiltername == "ipb") mpfnImport = ipbGraphicImport; - else if( maFiltername.equalsAscii( "ipd" ) ) + else if (maFiltername == "ipd") mpfnImport = ipdGraphicImport; - else if( maFiltername.equalsAscii( "ips" ) ) + else if (maFiltername == "ips") mpfnImport = ipsGraphicImport; - else if( maFiltername.equalsAscii( "ipt" ) ) + else if (maFiltername == "ipt") mpfnImport = iptGraphicImport; - else if( maFiltername.equalsAscii( "ipx" ) ) + else if (maFiltername == "ipx") mpfnImport = ipxGraphicImport; - else if( maFiltername.equalsAscii( "ira" ) ) + else if (maFiltername == "ira") mpfnImport = iraGraphicImport; - else if( maFiltername.equalsAscii( "itg" ) ) + else if (maFiltername == "itg") mpfnImport = itgGraphicImport; - else if( maFiltername.equalsAscii( "iti" ) ) + else if (maFiltername == "iti") mpfnImport = itiGraphicImport; #endif } @@ -2119,48 +2119,48 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString PFilterCall pFunc = NULL; OUString tmpFilterName = aExternalFilterName; - if (tmpFilterName.equalsAscii("egi")) + if (tmpFilterName == "egi") pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("egiGraphicExport")); - else if (tmpFilterName.equalsAscii("eme")) + else if (tmpFilterName == "eme") pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("emeGraphicExport")); - else if (tmpFilterName.equalsAscii("epb")) + else if (tmpFilterName == "epb") pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("epbGraphicExport")); - else if (tmpFilterName.equalsAscii("epg")) + else if (tmpFilterName == "epg") pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("epgGraphicExport")); - else if (tmpFilterName.equalsAscii("epp")) + else if (tmpFilterName == "epp") pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("eppGraphicExport")); - else if (tmpFilterName.equalsAscii("eps")) + else if (tmpFilterName == "eps") pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("epsGraphicExport")); - else if (tmpFilterName.equalsAscii("ept")) + else if (tmpFilterName == "ept") pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("eptGraphicExport")); - else if (tmpFilterName.equalsAscii("era")) + else if (tmpFilterName == "era") pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("eraGraphicExport")); - else if (tmpFilterName.equalsAscii("eti")) + else if (tmpFilterName == "eti") pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("etiGraphicExport")); - else if (tmpFilterName.equalsAscii("exp")) + else if (tmpFilterName == "exp") pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("expGraphicExport")); // Execute dialog in DLL #else PFilterCall pFunc = NULL; - if( aFilterName.equalsAscii( "egi" ) ) + if (aFilterName == "egi") pFunc = egiGraphicExport; - else if( aFilterName.equalsAscii( "eme" ) ) + else if (aFilterName == "eme") pFunc = emeGraphicExport; - else if( aFilterName.equalsAscii( "epb" ) ) + else if (aFilterName == "epb") pFunc = epbGraphicExport; - else if( aFilterName.equalsAscii( "epg" ) ) + else if (aFilterName == "epg") pFunc = epgGraphicExport; - else if( aFilterName.equalsAscii( "epp" ) ) + else if (aFilterName == "epp") pFunc = eppGraphicExport; - else if( aFilterName.equalsAscii( "eps" ) ) + else if (aFilterName == "eps") pFunc = epsGraphicExport; - else if( aFilterName.equalsAscii( "ept" ) ) + else if (aFilterName == "ept") pFunc = eptGraphicExport; - else if( aFilterName.equalsAscii( "era" ) ) + else if (aFilterName == "era") pFunc = eraGraphicExport; - else if( aFilterName.equalsAscii( "eti" ) ) + else if (aFilterName == "eti") pFunc = etiGraphicExport; - else if( aFilterName.equalsAscii( "exp" ) ) + else if (aFilterName == "exp") pFunc = expGraphicExport; #endif if( pFunc ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits