[Libreoffice-commits] core.git: sax/source

Julien Nabet serval2412 at yahoo.fr
Thu Aug 22 22:56:15 PDT 2013


 sax/source/expatwrap/xml2utf.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c958c4ed117a46889afc59ae52502b7262c9ea5c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Aug 23 07:54:04 2013 +0200

    cppcheck: fix duplicate if/else
    
    I don't know if it's possible to parse EBCDIC knowing that there are several implementations
    So I commented the block and added a TODO.
    => no time wasted for this block (ok "micro waste")+ 1 less cppcheck report
    
    Change-Id: I72b72b68295eab7be5332166b955adaddf6ee5c3

diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 76713d9..34440bf 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -314,12 +314,14 @@ sal_Bool XMLFile2UTFConverter::scanForEncoding( Sequence< sal_Int8 > &seq )
         // UCS-4 little endian
         m_sEncoding = "ucs-4";
     }
+/* TODO: no need to test for the moment since we return sal_False like default case anyway
     else if( 0x4c == pSource[0] && 0x6f == pSource[1]  &&
              0xa7 == static_cast<unsigned char> (pSource[2]) &&
              0x94 == static_cast<unsigned char> (pSource[3]) ) {
         // EBCDIC
         bReturn = sal_False;   // must be extended
     }
+*/
     else {
         // other
         // UTF8 is directly recognized by the parser.


More information about the Libreoffice-commits mailing list