reportdesign/source/filter/xml/dbloader2.cxx | 2 +- sal/osl/w32/procimpl.cxx | 6 +++--- sc/source/filter/excel/xlescher.cxx | 2 +- sc/source/ui/vba/vbaapplication.cxx | 2 +- sc/source/ui/vba/vbaeventshelper.cxx | 4 ++-- sc/source/ui/vba/vbafont.cxx | 4 ++-- scripting/source/basprov/basprov.cxx | 4 ++-- sd/source/filter/eppt/pptx-text.cxx | 4 ++-- sd/source/ui/unoidl/sddetect.cxx | 2 +- slideshow/source/engine/slide/slideimpl.cxx | 2 +- slideshow/source/engine/tools.cxx | 8 ++++---- svtools/source/filter/FilterConfigCache.cxx | 4 ++-- svtools/source/misc/langhelp.cxx | 4 ++-- svx/source/gallery2/gallery1.cxx | 2 +- sw/source/ui/vba/vbacheckbox.cxx | 2 +- sw/source/ui/vba/vbaformfield.cxx | 2 +- sw/source/ui/vba/vbaformfields.cxx | 2 +- unotools/source/i18n/localedatawrapper.cxx | 4 ++-- vcl/generic/app/gensys.cxx | 2 +- vcl/generic/print/genprnpsp.cxx | 6 +++--- vcl/headless/svpprn.cxx | 2 +- vcl/source/app/settings.cxx | 12 ++++++------ vcl/source/window/menu.cxx | 2 +- vcl/source/window/printdlg.cxx | 6 +++--- xmloff/source/draw/eventimp.cxx | 4 ++-- xmloff/source/draw/shapeexport2.cxx | 4 ++-- xmloff/source/forms/elementimport.cxx | 2 +- xmloff/source/transform/EventOASISTContext.cxx | 4 ++-- 28 files changed, 52 insertions(+), 52 deletions(-)
New commits: commit 30063974396f43ef30bc6b81f0260d3fb09d17cd Author: Takeshi Abe <t...@fixedpoint.jp> Date: Tue Feb 21 01:06:12 2012 +0900 Prefer equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("...")) to equalsIgnoreAsciiCaseAscii("...") diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index b8bdba5..ff7ebac 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -63,7 +63,7 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon if ( !sTemp.isEmpty() ) { INetURLObject aURL(sTemp); - if ( aURL.GetExtension().equalsIgnoreAsciiCaseAscii("orp") ) + if ( aURL.GetExtension().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("orp")) ) return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBaseReport")); else { diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index 23e74d1..2efb2b8 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -380,9 +380,9 @@ namespace /* private */ bool is_batch_file(const rtl::OUString& file_name) { rtl::OUString ext = get_file_extension(file_name); - return (ext.equalsIgnoreAsciiCaseAscii("bat") || - ext.equalsIgnoreAsciiCaseAscii("cmd") || - ext.equalsIgnoreAsciiCaseAscii("btm")); + return (ext.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("bat")) || + ext.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("cmd")) || + ext.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("btm"))); } //########################################################## diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index 4c894bf..ba76e58 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -345,7 +345,7 @@ String XclControlHelper::ExtractFromMacroDescriptor( const ScriptEventDescriptor& rDescriptor, XclTbxEventType eEventType, SfxObjectShell* /*pShell*/ ) { if( (!rDescriptor.ScriptCode.isEmpty()) && - rDescriptor.ScriptType.equalsIgnoreAsciiCaseAscii( "Script" ) && + rDescriptor.ScriptType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("Script")) && rDescriptor.ListenerType.equalsAscii( spTbxListenerData[ eEventType ].mpcListenerType ) && rDescriptor.EventMethod.equalsAscii( spTbxListenerData[ eEventType ].mpcEventMethod ) ) return XclTools::GetXclMacroName( rDescriptor.ScriptCode ); diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index fe74c56..9f5085f 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -342,7 +342,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) uno::Reference< lang::XServiceInfo > xServiceInfo( aSelection, uno::UNO_QUERY_THROW ); rtl::OUString sImplementationName = xServiceInfo->getImplementationName(); - if( sImplementationName.equalsIgnoreAsciiCaseAscii("com.sun.star.drawing.SvxShapeCollection") ) + if( sImplementationName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.SvxShapeCollection")) ) { uno::Reference< drawing::XShapes > xShapes( aSelection, uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xIndexAccess( xShapes, uno::UNO_QUERY_THROW ); diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 2854586..b085bc3 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -371,7 +371,7 @@ void SAL_CALL ScVbaEventListener::changesOccurred( const util::ChangesEvent& rEv util::ElementChange aChange = rEvent.Changes[ 0 ]; OUString sOperation; aChange.Accessor >>= sOperation; - if( !sOperation.equalsIgnoreAsciiCaseAscii("cell-change") ) + if( !sOperation.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("cell-change")) ) return; if( nCount == 1 ) @@ -394,7 +394,7 @@ void SAL_CALL ScVbaEventListener::changesOccurred( const util::ChangesEvent& rEv aChange.Accessor >>= sOperation; uno::Reference< table::XCellRange > xRangeObj; aChange.ReplacedElement >>= xRangeObj; - if( xRangeObj.is() && sOperation.equalsIgnoreAsciiCaseAscii("cell-change") ) + if( xRangeObj.is() && sOperation.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("cell-change")) ) { uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable( xRangeObj, uno::UNO_QUERY ); if( xCellRangeAddressable.is() ) diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 216b0b7..c3630ab 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -321,10 +321,10 @@ ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException ) std::vector< rtl::OUString >::iterator it; for( it = aTokens.begin(); it != aTokens.end(); ++it ) { - if( (*it).equalsIgnoreAsciiCaseAscii( "Bold" ) ) + if( (*it).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("Bold")) ) bBold = sal_True; - if( (*it).equalsIgnoreAsciiCaseAscii( "Italic" ) ) + if( (*it).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("Italic")) ) bItalic = sal_True; } diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 41b1075..bb89385 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -160,11 +160,11 @@ namespace basprov if ( xUriRef.is() ) { ::rtl::OUString aScheme = xUriRef->getScheme(); - if ( aScheme.equalsIgnoreAsciiCaseAscii( "file" ) ) + if ( aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("file")) ) { aFileURL = aLinkURL; } - else if ( aScheme.equalsIgnoreAsciiCaseAscii( "vnd.sun.star.pkg" ) ) + else if ( aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.pkg")) ) { ::rtl::OUString aAuthority = xUriRef->getAuthority(); if ( aAuthority.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "vnd.sun.star.expand:" ) ) ) diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index e5b87ed..b54acde 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -930,8 +930,8 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 case SVX_NUM_CHAR_SPECIAL : // Bullet { - if ( aFontDesc.Name.equalsIgnoreAsciiCaseAscii("starsymbol") || - aFontDesc.Name.equalsIgnoreAsciiCaseAscii("opensymbol") ) + if ( aFontDesc.Name.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("starsymbol")) || + aFontDesc.Name.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("opensymbol")) ) { String sFontName = aFontDesc.Name; String sNumStr = cBulletId; diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 59a7729..dba3e46 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -365,7 +365,7 @@ SdFilterDetect::~SdFilterDetect() if( SvtModuleOptions().IsImpress() ) { INetURLObject aCheckURL( aFileName ); - if( aCheckURL.getExtension().equalsIgnoreAsciiCaseAscii( "cgm" ) ) + if( aCheckURL.getExtension().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("cgm")) ) { sal_uInt8 n8; pStm->Seek( STREAM_SEEK_TO_BEGIN ); diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index c8a307d..cdc1642 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -1088,7 +1088,7 @@ bool SlideImpl::applyInitialShapeAttributes( for( ::std::size_t j=0; j<nShapePropSize; ++j ) { bool bVisible=false; - if( rShapeProps[j].Name.equalsIgnoreAsciiCaseAscii("visibility") && + if( rShapeProps[j].Name.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("visibility")) && extractValue( bVisible, rShapeProps[j].Value, pShape, diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index 7dabb90..0603d6a 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -417,14 +417,14 @@ namespace slideshow // we also take the strings "true" and "false", // as well as "on" and "off" here - if( aString.equalsIgnoreAsciiCaseAscii("true") || - aString.equalsIgnoreAsciiCaseAscii("on") ) + if( aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) || + aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("on")) ) { o_rValue = true; return true; } - if( aString.equalsIgnoreAsciiCaseAscii("false") || - aString.equalsIgnoreAsciiCaseAscii("off") ) + if( aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("false")) || + aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("off")) ) { o_rValue = false; return true; diff --git a/svtools/source/filter/FilterConfigCache.cxx b/svtools/source/filter/FilterConfigCache.cxx index f130b25..66ffb8d 100644 --- a/svtools/source/filter/FilterConfigCache.cxx +++ b/svtools/source/filter/FilterConfigCache.cxx @@ -213,10 +213,10 @@ void FilterConfigCache::ImplInit() xFilterSet->getPropertyValue(SFLAGS) >>= lFlags; if (lFlags.getLength()!=1 || lFlags[0].isEmpty()) continue; - if (lFlags[0].equalsIgnoreAsciiCaseAscii("import")) + if (lFlags[0].equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("import"))) aEntry.nFlags = 1; else - if (lFlags[0].equalsIgnoreAsciiCaseAscii("export")) + if (lFlags[0].equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("export"))) aEntry.nFlags = 2; OUString sUIComponent; diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx index b607cd4..88a8c78 100644 --- a/svtools/source/misc/langhelp.cxx +++ b/svtools/source/misc/langhelp.cxx @@ -33,8 +33,8 @@ void localizeWebserviceURI( ::rtl::OUString& rURI ) { ::rtl::OUString aLang = Application::GetSettings().GetUILocale().Language; - if ( aLang.equalsIgnoreAsciiCaseAscii( "pt" ) - && Application::GetSettings().GetUILocale().Country.equalsIgnoreAsciiCaseAscii("br") ) + if ( aLang.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("pt")) + && Application::GetSettings().GetUILocale().Country.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("br")) ) { aLang = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "pt-br" )); } diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 4bfacb4..a2d5d05 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -321,7 +321,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR { INetURLObject aThmURL( xContentAccess->queryContentIdentifierString() ); - if(aThmURL.GetExtension().equalsIgnoreAsciiCaseAscii("thm")) + if(aThmURL.GetExtension().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("thm"))) { INetURLObject aSdgURL( aThmURL); aSdgURL.SetExtension( s_sSDG_EXT ); INetURLObject aSdvURL( aThmURL ); aSdvURL.SetExtension( s_sSDV_EXT ); diff --git a/sw/source/ui/vba/vbacheckbox.cxx b/sw/source/ui/vba/vbacheckbox.cxx index 65b55a3..61509e9 100644 --- a/sw/source/ui/vba/vbacheckbox.cxx +++ b/sw/source/ui/vba/vbacheckbox.cxx @@ -59,7 +59,7 @@ sal_Bool SAL_CALL SwVbaCheckBox::getValue() throw ( uno::RuntimeException ) { if( mxFormField->getParamName(i).equalsIgnoreAsciiCaseAscii( ECMA_FORMCHECKBOX_CHECKED ) ) { - if( mxFormField->getParamValue(i).equalsIgnoreAsciiCaseAscii("on") ) + if( mxFormField->getParamValue(i).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("on")) ) bValue = sal_True; else bValue = sal_False; diff --git a/sw/source/ui/vba/vbaformfield.cxx b/sw/source/ui/vba/vbaformfield.cxx index ed6bf39..ec3e16b 100644 --- a/sw/source/ui/vba/vbaformfield.cxx +++ b/sw/source/ui/vba/vbaformfield.cxx @@ -64,7 +64,7 @@ rtl::OUString SAL_CALL SwVbaFormField::getResult() throw ( uno::RuntimeException { if( mxFormField->getParamName(i).equalsIgnoreAsciiCaseAscii( ECMA_FORMCHECKBOX_CHECKED ) ) { - if( mxFormField->getParamValue(i).equalsIgnoreAsciiCaseAscii("on") ) + if( mxFormField->getParamValue(i).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("on")) ) nValue = 1; else nValue = 0; diff --git a/sw/source/ui/vba/vbaformfields.cxx b/sw/source/ui/vba/vbaformfields.cxx index 43c8e3c..632aa0e 100644 --- a/sw/source/ui/vba/vbaformfields.cxx +++ b/sw/source/ui/vba/vbaformfields.cxx @@ -47,7 +47,7 @@ rtl::OUString lcl_getFormFieldName( const uno::Reference< text::XFormField >& xF sal_Int32 nCount = xFormField->getParamCount(); for( sal_Int32 i = 0; i < nCount; i++ ) { - if( xFormField->getParamName(i).equalsIgnoreAsciiCaseAscii( "Name" ) ) + if( xFormField->getParamName(i).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("Name")) ) { sName = xFormField->getParamValue(i); OSL_TRACE("lcl_getFormFieldName: %s", rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 9d55ce3..977b7b9 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -1088,8 +1088,8 @@ void LocaleDataWrapper::getDigitGroupingImpl() if (!aGrouping[0]) { i18n::LanguageCountryInfo aLCInfo( getLanguageCountryInfo()); - if (aLCInfo.Country.equalsIgnoreAsciiCaseAscii( "IN") || // India - aLCInfo.Country.equalsIgnoreAsciiCaseAscii( "BT")) // Bhutan + if (aLCInfo.Country.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("IN")) || // India + aLCInfo.Country.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("BT")) ) // Bhutan { aGrouping[0] = 3; aGrouping[1] = 2; diff --git a/vcl/generic/app/gensys.cxx b/vcl/generic/app/gensys.cxx index 29b39dd..ded4900 100644 --- a/vcl/generic/app/gensys.cxx +++ b/vcl/generic/app/gensys.cxx @@ -133,7 +133,7 @@ const char* SalGenericSystem::getFrameResName() { rtl::OUString aArg; if( ! osl_getCommandArg( n, &aArg.pData ) && - aArg.equalsIgnoreAsciiCaseAscii( "-name" ) && + aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("-name")) && ! osl_getCommandArg( n+1, &aArg.pData ) ) { aResName.append( rtl::OUStringToOString( aArg, osl_getThreadTextEncoding() ) ); diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 9bc8731..a456517 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -423,7 +423,7 @@ void SalGenericInstance::configurePspInfoPrinter(PspSalInfoPrinter *pPrinter, if( compat_it != pJobSetup->maValueMap.end() ) { - if( compat_it->second.equalsIgnoreAsciiCaseAscii( "true" ) ) + if( compat_it->second.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ) bStrictSO52Compatibility = true; } pPrinter->m_aPrinterGfx.setStrictSO52Compatibility( bStrictSO52Compatibility ); @@ -636,7 +636,7 @@ sal_Bool PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup ) if( compat_it != pJobSetup->maValueMap.end() ) { - if( compat_it->second.equalsIgnoreAsciiCaseAscii( "true" ) ) + if( compat_it->second.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ) bStrictSO52Compatibility = true; } m_aPrinterGfx.setStrictSO52Compatibility( bStrictSO52Compatibility ); @@ -1000,7 +1000,7 @@ sal_Bool PspSalPrinter::StartJob( if( compat_it != pJobSetup->maValueMap.end() ) { - if( compat_it->second.equalsIgnoreAsciiCaseAscii( "true" ) ) + if( compat_it->second.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ) bStrictSO52Compatibility = true; } m_aPrinterGfx.setStrictSO52Compatibility( bStrictSO52Compatibility ); diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx index eca65e3..a567438 100644 --- a/vcl/headless/svpprn.cxx +++ b/vcl/headless/svpprn.cxx @@ -199,7 +199,7 @@ SalInfoPrinter* SvpSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn pJobSetup->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StrictSO52Compatibility" ) ) ); if( compat_it != pJobSetup->maValueMap.end() ) { - if( compat_it->second.equalsIgnoreAsciiCaseAscii( "true" ) ) + if( compat_it->second.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ) bStrictSO52Compatibility = true; } pPrinter->m_aPrinterGfx.setStrictSO52Compatibility( bStrictSO52Compatibility ); diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index a3a7298..c95d561 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -620,12 +620,12 @@ sal_uLong StyleSettings::GetAutoSymbolsStyle() const { rtl::OUString const & env = Application::GetDesktopEnvironment(); sal_uLong nRet = - ( env.equalsIgnoreAsciiCaseAscii( "gnome" ) || - env.equalsIgnoreAsciiCaseAscii( "windows" ) ) + ( env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("gnome")) || + env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("windows")) ) ? STYLE_SYMBOLS_TANGO - : env.equalsIgnoreAsciiCaseAscii( "kde" ) + : env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")) ? STYLE_SYMBOLS_CRYSTAL - : env.equalsIgnoreAsciiCaseAscii( "kde4" ) + : env.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")) ? STYLE_SYMBOLS_OXYGEN : STYLE_SYMBOLS_DEFAULT; @@ -966,7 +966,7 @@ sal_Bool MiscSettings::GetDisablePrinting() const vcl::SettingsConfigItem::get()-> getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DesktopManagement" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisablePrinting" ) ) ); - mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCaseAscii( "true" ) ? 1 : 0; + mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ? 1 : 0; } return (sal_Bool)mpData->mnDisablePrinting; @@ -1022,7 +1022,7 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const vcl::SettingsConfigItem::get()-> getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Accessibility" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableATToolSupport" ) ) ); - mpData->mnEnableATT = aEnable.equalsIgnoreAsciiCaseAscii( "true" ) ? 1 : 0; + mpData->mnEnableATT = aEnable.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ? 1 : 0; } else { diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index c8e31d2..fb8557d 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -113,7 +113,7 @@ static sal_Bool ImplAccelDisabled() vcl::SettingsConfigItem::get()-> getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Menu" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SuppressAccelerators" ) ) ); - nAccelDisabled = aStr.equalsIgnoreAsciiCaseAscii( "true" ) ? 1 : 0; + nAccelDisabled = aStr.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ? 1 : 0; } return (nAccelDisabled == 1) ? sal_True : sal_False; } diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 74d6e08..11fba14 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -628,7 +628,7 @@ void PrintDialog::JobTabPage::readFromSettings() aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CollateBox" ) ) ); - if( aValue.equalsIgnoreAsciiCaseAscii( "alwaysoff" ) ) + if( aValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("alwaysoff")) ) { mnCollateUIMode = 1; maCollateBox.Check( sal_False ); @@ -639,7 +639,7 @@ void PrintDialog::JobTabPage::readFromSettings() mnCollateUIMode = 0; aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ) ); - maCollateBox.Check( aValue.equalsIgnoreAsciiCaseAscii( "true" ) ); + maCollateBox.Check( aValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ); } Resize(); } @@ -692,7 +692,7 @@ void PrintDialog::OutputOptPage::readFromSettings() rtl::OUString aValue; aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CollateSingleJobs" ) ) ); - if ( aValue.equalsIgnoreAsciiCaseAscii( "true" ) ) + if ( aValue.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) ) { maCollateSingleJobsBox.Check( sal_True ); } diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 202b5c7..9366a72 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -340,7 +340,7 @@ void SdXMLEventContext::EndElement() nPropertyCount += 1; break; case ClickAction_MACRO: - if ( msLanguage.equalsIgnoreAsciiCaseAscii("starbasic") ) + if ( msLanguage.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("starbasic")) ) nPropertyCount += 1; break; @@ -360,7 +360,7 @@ void SdXMLEventContext::EndElement() if( ClickAction_MACRO == meClickAction ) { - if ( msLanguage.equalsIgnoreAsciiCaseAscii("starbasic") ) + if ( msLanguage.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("starbasic")) ) { OUString sLibrary; const OUString& rApp = GetXMLToken( XML_APPLICATION ); diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index 3629e36..0e6c2a1 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -523,8 +523,8 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x if( nFound & FOUND_LIBRARY ) { OUString sLocation( GetXMLToken( - (aStrLibrary.equalsIgnoreAsciiCaseAscii("StarOffice") || - aStrLibrary.equalsIgnoreAsciiCaseAscii("application") ) ? XML_APPLICATION + (aStrLibrary.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("StarOffice")) || + aStrLibrary.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("application")) ) ? XML_APPLICATION : XML_DOCUMENT ) ); OUStringBuffer sTmp( sLocation.getLength() + aStrMacro.getLength() + 1 ); sTmp = sLocation; diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index a304480..9100f59 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -1455,7 +1455,7 @@ namespace xmloff SvXMLImportContext* OTextLikeImport::CreateChildContext( sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList ) { - if ( ( XML_NAMESPACE_TEXT == _nPrefix ) && _rLocalName.equalsIgnoreAsciiCaseAscii( "p" ) ) + if ( ( XML_NAMESPACE_TEXT == _nPrefix ) && _rLocalName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("p")) ) { OSL_ENSURE( m_eElementType == OControlElement::TEXT_AREA, "OTextLikeImport::CreateChildContext: text paragraphs in a non-text-area?" ); diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index cf8eeda..8f75bbc 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -183,7 +183,7 @@ bool ParseURLAsString( } } while ( params >= 0 ); - if ( aLanguage.equalsIgnoreAsciiCaseAscii( "basic" ) ) + if ( aLanguage.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("basic")) ) { return sal_True; } @@ -216,7 +216,7 @@ bool ParseURL( { OUString aLanguage = xUrl->getParameter( aLanguageKey ); - if ( aLanguage.equalsIgnoreAsciiCaseAscii( "basic" ) ) + if ( aLanguage.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("basic")) ) { *pName = xUrl->getName(); _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits