summaryrefslogtreecommitdiff
path: root/embeddedobj
diff options
context:
space:
mode:
authorSzabolcs Dezsi <dezsiszabi@hotmail.com>2012-04-06 14:28:18 +0200
committerJan Holesovsky <kendy@suse.cz>2012-04-06 14:30:05 +0200
commit8a01ee624318ac08800af89d988971114637a04e (patch)
treee4acf35e42ab0c1d0b593bd8970fa2c435f90c95 /embeddedobj
parent6cf547f02c79278430ee75483a3128076cfc609e (diff)
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Pattern used: find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\) ) *) *)$/\1\2 ( \3 == \4 )/' \{\} \;
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/source/commonembedding/miscobj.cxx18
-rw-r--r--embeddedobj/source/commonembedding/persistence.cxx36
-rw-r--r--embeddedobj/source/commonembedding/xfactory.cxx4
-rw-r--r--embeddedobj/source/general/docholder.cxx6
-rw-r--r--embeddedobj/source/general/intercept.cxx2
-rw-r--r--embeddedobj/source/general/xcreator.cxx2
-rw-r--r--embeddedobj/source/msole/oleembed.cxx2
-rw-r--r--embeddedobj/source/msole/olepersist.cxx12
-rw-r--r--embeddedobj/source/msole/ownview.cxx2
-rw-r--r--embeddedobj/source/msole/xolefactory.cxx2
-rw-r--r--embeddedobj/test/mtexecutor/mainthreadexecutor.cxx2
11 files changed, 44 insertions, 44 deletions
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index 475fd87c94ee..ae8f302051c8 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -114,15 +114,15 @@ void OCommonEmbeddedObject::CommonInit_Impl( const uno::Sequence< beans::NamedVa
// TODO/LATER: in future UI names can be also provided here
for ( sal_Int32 nInd = 0; nInd < aObjectProps.getLength(); nInd++ )
{
- if ( aObjectProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ClassID" ) ) )
+ if ( aObjectProps[nInd].Name == "ClassID" )
aObjectProps[nInd].Value >>= m_aClassID;
- else if ( aObjectProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ObjectDocumentServiceName" ) ) )
+ else if ( aObjectProps[nInd].Name == "ObjectDocumentServiceName" )
aObjectProps[nInd].Value >>= m_aDocServiceName;
- else if ( aObjectProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ObjectDocumentFilterName" ) ) )
+ else if ( aObjectProps[nInd].Name == "ObjectDocumentFilterName" )
aObjectProps[nInd].Value >>= m_aPresetFilterName;
- else if ( aObjectProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ObjectMiscStatus" ) ) )
+ else if ( aObjectProps[nInd].Name == "ObjectMiscStatus" )
aObjectProps[nInd].Value >>= m_nMiscStatus;
- else if ( aObjectProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ObjectVerbs" ) ) )
+ else if ( aObjectProps[nInd].Name == "ObjectVerbs" )
aObjectProps[nInd].Value >>= m_aObjectVerbs;
}
@@ -232,9 +232,9 @@ void OCommonEmbeddedObject::LinkInit_Impl(
// setPersistance has no effect on own links, so the complete initialization must be done here
for ( sal_Int32 nInd = 0; nInd < aMediaDescr.getLength(); nInd++ )
- if ( aMediaDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
+ if ( aMediaDescr[nInd].Name == "URL" )
aMediaDescr[nInd].Value >>= m_aLinkURL;
- else if ( aMediaDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ) )
+ else if ( aMediaDescr[nInd].Name == "FilterName" )
aMediaDescr[nInd].Value >>= m_aLinkFilterName;
OSL_ENSURE( m_aLinkURL.getLength() && m_aLinkFilterName.getLength(), "Filter and URL must be provided!\n" );
@@ -251,12 +251,12 @@ void OCommonEmbeddedObject::LinkInit_Impl(
uno::Reference< frame::XDispatchProviderInterceptor > xDispatchInterceptor;
for ( sal_Int32 nObjInd = 0; nObjInd < aObjectDescr.getLength(); nObjInd++ )
- if ( aObjectDescr[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutplaceDispatchInterceptor" ) ) )
+ if ( aObjectDescr[nObjInd].Name == "OutplaceDispatchInterceptor" )
{
aObjectDescr[nObjInd].Value >>= xDispatchInterceptor;
break;
}
- else if ( aObjectDescr[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Parent" ) ) )
+ else if ( aObjectDescr[nObjInd].Name == "Parent" )
{
aObjectDescr[nObjInd].Value >>= m_xParent;
}
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 654e221ee892..526688a6c521 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -110,7 +110,7 @@ uno::Sequence< beans::PropertyValue > addAsTemplate( const uno::Sequence< beans:
for ( sal_Int32 nInd = 0; nInd < nLength; nInd++ )
{
aResult[nInd].Name = aOrig[nInd].Name;
- if ( aResult[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "AsTemplate" ) ) )
+ if ( aResult[nInd].Name == "AsTemplate" )
{
aResult[nInd].Value <<= sal_True;
bAsTemplateSet = sal_True;
@@ -1013,32 +1013,32 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
m_bReadOnly = sal_False;
for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ )
- if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ReadOnly" ) ) )
+ if ( lArguments[nInd].Name == "ReadOnly" )
lArguments[nInd].Value >>= m_bReadOnly;
// TODO: use lObjArgs for StoreVisualReplacement
for ( sal_Int32 nObjInd = 0; nObjInd < lObjArgs.getLength(); nObjInd++ )
- if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutplaceDispatchInterceptor" ) ) )
+ if ( lObjArgs[nObjInd].Name == "OutplaceDispatchInterceptor" )
{
uno::Reference< frame::XDispatchProviderInterceptor > xDispatchInterceptor;
if ( lObjArgs[nObjInd].Value >>= xDispatchInterceptor )
m_pDocHolder->SetOutplaceDispatchInterceptor( xDispatchInterceptor );
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DefaultParentBaseURL" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "DefaultParentBaseURL" )
{
lObjArgs[nObjInd].Value >>= m_aDefaultParentBaseURL;
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Parent" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "Parent" )
{
lObjArgs[nObjInd].Value >>= m_xParent;
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IndividualMiscStatus" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "IndividualMiscStatus" )
{
sal_Int64 nMiscStatus=0;
lObjArgs[nObjInd].Value >>= nMiscStatus;
m_nMiscStatus |= nMiscStatus;
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CloneFrom" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "CloneFrom" )
{
uno::Reference < embed::XEmbeddedObject > xObj;
lObjArgs[nObjInd].Value >>= xObj;
@@ -1049,7 +1049,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
m_nClonedMapUnit = xObj->getMapUnit( embed::Aspects::MSOLE_CONTENT );
}
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutplaceFrameProperties" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "OutplaceFrameProperties" )
{
uno::Sequence< uno::Any > aOutFrameProps;
uno::Sequence< beans::NamedValue > aOutFramePropsTyped;
@@ -1073,19 +1073,19 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
else
OSL_FAIL( "OCommonEmbeddedObject::setPersistentEntry: illegal type for argument 'OutplaceFrameProperties'!" );
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ModuleName" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "ModuleName" )
{
lObjArgs[nObjInd].Value >>= m_aModuleName;
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EmbeddedScriptSupport" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "EmbeddedScriptSupport" )
{
OSL_VERIFY( lObjArgs[nObjInd].Value >>= m_bEmbeddedScriptSupport );
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentRecoverySupport" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "DocumentRecoverySupport" )
{
OSL_VERIFY( lObjArgs[nObjInd].Value >>= m_bDocumentRecoverySupport );
}
- else if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RecoveryStorage" ) ) )
+ else if ( lObjArgs[nObjInd].Name == "RecoveryStorage" )
{
OSL_VERIFY( lObjArgs[nObjInd].Value >>= m_xRecoveryStorage );
}
@@ -1219,7 +1219,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
// StoreVisualReplacement and VisualReplacement args have no sence here
- if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CanTryOptimization" ) ) )
+ if ( lObjArgs[nInd].Name == "CanTryOptimization" )
lObjArgs[nInd].Value >>= bTryOptimization;
}
@@ -1352,7 +1352,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
// StoreVisualReplacement and VisualReplacement args have no sence here
- if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CanTryOptimization" ) ) )
+ if ( lObjArgs[nInd].Name == "CanTryOptimization" )
lObjArgs[nInd].Value >>= bTryOptimization;
}
@@ -1703,13 +1703,13 @@ void SAL_CALL OCommonEmbeddedObject::reload(
::rtl::OUString aNewLinkFilter;
for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ )
{
- if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
+ if ( lArguments[nInd].Name == "URL" )
{
// the new URL
lArguments[nInd].Value >>= m_aLinkURL;
m_aLinkFilterName = ::rtl::OUString();
}
- else if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ) )
+ else if ( lArguments[nInd].Name == "FilterName" )
{
lArguments[nInd].Value >>= aNewLinkFilter;
m_aLinkFilterName = ::rtl::OUString();
@@ -1746,7 +1746,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
// TODO: use lObjArgs for StoreVisualReplacement
for ( sal_Int32 nObjInd = 0; nObjInd < lObjArgs.getLength(); nObjInd++ )
- if ( lObjArgs[nObjInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutplaceDispatchInterceptor" ) ) )
+ if ( lObjArgs[nObjInd].Name == "OutplaceDispatchInterceptor" )
{
uno::Reference< frame::XDispatchProviderInterceptor > xDispatchInterceptor;
if ( lObjArgs[nObjInd].Value >>= xDispatchInterceptor )
@@ -1762,7 +1762,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
m_bReadOnly = sal_False;
for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ )
- if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ReadOnly" ) ) )
+ if ( lArguments[nInd].Name == "ReadOnly" )
lArguments[nInd].Value >>= m_bReadOnly;
if ( bOldReadOnlyValue != m_bReadOnly && !m_bIsLink )
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx
index 56662e95fa67..3bef21d016fa 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -356,7 +356,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
// check if there is URL, URL must exist
::rtl::OUString aURL;
for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ )
- if ( aTempMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
+ if ( aTempMedDescr[nInd].Name == "URL" )
aTempMedDescr[nInd].Value >>= aURL;
if ( aURL.isEmpty() )
@@ -422,7 +422,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
::rtl::OUString aURL;
for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ )
- if ( aTempMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
+ if ( aTempMedDescr[nInd].Name == "URL" )
aTempMedDescr[nInd].Value >>= aURL;
if ( aURL.isEmpty() )
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 0d4a43ee636b..b8930efede2d 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -617,7 +617,7 @@ void DocumentHolder::FindConnectPoints(
xMenu->getByIndex( nInd ) >>= aProps;
rtl::OUString aCommand;
for ( sal_Int32 nSeqInd = 0; nSeqInd < aProps.getLength(); nSeqInd++ )
- if ( aProps[nSeqInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CommandURL" ) ) )
+ if ( aProps[nSeqInd].Name == "CommandURL" )
{
aProps[nSeqInd].Value >>= aCommand;
break;
@@ -626,9 +626,9 @@ void DocumentHolder::FindConnectPoints(
if ( aCommand.isEmpty() )
throw uno::RuntimeException();
- if ( aCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:PickList" ) ) )
+ if ( aCommand == ".uno:PickList" )
nConnectPoints[0] = nInd;
- else if ( aCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:WindowList" ) ) )
+ else if ( aCommand == ".uno:WindowList" )
nConnectPoints[1] = nInd;
}
}
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index f892e3b35493..8c9be5039b7e 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -170,7 +170,7 @@ Interceptor::dispatch(
while( nInd < aNewArgs.getLength() )
{
- if ( aNewArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SaveTo" ) ) )
+ if ( aNewArgs[nInd].Name == "SaveTo" )
{
aNewArgs[nInd].Value <<= sal_True;
break;
diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index 607fe2260c8b..1a4a5b2f54da 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -367,7 +367,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
// check if there is URL, URL must exist
::rtl::OUString aURL;
for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ )
- if ( aTempMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
+ if ( aTempMedDescr[nInd].Name == "URL" )
aTempMedDescr[nInd].Value >>= aURL;
if ( aURL.isEmpty() )
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 04d20caf7b4f..268b3efa51d4 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -293,7 +293,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
if ( aFilterAnyData >>= aFilterData )
{
for ( sal_Int32 nInd = 0; nInd < aFilterData.getLength(); nInd++ )
- if ( aFilterData[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentService" ) ) )
+ if ( aFilterData[nInd].Name == "DocumentService" )
aFilterData[nInd].Value >>= aDocServiceName;
}
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 196dba92a883..6840fe6cddcc 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -1130,11 +1130,11 @@ void OleEmbeddedObject::StoreToLocation_Impl(
uno::Reference< io::XStream > xCachedVisualRepresentation;
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
- if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StoreVisualReplacement" ) ) )
+ if ( lObjArgs[nInd].Name == "StoreVisualReplacement" )
lObjArgs[nInd].Value >>= bStoreVis;
- else if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VisualReplacement" ) ) )
+ else if ( lObjArgs[nInd].Name == "VisualReplacement" )
lObjArgs[nInd].Value >>= xCachedVisualRepresentation;
- else if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CanTryOptimization" ) ) )
+ else if ( lObjArgs[nInd].Name == "CanTryOptimization" )
lObjArgs[nInd].Value >>= bTryOptimization;
}
@@ -1391,7 +1391,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
m_bReadOnly = sal_False;
sal_Int32 nInd = 0;
for ( nInd = 0; nInd < lArguments.getLength(); nInd++ )
- if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ReadOnly" ) ) )
+ if ( lArguments[nInd].Name == "ReadOnly" )
lArguments[nInd].Value >>= m_bReadOnly;
#ifdef WNT
@@ -1401,7 +1401,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
SwitchOwnPersistence( xStorage, sEntName );
for ( nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
- if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StoreVisualReplacement" ) ) )
+ if ( lObjArgs[nInd].Name == "StoreVisualReplacement" )
lObjArgs[nInd].Value >>= m_bStoreVisRepl;
#ifdef WNT
@@ -1469,7 +1469,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
// use URL ( may be content or stream later ) from MediaDescriptor to initialize object
::rtl::OUString aURL;
for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ )
- if ( lArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
+ if ( lArguments[nInd].Name == "URL" )
lArguments[nInd].Value >>= aURL;
if ( aURL.isEmpty() )
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 91381263134e..063bb0d5a572 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -239,7 +239,7 @@ sal_Bool OwnView_Impl::CreateModel( sal_Bool bUseNative )
::rtl::OUString aFilterName;
for ( sal_Int32 nInd = 0; nInd < aArgs.getLength(); nInd++ )
- if ( aArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ) ) )
+ if ( aArgs[nInd].Name == "FilterName" )
aArgs[nInd].Value >>= aFilterName;
if ( aFilterName.isEmpty() && !aTypeName.isEmpty() )
diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx
index 8fac58e32012..27cd1017aebc 100644
--- a/embeddedobj/source/msole/xolefactory.cxx
+++ b/embeddedobj/source/msole/xolefactory.cxx
@@ -121,7 +121,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
- if ( lObjArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CloneFrom" ) ) )
+ if ( lObjArgs[nInd].Name == "CloneFrom" )
{
try
{
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
index a462b2eed162..952eca3cae67 100644
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
@@ -65,7 +65,7 @@ uno::Any SAL_CALL MainThreadExecutor::execute( const uno::Sequence< beans::Named
sal_Int32 nValuesSize = 0;
for ( sal_Int32 nInd = 0; nInd < aArguments.getLength(); nInd++ )
- if ( aArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "JobToExecute" ) ) )
+ if ( aArguments[nInd].Name == "JobToExecute" )
aArguments[nInd].Value >>= xJob;
else
{