summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-03-19 11:32:06 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-03-19 11:32:20 +0100
commit4c0c23af21db0b72541674c2352df04f48774e81 (patch)
treefe5697fbc7f793de73531e50711c5b39d9825923 /sc
parent8f2cf65ec9a450441b92ed1f638eda26231a9be7 (diff)
Simplify equalsIgnoreAsciiCaseAscii[L] calls
Change-Id: If5201bd772aed245e8f7f8b900d76ffe4ca57b49
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/excel/xlescher.cxx2
-rw-r--r--sc/source/filter/oox/drawingbase.cxx4
-rw-r--r--sc/source/filter/oox/drawingfragment.cxx2
-rw-r--r--sc/source/filter/oox/formulabase.cxx2
-rw-r--r--sc/source/filter/oox/numberformatsbuffer.cxx2
-rw-r--r--sc/source/ui/vba/vbaapplication.cxx2
-rw-r--r--sc/source/ui/vba/vbaeventshelper.cxx4
-rw-r--r--sc/source/ui/vba/vbafont.cxx4
-rw-r--r--sc/source/ui/vba/vbarange.cxx2
9 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index f04d983d2572..53713923acb5 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -336,7 +336,7 @@ String XclControlHelper::ExtractFromMacroDescriptor(
const ScriptEventDescriptor& rDescriptor, XclTbxEventType eEventType, SfxObjectShell* /*pShell*/ )
{
if( (!rDescriptor.ScriptCode.isEmpty()) &&
- rDescriptor.ScriptType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("Script")) &&
+ rDescriptor.ScriptType.equalsIgnoreAsciiCase("Script") &&
rDescriptor.ListenerType.equalsAscii( spTbxListenerData[ eEventType ].mpcListenerType ) &&
rDescriptor.EventMethod.equalsAscii( spTbxListenerData[ eEventType ].mpcEventMethod ) )
return XclTools::GetXclMacroName( rDescriptor.ScriptCode );
diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx
index f0a5f7d1e0c0..8b3bb9b7a3e4 100644
--- a/sc/source/filter/oox/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -99,9 +99,9 @@ void ShapeAnchor::importAnchor( sal_Int32 nElement, const AttributeList& rAttrib
OUString sEditAs = rAttribs.getXString( XML_editAs, OUString() );
if ( !sEditAs.isEmpty() )
{
- if ( sEditAs.equalsIgnoreAsciiCaseAscii("absolute" ) )
+ if ( sEditAs.equalsIgnoreAsciiCase("absolute" ) )
meEditAs = ANCHOR_ABSOLUTE;
- else if ( sEditAs.equalsIgnoreAsciiCaseAscii("oneCell") )
+ else if ( sEditAs.equalsIgnoreAsciiCase("oneCell") )
meEditAs = ANCHOR_ONECELL;
}
}
diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index 261473dfeb5d..22f4a6bbd2ea 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -674,7 +674,7 @@ void VmlDrawing::notifyXShapeInserted( const Reference< XShape >& rxShape,
sal_uInt32 VmlDrawing::convertControlTextColor( const OUString& rTextColor ) const
{
// color attribute not present or 'auto' - use passed default color
- if( rTextColor.isEmpty() || rTextColor.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "auto" ) ) )
+ if( rTextColor.isEmpty() || rTextColor.equalsIgnoreAsciiCase( "auto" ) )
return AX_SYSCOLOR_WINDOWTEXT;
if( rTextColor[ 0 ] == '#' )
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index efe95146b15f..3adbfdbd3ac4 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -1044,7 +1044,7 @@ const FunctionInfo* FunctionProvider::getFuncInfoFromMacroName( const OUString&
FunctionLibraryType FunctionProvider::getFuncLibTypeFromLibraryName( const OUString& rLibraryName ) const
{
-#define OOX_XLS_IS_LIBNAME( libname, basename ) (libname.equalsIgnoreAsciiCaseAscii( basename ".XLA" ) || libname.equalsIgnoreAsciiCaseAscii( basename ".XLAM" ))
+#define OOX_XLS_IS_LIBNAME( libname, basename ) (libname.equalsIgnoreAsciiCase( basename ".XLA" ) || libname.equalsIgnoreAsciiCase( basename ".XLAM" ))
// the EUROTOOL add-in containing the EUROCONVERT function
if( OOX_XLS_IS_LIBNAME( rLibraryName, "EUROTOOL" ) )
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index a26137dad4e6..8612e0d96c80 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -1848,7 +1848,7 @@ sal_Int32 lclCreateFormat( const Reference< XNumberFormats >& rxNumFmts,
catch( Exception& )
{
// BIFF2-BIFF4 stores standard format explicitly in stream
- if( rFmtCode.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "general" ) ) )
+ if( rFmtCode.equalsIgnoreAsciiCase( "general" ) )
{
nIndex = lclCreatePredefinedFormat( rxNumFmts, 0, rToLocale );
}
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 0825e457cad5..9afb8724653e 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -266,7 +266,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException)
uno::Reference< lang::XServiceInfo > xServiceInfo( aSelection, uno::UNO_QUERY_THROW );
rtl::OUString sImplementationName = xServiceInfo->getImplementationName();
- if( sImplementationName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.SvxShapeCollection")) )
+ if( sImplementationName.equalsIgnoreAsciiCase("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 0b2282e363b0..b444c2f836a8 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -362,7 +362,7 @@ void SAL_CALL ScVbaEventListener::changesOccurred( const util::ChangesEvent& rEv
util::ElementChange aChange = rEvent.Changes[ 0 ];
OUString sOperation;
aChange.Accessor >>= sOperation;
- if( !sOperation.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("cell-change")) )
+ if( !sOperation.equalsIgnoreAsciiCase("cell-change") )
return;
if( nCount == 1 )
@@ -385,7 +385,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.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("cell-change")) )
+ if( xRangeObj.is() && sOperation.equalsIgnoreAsciiCase("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 b89f3cd46416..91dfba73542a 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -312,10 +312,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).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("Bold")) )
+ if( (*it).equalsIgnoreAsciiCase("Bold") )
bBold = sal_True;
- if( (*it).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("Italic")) )
+ if( (*it).equalsIgnoreAsciiCase("Italic") )
bItalic = sal_True;
}
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 43f7d5076c79..836f2aa38ef3 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -567,7 +567,7 @@ public:
{
// #163288# treat "General" as "Standard" format
sal_Int32 nNewIndex = 0;
- if( !rFormat.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "General" ) ) )
+ if( !rFormat.equalsIgnoreAsciiCase( "General" ) )
{
lang::Locale aLocale;
uno::Reference< beans::XPropertySet > xNumProps = getNumberProps();