diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-19 11:32:06 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-19 11:32:20 +0100 |
commit | 4c0c23af21db0b72541674c2352df04f48774e81 (patch) | |
tree | fe5697fbc7f793de73531e50711c5b39d9825923 /oox | |
parent | 8f2cf65ec9a450441b92ed1f638eda26231a9be7 (diff) |
Simplify equalsIgnoreAsciiCaseAscii[L] calls
Change-Id: If5201bd772aed245e8f7f8b900d76ffe4ca57b49
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/textparagraphproperties.cxx | 18 | ||||
-rw-r--r-- | oox/source/dump/dumperbase.cxx | 2 | ||||
-rw-r--r-- | oox/source/dump/pptxdumper.cxx | 34 | ||||
-rw-r--r-- | oox/source/mathml/importutils.cxx | 16 | ||||
-rw-r--r-- | oox/source/ole/axcontrol.cxx | 30 | ||||
-rw-r--r-- | oox/source/ole/vbacontrol.cxx | 6 | ||||
-rw-r--r-- | oox/source/ole/vbaproject.cxx | 8 |
7 files changed, 57 insertions, 57 deletions
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index c4a88b384842..b39ffb6d0b4f 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -308,15 +308,15 @@ void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, P aFontDesc.Name = aBulletFontName; aFontDesc.Pitch = nBulletFontPitch; aFontDesc.Family = nBulletFontFamily; - if ( aBulletFontName.equalsIgnoreAsciiCaseAscii("Wingdings") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("Wingdings 2") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("Wingdings 3") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("Monotype Sorts") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("Monotype Sorts 2") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("Webdings") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("StarBats") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("StarMath") || - aBulletFontName.equalsIgnoreAsciiCaseAscii("ZapfDingbats") ) { + if ( aBulletFontName.equalsIgnoreAsciiCase("Wingdings") || + aBulletFontName.equalsIgnoreAsciiCase("Wingdings 2") || + aBulletFontName.equalsIgnoreAsciiCase("Wingdings 3") || + aBulletFontName.equalsIgnoreAsciiCase("Monotype Sorts") || + aBulletFontName.equalsIgnoreAsciiCase("Monotype Sorts 2") || + aBulletFontName.equalsIgnoreAsciiCase("Webdings") || + aBulletFontName.equalsIgnoreAsciiCase("StarBats") || + aBulletFontName.equalsIgnoreAsciiCase("StarMath") || + aBulletFontName.equalsIgnoreAsciiCase("ZapfDingbats") ) { aFontDesc.CharSet = RTL_TEXTENCODING_SYMBOL; bSymbolFont = sal_True; } diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 8f8aa49516d8..dfa19ba4c013 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -2455,7 +2455,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 ).equalsIgnoreAsciiCase("vml"); while( !rTextStrm.isEof() ) { diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx index 1e372a6a1454..9c9b81f07559 100644 --- a/oox/source/dump/pptxdumper.cxx +++ b/oox/source/dump/pptxdumper.cxx @@ -48,40 +48,40 @@ 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.equalsIgnoreAsciiCase("pptx") || + aExt.equalsIgnoreAsciiCase("potx") ) { Dumper( getContext(), rxStrm, rSysFileName ).dump(); } #ifdef FIXME else if( - aExt.equalsIgnoreAsciiCaseAscii("xlsb") || - aExt.equalsIgnoreAsciiCaseAscii("xlsm") || - aExt.equalsIgnoreAsciiCaseAscii("xlsx") || - aExt.equalsIgnoreAsciiCaseAscii("xltm") || - aExt.equalsIgnoreAsciiCaseAscii("xltx") ) + aExt.equalsIgnoreAsciiCase("xlsb") || + aExt.equalsIgnoreAsciiCase("xlsm") || + aExt.equalsIgnoreAsciiCase("xlsx") || + aExt.equalsIgnoreAsciiCase("xltm") || + aExt.equalsIgnoreAsciiCase("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.equalsIgnoreAsciiCase("xla") || + aExt.equalsIgnoreAsciiCase("xlc") || + aExt.equalsIgnoreAsciiCase("xlm") || + aExt.equalsIgnoreAsciiCase("xls") || + aExt.equalsIgnoreAsciiCase("xlt") || + aExt.equalsIgnoreAsciiCase("xlw") ) { ::oox::dump::biff::Dumper( getContext(), rxStrm, rSysFileName ).dump(); } #endif else if( - aExt.equalsIgnoreAsciiCaseAscii("xml") || - aExt.equalsIgnoreAsciiCaseAscii("vml") || - aExt.equalsIgnoreAsciiCaseAscii("rels") ) + aExt.equalsIgnoreAsciiCase("xml") || + aExt.equalsIgnoreAsciiCase("vml") || + aExt.equalsIgnoreAsciiCase("rels") ) { XmlStreamObject( *this, rxStrm, rSysFileName ).dump(); } - else if( aExt.equalsIgnoreAsciiCaseAscii("bin") ) + else if( aExt.equalsIgnoreAsciiCase("bin") ) { if( rStrgPath == "ppt" && rStrmName == "vbaProject.bin" ) { diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx index 5350d5846bf1..6d44cf07f000 100644 --- a/oox/source/mathml/importutils.cxx +++ b/oox/source/mathml/importutils.cxx @@ -128,15 +128,15 @@ bool XmlStream::AttributeList::attribute( int token, bool def ) const if( find != attrs.end()) { const OUString sValue = find->second; - if( sValue.equalsIgnoreAsciiCaseAscii("true") || - sValue.equalsIgnoreAsciiCaseAscii("on") || - sValue.equalsIgnoreAsciiCaseAscii("t") || - sValue.equalsIgnoreAsciiCaseAscii("1") ) + if( sValue.equalsIgnoreAsciiCase("true") || + sValue.equalsIgnoreAsciiCase("on") || + sValue.equalsIgnoreAsciiCase("t") || + sValue.equalsIgnoreAsciiCase("1") ) return true; - if( sValue.equalsIgnoreAsciiCaseAscii("false") || - sValue.equalsIgnoreAsciiCaseAscii("off") || - sValue.equalsIgnoreAsciiCaseAscii("f") || - sValue.equalsIgnoreAsciiCaseAscii("0") ) + if( sValue.equalsIgnoreAsciiCase("false") || + sValue.equalsIgnoreAsciiCase("off") || + sValue.equalsIgnoreAsciiCase("f") || + sValue.equalsIgnoreAsciiCase("0") ) return false; SAL_WARN( "oox.xmlstream", "Cannot convert \'" << sValue << "\' to bool." ); } diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 813b78b6d08a..bbb8a5f249a7 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -2516,21 +2516,21 @@ ControlModelBase* EmbeddedControl::createModelFromGuid( const OUString& rClassId { OUString aClassId = rClassId;//.toAsciiUpperCase(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_COMMANDBUTTON ) ) return &createModel< AxCommandButtonModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_LABEL ) ) return &createModel< AxLabelModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_IMAGE ) ) return &createModel< AxImageModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_TOGGLEBUTTON ) ) return &createModel< AxToggleButtonModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_CHECKBOX ) ) return &createModel< AxCheckBoxModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_OPTIONBUTTON ) ) return &createModel< AxOptionButtonModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_TEXTBOX ) ) return &createModel< AxTextBoxModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_LISTBOX ) ) return &createModel< AxListBoxModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_COMBOBOX ) ) return &createModel< AxComboBoxModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_SPINBUTTON ) ) return &createModel< AxSpinButtonModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_SCROLLBAR ) ) return &createModel< AxScrollBarModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( AX_GUID_FRAME ) ) return &createModel< AxFrameModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( COMCTL_GUID_SCROLLBAR_60 ) ) return &createModel< ComCtlScrollBarModel >( COMCTL_VERSION_60 ); - if( aClassId.equalsIgnoreAsciiCaseAscii( HTML_GUID_SELECT ) ) return &createModel< HtmlSelectModel >(); - if( aClassId.equalsIgnoreAsciiCaseAscii( HTML_GUID_TEXTBOX ) ) return &createModel< HtmlTextBoxModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_COMMANDBUTTON ) ) return &createModel< AxCommandButtonModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_LABEL ) ) return &createModel< AxLabelModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_IMAGE ) ) return &createModel< AxImageModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_TOGGLEBUTTON ) ) return &createModel< AxToggleButtonModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_CHECKBOX ) ) return &createModel< AxCheckBoxModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_OPTIONBUTTON ) ) return &createModel< AxOptionButtonModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_TEXTBOX ) ) return &createModel< AxTextBoxModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_LISTBOX ) ) return &createModel< AxListBoxModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_COMBOBOX ) ) return &createModel< AxComboBoxModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_SPINBUTTON ) ) return &createModel< AxSpinButtonModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_SCROLLBAR ) ) return &createModel< AxScrollBarModel >(); + if( aClassId.equalsIgnoreAsciiCase( AX_GUID_FRAME ) ) return &createModel< AxFrameModel >(); + if( aClassId.equalsIgnoreAsciiCase( COMCTL_GUID_SCROLLBAR_60 ) ) return &createModel< ComCtlScrollBarModel >( COMCTL_VERSION_60 ); + if( aClassId.equalsIgnoreAsciiCase( HTML_GUID_SELECT ) ) return &createModel< HtmlSelectModel >(); + if( aClassId.equalsIgnoreAsciiCase( HTML_GUID_TEXTBOX ) ) return &createModel< HtmlTextBoxModel >(); mxModel.reset(); return 0; diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index 6c311e251c0a..ad6eaf5b438a 100644 --- a/oox/source/ole/vbacontrol.cxx +++ b/oox/source/ole/vbacontrol.cxx @@ -779,12 +779,12 @@ void VbaUserForm::importForm( const Reference< XNameContainer >& rxDialogLib, while( !bExitLoop && !aFrameTextStrm.isEof() ) { aLine = aFrameTextStrm.readLine().trim(); - bExitLoop = aLine.equalsIgnoreAsciiCaseAscii( "End" ); + bExitLoop = aLine.equalsIgnoreAsciiCase( "End" ); if( !bExitLoop && VbaHelper::extractKeyValue( aKey, aValue, aLine ) ) { - if( aKey.equalsIgnoreAsciiCaseAscii( "Caption" ) ) + if( aKey.equalsIgnoreAsciiCase( "Caption" ) ) mxCtrlModel->importProperty( XML_Caption, lclGetQuotedString( aValue ) ); - else if( aKey.equalsIgnoreAsciiCaseAscii( "Tag" ) ) + else if( aKey.equalsIgnoreAsciiCase( "Tag" ) ) mxSiteModel->importProperty( XML_Tag, lclGetQuotedString( aValue ) ); } } diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index f936b9040512..91be35621d3d 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -380,7 +380,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap if( !bExitLoop && VbaHelper::extractKeyValue( aKey, aValue, aLine ) ) { sal_Int32 nType = ModuleType::UNKNOWN; - if( aKey.equalsIgnoreAsciiCaseAscii( "Document" ) ) + if( aKey.equalsIgnoreAsciiCase( "Document" ) ) { nType = ModuleType::DOCUMENT; // strip automation server version from module names @@ -388,11 +388,11 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap if( nSlashPos >= 0 ) aValue = aValue.copy( 0, nSlashPos ); } - else if( aKey.equalsIgnoreAsciiCaseAscii( "Module" ) ) + else if( aKey.equalsIgnoreAsciiCase( "Module" ) ) nType = ModuleType::NORMAL; - else if( aKey.equalsIgnoreAsciiCaseAscii( "Class" ) ) + else if( aKey.equalsIgnoreAsciiCase( "Class" ) ) nType = ModuleType::CLASS; - else if( aKey.equalsIgnoreAsciiCaseAscii( "BaseClass" ) ) + else if( aKey.equalsIgnoreAsciiCase( "BaseClass" ) ) nType = ModuleType::FORM; if( (nType != ModuleType::UNKNOWN) && !aValue.isEmpty() ) |