diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-02-19 23:27:29 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-02-19 23:28:55 +0900 |
commit | 96cb767123c9e8f5db197454b4da02c8f7583d2b (patch) | |
tree | 4790978cfa591fb5cf5fd0920159abee7d6f1ac8 /oox/source/dump | |
parent | e34e95aef33262c7aad006883e02cb76e5bb9947 (diff) |
Prefer equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("..."))
to equalsIgnoreAsciiCaseAscii("...")
Diffstat (limited to 'oox/source/dump')
-rw-r--r-- | oox/source/dump/dumperbase.cxx | 2 | ||||
-rw-r--r-- | oox/source/dump/pptxdumper.cxx | 34 | ||||
-rw-r--r-- | oox/source/dump/xlsbdumper.cxx | 34 |
3 files changed, 35 insertions, 35 deletions
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index f109168e7a09..d8061cf07f5f 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -2942,7 +2942,7 @@ void XmlStreamObject::implDumpText( TextInputStream& rTextStrm ) matching start/end elements and the element text on the same line. */ OUStringBuffer aOldStartElem; // special handling for VML - bool bIsVml = InputOutputHelper::getFileNameExtension( maSysFileName ).equalsIgnoreAsciiCaseAscii( "vml" ); + bool bIsVml = InputOutputHelper::getFileNameExtension( maSysFileName ).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("vml")); while( !rTextStrm.isEof() ) { diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx index 798d805ae5e5..a569f04edb55 100644 --- a/oox/source/dump/pptxdumper.cxx +++ b/oox/source/dump/pptxdumper.cxx @@ -60,38 +60,38 @@ RootStorageObject::RootStorageObject( const DumperBase& rParent ) void RootStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName ) { OUString aExt = InputOutputHelper::getFileNameExtension( rStrmName ); - if( aExt.equalsIgnoreAsciiCaseAscii( "pptx" ) || - aExt.equalsIgnoreAsciiCaseAscii( "potx" ) ) + if( aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("pptx")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("potx")) ) { Dumper( getContext(), rxStrm, rSysFileName ).dump(); } else if( - aExt.equalsIgnoreAsciiCaseAscii( "xlsb" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xlsm" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xlsx" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xltm" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xltx" ) ) + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlsb")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlsm")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlsx")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xltm")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xltx")) ) { ::oox::dump::xlsb::Dumper( getContext(), rxStrm, rSysFileName ).dump(); } else if( - aExt.equalsIgnoreAsciiCaseAscii( "xla" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xlc" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xlm" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xls" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xlt" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xlw" ) ) + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xla")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlc")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlm")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xls")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlt")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlw")) ) { ::oox::dump::biff::Dumper( getContext(), rxStrm, rSysFileName ).dump(); } else if( - aExt.equalsIgnoreAsciiCaseAscii( "xml" ) || - aExt.equalsIgnoreAsciiCaseAscii( "vml" ) || - aExt.equalsIgnoreAsciiCaseAscii( "rels" ) ) + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xml")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("vml")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("rels")) ) { XmlStreamObject( *this, rxStrm, rSysFileName ).dump(); } - else if( aExt.equalsIgnoreAsciiCaseAscii( "bin" ) ) + else if( aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("bin")) ) { if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ppt" ) ) && rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "vbaProject.bin" ) ) ) { diff --git a/oox/source/dump/xlsbdumper.cxx b/oox/source/dump/xlsbdumper.cxx index 9a13d973fb3b..610ffce2b046 100644 --- a/oox/source/dump/xlsbdumper.cxx +++ b/oox/source/dump/xlsbdumper.cxx @@ -2236,38 +2236,38 @@ void RootStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, { OUString aExt = InputOutputHelper::getFileNameExtension( rStrmName ); if( - aExt.equalsIgnoreAsciiCaseAscii( "xlsb" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xlsm" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xlsx" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xltm" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xltx" ) ) + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlsb")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlsm")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlsx")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xltm")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xltx")) ) { Dumper( getContext(), rxStrm, rSysFileName ).dump(); } else if( - aExt.equalsIgnoreAsciiCaseAscii( "xla" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xlc" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xlm" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xls" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xlt" ) || - aExt.equalsIgnoreAsciiCaseAscii( "xlw" ) ) + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xla")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlc")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlm")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xls")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlt")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xlw")) ) { ::oox::dump::biff::Dumper( getContext(), rxStrm, rSysFileName ).dump(); } else if( - aExt.equalsIgnoreAsciiCaseAscii( "pptx" ) || - aExt.equalsIgnoreAsciiCaseAscii( "potx" ) ) + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("pptx")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("potx")) ) { ::oox::dump::pptx::Dumper( getContext(), rxStrm, rSysFileName ).dump(); } else if( - aExt.equalsIgnoreAsciiCaseAscii( "xml" ) || - aExt.equalsIgnoreAsciiCaseAscii( "vml" ) || - aExt.equalsIgnoreAsciiCaseAscii( "rels" ) ) + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xml")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("vml")) || + aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("rels")) ) { XmlStreamObject( *this, rxStrm, rSysFileName ).dump(); } - else if( aExt.equalsIgnoreAsciiCaseAscii( "bin" ) ) + else if( aExt.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("bin")) ) { if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl" ) ) && rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "vbaProject.bin" ) ) ) { |