strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace suitable equalsAscii calls with equalsAsciiL.

Browse source
This commit is contained in:
Thomas Arnhold 2011-01-22 18:55:06 +01:00
parent 0f93c62a85
commit c519f73674
7 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sc/source/core/data/tabprotection.cxx
View file

@ -93,9 +93,9 @@ OUString ScPassHashHelper::getHashURI(ScPasswordHash eHash)
ScPasswordHash ScPassHashHelper::getHashTypeFromURI(const OUString& rURI)
{
if (rURI.equalsAscii(URI_SHA1))
if (rURI.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URI_SHA1)))
return PASSHASH_SHA1;
else if (rURI.equalsAscii(URI_XLS_LEGACY))
else if (rURI.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URI_XLS_LEGACY)))
return PASSHASH_XL;
return PASSHASH_UNSPECIFIED;
}

2
sc/source/ui/miscdlgs/optsolver.cxx
View file

@ -796,7 +796,7 @@ bool ScOptSolverDlg::FindTimeout( sal_Int32& rTimeout )
for (sal_Int32 nProp=0; nProp<nPropCount && !bFound; ++nProp)
{
const beans::PropertyValue& rValue = maProperties[nProp];
if ( rValue.Name.equalsAscii( SC_UNONAME_TIMEOUT ) )
if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_TIMEOUT ) ) )
bFound = ( rValue.Value >>= rTimeout );
}
return bFound;

14
sc/source/ui/unoobj/dapiuno.cxx
View file

@ -1695,7 +1695,7 @@ BOOL lcl_GetFieldDataByName( ScDPObject* pDPObj, const OUString& rFieldName, ScF
// The name "Data" always refers to the data layout field.
rFieldId.maFieldName = rFieldName;
rFieldId.mnFieldIdx = 0;
rFieldId.mbDataLayout = rFieldName.equalsAscii( SC_DATALAYOUT_NAME );
rFieldId.mbDataLayout = rFieldName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_DATALAYOUT_NAME ) );
pDPObj->GetSource(); // IsDimNameInUse doesn't update source data
@ -3425,11 +3425,11 @@ void SAL_CALL ScDataPilotItemObj::setPropertyValue( const OUString& aPropertyNam
if (pMember)
{
bool bGetNewIndex = false;
if ( aPropertyName.equalsAscii( SC_UNONAME_SHOWDETAIL ) )
if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_SHOWDETAIL ) ) )
pMember->SetShowDetails(cppu::any2bool(aValue));
else if ( aPropertyName.equalsAscii( SC_UNONAME_ISHIDDEN ) )
else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_ISHIDDEN ) ) )
pMember->SetIsVisible(!cppu::any2bool(aValue));
else if ( aPropertyName.equalsAscii( SC_UNONAME_POS ) )
else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_POS ) ) )
{
sal_Int32 nNewPos = 0;
if ( ( aValue >>= nNewPos ) && nNewPos >= 0 && nNewPos < nCount )
@ -3475,7 +3475,7 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName
Reference< XNamed > xMember( xMembersIndex->getByIndex( mnIndex ), UNO_QUERY );
String sName( xMember->getName() );
ScDPSaveMember* pMember = pDim->GetExistingMemberByName( sName );
if( aPropertyName.equalsAscii( SC_UNONAME_SHOWDETAIL ) )
if( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_SHOWDETAIL ) ) )
{
if (pMember && pMember->HasShowDetails())
{
@ -3490,7 +3490,7 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName
aRet <<= true;
}
}
else if ( aPropertyName.equalsAscii( SC_UNONAME_ISHIDDEN ) )
else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_ISHIDDEN ) ) )
{
if (pMember && pMember->HasIsVisible())
{
@ -3505,7 +3505,7 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName
aRet <<= false;
}
}
else if ( aPropertyName.equalsAscii( SC_UNONAME_POS ) )
else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_POS ) ) )
{
aRet <<= mnIndex;
}

20
sc/source/ui/unoobj/fmtuno.cxx
View file

@ -268,13 +268,13 @@ void SAL_CALL ScTableConditionalFormat::addNew(
{
const beans::PropertyValue& rProp = pPropArray[i];
if ( rProp.Name.equalsAscii( SC_UNONAME_OPERATOR ) )
if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_OPERATOR ) ) )
{
sheet::ConditionOperator eOper = (sheet::ConditionOperator)
ScUnoHelpFunctions::GetEnumFromAny( rProp.Value );
aEntry.meMode = lcl_ConditionOperatorToMode( eOper );
}
else if ( rProp.Name.equalsAscii( SC_UNONAME_FORMULA1 ) )
else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_FORMULA1 ) ) )
{
rtl::OUString aStrVal;
uno::Sequence<sheet::FormulaToken> aTokens;
@ -286,7 +286,7 @@ void SAL_CALL ScTableConditionalFormat::addNew(
aEntry.maTokens1 = aTokens;
}
}
else if ( rProp.Name.equalsAscii( SC_UNONAME_FORMULA2 ) )
else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_FORMULA2 ) ) )
{
rtl::OUString aStrVal;
uno::Sequence<sheet::FormulaToken> aTokens;
@ -298,44 +298,44 @@ void SAL_CALL ScTableConditionalFormat::addNew(
aEntry.maTokens2 = aTokens;
}
}
else if ( rProp.Name.equalsAscii( SC_UNONAME_SOURCEPOS ) )
else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_SOURCEPOS ) ) )
{
table::CellAddress aAddress;
if ( rProp.Value >>= aAddress )
aEntry.maPos = ScAddress( (SCCOL)aAddress.Column, (SCROW)aAddress.Row, aAddress.Sheet );
}
else if ( rProp.Name.equalsAscii( SC_UNONAME_SOURCESTR ) )
else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_SOURCESTR ) ) )
{
rtl::OUString aStrVal;
if ( rProp.Value >>= aStrVal )
aEntry.maPosStr = String( aStrVal );
}
else if ( rProp.Name.equalsAscii( SC_UNONAME_STYLENAME ) )
else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_STYLENAME ) ) )
{
rtl::OUString aStrVal;
if ( rProp.Value >>= aStrVal )
aEntry.maStyle = ScStyleNameConversion::ProgrammaticToDisplayName(
aStrVal, SFX_STYLE_FAMILY_PARA );
}
else if ( rProp.Name.equalsAscii( SC_UNONAME_FORMULANMSP1 ) )
else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_FORMULANMSP1 ) ) )
{
rtl::OUString aStrVal;
if ( rProp.Value >>= aStrVal )
aEntry.maExprNmsp1 = aStrVal;
}
else if ( rProp.Name.equalsAscii( SC_UNONAME_FORMULANMSP2 ) )
else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_FORMULANMSP2 ) ) )
{
rtl::OUString aStrVal;
if ( rProp.Value >>= aStrVal )
aEntry.maExprNmsp2 = aStrVal;
}
else if ( rProp.Name.equalsAscii( SC_UNONAME_GRAMMAR1 ) )
else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_GRAMMAR1 ) ) )
{
sal_Int32 nVal = 0;
if ( rProp.Value >>= nVal )
aEntry.meGrammar1 = static_cast< FormulaGrammar::Grammar >( nVal );
}
else if ( rProp.Name.equalsAscii( SC_UNONAME_GRAMMAR2 ) )
else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_GRAMMAR2 ) ) )
{
sal_Int32 nVal = 0;
if ( rProp.Value >>= nVal )

18
sc/source/ui/unoobj/nameuno.cxx
View file

@ -382,7 +382,7 @@ void SAL_CALL ScNamedRangeObj::setPropertyValue(
uno::RuntimeException)
{
SolarMutexGuard aGuard;
if ( rPropertyName.equalsAscii( SC_UNONAME_ISSHAREDFMLA ) )
if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_ISSHAREDFMLA ) ) )
{
bool bIsShared = false;
if( aValue >>= bIsShared )
@ -399,21 +399,21 @@ uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const rtl::OUString& rPrope
{
SolarMutexGuard aGuard;
uno::Any aRet;
if ( rPropertyName.equalsAscii( SC_UNO_LINKDISPBIT ) )
if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNO_LINKDISPBIT ) ) )
{
// no target bitmaps for individual entries (would be all equal)
// ScLinkTargetTypeObj::SetLinkTargetBitmap( aRet, SC_LINKTARGETTYPE_RANGENAME );
}
else if ( rPropertyName.equalsAscii( SC_UNO_LINKDISPNAME ) )
else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNO_LINKDISPNAME ) ) )
aRet <<= rtl::OUString( aName );
else if ( rPropertyName.equalsAscii( SC_UNONAME_TOKENINDEX ) )
else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_TOKENINDEX ) ) )
{
// get index for use in formula tokens (read-only)
ScRangeData* pData = GetRangeData_Impl();
if (pData)
aRet <<= static_cast<sal_Int32>(pData->GetIndex());
}
else if ( rPropertyName.equalsAscii( SC_UNONAME_ISSHAREDFMLA ) )
else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_ISSHAREDFMLA ) ) )
{
if( ScRangeData* pData = GetRangeData_Impl() )
aRet <<= static_cast< bool >( pData->HasType( RT_SHARED ) );
@ -433,8 +433,8 @@ rtl::OUString SAL_CALL ScNamedRangeObj::getImplementationName() throw(uno::Runti
sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const rtl::OUString& rServiceName )
throw(uno::RuntimeException)
{
return rServiceName.equalsAscii( SCNAMEDRANGEOBJ_SERVICE ) ||
rServiceName.equalsAscii( SCLINKTARGET_SERVICE );
return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SCNAMEDRANGEOBJ_SERVICE ) ) ||
rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SCLINKTARGET_SERVICE ) );
}
uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames()
@ -730,7 +730,7 @@ void SAL_CALL ScNamedRangesObj::setPropertyValue(
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
{
if (rPropertyName.equalsAscii(SC_UNO_MODIFY_BROADCAST))
if (rPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SC_UNO_MODIFY_BROADCAST)))
{
aValue >>= mbModifyAndBroadcast;
}
@ -741,7 +741,7 @@ Any SAL_CALL ScNamedRangesObj::getPropertyValue( const rtl::OUString& rPropertyN
uno::RuntimeException)
{
Any aRet;
if (rPropertyName.equalsAscii(SC_UNO_MODIFY_BROADCAST))
if (rPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SC_UNO_MODIFY_BROADCAST)))
{
aRet <<= mbModifyAndBroadcast;
}

2
sc/source/ui/unoobj/styleuno.cxx
View file

@ -1972,7 +1972,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa
SolarMutexGuard aGuard;
uno::Any aAny;
if ( aPropertyName.equalsAscii( SC_UNONAME_DISPNAME ) ) // read-only
if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_DISPNAME ) ) ) // read-only
{
// core always has the display name
SfxStyleSheetBase* pStyle = GetStyle_Impl();

4
scaddins/source/datefunc/datefunc.cxx
View file

@ -428,8 +428,8 @@ OUString SAL_CALL ScaDateAddIn::getImplementationName() throw( uno::RuntimeExcep
sal_Bool SAL_CALL ScaDateAddIn::supportsService( const OUString& aServiceName ) throw( uno::RuntimeException )
{
return aServiceName.equalsAscii( ADDIN_SERVICE ) ||
aServiceName.equalsAscii( MY_SERVICE );
return aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ADDIN_SERVICE ) ) ||
aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( MY_SERVICE ) );
}
uno::Sequence< OUString > SAL_CALL ScaDateAddIn::getSupportedServiceNames() throw( uno::RuntimeException )