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 )/' \{\} \;
author: Szabolcs Dezsi <dezsiszabi@hotmail.com> 2012-04-06 15:05:52 +0200
committer: Jan Holesovsky <kendy@suse.cz> 2012-04-06 15:07:41 +0200
commit: 743f22045c4ec08c46c259fc0ba240194a391457 (patch)
tree: faed42bb31c4ee767619eb5c3ebd4dec0a41fa03
parent: 0c6ebe5d225d6a655f078977455cec6d0a3afa6e (diff)
219 files changed, 1130 insertions, 1130 deletions
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 7dc31025da72..9bb8782cd016 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -3344,11 +3344,11 @@ Reference< deployment::XPackage > ScriptSubPackageIterator::implDetectScriptPack
     {
         const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xPackage->getPackageType();
         rtl::OUString aMediaType = xPackageTypeInfo->getMediaType();
-        if( aMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sBasicLibMediaType)) )
+        if ( aMediaType == sBasicLibMediaType )
         {
             xScriptPackage = xPackage;
         }
-        else if( aMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sDialogLibMediaType)) )
+        else if ( aMediaType == sDialogLibMediaType )
         {
             rbPureDialogLib = true;
             xScriptPackage = xPackage;
diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx
index b395b20cc2e6..45e9c0d9b735 100644
--- a/canvas/source/tools/parametricpolypolygon.cxx
+++ b/canvas/source/tools/parametricpolypolygon.cxx
@@ -83,46 +83,46 @@ namespace canvas
             beans::PropertyValue aProp;
             if( (rArgs[i] >>= aProp) )
             {
-                if( aProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Colors")) )
+                if ( aProp.Name == "Colors" )
                 {
                     aProp.Value >>= colorSequence;
                 }
-                else if( aProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Stops")) )
+                else if ( aProp.Name == "Stops" )
                 {
                     aProp.Value >>= colorStops;
                 }
-                else if( aProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AspectRatio")) )
+                else if ( aProp.Name == "AspectRatio" )
                 {
                     aProp.Value >>= fAspectRatio;
                 }
             }
         }
 
-        if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LinearGradient")) )
+        if ( rServiceName == "LinearGradient" )
         {
             return createLinearHorizontalGradient(rDevice, colorSequence, colorStops);
         }
-        else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EllipticalGradient")) )
+        else if ( rServiceName == "EllipticalGradient" )
         {
             return createEllipticalGradient(rDevice, colorSequence, colorStops, fAspectRatio);
         }
-        else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RectangularGradient")) )
+        else if ( rServiceName == "RectangularGradient" )
         {
             return createRectangularGradient(rDevice, colorSequence, colorStops, fAspectRatio);
         }
-        else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("VerticalLineHatch")) )
+        else if ( rServiceName == "VerticalLineHatch" )
         {
             // TODO: NYI
         }
-        else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OrthogonalLinesHatch")) )
+        else if ( rServiceName == "OrthogonalLinesHatch" )
         {
             // TODO: NYI
         }
-        else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ThreeCrossingLinesHatch")) )
+        else if ( rServiceName == "ThreeCrossingLinesHatch" )
         {
             // TODO: NYI
         }
-        else if( rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FourCrossingLinesHatch")) )
+        else if ( rServiceName == "FourCrossingLinesHatch" )
         {
             // TODO: NYI
         }
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index 007bbf1b4c54..17d413aee3be 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -150,7 +150,7 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt )
                                     beans::PropertyValue * pCellRange = 0;
                                     for( sal_Int32 i=0; i<aArguments.getLength(); ++i )
                                     {
-                                        if( aArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
+                                        if ( aArguments[i].Name == "CellRangeRepresentation" )
                                         {
                                             pCellRange = (aArguments.getArray() + i);
                                             aArguments[i].Value >>= aOldRange;
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index 3e1b1d05c55f..33af33fd44aa 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -158,7 +158,7 @@ Sequence< Reference< frame::XDispatch > > CommandDispatchContainer::getDispatche
 
     for( sal_Int32 nPos = 0; nPos < nCount; ++nPos )
     {
-        if( aDescriptors[ nPos ].FrameName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("_self")))
+        if ( aDescriptors[ nPos ].FrameName == "_self" )
             aRet[ nPos ] = getDispatchForURL( aDescriptors[ nPos ].FeatureURL );
     }
     return aRet;
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index e97e82d00169..8bcdb3ce157e 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -312,7 +312,7 @@ void SAL_CALL ChartModel::storeToURL(
     uno::Sequence< beans::PropertyValue > aReducedMediaDescriptor(
         aMediaDescriptorHelper.getReducedForModel() );
 
-    if( rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("private:stream")))
+    if ( rURL == "private:stream" )
     {
         try
         {
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 6f1850897c7c..b3767eeae973 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -543,7 +543,7 @@ Components::Components(
         if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("xcsxcu"))) {
             parseXcsXcuLayer(layer, url);
             layer += 2; //TODO: overflow
-        } else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("bundledext")))
+        } else if ( type == "bundledext" )
         {
             parseXcsXcuIniLayer(layer, url, false);
             layer += 2; //TODO: overflow
diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx
index 86a2e6dabced..0fae6abfdf92 100644
--- a/configmgr/source/type.cxx
+++ b/configmgr/source/type.cxx
@@ -156,13 +156,13 @@ Type getDynamicType(css::uno::Any const & value) {
                            RTL_CONSTASCII_STRINGPARAM("[]boolean")))
             {
                 return TYPE_BOOLEAN_LIST;
-            } else if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]short")))
+            } else if ( name == "[]short" )
             {
                 return TYPE_SHORT_LIST;
-            } else if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]long")))
+            } else if ( name == "[]long" )
             {
                 return TYPE_INT_LIST;
-            } else if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]hyper")))
+            } else if ( name == "[]hyper" )
             {
                 return TYPE_LONG_LIST;
             } else if (name.equalsAsciiL(
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 1ad898560b73..db7ce81152c6 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -868,7 +868,7 @@ bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Referenc
             const PropertyValue* pEnd  = pIter + aArgs.getLength();
             for(;pIter != pEnd;++pIter)
             {
-                if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ComponentData")) )
+                if ( pIter->Name == "ComponentData" )
                 {
                     Sequence<PropertyValue> aDocumentContext;
                     pIter->Value >>= aDocumentContext;
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 896d34fcd89c..815e752c4f7e 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -121,9 +121,9 @@ void OEvoabConnection::construct(const ::rtl::OUString& url, const Sequence< Pro
                 }
         }
 
-    if (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:groupwise")))
+    if ( url == "sdbc:address:evolution:groupwise" )
         setSDBCAddressType(SDBCAddress::EVO_GWISE);
-    else if (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:ldap")))
+    else if ( url == "sdbc:address:evolution:ldap" )
         setSDBCAddressType(SDBCAddress::EVO_LDAP);
     else
         setSDBCAddressType(SDBCAddress::EVO_LOCAL);
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index b1b5784086ef..8aebe8e09b7e 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -195,11 +195,11 @@ namespace connectivity
 
                 for (;pIter != pEnd; ++pIter)
                 {
-                    if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Storage")) )
+                    if ( pIter->Name == "Storage" )
                     {
                         xStorage.set(pIter->Value,UNO_QUERY);
                     }
-                    else if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
+                    else if ( pIter->Name == "URL" )
                     {
                         pIter->Value >>= sURL;
                     }
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 8fb63829bbb0..c148646e704d 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -181,13 +181,13 @@ static sal_Int32 readLogLevelFromConfiguration()
     OUString str;
     if( bootstrapHandle.getFrom( ASCII_STR( "PQ_LOGLEVEL" ), str ) )
     {
-        if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("NONE")) )
+        if ( str == "NONE" )
             loglevel = LogLevel::NONE;
-        else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ERROR")) )
+        else if ( str == "ERROR" )
             loglevel = LogLevel::ERROR;
-        else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SQL")) )
+        else if ( str == "SQL" )
             loglevel = LogLevel::SQL;
-        else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("INFO")) )
+        else if ( str == "INFO" )
             loglevel = LogLevel::INFO;
         else
         {
diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
index 9ad71b10c82c..314924d9d672 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
@@ -117,9 +117,9 @@ Keys::~Keys()
 static sal_Int32 string2keytype( const rtl::OUString &type )
 {
     sal_Int32 ret = com::sun::star::sdbcx::KeyType::UNIQUE;
-    if( type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("p")) )
+    if ( type == "p" )
         ret = com::sun::star::sdbcx::KeyType::PRIMARY;
-    else if( type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("f")) )
+    else if ( type == "f" )
         ret =  com::sun::star::sdbcx::KeyType::FOREIGN;
     return ret;
 }
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 0fc5239fddb9..7a4d493ccc76 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1065,7 +1065,7 @@ static bool loadEnv(OUString const  & cLibStem,
     oslModule hMod;
     uno_initEnvironmentFunc fpInit = NULL;
 
-    if (cLibStem.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno")) )
+    if ( cLibStem == CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno" )
         fpInit = CPPU_ENV_uno_initEnvironment;
     else
     {
@@ -1116,7 +1116,7 @@ static uno_Environment * initDefaultEnvironment(
     OUString envTypeName = cppu::EnvDcp::getTypeName(rEnvDcp);
 
     // create default environment
-    if (envTypeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_LB_UNO) ))
+    if ( envTypeName == UNO_LB_UNO )
     {
         uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
         that->computeObjectIdentifier = unoenv_computeObjectIdentifier;
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 6c795dec88cc..6ca08be08580 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -524,7 +524,7 @@ Any ComponentContext::lookupMap( OUString const & rName )
     SAL_THROW( (RuntimeException) )
 {
 #ifdef CONTEXT_DIAG
-    if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dump_maps") ))
+    if ( rName == "dump_maps" )
     {
         ::fprintf( stderr, ">>> dumping out ComponentContext %p m_map:\n", this );
         typedef ::std::map< OUString, ContextEntry * > t_sorted; // sorted map
@@ -653,7 +653,7 @@ Any ComponentContext::getValueByName( OUString const & rName )
     throw (RuntimeException)
 {
     // to determine the root context:
-    if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("_root") ))
+    if ( rName == "_root" )
     {
         if (m_xDelegate.is())
             return m_xDelegate->getValueByName( rName );
@@ -723,15 +723,15 @@ void ComponentContext::disposing()
             pEntry->value >>= xComp;
             if (xComp.is())
             {
-                if (iPos->first.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(TDMGR_SINGLETON) ))
+                if ( iPos->first == TDMGR_SINGLETON )
                 {
                     xTDMgr = xComp;
                 }
-                else if (iPos->first.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(AC_SINGLETON) ))
+                else if ( iPos->first == AC_SINGLETON )
                 {
                     xAC = xComp;
                 }
-                else if (iPos->first.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(AC_POLICY) ))
+                else if ( iPos->first == AC_POLICY )
                 {
                     xPolicy = xComp;
                 }
@@ -770,7 +770,7 @@ ComponentContext::ComponentContext(
     {
         ContextEntry_Init const & rEntry = pEntries[ nPos ];
 
-        if (rEntry.name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(SMGR_SINGLETON) ))
+        if ( rEntry.name == SMGR_SINGLETON )
         {
             rEntry.value >>= m_xSMgr;
         }
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 570e7eba404c..23b3aa4ddaf8 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1231,7 +1231,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
                     sal_Int32 i = 0;
                     while ( sFullCommentURL.isEmpty() && i < aProperties.getLength() )
                     {
-                        if ( aProperties[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FullCommentURL")) )
+                        if ( aProperties[i].Name == "FullCommentURL" )
                         {
                             uno::Any aValue = aProperties[i].Value;
                             aValue >>= sFullCommentURL;
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index f4c570b33482..bcb26fdf2715 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1881,11 +1881,11 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia
             const SvObjectServerList* pList )
 {
     InsertObjectDialog_Impl* pDlg=0;
-    if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertObject")) )
+    if ( rCommand == ".uno:InsertObject" )
         pDlg = new SvInsertOleDlg( pParent, xStor, pList );
-    else if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertPlugin")) )
+    else if ( rCommand == ".uno:InsertPlugin" )
         pDlg = new SvInsertPlugInDialog( pParent, xStor );
-    else if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertObjectFloatingFrame")) )
+    else if ( rCommand == ".uno:InsertObjectFloatingFrame" )
         pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor );
 
     if ( pDlg )
@@ -1900,7 +1900,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* p
             const Reference < com::sun::star::embed::XEmbeddedObject >& xObj )
 {
     InsertObjectDialog_Impl* pDlg=0;
-    if ( rCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:InsertObjectFloatingFrame")) )
+    if ( rCommand == ".uno:InsertObjectFloatingFrame" )
     {
         pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj );
         pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index e5b8a6cb283e..e85b5fdab550 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -128,17 +128,17 @@ SvxNumSettings_ImplPtr lcl_CreateNumSettingsPtr(const Sequence<PropertyValue>& r
     SvxNumSettings_ImplPtr pNew = new SvxNumSettings_Impl;
     for(sal_Int32 j = 0; j < rLevelProps.getLength(); j++)
     {
-        if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cNumberingType)))
+        if ( pValues[j].Name == cNumberingType )
             pValues[j].Value >>= pNew->nNumberType;
-        else if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cPrefix)))
+        else if ( pValues[j].Name == cPrefix )
             pValues[j].Value >>= pNew->sPrefix;
-        else if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cSuffix)))
+        else if ( pValues[j].Name == cSuffix )
             pValues[j].Value >>= pNew->sSuffix;
-        else if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cParentNumbering)))
+        else if ( pValues[j].Name == cParentNumbering )
             pValues[j].Value >>= pNew->nParentNumbering;
-        else if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cBulletChar)))
+        else if ( pValues[j].Name == cBulletChar )
             pValues[j].Value >>= pNew->sBulletChar;
-        else if(pValues[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cBulletFontName)))
+        else if ( pValues[j].Name == cBulletFontName )
             pValues[j].Value >>= pNew->sBulletFont;
     }
     return pNew;
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 608334026190..8e959d9cae65 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -322,7 +322,7 @@ void SAL_CALL OContentHelper::initialize( const Sequence< Any >& _aArguments ) t
     for(;pBegin != pEnd;++pBegin)
     {
         *pBegin >>= aValue;
-        if ( aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Parent")) )
+        if ( aValue.Name == "Parent" )
         {
             m_xParentContainer.set(aValue.Value,UNO_QUERY);
         }
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 36fa23690f76..255fd9339247 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -177,21 +177,21 @@ void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > &
     const beans::PropertyValue* pArgEnd  = pArgIter + _aArguments.getLength();
     for(;pArgIter != pArgEnd;++pArgIter)
     {
-        if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataRowSource")) )
+        if ( pArgIter->Name == "DataRowSource" )
         {
             ::com::sun::star::chart::ChartDataRowSource eRowSource = ::com::sun::star::chart::ChartDataRowSource_COLUMNS;
             pArgIter->Value >>= eRowSource;
             if ( eRowSource != ::com::sun::star::chart::ChartDataRowSource_COLUMNS )
                 return sal_False;
         }
-        else if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")) )
+        else if ( pArgIter->Name == "CellRangeRepresentation" )
         {
             ::rtl::OUString sRange;
             pArgIter->Value >>= sRange;
             if ( !sRange.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("all")) )
                 return sal_False;
         }
-        else if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FirstCellAsLabel")) )
+        else if ( pArgIter->Name == "FirstCellAsLabel" )
         {
             sal_Bool bFirstCellAsLabel = sal_True;
             pArgIter->Value >>= bFirstCellAsLabel;
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index c2130d19efec..1ae1ad36f302 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -144,13 +144,13 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
                 break;
             case XML_TOK_BOOLEAN_COMPARISON_MODE:
                 aProperty.Name = PROPERTY_BOOLEANCOMPARISONMODE;
-                if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-integer")) )
+                if ( sValue == "equal-integer" )
                     aProperty.Value <<= sal_Int32(0);
-                else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("is-boolean")) )
+                else if ( sValue == "is-boolean" )
                     aProperty.Value <<= sal_Int32(1);
-                else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-boolean")) )
+                else if ( sValue == "equal-boolean" )
                     aProperty.Value <<= sal_Int32(2);
-                else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-use-only-zero")) )
+                else if ( sValue == "equal-use-only-zero" )
                     aProperty.Value <<= sal_Int32(3);
                 break;
             case XML_TOK_USE_CATALOG:
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 06ad47712ed4..ca93c9007269 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -402,15 +402,15 @@ void ODBExport::exportDataSource()
                 {
                     sal_Int32 nValue = 0;
                     aValue >>= nValue;
-                    if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("0")) )
+                    if ( sValue == "0" )
                         sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-integer"));
-                    else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1")) )
+                    else if ( sValue == "1" )
                         sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("is-boolean"));
-                    else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")) )
+                    else if ( sValue == "2" )
                         sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-boolean"));
-                    else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("3")) )
+                    else if ( sValue == "3" )
                         sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-use-only-zero"));
-                    if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-integer")) )
+                    if ( sValue == "equal-integer" )
                         continue;
                     eToken = XML_BOOLEAN_COMPARISON_MODE;
                 }
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index bc059d3d317d..d2c7266a6f35 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -1114,7 +1114,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
                         const PropertyValue* pEnd  = pIter + aArgs.getLength();
                         for( ; pIter != pEnd ; ++pIter)
                         {
-                            if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FormatStringId")) )
+                            if ( pIter->Name == "FormatStringId" )
                             {
                                 SotFormatStringId nFormatId = 0;
                                 if ( pIter->Value >>= nFormatId )
@@ -2886,7 +2886,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
         const NamedValue* pEnd  = pIter + aCurrentSelection.getLength();
         for(;pIter != pEnd;++pIter)
         {
-            if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Type")) )
+            if ( pIter->Name == "Type" )
             {
                 sal_Int32 nType = 0;
                 pIter->Value >>= nType;
@@ -2894,7 +2894,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
                     throw IllegalArgumentException();
                 eType = static_cast< ElementType >( nType );
             }
-            else if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Selection")) )
+            else if ( pIter->Name == "Selection" )
                 pIter->Value >>= aSelection;
         }
 
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 3ecb7d9ebdbd..cd01aa152794 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -112,7 +112,7 @@ namespace dbaui
         SolarMutexGuard aSolarMutexGuard;
         ::osl::MutexGuard aGuard(m_aMutex);
 
-        if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:DBNewForm")) )
+        if ( m_aCommandURL == ".uno:DBNewForm" )
         {
             m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewForm"))           ,sal_True));
             m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewView"))           ,sal_True));
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index afc4f109f0ab..0d7828fd457f 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -153,9 +153,9 @@ namespace dbaui
                 {
                     ::rtl::OUString sAuth;
                     aMetaData.get("Authentication") >>= sAuth;
-                    if ( sAuth.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserPassword")) )
+                    if ( sAuth == "UserPassword" )
                         aInit = AuthUserPwd;
-                    else if ( sAuth.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Password")) )
+                    else if ( sAuth == "Password" )
                         aInit = AuthPwd;
                 }
                 s_aSupport.insert(Supported::value_type(*pIter,aInit));
diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx
index f4e1044acea9..a51dd36ffef1 100644
--- a/desktop/source/app/configinit.cxx
+++ b/desktop/source/app/configinit.cxx
@@ -124,7 +124,7 @@ private:
 uno::Any SAL_CALL ConfigurationErrorHandler::Context::getValueByName( OUString const & aName)
         throw (uno::RuntimeException)
 {
-    if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CONFIG_ERROR_HANDLER)) )
+    if ( aName == CONFIG_ERROR_HANDLER )
     {
         if ( !m_xHandler.is() )
             m_xHandler = ConfigurationErrorHandler::getDefaultInteractionHandler();
diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx
index 82338f3d504f..0627da3cc778 100644
--- a/desktop/source/app/desktopcontext.cxx
+++ b/desktop/source/app/desktopcontext.cxx
@@ -48,7 +48,7 @@ Any SAL_CALL DesktopContext::getValueByName( const OUString& Name) throw (Runtim
 {
     Any retVal;
 
-    if (Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(JAVA_INTERACTION_HANDLER_NAME)))
+    if ( Name == JAVA_INTERACTION_HANDLER_NAME )
     {
         retVal = makeAny( Reference< XInteractionHandler >( new svt::JavaInteractionHandler()) );
     }
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index 9061f044f8e8..5312923cbb68 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -148,11 +148,11 @@ PackageManagerFactoryImpl::getPackageManager( OUString const & context )
     {
         OSL_ASSERT( insertion.first->second.get() == xRet );
         // hold user, shared mgrs for whole process: live deployment
-        if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("user") ))
+        if ( context == "user" )
             m_xUserMgr = xRet;
-        else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("shared") ))
+        else if ( context == "shared" )
             m_xSharedMgr = xRet;
-        else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled") ))
+        else if ( context == "bundled" )
             m_xBundledMgr = xRet;
     }
     else
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 8b84ec5d565c..fef95a8215ce 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -94,15 +94,15 @@ PackageRegistryBackend::PackageRegistryBackend(
     if (readOnly)
         m_readOnly = *readOnly;
 
-    if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("user") ))
+    if ( m_context == "user" )
         m_eContext = CONTEXT_USER;
-    else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("shared") ))
+    else if ( m_context == "shared" )
         m_eContext = CONTEXT_SHARED;
-    else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled") ))
+    else if ( m_context == "bundled" )
         m_eContext = CONTEXT_BUNDLED;
-    else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("tmp") ))
+    else if ( m_context == "tmp" )
         m_eContext = CONTEXT_TMP;
-    else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled_prereg") ))
+    else if ( m_context == "bundled_prereg" )
         m_eContext = CONTEXT_BUNDLED_PREREG;
     else if (m_context.matchIgnoreAsciiCaseAsciiL(
                  RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.tdoc:/") ))
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index d0efd587ad81..eca75099bd58 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -1080,9 +1080,9 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
         {
             for(int i=0; i<aProp.getLength(); ++i)
             {
-                if (aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)))
+                if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
                     aProp[i].Value >>= aMigrationItem.m_sCommandURL;
-                else if (aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)))
+                else if ( aProp[i].Name == ITEM_DESCRIPTOR_CONTAINER )
                     aProp[i].Value >>= aMigrationItem.m_xPopupMenu;
             }
 
@@ -1098,9 +1098,9 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
         {
             for(int i=0; i<aProp.getLength(); ++i)
             {
-                if (aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)))
+                if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
                     aProp[i].Value >>= aMigrationItem.m_sCommandURL;
-                else if (aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)))
+                else if ( aProp[i].Name == ITEM_DESCRIPTOR_CONTAINER )
                     aProp[i].Value >>= aMigrationItem.m_xPopupMenu;
             }
 
@@ -1209,11 +1209,11 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
                 for (sal_Int32 j=0; j<aPropSeq.getLength(); ++j)
                 {
                     ::rtl::OUString sPropName = aPropSeq[j].Name;
-                    if (sPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)))
+                    if ( sPropName == ITEM_DESCRIPTOR_COMMANDURL )
                         aPropSeq[j].Value >>= sCommandURL;
-                    else if (sPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_LABEL)))
+                    else if ( sPropName == ITEM_DESCRIPTOR_LABEL )
                         aPropSeq[j].Value >>= sLabel;
-                    else if (sPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)))
+                    else if ( sPropName == ITEM_DESCRIPTOR_CONTAINER )
                         aPropSeq[j].Value >>= xChild;
                 }
 
@@ -1250,7 +1250,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
                     xTemp->getByIndex(i) >>= aTempPropSeq;
                     for (sal_Int32 j=0; j<aTempPropSeq.getLength(); ++j)
                     {
-                        if (aTempPropSeq[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)))
+                        if ( aTempPropSeq[j].Name == ITEM_DESCRIPTOR_COMMANDURL )
                         {
                             aTempPropSeq[j].Value >>= sCmd;
                             break;
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index b2946aff500e..e997736417c3 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -276,7 +276,7 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
     for(;pIter != pEnd;++pIter)
     {
         *pIter >>= aValue;
-        if (aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OldConfiguration")))
+        if ( aValue.Name == "OldConfiguration" )
         {
             sal_Bool bSuccess = aValue.Value >>= aOldConfigValues;
             OSL_ENSURE(bSuccess == sal_True, "[Service implementation " IMPL_NAME
@@ -287,7 +287,7 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
                 const css::beans::NamedValue* pEnd2 = pIter2 + aOldConfigValues.getLength();
                 for(;pIter2 != pEnd2;++pIter2)
                 {
-                    if ( pIter2->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("org.openoffice.Office.Java")) )
+                    if ( pIter2->Name == "org.openoffice.Office.Java" )
                     {
                         pIter2->Value >>= m_xLayer;
                         break;
@@ -295,7 +295,7 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
                 }
             }
         }
-        else if (aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserData")))
+        else if ( aValue.Name == "UserData" )
         {
             if ( !(aValue.Value >>= m_sUserDir) )
             {
@@ -418,9 +418,9 @@ void SAL_CALL  JavaMigration::overrideProperty(
         MalformedDataException,
         WrappedTargetException )
 {
-    if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Enable")))
+    if ( aName == "Enable" )
         m_aStack.push(TElementStack::value_type(aName,ENABLE_JAVA));
-    else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserClassPath")))
+    else if ( aName == "UserClassPath" )
         m_aStack.push(TElementStack::value_type(aName, USER_CLASS_PATH));
 }
 // -----------------------------------------------------------------------------
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 7b48403cdb12..bc2fda67839c 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -483,7 +483,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
             xExtensionManager->reinstallDeployedExtensions(
                 repository, Reference<task::XAbortChannel>(), xCmdEnv);
         }
-        else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("list") ))
+        else if ( subCommand == "list" )
         {
             ::std::vector<Reference<deployment::XPackage> > vecExtUnaccepted;
             ::comphelper::sequenceToContainer(vecExtUnaccepted,
@@ -572,7 +572,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
 
             printf_packages(allExtensions, vecUnaccepted, xCmdEnv );
         }
-        else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("validate") ))
+        else if ( subCommand == "validate" )
         {
             ::std::vector<Reference<deployment::XPackage> > vecExtUnaccepted;
             ::comphelper::sequenceToContainer(
@@ -610,7 +610,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
                         extension, Reference<task::XAbortChannel>(), xCmdEnv);
             }
         }
-        else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("gui") ))
+        else if ( subCommand == "gui" )
         {
             Reference<ui::dialogs::XAsynchronousExecutableDialog> xDialog(
                 deployment::ui::PackageManagerDialog::createAndInstall(
@@ -626,7 +626,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
             xDialog->startExecuteModal(xListener);
             dialogEnded.wait();
         }
-        else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("sync")))
+        else if ( subCommand == "sync" )
         {
             if (! dp_misc::office_is_running())
             {
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 8621dc16fb4b..10380668c053 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -1127,27 +1127,27 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rt
 
         sal_Int32 nId = ID_UNKNOWN;
 
-        if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DateTime") ) )
+        if ( aFieldType == "DateTime" )
         {
             nId = ID_DATEFIELD;
         }
-        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("URL") ) )
+        else if ( aFieldType == "URL" )
         {
             nId = ID_URLFIELD;
         }
-        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("PageNumber") ) )
+        else if ( aFieldType == "PageNumber" )
         {
             nId = ID_PAGEFIELD;
         }
-        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("PageCount") ) )
+        else if ( aFieldType == "PageCount" )
         {
             nId = ID_PAGESFIELD;
         }
-        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("SheetName") ) )
+        else if ( aFieldType == "SheetName" )
         {
             nId = ID_TABLEFIELD;
         }
-        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FileName") ) )
+        else if ( aFieldType == "FileName" )
         {
             nId = ID_EXT_FILEFIELD;
         }
@@ -1158,11 +1158,11 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rt
         {
             nId = ID_FILEFIELD;
         }
-        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Author") ) )
+        else if ( aFieldType == "Author" )
         {
             nId = ID_AUTHORFIELD;
         }
-        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Measure") ) )
+        else if ( aFieldType == "Measure" )
         {
             nId = ID_MEASUREFIELD;
         }
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 16f8c6a790c8..bd171da234ee 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -290,7 +290,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
         const OUString& rPropName = rProp.Name;
         const Any& aVal = rProp.Value;
 
-        if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_NUMBERINGTYPE)))
+        if ( rPropName == UNO_NAME_NRULE_NUMBERINGTYPE )
         {
             sal_Int16 nSet = sal_Int16();
             aVal >>= nSet;
@@ -311,7 +311,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
                 continue;
             }
         }
-        else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_PREFIX)))
+        else if ( rPropName == UNO_NAME_NRULE_PREFIX )
         {
             OUString aPrefix;
             if( aVal >>= aPrefix )
@@ -320,7 +320,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
                 continue;
             }
         }
-        else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_SUFFIX)))
+        else if ( rPropName == UNO_NAME_NRULE_SUFFIX )
         {
             OUString aSuffix;
             if( aVal >>= aSuffix )
@@ -329,7 +329,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
                 continue;
             }
         }
-        else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_BULLETID)))
+        else if ( rPropName == UNO_NAME_NRULE_BULLETID )
         {
             sal_Int16 nSet = sal_Int16();
             if( aVal >>= nSet )
@@ -341,7 +341,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
                 }
             }
         }
-        else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("BulletChar")))
+        else if ( rPropName == "BulletChar" )
         {
             OUString aStr;
             if( aVal >>= aStr )
@@ -357,7 +357,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
                 continue;
             }
         }
-        else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_ADJUST)))
+        else if ( rPropName == UNO_NAME_NRULE_ADJUST )
         {
             sal_Int16 nAdjust = sal_Int16();
             if( aVal >>= nAdjust )
@@ -366,7 +366,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
                 continue;
             }
         }
-        else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_BULLET_FONT)))
+        else if ( rPropName == UNO_NAME_NRULE_BULLET_FONT )
         {
             awt::FontDescriptor aDesc;
             if( aVal >>= aDesc )
@@ -377,7 +377,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
                 continue;
             }
         }
-        else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Graphic")))
+        else if ( rPropName == "Graphic" )
         {
             Reference< awt::XBitmap > xBmp;
             if( aVal >>= xBmp )
@@ -388,7 +388,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
                 continue;
             }
         }
-        else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("GraphicURL")))
+        else if ( rPropName == "GraphicURL" )
         {
             OUString aURL;
             if( aVal >>= aURL )
@@ -399,7 +399,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
                 continue;
             }
         }
-        else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("GraphicSize")))
+        else if ( rPropName == "GraphicSize" )
         {
             awt::Size aUnoSize;
             if( aVal >>= aUnoSize )
@@ -408,7 +408,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
                 continue;
             }
         }
-        else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_START_WITH)))
+        else if ( rPropName == UNO_NAME_NRULE_START_WITH )
         {
             sal_Int16 nStart = sal_Int16();
             if( aVal >>= nStart )
@@ -417,7 +417,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
                 continue;
             }
         }
-        else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_LEFT_MARGIN)))
+        else if ( rPropName == UNO_NAME_NRULE_LEFT_MARGIN )
         {
             sal_Int32 nMargin = 0;
             if( aVal >>= nMargin )
@@ -426,7 +426,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
                 continue;
             }
         }
-        else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_FIRST_LINE_OFFSET)))
+        else if ( rPropName == UNO_NAME_NRULE_FIRST_LINE_OFFSET )
         {
             sal_Int32 nMargin = 0;
             if( aVal >>= nMargin )
@@ -435,7 +435,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
                 continue;
             }
         }
-        else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("SymbolTextDistance")))
+        else if ( rPropName == "SymbolTextDistance" )
         {
             sal_Int32 nTextDistance = 0;
             if( aVal >>= nTextDistance )
@@ -444,7 +444,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
                 continue;
             }
         }
-        else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_BULLET_COLOR)))
+        else if ( rPropName == UNO_NAME_NRULE_BULLET_COLOR )
         {
             sal_Int32 nColor = 0;
             if( aVal >>= nColor )
@@ -453,7 +453,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
                 continue;
             }
         }
-        else if(rPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_NRULE_BULLET_RELSIZE)))
+        else if ( rPropName == UNO_NAME_NRULE_BULLET_RELSIZE )
         {
             sal_Int16 nSize = sal_Int16();
             if( aVal >>= nSize )
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 716655e977ff..4ac6f7f0487c 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1689,7 +1689,7 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
     if (pLocale == lLocales.end())
     {
 #if OSL_DEBUG_LEVEL > 0
-        if (sActLocale.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("en-US")))
+        if ( sActLocale == "en-US" )
             return;
         ::rtl::OUString sName = rItem.getUnpackedValueOrDefault(PROPNAME_NAME, ::rtl::OUString());
 
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 87702f7df27c..935ada0e0147 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -303,43 +303,43 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize
 
 #define COMP_HACK
 #ifdef COMP_HACK
-    if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer")))
+    if ( sDocumentService == "writer" )
     {
         OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
         sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ));
     }
     else
-    if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("web")))
+    if ( sDocumentService == "web" )
     {
         OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
         sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.WebDocument" ));
     }
     else
-    if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("global")))
+    if ( sDocumentService == "global" )
     {
         OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
         sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.GlobalDocument" ));
     }
     else
-    if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("calc")))
+    if ( sDocumentService == "calc" )
     {
         OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
         sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ));
     }
     else
-    if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("draw")))
+    if ( sDocumentService == "draw" )
     {
         OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
         sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ));
     }
     else
-    if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("impress")))
+    if ( sDocumentService == "impress" )
     {
         OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
         sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ));
     }
     else
-    if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("math")))
+    if ( sDocumentService == "math" )
     {
         OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
         sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.formula.FormulaProperties" ));
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 397de51020c8..974cdac983e3 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -454,7 +454,7 @@ sal_Bool TypeDetection::impl_getPreselectionForType(const ::rtl::OUString& sPreS
     {
         // We cant check a preselected type for a given stream!
         // So we must believe, that it can work ...
-        if (aParsedURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("private:stream")))
+        if ( aParsedURL.Complete == "private:stream" )
             bBreakDetection = sal_True;
     }
 
@@ -813,9 +813,9 @@ namespace
     {
         if (rA == rB)
             return false;
-        if (rA.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.FormatDetector")))
+        if ( rA == "com.sun.star.text.FormatDetector" )
             return false;
-        if (rB.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.FormatDetector")))
+        if ( rB == "com.sun.star.text.FormatDetector" )
             return true;
         return rA < rB;
     }
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index 64714042f7c9..18451904a632 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -131,9 +131,9 @@ OdfFlatXml::importer(
     for (sal_Int32 paramIdx = 0; paramIdx < paramCount; paramIdx++)
         {
             paramName = sourceData[paramIdx].Name;
-            if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")))
+            if ( paramName == "InputStream" )
                 sourceData[paramIdx].Value >>= inputStream;
-            else if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
+            else if ( paramName == "URL" )
                 sourceData[paramIdx].Value >>= url;
         }
 
@@ -183,9 +183,9 @@ OdfFlatXml::exporter(const Sequence< PropertyValue >& sourceData,
     for (sal_Int32 paramIdx = 0; paramIdx < paramCount; paramIdx++)
         {
             paramName = sourceData[paramIdx].Name;
-            if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutputStream")))
+            if ( paramName == "OutputStream" )
                 sourceData[paramIdx].Value >>= outputStream;
-            else if (paramName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
+            else if ( paramName == "URL" )
                 sourceData[paramIdx].Value >>= targetURL;
         }
 
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 58b9afa66960..ef8120b0b93b 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -69,7 +69,7 @@ sal_Bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
             pValue[ i ].Value >>= aFilterData;
         else if ( pValue[ i ].Name == "StatusIndicator" )
             pValue[ i ].Value >>= xStatusIndicator;
-        else if( pValue[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")) )
+        else if ( pValue[i].Name == "InteractionHandler" )
             pValue[i].Value >>= xIH;
     }
 
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index f2e0fc7159a3..c9413a69fdd3 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -471,7 +471,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
             if( pOStm )
                 xOStm = Reference< XOutputStream >( new ::utl::OOutputStreamWrapper ( *pOStm ) );
         }
-        else if( pValue[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterData")) )
+        else if ( pValue[ i ].Name == "FilterData" )
         {
             pValue[ i ].Value >>= maFilterData;
         }
diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx
index ec2565379ae2..e2226c099ad0 100644
--- a/filter/source/xsltfilter/OleHandler.cxx
+++ b/filter/source/xsltfilter/OleHandler.cxx
@@ -164,7 +164,7 @@ namespace XSLT
     void SAL_CALL
     OleHandler::insertByName(const OUString& streamName, const OString& content)
     {
-        if (streamName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("oledata.mso")))
+        if ( streamName == "oledata.mso" )
             {
                 initRootStorageFromBase64(content);
             }
@@ -178,7 +178,7 @@ namespace XSLT
     const OString
     SAL_CALL OleHandler::getByName(const OUString& streamName)
     {
-        if (streamName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("oledata.mso")))
+        if ( streamName == "oledata.mso" )
         {
             //get the length and seek to 0
             Reference<XSeekable> xSeek (m_rootStream, UNO_QUERY);
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 687192efa6b7..b42e1f373b0a 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -284,13 +284,13 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False)
             {
                 aName = aSourceData[i].Name;
                 Any value = aSourceData[i].Value;
-                if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")))
+                if ( aName == "InputStream" )
                     value >>= xInputStream;
-                else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName")))
+                else if ( aName == "FileName" )
                     value >>= aFileName;
-                else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
+                else if ( aName == "URL" )
                     value >>= aURL;
-                else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")))
+                else if ( aName == "InteractionHandler" )
                     value >>= xInterActionHandler;
             }
         OSL_ASSERT(xInputStream.is());
@@ -443,15 +443,15 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False)
         for (sal_Int32 i = 0; i < nLength; i++)
             {
                 aName = aSourceData[i].Name;
-                if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Indent")))
+                if ( aName == "Indent" )
                     aSourceData[i].Value >>= bIndent;
-                if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocType_Public")))
+                if ( aName == "DocType_Public" )
                     aSourceData[i].Value >>= aDoctypePublic;
-                if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocType_System")))
+                if ( aName == "DocType_System" )
                     aSourceData[i].Value >>= aDoctypeSystem;
-                if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutputStream")))
+                if ( aName == "OutputStream" )
                     aSourceData[i].Value >>= m_rOutputStream;
-                else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
+                else if ( aName == "URL" )
                     aSourceData[i].Value >>= sURL;
             }
 
diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx
index 94a6d31e4062..c3c69bcf0511 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -77,9 +77,9 @@ void SAL_CALL CLibxml2XFormsExtension::initialize(const Sequence< Any >& aSequen
     {
         if (! (aSequence[i] >>= aValue))
             throw RuntimeException();
-        if (aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Model")))
+        if ( aValue.Name == "Model" )
             aValue.Value >>= m_aModel;
-        else if (aValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ContextNode")))
+        else if ( aValue.Name == "ContextNode" )
             aValue.Value >>= m_aContextNode;
     }
 }
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index ca210b89260e..ed3d0ca721fd 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -1179,14 +1179,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
 {
     css::uno::Reference< css::container::XNamed > xNamed(m_xCfg, css::uno::UNO_QUERY);
     ::rtl::OUString sConfig = xNamed->getName();
-    if ( sConfig.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Global")) )
+    if ( sConfig == "Global" )
     {
         m_xCfg = css::uno::Reference< css::container::XNameAccess > (
             ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_GLOBAL, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
             css::uno::UNO_QUERY );
         XCUBasedAcceleratorConfiguration::reload();
     }
-    else if ( sConfig.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Modules")) )
+    else if ( sConfig == "Modules" )
     {
         m_xCfg = css::uno::Reference< css::container::XNameAccess > (
             ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_MODULES, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
@@ -1241,14 +1241,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util:
         ::rtl::OUString sPrimarySecondary = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
         ::rtl::OUString sGlobalModules = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
 
-        if ( sGlobalModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
+        if ( sGlobalModules == CFG_ENTRY_GLOBAL )
         {
             ::rtl::OUString sModule;
             sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
             if ( !sKey.isEmpty() && !sPath.isEmpty() )
                 reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey);
         }
-        else if ( sGlobalModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_MODULES)) )
+        else if ( sGlobalModules == CFG_ENTRY_MODULES )
         {
             ::rtl::OUString sModule = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
             sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
@@ -1272,9 +1272,9 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
 {
     AcceleratorCache aReadCache = AcceleratorCache();
     css::uno::Reference< css::container::XNameAccess > xAccess;
-    if (m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Global")))
+    if ( m_sGlobalOrModules == "Global" )
         xCfg->getByName(CFG_ENTRY_GLOBAL) >>= xAccess;
-    else if (m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Modules")))
+    else if ( m_sGlobalOrModules == "Modules" )
     {
         css::uno::Reference< css::container::XNameAccess > xModules;
         xCfg->getByName(CFG_ENTRY_MODULES) >>= xModules;
@@ -1351,13 +1351,13 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
                     break;
                 }
 
-                if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SHIFT")))
+                if ( sToken[k] == "SHIFT" )
                     aKeyEvent.Modifiers |= css::awt::KeyModifier::SHIFT;
-                else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD1")))
+                else if ( sToken[k] == "MOD1" )
                     aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1;
-                else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD2")))
+                else if ( sToken[k] == "MOD2" )
                     aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2;
-                else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD3")))
+                else if ( sToken[k] == "MOD3" )
                     aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3;
                 else
                 {
@@ -1483,9 +1483,9 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt:
     else
         m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess;
 
-    if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
+    if ( m_sGlobalOrModules == CFG_ENTRY_GLOBAL )
         xAccess->getByName(CFG_ENTRY_GLOBAL) >>= xContainer;
-    else if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_MODULES)) )
+    else if ( m_sGlobalOrModules == CFG_ENTRY_MODULES )
     {
         css::uno::Reference< css::container::XNameContainer > xModules;
         xAccess->getByName(CFG_ENTRY_MODULES) >>= xModules;
@@ -1528,9 +1528,9 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw
     else
         m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess;
 
-    if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
+    if ( m_sGlobalOrModules == CFG_ENTRY_GLOBAL )
         xAccess->getByName(CFG_ENTRY_GLOBAL) >>= xContainer;
-    else if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_MODULES)) )
+    else if ( m_sGlobalOrModules == CFG_ENTRY_MODULES )
     {
         css::uno::Reference< css::container::XNameAccess > xModules;
         xAccess->getByName(CFG_ENTRY_MODULES) >>= xModules;
@@ -1550,7 +1550,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
     css::uno::Reference< css::container::XNameContainer > xContainer;
 
     m_xCfg->getByName(sPrimarySecondary) >>= xAccess;
-    if ( sGlobalModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
+    if ( sGlobalModules == CFG_ENTRY_GLOBAL )
         xAccess->getByName(CFG_ENTRY_GLOBAL) >>= xContainer;
     else
     {
@@ -1576,13 +1576,13 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
             break;
 
         sToken[i] = sKey.getToken(0, '_', nIndex);
-        if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SHIFT")))
+        if ( sToken[i] == "SHIFT" )
             aKeyEvent.Modifiers |= css::awt::KeyModifier::SHIFT;
-        else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD1")))
+        else if ( sToken[i] == "MOD1" )
             aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1;
-        else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD2")))
+        else if ( sToken[i] == "MOD2" )
             aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2;
-                else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD3")))
+                else if ( sToken[i] == "MOD3" )
                         aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3;
     }
 
@@ -1598,14 +1598,14 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
         xCommand->getByName(sLocale)       >>= sCommand;
     }
 
-    if (sPrimarySecondary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_PRIMARY)))
+    if ( sPrimarySecondary == CFG_ENTRY_PRIMARY )
     {
         if (sCommand.isEmpty())
             m_aPrimaryReadCache.removeKey(aKeyEvent);
         else
             m_aPrimaryReadCache.setKeyCommandPair(aKeyEvent, sCommand);
     }
-    else if (sPrimarySecondary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_SECONDARY)))
+    else if ( sPrimarySecondary == CFG_ENTRY_SECONDARY )
     {
         if (sCommand.isEmpty())
             m_aSecondaryReadCache.removeKey(aKeyEvent);
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index f008fb215cdc..159739a6df26 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -341,17 +341,17 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
         beans::NamedValue aValue = rProperties[i];
         ::rtl::OUString sName = aValue.Name;
 
-        if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")) )
+        if ( sName == "Title" )
             aValue.Value >>= sTitle;
-        else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ToolTip")) )
+        else if ( sName == "ToolTip" )
             aValue.Value >>= sToolTip;
-        else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PageURL")) )
+        else if ( sName == "PageURL" )
             aValue.Value >>= sPageURL;
-        else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EventHdl")) )
+        else if ( sName == "EventHdl" )
             aValue.Value >>= xEventHdl;
-        else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Image")) )
+        else if ( sName == "Image" )
             aValue.Value >>= xImage;
-        else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Disabled")) )
+        else if ( sName == "Disabled" )
             aValue.Value >>= bDisabled;
     }
 
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 43756fb36b23..cf81fa5d1554 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -193,11 +193,11 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
     // If not - we have to break this operation. But an optional listener must be informed.
     // BTW: We save the information about the requested operation. Because
     // we need it later.
-    if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URL_CLOSEDOC)))
+    if ( aURL.Complete == URL_CLOSEDOC )
         m_eOperation = E_CLOSE_DOC;
-    else if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URL_CLOSEWIN)))
+    else if ( aURL.Complete == URL_CLOSEWIN )
         m_eOperation = E_CLOSE_WIN;
-    else if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URL_CLOSEFRAME)))
+    else if ( aURL.Complete == URL_CLOSEFRAME )
         m_eOperation = E_CLOSE_FRAME;
     else
     {
@@ -230,7 +230,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
     sal_Bool bIsSynchron = sal_False;
     for (sal_Int32 nArgs=0; nArgs<lArguments.getLength(); nArgs++ )
     {
-        if ( lArguments[nArgs].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SynchronMode")) )
+        if ( lArguments[nArgs].Name == "SynchronMode" )
         {
             lArguments[nArgs].Value >>= bIsSynchron;
             break;
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 562dd744ce47..eead1818dcfd 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -430,7 +430,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
             else
                 xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame );
         }
-        else if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CloseFrame")))
+        else if ( aURL.Complete == ".uno:CloseFrame" )
             xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame );
 
         if ( ! xDispatcher.is())
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index bee51f791184..90e0eefcfb8c 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -118,7 +118,7 @@ void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::U
     throw(css::uno::RuntimeException)
 {
     ::sal_Int16 nResult = css::frame::DispatchResultState::DONTKNOW;
-    if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_UNO_SHOWSTARTMODULE)))
+    if ( aURL.Complete == CMD_UNO_SHOWSTARTMODULE )
     {
         nResult = css::frame::DispatchResultState::FAILURE;
         if (implts_isBackingModePossible ())
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index e280b304a8b9..d80fcfb88db5 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -138,28 +138,28 @@ static void ExtractMenuParameters( const Sequence< PropertyValue > rProp,
 {
     for ( sal_Int32 i = 0; i < rProp.getLength(); i++ )
     {
-        if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
+        if ( rProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
         {
             rProp[i].Value >>= rCommandURL;
             rCommandURL = rCommandURL.intern();
         }
-        else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
+        else if ( rProp[i].Name == ITEM_DESCRIPTOR_HELPURL )
         {
             rProp[i].Value >>= rHelpURL;
         }
-        else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)) )
+        else if ( rProp[i].Name == ITEM_DESCRIPTOR_CONTAINER )
         {
             rProp[i].Value >>= rSubMenu;
         }
-        else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_LABEL)) )
+        else if ( rProp[i].Name == ITEM_DESCRIPTOR_LABEL )
         {
             rProp[i].Value >>= rLabel;
         }
-        else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
+        else if ( rProp[i].Name == ITEM_DESCRIPTOR_TYPE )
         {
             rProp[i].Value >>= rType;
         }
-        else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
+        else if ( rProp[i].Name == ITEM_DESCRIPTOR_STYLE )
         {
             rProp[i].Value >>= rStyle;
         }
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index 6ead1feee3f3..070799e371ff 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -350,7 +350,7 @@ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::bean
 Any SAL_CALL ConstItemContainer::getPropertyValue( const ::rtl::OUString& PropertyName )
 throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
-    if (PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROPNAME_UINAME)))
+    if ( PropertyName == PROPNAME_UINAME )
         return makeAny( m_aUIName );
 
     throw UnknownPropertyException();
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 4c1659ba0976..c14fd5814148 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -207,13 +207,13 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
              aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument")) ||
              aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.xforms.XMLFormDocument")) )
             sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("writer"));
-        else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sheet.SpreadsheetDocument")) )
+        else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" )
             sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("calc"));
-        else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationDocument")) )
+        else if ( aModuleId == "com.sun.star.presentation.PresentationDocument" )
             sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impress"));
-        else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocument")) )
+        else if ( aModuleId == "com.sun.star.drawing.DrawingDocument" )
             sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("draw"));
-        else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.formula.FormulaProperties")) )
+        else if ( aModuleId == "com.sun.star.formula.FormulaProperties" )
             sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("math"));
         else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DatabaseDocument")) ||
                   aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument")) ||
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 92b5f7f65859..185008b6bbca 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -161,19 +161,19 @@ throw ( Exception, RuntimeException )
             PropertyValue aPropValue;
             if ( aArguments[n] >>= aPropValue )
             {
-                if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_CONFIGSOURCE)))
+                if ( aPropValue.Name == UIELEMENT_PROPNAME_CONFIGSOURCE )
                     setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_CONFIGSOURCE, aPropValue.Value );
-                else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_FRAME)))
+                else if ( aPropValue.Name == UIELEMENT_PROPNAME_FRAME )
                     setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_FRAME, aPropValue.Value );
-                else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_PERSISTENT)))
+                else if ( aPropValue.Name == UIELEMENT_PROPNAME_PERSISTENT )
                     setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_PERSISTENT, aPropValue.Value );
-                else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_RESOURCEURL)))
+                else if ( aPropValue.Name == UIELEMENT_PROPNAME_RESOURCEURL )
                     setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_RESOURCEURL, aPropValue.Value );
-                else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_TYPE)))
+                else if ( aPropValue.Name == UIELEMENT_PROPNAME_TYPE )
                     setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_TYPE, aPropValue.Value );
-                else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_CONFIGLISTENER)))
+                else if ( aPropValue.Name == UIELEMENT_PROPNAME_CONFIGLISTENER )
                     setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_CONFIGLISTENER, aPropValue.Value );
-                else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UIELEMENT_PROPNAME_NOCLOSE)))
+                else if ( aPropValue.Name == UIELEMENT_PROPNAME_NOCLOSE )
                     setFastPropertyValue_NoBroadcast( UIELEMENT_PROPHANDLE_NOCLOSE, aPropValue.Value );
             }
         }
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 3b4774ca2948..7d5e6a580cdc 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -580,22 +580,22 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName,
                         if ( aWindowState[n].Value >>= bValue )
                             rElementData.m_aDockedData.m_bLocked = bValue;
                     }
-                    else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_CONTEXT)))
+                    else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_CONTEXT )
                     {
                         if ( aWindowState[n].Value >>= bValue )
                             rElementData.m_bContextSensitive = bValue;
                     }
-                    else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_NOCLOSE)))
+                    else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_NOCLOSE )
                     {
                         if ( aWindowState[n].Value >>= bValue )
                             rElementData.m_bNoClose = bValue;
                     }
-                    else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_CONTEXTACTIVE)))
+                    else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_CONTEXTACTIVE )
                     {
                         if ( aWindowState[n].Value >>= bValue )
                             rElementData.m_bContextActive = bValue;
                     }
-                    else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_SOFTCLOSE)))
+                    else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_SOFTCLOSE )
                     {
                         if ( aWindowState[n].Value >>= bValue )
                             rElementData.m_bSoftClose = bValue;
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 0c0a241a9fcd..ff6ea0b04513 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -1192,9 +1192,9 @@ void ToolbarLayoutManager::implts_createCustomToolBars( const uno::Sequence< uno
         ::rtl::OUString aTbxTitle;
         for ( sal_Int32 j = 0; j < rTbxSeq.getLength(); j++ )
         {
-            if ( rTbxSeq[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ResourceURL")))
+            if ( rTbxSeq[j].Name == "ResourceURL" )
                 rTbxSeq[j].Value >>= aTbxResName;
-            else if ( rTbxSeq[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UIName")))
+            else if ( rTbxSeq[j].Name == "UIName" )
                 rTbxSeq[j].Value >>= aTbxTitle;
         }
 
diff --git a/framework/source/lomenubar/FrameJob.cxx b/framework/source/lomenubar/FrameJob.cxx
index f31fde0ced83..d96d8fc4879b 100644
--- a/framework/source/lomenubar/FrameJob.cxx
+++ b/framework/source/lomenubar/FrameJob.cxx
@@ -225,7 +225,7 @@ Any SAL_CALL FrameJob::execute( const Sequence< NamedValue >& aArguments )
 
     for (int i = 0; i<len; i++)
     {
-        if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Environment")))
+        if ( aArguments[i].Name == "Environment" )
         {
             aArguments[i].Value >>= lEnv;
             break;
@@ -235,7 +235,7 @@ Any SAL_CALL FrameJob::execute( const Sequence< NamedValue >& aArguments )
     len = lEnv.getLength ();
     for (int i = 0; i<len; i++)
     {
-        if (lEnv[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Model")))
+        if ( lEnv[i].Name == "Model" )
         {
             lEnv[i].Value >>= xModel;
         }
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 28d2734a44c8..fecbf6a5202c 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -776,7 +776,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent
         implts_registerDocument(xDocument);
     }
     // document modified => set its modify state new (means modified against the original file!)
-    else if (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(EVENT_ON_MODIFYCHANGED)))
+    else if ( aEvent.EventName == EVENT_ON_MODIFYCHANGED )
     {
         implts_updateModifiedState(xDocument);
     }
@@ -807,7 +807,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent
        Dont remove temp. files or change the modified state of the document!
        It was not realy saved to the original file ...
     */
-    else if (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(EVENT_ON_SAVETODONE)))
+    else if ( aEvent.EventName == EVENT_ON_SAVETODONE )
     {
         implts_updateDocumentUsedForSavingState(xDocument, SAVE_FINISHED);
     }
@@ -824,7 +824,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent
         implts_updateDocumentUsedForSavingState(xDocument, SAVE_FINISHED);
     }
     // document closed => remove temp. files and configuration entries
-    else if (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(EVENT_ON_UNLOAD)))
+    else if ( aEvent.EventName == EVENT_ON_UNLOAD )
     {
         implts_deregisterDocument(xDocument, sal_True); // sal_True => stop listening for disposing() !
     }
@@ -854,7 +854,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven
         ::rtl::OUString sPath;
         pChanges[i].Accessor >>= sPath;
 
-        if (sPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_AUTOSAVE_ENABLED)))
+        if ( sPath == CFG_ENTRY_AUTOSAVE_ENABLED )
         {
             sal_Bool bEnabled = sal_False;
             if (pChanges[i].Element >>= bEnabled)
@@ -872,7 +872,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven
             }
         }
         else
-        if (sPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_AUTOSAVE_TIMEINTERVALL)))
+        if ( sPath == CFG_ENTRY_AUTOSAVE_TIMEINTERVALL )
             pChanges[i].Element >>= m_nAutoSaveTimeIntervall;
     }
 
@@ -2878,27 +2878,27 @@ void AutoRecovery::implts_informListener(      sal_Int32                      eJ
 //-----------------------------------------------
 sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL)
 {
-    if (aURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL)))
+    if ( aURL.Protocol == CMD_PROTOCOL )
     {
-        if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_PREPARE_EMERGENCY_SAVE)))
+        if ( aURL.Path == CMD_DO_PREPARE_EMERGENCY_SAVE )
             return AutoRecovery::E_PREPARE_EMERGENCY_SAVE;
-        else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_EMERGENCY_SAVE)))
+        else if ( aURL.Path == CMD_DO_EMERGENCY_SAVE )
             return AutoRecovery::E_EMERGENCY_SAVE;
-        else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_RECOVERY)))
+        else if ( aURL.Path == CMD_DO_RECOVERY )
             return AutoRecovery::E_RECOVERY;
-        else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_ENTRY_BACKUP)))
+        else if ( aURL.Path == CMD_DO_ENTRY_BACKUP )
             return AutoRecovery::E_ENTRY_BACKUP;
-        else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_ENTRY_CLEANUP)))
+        else if ( aURL.Path == CMD_DO_ENTRY_CLEANUP )
             return AutoRecovery::E_ENTRY_CLEANUP;
-        else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SESSION_SAVE)))
+        else if ( aURL.Path == CMD_DO_SESSION_SAVE )
             return AutoRecovery::E_SESSION_SAVE;
-        else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SESSION_QUIET_QUIT)))
+        else if ( aURL.Path == CMD_DO_SESSION_QUIET_QUIT )
             return AutoRecovery::E_SESSION_QUIET_QUIT;
-        else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SESSION_RESTORE)))
+        else if ( aURL.Path == CMD_DO_SESSION_RESTORE )
             return AutoRecovery::E_SESSION_RESTORE;
-        else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_DISABLE_RECOVERY)))
+        else if ( aURL.Path == CMD_DO_DISABLE_RECOVERY )
             return AutoRecovery::E_DISABLE_AUTORECOVERY;
-        else if (aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SET_AUTOSAVE_STATE)))
+        else if ( aURL.Path == CMD_DO_SET_AUTOSAVE_STATE )
             return AutoRecovery::E_SET_AUTOSAVE_STATE;
     }
 
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 92b479d1bcff..55bed9b4b9dc 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -227,11 +227,11 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any  >& args)
         {
             if (args[i] >>= v)
             {
-                if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SessionManagerName")))
+                if ( v.Name == "SessionManagerName" )
                     v.Value >>= aSMgr;
-                else if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SessionManager")))
+                else if ( v.Name == "SessionManager" )
                     v.Value >>= m_rSessionManager;
-                else if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AllowUserInteractionOnQuit")))
+                else if ( v.Name == "AllowUserInteractionOnQuit" )
                     v.Value >>= m_bAllowUserInteractionOnQuit;
             }
         }
@@ -250,13 +250,13 @@ void SAL_CALL SessionListener::statusChanged(const FeatureStateEvent& event)
     throw (css::uno::RuntimeException)
 {
    SAL_INFO("fwk.session", "SessionListener::statusChanged");
-   if (event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionRestore")))
+   if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionRestore" )
     {
         if (event.FeatureDescriptor.compareToAscii("update")==0)
             m_bRestored = sal_True; // a document was restored
 
     }
-    else if (event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionSave")))
+    else if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionSave" )
     {
         if (event.FeatureDescriptor.compareToAscii("stop")==0)
         {
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 7426360fa27b..0abb42bb6539 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -770,15 +770,15 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments )
             PropertyValue aPropValue;
             if ( aArguments[n] >>= aPropValue )
             {
-                if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserConfigStorage")) )
+                if ( aPropValue.Name == "UserConfigStorage" )
                 {
                     aPropValue.Value >>= m_xUserConfigStorage;
                 }
-                else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ModuleIdentifier")) )
+                else if ( aPropValue.Name == "ModuleIdentifier" )
                 {
                     aPropValue.Value >>= m_aModuleIdentifier;
                 }
-                else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserRootCommit")) )
+                else if ( aPropValue.Name == "UserRootCommit" )
                 {
                     aPropValue.Value >>= m_xUserRootCommit;
                 }
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 241a3d5874ce..773b1cebfa15 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -215,7 +215,7 @@ throw ( NoSuchElementException, RuntimeException)
             xCont->getByName(ModuleIdentifier) >>= lProps;
             for (sal_Int32 i=0; i<lProps.getLength(); ++i)
             {
-                if (lProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryShortName")))
+                if ( lProps[i].Name == "ooSetupFactoryShortName" )
                 {
                     lProps[i].Value >>= sShort;
                     break;
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 1f0974282d3f..bc68f637add3 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -1396,7 +1396,7 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XMultiServi
             ::rtl::OUString aWindowStateFileStr;
             for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
             {
-                if ( aSeq[y].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryWindowStateConfigRef")) )
+                if ( aSeq[y].Name == "ooSetupFactoryWindowStateConfigRef" )
                 {
                     aSeq[y].Value >>= aWindowStateFileStr;
                     break;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 0ff34d6d097b..38b14b1d8114 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -883,7 +883,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
 
                 // Set key code, workaround for hard-coded shortcut F1 mapped to .uno:HelpIndex
                 // Only non-popup menu items can have a short-cut
-                if ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdHelpIndex)) )
+                if ( pMenuItemHandler->aMenuItemURL == aCmdHelpIndex )
                 {
                     KeyCode aKeyCode( KEY_F1 );
                     pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode );
@@ -1481,7 +1481,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
 
             // Set key code, workaround for hard-coded shortcut F1 mapped to .uno:HelpIndex
             // Only non-popup menu items can have a short-cut
-            if ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdHelpIndex)) )
+            if ( pMenuItemHandler->aMenuItemURL == aCmdHelpIndex )
             {
                 KeyCode aKeyCode( KEY_F1 );
                 pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode );
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index a89ca7e8653f..45d5bf849ad6 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -193,7 +193,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
                 PropertyValue aPropValue;
                 if ( aArguments[n] >>= aPropValue )
                 {
-                    if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MenuOnly")) )
+                    if ( aPropValue.Name == "MenuOnly" )
                         aPropValue.Value >>= bMenuOnly;
                 }
             }
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index d2731962f4c2..d82be5a8629a 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -514,7 +514,7 @@ void NewMenuController::impl_setPopupMenu()
                 {
                     for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
                     {
-                        if ( aSeq[y].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryEmptyDocumentURL")) )
+                        if ( aSeq[y].Name == "ooSetupFactoryEmptyDocumentURL" )
                         {
                             aSeq[y].Value >>= m_aEmptyDocURL;
                             break;
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 3093ec77ad0e..ef15fe75c06d 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -490,27 +490,27 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
             {
                 for ( int i = 0; i < aProp.getLength(); i++ )
                 {
-                    if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
+                    if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
                     {
                         aProp[i].Value >>= aCommandURL;
                     }
-                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
+                    else if ( aProp[i].Name == ITEM_DESCRIPTOR_HELPURL )
                     {
                         aProp[i].Value >>= aHelpURL;
                     }
-                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
+                    else if ( aProp[i].Name == ITEM_DESCRIPTOR_STYLE )
                     {
                         aProp[i].Value >>= nStyle;
                     }
-                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
+                    else if ( aProp[i].Name == ITEM_DESCRIPTOR_TYPE )
                     {
                         aProp[i].Value >>= nType;
                     }
-                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_WIDTH)) )
+                    else if ( aProp[i].Name == ITEM_DESCRIPTOR_WIDTH )
                     {
                         aProp[i].Value >>= nWidth;
                     }
-                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_OFFSET)) )
+                    else if ( aProp[i].Name == ITEM_DESCRIPTOR_OFFSET )
                     {
                         aProp[i].Value >>= nOffset;
                     }
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 067dbe4eacb1..80adbd735883 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -547,7 +547,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
     if ( m_bDisposed )
         return;
 
-    if ( Event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ImageOrientation")) )
+    if ( Event.FeatureURL.Complete == ".uno:ImageOrientation" )
     {
         SfxImageItem aItem( 1, 0 );
         aItem.PutValue( Event.State );
@@ -872,7 +872,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const
     aPropSeq = GetPropsForCommand( aCmdURL );
     for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
     {
-        if ( aPropSeq[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Name")) )
+        if ( aPropSeq[i].Name == "Name" )
         {
             aPropSeq[i].Value >>= aLabel;
             break;
@@ -890,7 +890,7 @@ sal_Int32 ToolBarManager::RetrievePropertiesFromCommand( const ::rtl::OUString&
     aPropSeq = GetPropsForCommand( aCmdURL );
     for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
     {
-        if ( aPropSeq[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Properties")) )
+        if ( aPropSeq[i].Name == "Properties" )
         {
             aPropSeq[i].Value >>= nProperties;
             break;
@@ -1282,7 +1282,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
             {
                 for ( int i = 0; i < aProp.getLength(); i++ )
                 {
-                    if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
+                    if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
                     {
                         aProp[i].Value >>= aCommandURL;
                         if ( aCommandURL.compareToAscii(MENUPREFIX, RTL_CONSTASCII_LENGTH(MENUPREFIX) ) == 0  )
@@ -1303,7 +1303,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                                     xMenuContainer->getByIndex(0) >>= aProps;
                                     for ( sal_Int32 index=0; index<aProps.getLength(); ++index )
                                     {
-                                        if ( aProps[ index ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)) )
+                                        if ( aProps[ index ].Name == ITEM_DESCRIPTOR_CONTAINER )
 
                                         {
                                             aProps[ index ].Value >>= aMenuDesc;
@@ -1317,19 +1317,19 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                             }
                         }
                     }
-                    else if (  aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
+                    else if ( aProp[i].Name == ITEM_DESCRIPTOR_HELPURL )
                         aProp[i].Value >>= aHelpURL;
-                    else if (  aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TOOLTIP)) )
+                    else if ( aProp[i].Name == ITEM_DESCRIPTOR_TOOLTIP )
                         aProp[i].Value >>= aTooltip;
-                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_LABEL)) )
+                    else if ( aProp[i].Name == ITEM_DESCRIPTOR_LABEL )
                         aProp[i].Value >>= aLabel;
-                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
+                    else if ( aProp[i].Name == ITEM_DESCRIPTOR_TYPE )
                         aProp[i].Value >>= nType;
-                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_VISIBLE)) )
+                    else if ( aProp[i].Name == ITEM_DESCRIPTOR_VISIBLE )
                         aProp[i].Value >>= bIsVisible;
-                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_WIDTH)) )
+                    else if ( aProp[i].Name == ITEM_DESCRIPTOR_WIDTH )
                         aProp[i].Value >>= nWidth;
-                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
+                    else if ( aProp[i].Name == ITEM_DESCRIPTOR_STYLE )
                         aProp[i].Value >>= nStyle;
                 }
 
@@ -2005,11 +2005,11 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
                                 {
                                     for ( sal_Int32 j = 0; j < aProp.getLength(); j++ )
                                     {
-                                        if ( aProp[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
+                                        if ( aProp[j].Name == ITEM_DESCRIPTOR_COMMANDURL )
                                         {
                                             aProp[j].Value >>= aCommandURL;
                                         }
-                                        else if ( aProp[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_VISIBLE)) )
+                                        else if ( aProp[j].Name == ITEM_DESCRIPTOR_VISIBLE )
                                         {
                                             aProp[j].Value >>= bVisible;
                                             nVisibleIndex = j;
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index 55581665916c..7686b9535089 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -129,13 +129,13 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL
 
     for ( sal_Int32 n = 0; n < Args.getLength(); n++ )
     {
-        if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ConfigurationSource")) )
+        if ( Args[n].Name == "ConfigurationSource" )
             Args[n].Value >>= xConfigSource;
-        else if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Frame")) )
+        else if ( Args[n].Name == "Frame" )
             Args[n].Value >>= xFrame;
-        else if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ResourceURL")) )
+        else if ( Args[n].Name == "ResourceURL" )
             Args[n].Value >>= aResourceURL;
-        else if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Persistent")) )
+        else if ( Args[n].Name == "Persistent" )
             Args[n].Value >>= bPersistent;
         else if ( _pExtraMode && Args[n].Name.equalsAscii( _pExtraMode ))
             Args[n].Value >>= bExtraMode;
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index 63b8dd5085b5..c912529e32a7 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -1043,7 +1043,7 @@ Calendar_gregorian::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16
                 sprintf(aStr, "%d", value);     // #100211# - checked
                 break;
             case CalendarDisplayCode::LONG_YEAR:
-                if (aCalendar.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("gengou")))
+                if ( aCalendar.Name == "gengou" )
                     sprintf(aStr, "%02d", value);     // #100211# - checked
                 else
                     sprintf(aStr, "%d", value);     // #100211# - checked
diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
index 1c88b9b8997e..b5ce82d80e1f 100644
--- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
@@ -118,9 +118,9 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry,
     if (hModule) {
         sal_uInt16 **(*func)(sal_Int16*)=NULL;
         const sal_Char *func_name=NULL;
-        if (rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("zh")))
+        if ( rLocale.Language == "zh" )
             func_name=(OUString(RTL_CONSTASCII_USTRINGPARAM("TW HK MO")).indexOf(rLocale.Country) >= 0) ?  "get_zh_zhuyin" : "get_zh_pinyin";
-        else if (rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ko")))
+        else if ( rLocale.Language == "ko" )
             func_name="get_ko_phonetic";
         if (func_name)
             func=(sal_uInt16 **(*)(sal_Int16*))osl_getFunctionSymbol(hModule, OUString::createFromAscii(func_name).pData);
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 42cf5837fb36..840bf30529ae 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -128,31 +128,31 @@ LocaleNode::~LocaleNode()
 
 LocaleNode* LocaleNode::createNode (const OUString& name, const Reference< XAttributeList > & attr)
 {
-    if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_INFO")))
+    if ( name == "LC_INFO" )
         return new LCInfoNode (name,attr);
-    if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_CTYPE")))
+    if ( name == "LC_CTYPE" )
         return new LCCTYPENode (name,attr);
-    if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_FORMAT")))
+    if ( name == "LC_FORMAT" )
         return new LCFormatNode (name,attr);
-    if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_FORMAT_1")))
+    if ( name == "LC_FORMAT_1" )
         return new LCFormatNode (name,attr);
-    if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_CALENDAR")))
+    if ( name == "LC_CALENDAR" )
         return new LCCalendarNode (name,attr);
-    if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_CURRENCY")))
+    if ( name == "LC_CURRENCY" )
         return new LCCurrencyNode (name,attr);
-    if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_TRANSLITERATION")))
+    if ( name == "LC_TRANSLITERATION" )
         return new LCTransliterationNode (name,attr);
-    if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_COLLATION")))
+    if ( name == "LC_COLLATION" )
         return new LCCollationNode (name,attr);
-    if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_INDEX")))
+    if ( name == "LC_INDEX" )
         return new LCIndexNode (name,attr);
-    if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_SEARCH")))
+    if ( name == "LC_SEARCH" )
         return new LCSearchNode (name,attr);
-    if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_MISC")))
+    if ( name == "LC_MISC" )
         return new LCMiscNode (name,attr);
-      if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_NumberingLevel")))
+      if ( name == "LC_NumberingLevel" )
                 return new LCNumberingLevelNode (name, attr);
-      if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LC_OutLineNumberingLevel")))
+      if ( name == "LC_OutLineNumberingLevel" )
                 return new LCOutlineNumberingLevelNode (name, attr);
 
     return new LocaleNode(name,attr);
@@ -447,7 +447,7 @@ void LCCTYPENode::generateCode (const OFileWriter &of) const
         incError( "DateSeparator equals TimeSeparator.");
     if (aDecSep == aThoSep)
         incError( "DecimalSeparator equals ThousandSeparator.");
-    if (aThoSep.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( " ")))
+    if ( aThoSep == " " )
         incError( "ThousandSeparator is an ' ' ordinary space, this should be a non-breaking space U+00A0 instead.");
     if (aListSep == aDecSep)
         fprintf( stderr, "Warning: %s\n",
@@ -624,7 +624,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
         incErrorStr("replaceTo=\"%s\" needs FFFF to be adapted to the real LangID value.", str);
     of.writeParameter("replaceTo", str, mnSection);
     // Remember the replaceTo value for "[CURRENCY]" to check format codes.
-    if (strFrom.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "[CURRENCY]")))
+    if ( strFrom == "[CURRENCY]" )
         sTheCurrencyReplaceTo = str;
     // Remember the currency symbol if present.
     if (str.indexOfAsciiL( "[$", 2) == 0)
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 3febdd461f6a..de1a36e2795a 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -703,7 +703,7 @@ sal_Bool SAL_CALL ConvDic::supportsService( const OUString& rServiceName )
 {
     MutexGuard  aGuard( GetLinguMutex() );
     sal_Bool bRes = sal_False;
-    if (rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_CONV_DICTIONARY)))
+    if ( rServiceName == SN_CONV_DICTIONARY )
         bRes = sal_True;
     return bRes;
 }
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index d6b2663aec38..b93971f99184 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -529,7 +529,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
         const PropertyValue *pVal = rPropVals.getConstArray();
         for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
-            if (pVal[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UPN_MAX_NUMBER_OF_SUGGESTIONS)))
+            if ( pVal[i].Name == UPN_MAX_NUMBER_OF_SUGGESTIONS )
             {
                 pVal[i].Value >>= nResMaxNumberOfSuggestions;
             }
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index dc2bfee0bde3..ff59c792442d 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -114,7 +114,7 @@ sal_Bool LWPFilterReader::filter( const Sequence< PropertyValue >& aDescriptor )
     for( sal_Int32 i = 0; i < aDescriptor.getLength(); i++ )
     {
         //Note we should attempt to use "InputStream" if it exists first!
-        if( aDescriptor[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
+        if ( aDescriptor[i].Name == "URL" )
             aDescriptor[i].Value >>= sURL;
     }
 
@@ -218,11 +218,11 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
     sal_Int32 nPropertyCount = aDescriptor.getLength();
      for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
     {
-        if( aDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TypeName")) )
+        if ( aDescriptor[nProperty].Name == "TypeName" )
         {
             aDescriptor[nProperty].Value >>= aTypeName;
         }
-        else if( aDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AsTemplate")) )
+        else if ( aDescriptor[nProperty].Name == "AsTemplate" )
         {
             bOpenAsTemplate = sal_True;
         }
@@ -232,7 +232,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
     {
         OUString strTemp;
         aDescriptor[i].Value >>= strTemp;
-        if( aDescriptor[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")) )
+        if ( aDescriptor[i].Name == "InputStream" )
         {
             uno::Reference< XInputStream> rInputStream;
             aDescriptor[i].Value >>= rInputStream;
@@ -242,7 +242,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
             //
             if( IsWordproFile(rInputStream) )
             {
-                if( aTypeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("wordpro_template")) )
+                if ( aTypeName == "wordpro_template" )
                 {
                     if(!bOpenAsTemplate)
                     {
@@ -259,7 +259,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
             }
             return ret;
         }
-        else if( aDescriptor[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
+        else if ( aDescriptor[i].Name == "URL" )
         {
                     OUString        sURL;
             OUString        sFileName;
@@ -277,7 +277,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
             //end with .lwp:
             if( IsWordproFile(sURL) )
             {
-                if( aTypeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("wordpro_template")) )
+                if ( aTypeName == "wordpro_template" )
                 {
                     if(!bOpenAsTemplate)
                     {
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index a20c30e0375d..b74e21dc8eee 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -141,11 +141,11 @@ sal_Bool XFlatXml::importer(
     for ( sal_Int32 i = 0 ; i < nLength; i++)
     {
         aName = aSourceData[i].Name;
-        if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")))
+        if ( aName == "InputStream" )
             aSourceData[i].Value >>= xInputStream;
-        else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName")))
+        else if ( aName == "FileName" )
             aSourceData[i].Value >>= aFileName;
-        else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
+        else if ( aName == "URL" )
             aSourceData[i].Value >>= aURL;
     }
 
@@ -203,7 +203,7 @@ sal_Bool XFlatXml::exporter(
     for ( sal_Int32 i = 0 ; i < nLength; i++)
     {
         aName = aSourceData[i].Name;
-        if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutputStream")))
+        if ( aName == "OutputStream" )
             aSourceData[i].Value >>= rOutputStream;
         else if ( aName == "URL" )
             aSourceData[i].Value >>= sURL;
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
index b3e6cbaeb9bf..755e69123af0 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
@@ -57,7 +57,7 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans:
     const css::beans::NamedValue* p = lArguments.getConstArray();
     for (i=0; i<c; ++i)
     {
-        if (p[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Environment")))
+        if ( p[i].Name == "Environment" )
         {
             p[i].Value >>= lEnv;
             break;
@@ -70,12 +70,12 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans:
     p = lEnv.getConstArray();
     for (i=0; i<c; ++i)
     {
-        if (p[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Model")))
+        if ( p[i].Name == "Model" )
         {
             p[i].Value >>= xModel;
             break;
         }
-        if (p[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Frame")))
+        if ( p[i].Name == "Frame" )
         {
             css::uno::Reference< css::frame::XController > xController;
             css::uno::Reference< css::frame::XFrame >      xFrame;
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
index fa748a7b6552..219d028dd4a4 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
@@ -373,7 +373,7 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
 
 void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener >& xControl, const URL& aURL ) throw (RuntimeException)
 {
-    if ( aURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.demo.complextoolbarcontrols.demoaddon:")) )
+    if ( aURL.Protocol == "vnd.demo.complextoolbarcontrols.demoaddon:" )
     {
         if ( aURL.Path == "Command1" )
         {
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 01ee8191ac41..967f57c661cb 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -394,7 +394,7 @@ Reference< XShape > Shape::createAndInsert(
     aTransformation.scale(1/360.0, 1/360.0);
 
     // special for lineshape
-    if ( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.LineShape")) )
+    if ( aServiceName == "com.sun.star.drawing.LineShape" )
     {
         ::basegfx::B2DPolygon aPoly;
         aPoly.insert( 0, ::basegfx::B2DPoint( 0, 0 ) );
@@ -415,7 +415,7 @@ Reference< XShape > Shape::createAndInsert(
 
         maShapeProperties[ PROP_PolyPolygon ] <<= aPolyPolySequence;
     }
-    else if ( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ConnectorShape")) )
+    else if ( aServiceName == "com.sun.star.drawing.ConnectorShape" )
     {
         ::basegfx::B2DPolygon aPoly;
         aPoly.insert( 0, ::basegfx::B2DPoint( 0, 0 ) );
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index e8c56b3d30f0..4283a48986a8 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -662,24 +662,24 @@ void ChartExport::InitRangeSegmentationProperties( const Reference< chart2::XCha
                 bool bBrokenRangeAvailable = false;
                 for( sal_Int32 i=0; i<aArgs.getLength(); ++i )
                 {
-                    if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
+                    if ( aArgs[i].Name == "CellRangeRepresentation" )
                         aArgs[i].Value >>= sCellRange;
-                    else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("BrokenCellRangeForExport")))
+                    else if ( aArgs[i].Name == "BrokenCellRangeForExport" )
                     {
                         if( aArgs[i].Value >>= sBrokenRange )
                             bBrokenRangeAvailable = true;
                     }
-                    else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DataRowSource")))
+                    else if ( aArgs[i].Name == "DataRowSource" )
                     {
                         ::com::sun::star::chart::ChartDataRowSource eRowSource;
                         aArgs[i].Value >>= eRowSource;
                         mbRowSourceColumns = ( eRowSource == ::com::sun::star::chart::ChartDataRowSource_COLUMNS );
                     }
-                    else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FirstCellAsLabel")))
+                    else if ( aArgs[i].Name == "FirstCellAsLabel" )
                         aArgs[i].Value >>= mbHasSeriesLabels;
-                    else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("SequenceMapping")))
+                    else if ( aArgs[i].Name == "SequenceMapping" )
                         aArgs[i].Value >>= maSequenceMapping;
-                    else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("TableNumberList")))
+                    else if ( aArgs[i].Name == "TableNumberList" )
                         aArgs[i].Value >>= msTableNumberList;
                 }
 
diff --git a/oox/source/ole/axfontdata.cxx b/oox/source/ole/axfontdata.cxx
index b4846ca00373..dc6a070e4be2 100644
--- a/oox/source/ole/axfontdata.cxx
+++ b/oox/source/ole/axfontdata.cxx
@@ -117,7 +117,7 @@ bool AxFontData::importGuidAndFont( BinaryInputStream& rInStrm )
     OUString aGuid = OleHelper::importGuid( rInStrm );
     if( aGuid.equalsAscii( AX_GUID_CFONT ) )
         return importBinaryModel( rInStrm );
-    if( aGuid.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(OLE_GUID_STDFONT) ) )
+    if ( aGuid == OLE_GUID_STDFONT )
         return importStdFont( rInStrm );
     return false;
 }
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 91953f35aa4b..191c74b024aa 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -404,7 +404,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight,
         else // hyperlink moniker
         {
             OUString aGuid = importGuid( rInStrm );
-            if( aGuid.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_FILEMONIKER)) )
+            if ( aGuid == OLE_GUID_FILEMONIKER )
             {
                 // file name, maybe relative and with directory up-count
                 sal_Int16 nUpLevels;
@@ -425,7 +425,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight,
                     for( sal_Int16 nLevel = 0; nLevel < nUpLevels; ++nLevel )
                         orHlinkInfo.maTarget = CREATE_OUSTRING( "../" ) + orHlinkInfo.maTarget;
             }
-            else if( aGuid.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OLE_GUID_URLMONIKER)) )
+            else if ( aGuid == OLE_GUID_URLMONIKER )
             {
                 // URL, maybe relative and with leading '../'
                 sal_Int32 nBytes = rInStrm.readInt32();
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 1112e68d28d8..486cfef0af8f 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -277,7 +277,7 @@ namespace oox { namespace ppt {
                             {
                                 nCommand = EffectCommands::STOPAUDIO;
                             }
-                            else if( msCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("play") ) )
+                            else if ( msCommand == "play" )
                             {
                                 nCommand = EffectCommands::PLAY;
                             }
@@ -293,11 +293,11 @@ namespace oox { namespace ppt {
                                 }
                                 nCommand = EffectCommands::PLAY;
                             }
-                            else if( msCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("togglePause") ) )
+                            else if ( msCommand == "togglePause" )
                             {
                                 nCommand = EffectCommands::TOGGLEPAUSE;
                             }
-                            else if( msCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("stop") ) )
+                            else if ( msCommand == "stop" )
                             {
                                 nCommand = EffectCommands::STOP;
                             }
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 9258c5a3a7a7..2b61e91aa783 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -585,12 +585,12 @@ Reference< XShape > ComplexShape::implConvertAndInsert( const Reference< XShapes
                 aPropSet.setProperty( PROP_GraphicURL, aGraphicUrl );
             }
             // If the shape has an absolute position, set the properties accordingly.
-            if (maTypeModel.maPosition.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("absolute")))
+            if ( maTypeModel.maPosition == "absolute" )
             {
                 aPropSet.setProperty(PROP_HoriOrientPosition, rShapeRect.X);
                 aPropSet.setProperty(PROP_VertOrientPosition, rShapeRect.Y);
             }
-            if (maTypeModel.maPositionVerticalRelative.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("page")))
+            if ( maTypeModel.maPositionVerticalRelative == "page" )
             {
                 aPropSet.setProperty(PROP_VertOrientRelation, text::RelOrientation::PAGE_FRAME);
             }
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index 5fabbab1e973..b8811b5f61cf 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -780,7 +780,7 @@ sal_Int64 SAL_CALL ZipPackageFolder::getSomething( const uno::Sequence< sal_Int8
 void SAL_CALL ZipPackageFolder::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue )
         throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, uno::RuntimeException)
 {
-    if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MediaType")))
+    if ( aPropertyName == "MediaType" )
     {
         // TODO/LATER: activate when zip ucp is ready
         // if ( m_nFormat != embed::StorageFormats::PACKAGE )
@@ -788,9 +788,9 @@ void SAL_CALL ZipPackageFolder::setPropertyValue( const ::rtl::OUString& aProper
 
         aValue >>= sMediaType;
     }
-    else if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Version")))
+    else if ( aPropertyName == "Version" )
         aValue >>= m_sVersion;
-    else if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Size") ) )
+    else if ( aPropertyName == "Size" )
         aValue >>= aEntry.nSize;
     else
         throw UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx
index ff7ebac5d145..3b5ddd9172cb 100644
--- a/reportdesign/source/filter/xml/dbloader2.cxx
+++ b/reportdesign/source/filter/xml/dbloader2.cxx
@@ -74,7 +74,7 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon
                 {
                     ::rtl::OUString sMediaType;
                     xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ) >>= sMediaType;
-                    if ( sMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII)) )
+                    if ( sMediaType == MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII )
                         return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBaseReport"));
                     ::comphelper::disposeComponent(xProp);
                 }
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index f434fc05cc7b..75155732a956 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -158,7 +158,7 @@ void SAL_CALL ExportDocumentHandler::endDocument() throw (uno::RuntimeException,
 void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs) throw (uno::RuntimeException, xml::sax::SAXException)
 {
     bool bExport = true;
-    if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:chart")) )
+    if ( _sName == "office:chart" )
     {
         SvXMLAttributeList* pList = new SvXMLAttributeList();
         uno::Reference< xml::sax::XAttributeList > xNewAttribs = pList;
@@ -201,12 +201,12 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
         m_xDelegatee->endElement(sTableCalc);
         bExport = false;
     }
-    else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table")) )
+    else if ( _sName == "table:table" )
     {
         m_xDelegatee->startElement(lcl_createAttribute(XML_NP_RPT,XML_DETAIL),NULL);
         lcl_exportPrettyPrinting(m_xDelegatee);
     }
-    else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-header-rows")) )
+    else if ( _sName == "table:table-header-rows" )
     {
         m_bCountColumnHeader = true;
     }
@@ -214,7 +214,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
     {
         ++m_nColumnCount;
     }
-    else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-rows")) )
+    else if ( _sName == "table:table-rows" )
     {
         m_xDelegatee->startElement(_sName,xAttribs);
         exportTableRows();
@@ -224,17 +224,17 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
     }
     else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell"))) )
         bExport = false;
-    else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:plot-area")))
+    else if ( _sName == "chart:plot-area" )
     {
         SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);
         pList->RemoveAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("table:cell-range-address")));
     }
-    else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:categories")))
+    else if ( _sName == "chart:categories" )
     {
         static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_TABLE,XML_CELL_RANGE_ADDRESS));
         lcl_correctCellAddress(s_sCellAddress,xAttribs);
     }
-    else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:series")))
+    else if ( _sName == "chart:series" )
     {
         static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_CHART,XML_VALUES_CELL_RANGE_ADDRESS));
         lcl_correctCellAddress(s_sCellAddress,xAttribs);
@@ -257,21 +257,21 @@ void SAL_CALL ExportDocumentHandler::endElement(const ::rtl::OUString & _sName)
 {
     bool bExport = true;
     ::rtl::OUString sNewName = _sName;
-    if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:chart")) )
+    if ( _sName == "office:chart" )
     {
         sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_REPORT);
     }
-    else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table")) )
+    else if ( _sName == "table:table" )
     {
         m_xDelegatee->endElement(_sName);
         lcl_exportPrettyPrinting(m_xDelegatee);
         sNewName = lcl_createAttribute(XML_NP_RPT,XML_DETAIL);
     }
-    else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-header-rows")) )
+    else if ( _sName == "table:table-header-rows" )
     {
         m_bCountColumnHeader = false;
     }
-    else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-rows")) )
+    else if ( _sName == "table:table-rows" )
         m_bTableRowsStarted = false;
     else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell"))) )
         bExport = false;
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index 0e87b7a20c39..215d5301338c 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -148,7 +148,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
 {
     uno::Reference< xml::sax::XAttributeList > xNewAttribs = _xAttrList;
     bool bExport = true;
-    if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:report")) )
+    if ( _sName == "office:report" )
     {
         const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
         static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
@@ -196,7 +196,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
         bExport = false;
         m_bImportedChart = true;
     }
-    else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-field")) )
+    else if ( _sName == "rpt:master-detail-field" )
     {
         const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
         static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
@@ -244,7 +244,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
         ||    _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-component"))
         ||    _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-element")))
         bExport = false;
-    else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:plot-area")))
+    else if ( _sName == "chart:plot-area" )
     {
         sal_Bool bHasCategories = sal_True;
         const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
@@ -260,7 +260,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
                 sLocalName = sAttrName;
             else
                 sLocalName = sAttrName.copy( nColonPos + 1L );
-            if ( sLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("data-source-has-labels")) )
+            if ( sLocalName == "data-source-has-labels" )
             {
                 const rtl::OUString sValue = _xAttrList->getValueByIndex( i );
                 bHasCategories = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("both"));
@@ -271,7 +271,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
         beans::PropertyValue* pArgEnd  = pArgIter + m_aArguments.getLength();
         for(;pArgIter != pArgEnd;++pArgIter)
         {
-            if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HasCategories")) )
+            if ( pArgIter->Name == "HasCategories" )
             {
                 pArgIter->Value <<= bHasCategories;
                 break;
@@ -293,11 +293,11 @@ void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName)
 {
     bool bExport = true;
     ::rtl::OUString sNewName = _sName;
-    if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:report")) )
+    if ( _sName == "office:report" )
     {
         sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_CHART);
     }
-    else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-fields")) )
+    else if ( _sName == "rpt:master-detail-fields" )
     {
         if ( !m_aMasterFields.empty() )
             m_xDatabaseDataProvider->setMasterFields(uno::Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index b93f27f564e2..5d77ea8efef1 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -108,11 +108,11 @@ void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArgumen
                 break;
             }
         }
-        if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ZoomSlider")) )
+        if ( m_aCommandURL == ".uno:ZoomSlider" )
         {
             m_pController = TStatusbarHelper::createFromQuery(new SvxZoomSliderControl(m_nSlotId = SID_ATTR_ZOOMSLIDER,m_nId,*pStatusBar));
         }
-        else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Zoom")) )
+        else if ( m_aCommandURL == ".uno:Zoom" )
         {
             m_pController = TStatusbarHelper::createFromQuery(new SvxZoomStatusBarControl(m_nSlotId = SID_ATTR_ZOOM,m_nId,*pStatusBar));
         }
@@ -135,7 +135,7 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv
 
     if ( m_pController.is() )
     {
-        if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ZoomSlider")) )
+        if ( m_aCommandURL == ".uno:ZoomSlider" )
         {
             Sequence< PropertyValue > aSeq;
             if ( (_aEvent.State >>= aSeq) && aSeq.getLength() == 2 )
@@ -145,7 +145,7 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv
                 static_cast<SvxZoomSliderControl*>(m_pController.get())->StateChanged(m_nSlotId,SFX_ITEM_AVAILABLE,&aZoomSlider);
             }
         }
-        else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Zoom")) )
+        else if ( m_aCommandURL == ".uno:Zoom" )
         {
             Sequence< PropertyValue > aSeq;
             if ( (_aEvent.State >>= aSeq) && aSeq.getLength() == 3 )
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index 74e670a19c3a..61219dc0531e 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -158,37 +158,37 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments
                 break;
             }
         }
-        if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:BasicShapes")) )
+        if ( m_aCommandURL == ".uno:BasicShapes" )
         {
             m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:BasicShapes")),sal_True));
             m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_BASIC,m_nToolBoxId,*pToolBox));
         }
-        else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:SymbolShapes")) )
+        else if ( m_aCommandURL == ".uno:SymbolShapes" )
         {
             m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SymbolShapes")),sal_True));
             m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_SYMBOL,m_nToolBoxId,*pToolBox));
         }
-        else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ArrowShapes")) )
+        else if ( m_aCommandURL == ".uno:ArrowShapes" )
         {
             m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ArrowShapes")),sal_True));
             m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_ARROW,m_nToolBoxId,*pToolBox));
         }
-        else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:FlowChartShapes")) )
+        else if ( m_aCommandURL == ".uno:FlowChartShapes" )
         {
             m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FlowChartShapes")),sal_True));
             m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_FLOWCHART,m_nToolBoxId,*pToolBox));
         }
-        else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CalloutShapes")) )
+        else if ( m_aCommandURL == ".uno:CalloutShapes" )
         {
             m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CalloutShapes")),sal_True));
             m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_CALLOUT,m_nToolBoxId,*pToolBox));
         }
-        else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:StarShapes")) )
+        else if ( m_aCommandURL == ".uno:StarShapes" )
         {
             m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:StarShapes")),sal_True));
             m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_STAR,m_nToolBoxId,*pToolBox));
         }
-        else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CharFontName")) )
+        else if ( m_aCommandURL == ".uno:CharFontName" )
         {
             m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CharFontName")),sal_True));
             m_pToolbarController = TToolbarHelper::createFromQuery(new SvxFontNameToolBoxControl/*SvxStyleToolBoxControl*/(m_nSlotId = SID_ATTR_CHAR_FONT,m_nToolBoxId,*pToolBox));
diff --git a/sal/qa/rtl/bootstrap/bootstrap_process.cxx b/sal/qa/rtl/bootstrap/bootstrap_process.cxx
index 455e30a23497..6455073224b5 100644
--- a/sal/qa/rtl/bootstrap/bootstrap_process.cxx
+++ b/sal/qa/rtl/bootstrap/bootstrap_process.cxx
@@ -52,7 +52,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         aBootstrap.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("UNO_SERVICES")),
             suValue );
-        if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("service.rdb")) )
+        if ( suValue == "service.rdb" )
         {
             return 10;
         }
@@ -63,7 +63,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         aBootstrap.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTABLE_RC")),
             suValue );
-        if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) )
+        if ( suValue == "true" )
         {
             return 20;
         }
@@ -74,7 +74,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         aBootstrap.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("QADEV_BOOTSTRAP")),
             suValue );
-        if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sun&ms")) )
+        if ( suValue == "sun&ms" )
         {
             return 30;
         }
@@ -85,7 +85,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         aBs_custom.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("RTLVALUE")),
             suValue );
-        if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("qadev17")) )
+        if ( suValue == "qadev17" )
         {
             return 40;
         }
@@ -96,7 +96,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         aBs_custom.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTABLE_RC")),
             suValue );
-        if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) )
+        if ( suValue == "true" )
         {
             return 50;
         }
@@ -107,7 +107,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         aBs_custom.getFrom(
             OUString(RTL_CONSTASCII_USTRINGPARAM("ABCDE")),
             suValue, suDefault );
-        if (suValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("mydefault")) )
+        if ( suValue == "mydefault" )
         {
             return 60;
         }
diff --git a/sal/test/unloading/unloadTest.cxx b/sal/test/unloading/unloadTest.cxx
index 303bc7ecd8e3..36d2691c8440 100644
--- a/sal/test/unloading/unloadTest.cxx
+++ b/sal/test/unloading/unloadTest.cxx
@@ -559,7 +559,7 @@ sal_Bool test8()
     for( sal_Int32 i=0; i<seqTypes.getLength(); i++)
     {
         OUString name= seqTypes[i].getTypeName();
-        if( name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.uno.XUnloadingPreference")))
+        if ( name == "com.sun.star.uno.XUnloadingPreference" )
             b_ifaceSupported= sal_True;
     }
 
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 998f330a3cf1..87fbcedc1d03 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -87,13 +87,13 @@ void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument >& xCh
             const beans::PropertyValue& rProp = pPropArray[i];
             rtl::OUString aPropName(rProp.Name);
 
-            if (aPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
+            if ( aPropName == "CellRangeRepresentation" )
                 rProp.Value >>= rRanges;
-            else if (aPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataRowSource")))
+            else if ( aPropName == "DataRowSource" )
                 rDataRowSource = (chart::ChartDataRowSource)ScUnoHelpFunctions::GetEnumFromAny( rProp.Value );
-            else if (aPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HasCategories")))
+            else if ( aPropName == "HasCategories" )
                 rHasCategories = ScUnoHelpFunctions::GetBoolFromAny( rProp.Value );
-            else if (aPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FirstCellAsLabel")))
+            else if ( aPropName == "FirstCellAsLabel" )
                 rFirstCellAsLabel = ScUnoHelpFunctions::GetBoolFromAny( rProp.Value );
         }
     }
diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
index a4ce72468f0f..3b8ebabed36f 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -90,9 +90,9 @@ OUString ScPassHashHelper::getHashURI(ScPasswordHash eHash)
 
 ScPasswordHash ScPassHashHelper::getHashTypeFromURI(const OUString& rURI)
 {
-    if (rURI.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URI_SHA1)))
+    if ( rURI == URI_SHA1 )
         return PASSHASH_SHA1;
-    else if (rURI.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URI_XLS_LEGACY)))
+    else if ( rURI == URI_XLS_LEGACY )
         return PASSHASH_XL;
     return PASSHASH_UNSPECIFIED;
 }
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 9b0e48f0f3b4..2d201d1371f4 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -143,7 +143,7 @@ void ScAppOptions::GetDefaultFormulaSeparators(
 
     const Locale& rLocale = *ScGlobal::GetLocale();
     const OUString& rLang = rLocale.Language;
-    if (rLang.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ru")))
+    if ( rLang == "ru" )
         // Don't do automatic guess for these languages, and fall back to
         // the old separator set.
         return;
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index fb8e42998479..66c19f5e59e6 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2330,11 +2330,11 @@ void ScInterpreter::ScCellExternal()
     ScCellKeywordTranslator::transKeyword(aInfoType, ScGlobal::GetLocale(), ocCell);
     ScExternalRefManager* pRefMgr = pDok->GetExternalRefManager();
 
-    if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("COL")))
+    if ( aInfoType == "COL" )
         PushInt(nCol + 1);
-    else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ROW")))
+    else if ( aInfoType == "ROW" )
         PushInt(nRow + 1);
-    else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SHEET")))
+    else if ( aInfoType == "SHEET" )
     {
         // For SHEET, No idea what number we should set, but let's always set
         // 1 if the external sheet exists, no matter what sheet.  Excel does
@@ -2344,7 +2344,7 @@ void ScInterpreter::ScCellExternal()
         else
             SetError(errNoName);
     }
-    else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ADDRESS")))
+    else if ( aInfoType == "ADDRESS" )
     {
         // ODF 1.2 says we need to always display address using the ODF A1 grammar.
         ScTokenArray aArray;
@@ -2355,7 +2355,7 @@ void ScInterpreter::ScCellExternal()
         aComp.CreateStringFromTokenArray(aStr);
         PushString(aStr);
     }
-    else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FILENAME")))
+    else if ( aInfoType == "FILENAME" )
     {
         // 'file URI'#$SheetName
 
@@ -2374,7 +2374,7 @@ void ScInterpreter::ScCellExternal()
         aBuf.append(aTabName);
         PushString(aBuf.makeStringAndClear());
     }
-    else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CONTENTS")))
+    else if ( aInfoType == "CONTENTS" )
     {
         switch (pToken->GetType())
         {
@@ -2391,7 +2391,7 @@ void ScInterpreter::ScCellExternal()
                 PushString(ScGlobal::GetEmptyString());
         }
     }
-    else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TYPE")))
+    else if ( aInfoType == "TYPE" )
     {
         sal_Unicode c = 'v';
         switch (pToken->GetType())
@@ -2407,14 +2407,14 @@ void ScInterpreter::ScCellExternal()
         }
         PushString(rtl::OUString(c));
     }
-    else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FORMAT")))
+    else if ( aInfoType == "FORMAT" )
     {
         String aFmtStr;
         sal_uLong nFmt = aFmt.mbIsSet ? aFmt.mnIndex : 0;
         getFormatString(pFormatter, nFmt, aFmtStr);
         PushString(aFmtStr);
     }
-    else if (aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("COLOR")))
+    else if ( aInfoType == "COLOR" )
     {
         // 1 = negative values are colored, otherwise 0
         int nVal = 0;
@@ -2425,7 +2425,7 @@ void ScInterpreter::ScCellExternal()
         }
         PushInt(nVal);
     }
-    else if(aInfoType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PARENTHESES")))
+    else if ( aInfoType == "PARENTHESES" )
     {
         // 1 = format string contains a '(' character, otherwise 0
         int nVal = 0;
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 551c035de12f..d8c49798cd73 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -111,7 +111,7 @@ ScMyEmptyDatabaseRangesContainer ScXMLExportDatabaseRanges::GetEmptyDatabaseRang
                             sal_Int32 nLength = aImportProperties.getLength();
                             sheet::DataImportMode nSourceType = sheet::DataImportMode_NONE;
                             for (sal_Int32 j = 0; j < nLength; ++j)
-                                if (aImportProperties[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SC_UNONAME_SRCTYPE)))
+                                if ( aImportProperties[j].Name == SC_UNONAME_SRCTYPE )
                                     aImportProperties[j].Value >>= nSourceType;
                             if (nSourceType != sheet::DataImportMode_NONE)
                             {
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 61bd2ce2c567..f82b2a06f5bf 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -189,7 +189,7 @@ void ScFilterOptionsMgr::Init()
                 rBtnHeader.Check( pDBData->HasHeader() );
                 theDbName = pDBData->GetName();
 
-                if ( theDbName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)) )
+                if ( theDbName == STR_DB_LOCAL_NONAME )
                     rBtnHeader.Enable();
                 else
                     rBtnHeader.Disable();
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index c315147419da..f935ef977246 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -92,7 +92,7 @@ bool ScDBDocFunc::AddDBRange( const ::rtl::OUString& rName, const ScRange& rRang
     bool bOk;
     if ( bCompile )
         pDoc->CompileDBFormula( sal_True );     // CreateFormulaString
-    if (rName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)))
+    if ( rName == STR_DB_LOCAL_NONAME )
     {
         pDoc->SetAnonymousDBData(rRange.aStart.Tab() , pNew);
         bOk = true;
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index 6b52369b748e..941002c42250 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -134,7 +134,7 @@ void ScRangeManagerTable::Init()
     {
         const ScRangeName* pLocalRangeName = itr->second;
         ScRangeNameLine aLine;
-        if (itr->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_GLOBAL_RANGE_NAME)))
+        if ( itr->first == STR_GLOBAL_RANGE_NAME )
             aLine.aScope = maGlobalString;
         else
             aLine.aScope = itr->first;
diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx
index 913333fc3a00..56b42b05ea80 100644
--- a/sc/source/ui/undo/undoutil.cxx
+++ b/sc/source/ui/undo/undoutil.cxx
@@ -97,7 +97,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB
         if ( pUndoData )
         {
             const ::rtl::OUString& aName = pUndoData->GetName();
-            if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)))
+            if ( aName == STR_DB_LOCAL_NONAME )
                 bWasTemp = true;
         }
         OSL_ENSURE(bWasTemp, "Undo: didn't find database range");
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 5ff808bff4f9..bbfdce78d04a 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1051,7 +1051,7 @@ void ScChart2DataProvider::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
     for(sal_Int32 i = 0; i < aArguments.getLength(); ++i)
     {
         rtl::OUString sName(aArguments[i].Name);
-        if (aArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
+        if ( aArguments[i].Name == "CellRangeRepresentation" )
         {
             aArguments[i].Value >>= aRangeRepresentation;
         }
@@ -1460,7 +1460,7 @@ ScChart2DataProvider::createDataSource(
     for(sal_Int32 i = 0; i < aArguments.getLength(); ++i)
     {
         rtl::OUString sName(aArguments[i].Name);
-        if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataRowSource")))
+        if ( aArguments[i].Name == "DataRowSource" )
         {
             chart::ChartDataRowSource eSource = chart::ChartDataRowSource_COLUMNS;
             if( ! (aArguments[i].Value >>= eSource))
@@ -1471,19 +1471,19 @@ ScChart2DataProvider::createDataSource(
             }
             bOrientCol = (eSource == chart::ChartDataRowSource_COLUMNS);
         }
-        else if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FirstCellAsLabel")))
+        else if ( aArguments[i].Name == "FirstCellAsLabel" )
         {
             bLabel = ::cppu::any2bool(aArguments[i].Value);
         }
-        else if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HasCategories")))
+        else if ( aArguments[i].Name == "HasCategories" )
         {
             bCategories = ::cppu::any2bool(aArguments[i].Value);
         }
-        else if (aArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
+        else if ( aArguments[i].Name == "CellRangeRepresentation" )
         {
             aArguments[i].Value >>= aRangeRepresentation;
         }
-        else if (aArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("SequenceMapping")))
+        else if ( aArguments[i].Name == "SequenceMapping" )
         {
             aArguments[i].Value >>= aSequenceMapping;
         }
@@ -2319,7 +2319,7 @@ void SAL_CALL ScChart2DataProvider::setPropertyValue(
                     lang::IllegalArgumentException,
                     lang::WrappedTargetException, uno::RuntimeException)
 {
-    if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_INCLUDEHIDDENCELLS)))
+    if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS )
     {
         if ( !(rValue >>= m_bIncludeHiddenCells))
             throw lang::IllegalArgumentException();
@@ -2335,7 +2335,7 @@ uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue(
                     lang::WrappedTargetException, uno::RuntimeException)
 {
     uno::Any aRet;
-    if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_INCLUDEHIDDENCELLS)))
+    if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS )
         aRet <<= m_bIncludeHiddenCells;
     else
         throw beans::UnknownPropertyException();
@@ -3497,12 +3497,12 @@ void SAL_CALL ScChart2DataSequence::setPropertyValue(
                     lang::IllegalArgumentException,
                     lang::WrappedTargetException, uno::RuntimeException)
 {
-    if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_ROLE)))
+    if ( rPropertyName == SC_UNONAME_ROLE )
     {
         if ( !(rValue >>= m_aRole))
             throw lang::IllegalArgumentException();
     }
-    else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_INCLUDEHIDDENCELLS)))
+    else if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS )
     {
         sal_Bool bOldValue = m_bIncludeHiddenCells;
         if ( !(rValue >>= m_bIncludeHiddenCells))
@@ -3522,11 +3522,11 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(
                     lang::WrappedTargetException, uno::RuntimeException)
 {
     uno::Any aRet;
-    if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_ROLE)))
+    if ( rPropertyName == SC_UNONAME_ROLE )
         aRet <<= m_aRole;
-    else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_INCLUDEHIDDENCELLS)))
+    else if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS )
         aRet <<= m_bIncludeHiddenCells;
-    else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(SC_UNONAME_HIDDENVALUES)))
+    else if ( rPropertyName == SC_UNONAME_HIDDENVALUES )
     {
         // This property is read-only thus cannot be set externally via
         // setPropertyValue(...).
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 030395c587e4..0d03f9927ee7 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -377,7 +377,7 @@ void ScPrintUIOptions::SetDefaults()
                             aPropertyValue.Value <<= nContent;
                             aUIProp[nPropPos].Value <<= aPropertyValue;
                         }
-                        else if ( aPropertyValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsIncludeEmptyPages") ) )
+                        else if ( aPropertyValue.Name == "IsIncludeEmptyPages" )
                         {
                             ScUnoHelpFunctions::SetBoolInAny( aPropertyValue.Value, ! bSuppress );
                             aUIProp[nPropPos].Value <<= aPropertyValue;
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 9119c1ee1af0..66aa69473cb7 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -693,7 +693,7 @@ void SAL_CALL ScNamedRangesObj::setPropertyValue(
                         lang::IllegalArgumentException, lang::WrappedTargetException,
                         uno::RuntimeException)
 {
-    if (rPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SC_UNO_MODIFY_BROADCAST)))
+    if ( rPropertyName == SC_UNO_MODIFY_BROADCAST )
     {
         aValue >>= mbModifyAndBroadcast;
     }
@@ -704,7 +704,7 @@ Any SAL_CALL ScNamedRangesObj::getPropertyValue( const rtl::OUString& rPropertyN
                         uno::RuntimeException)
 {
     Any aRet;
-    if (rPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SC_UNO_MODIFY_BROADCAST)))
+    if ( rPropertyName == SC_UNO_MODIFY_BROADCAST )
     {
         aRet <<= mbModifyAndBroadcast;
     }
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index fdab3736a9ee..6ef14291107c 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -269,7 +269,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
     for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
     {
         // extract properties
-        if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
+        if ( lDescriptor[nProperty].Name == "URL" )
         {
             lDescriptor[nProperty].Value >>= sTemp;
             aURL = sTemp;
@@ -279,12 +279,12 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
             lDescriptor[nProperty].Value >>= sTemp;
             aURL = sTemp;
         }
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TypeName")) )
+        else if ( lDescriptor[nProperty].Name == "TypeName" )
         {
             lDescriptor[nProperty].Value >>= sTemp;
             aTypeName = sTemp;
         }
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterName")) )
+        else if ( lDescriptor[nProperty].Name == "FilterName" )
         {
             lDescriptor[nProperty].Value >>= sTemp;
             aPreselectedFilterName = sTemp;
@@ -293,22 +293,22 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
             // remember index of property to get access to it later
             nIndexOfFilterName = nProperty;
         }
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")) )
+        else if ( lDescriptor[nProperty].Name == "InputStream" )
             nIndexOfInputStream = nProperty;
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ReadOnly")) )
+        else if ( lDescriptor[nProperty].Name == "ReadOnly" )
             nIndexOfReadOnlyFlag = nProperty;
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UCBContent")) )
+        else if ( lDescriptor[nProperty].Name == "UCBContent" )
             nIndexOfContent = nProperty;
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AsTemplate")) )
+        else if ( lDescriptor[nProperty].Name == "AsTemplate" )
         {
             lDescriptor[nProperty].Value >>= bOpenAsTemplate;
             nIndexOfTemplateFlag = nProperty;
         }
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")) )
+        else if ( lDescriptor[nProperty].Name == "InteractionHandler" )
             lDescriptor[nProperty].Value >>= xInteraction;
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RepairPackage")) )
+        else if ( lDescriptor[nProperty].Name == "RepairPackage" )
             lDescriptor[nProperty].Value >>= bRepairPackage;
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocumentTitle")) )
+        else if ( lDescriptor[nProperty].Name == "DocumentTitle" )
             nIndexOfDocumentTitle = nProperty;
     }
 
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 63d8a140fbaa..aa173a701aca 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1040,7 +1040,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPr
 {
     uno::Any aRet;
 
-    if ( sPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DisplayName") ) )
+    if ( sPropertyName == "DisplayName" )
     {
         SolarMutexGuard aGuard;
         sal_uInt32 nResId = 0;
@@ -1873,7 +1873,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons
                                     if (*pValue >>= nPages)
                                     {
                                         ScPageScaleToItem aItem = ((const ScPageScaleToItem&)rSet.Get(ATTR_PAGE_SCALETO));
-                                        if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SC_UNO_PAGE_SCALETOX)))
+                                        if ( rPropertyName == SC_UNO_PAGE_SCALETOX )
                                             aItem.SetWidth(static_cast<sal_uInt16>(nPages));
                                         else
                                             aItem.SetHeight(static_cast<sal_uInt16>(nPages));
@@ -2061,7 +2061,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa
                     case ATTR_PAGE_SCALETO:
                         {
                             ScPageScaleToItem aItem((const ScPageScaleToItem&)pItemSet->Get(ATTR_PAGE_SCALETO));
-                            if (aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SC_UNO_PAGE_SCALETOX)))
+                            if ( aPropertyName == SC_UNO_PAGE_SCALETOX )
                                 aAny = uno::makeAny(static_cast<sal_Int16>(aItem.GetWidth()));
                             else
                                 aAny = uno::makeAny(static_cast<sal_Int16>(aItem.GetHeight()));
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index 507915ac0221..2759b9efab0e 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -234,7 +234,7 @@ namespace basprov
                         for ( sal_Int32 i = 0; i < nProps; ++i )
                         {
                             // TODO: according to MBA the property 'Title' may change in future
-                            if ( pProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")) )
+                            if ( pProps[i].Name == "Title" )
                             {
                                 pProps[i].Value >>= sDocURL;
                                 break;
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index 1c137c0a97ca..420506c61d16 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -379,11 +379,11 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re
             // TODO: dialogs in packages
             Reference< XLibraryContainer > xLibContainer;
 
-            if ( sLocation.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application")) )
+            if ( sLocation == "application" )
             {
                 xLibContainer = Reference< XLibraryContainer >( SFX_APP()->GetDialogContainer(), UNO_QUERY );
             }
-            else if ( sLocation.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("document")) )
+            else if ( sLocation == "document" )
             {
                 Reference< XEmbeddedScripts > xDocumentScripts( m_xModel, UNO_QUERY );
                 if ( xDocumentScripts.is() )
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 6405b0cbf548..a9b623a2bc5e 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -551,7 +551,7 @@ void SdStyleFamily::setPropertyValue( const OUString& , const Any&  ) throw (Unk
 
 Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
-    if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DisplayName") ))
+    if ( PropertyName == "DisplayName" )
     {
         SolarMutexGuard aGuard;
         OUString sDisplayName;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index e5e1f1d57ead..dcdfbd64455b 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -772,12 +772,12 @@ bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >&
     sal_Int32 nMasterRel = 0;
     for( ; nLength--; pValue++ )
     {
-        if( pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("after-effect") ) )
+        if ( pValue->Name == "after-effect" )
         {
             pValue->Value >>= bAfterEffect;
             nRemoved++;
         }
-        else if( pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("master-rel") ) )
+        else if ( pValue->Name == "master-rel" )
         {
             pValue->Value >>= nMasterRel;
             nRemoved++;
@@ -2226,7 +2226,7 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen
                 {
                     nCommand = EffectCommands::STOPAUDIO;
                 }
-                else if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("play") ) )
+                else if ( aParam == "play" )
                 {
                     nCommand = EffectCommands::PLAY;
                 }
@@ -2242,11 +2242,11 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen
                     }
                     nCommand = EffectCommands::PLAY;
                 }
-                else if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("togglePause") ) )
+                else if ( aParam == "togglePause" )
                 {
                     nCommand = EffectCommands::TOGGLEPAUSE;
                 }
-                else if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("stop") ) )
+                else if ( aParam == "stop" )
                 {
                     nCommand = EffectCommands::STOP;
                 }
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 3bfe71880924..11e4b909816b 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -744,7 +744,7 @@ void SAL_CALL AccessibleDocumentViewBase::disposing (void)
     if (xInfo.is())
     {
         OUString sFirstService = xInfo->getSupportedServiceNames()[0];
-        if (sFirstService.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
+        if ( sFirstService == "com.sun.star.drawing.DrawingDocumentDrawView" )
         {
             sDescription = OUString (RTL_CONSTASCII_USTRINGPARAM("Draw Document"));
         }
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index e1c92534044d..9231f420dc87 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -298,7 +298,7 @@ void SAL_CALL
     AccessibleDocumentViewBase::propertyChange (rEventObject);
 
     OSL_TRACE ("AccessibleDrawDocumentView::propertyChange");
-    if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CurrentPage")))
+    if ( rEventObject.PropertyName == "CurrentPage" )
     {
         OSL_TRACE ("    current page changed");
 
@@ -333,7 +333,7 @@ void SAL_CALL
         else
             OSL_TRACE ("View invalid");
     }
-    else if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("VisibleArea")))
+    else if ( rEventObject.PropertyName == "VisibleArea" )
     {
         OSL_TRACE ("    visible area changed");
         if (mpChildrenManager != NULL)
@@ -397,7 +397,7 @@ void SAL_CALL
     {
         uno::Sequence< ::rtl::OUString > aServices( xInfo->getSupportedServiceNames() );
         OUString sFirstService = aServices[0];
-        if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
+        if ( sFirstService == "com.sun.star.drawing.DrawingDocumentDrawView" )
         {
             if( aServices.getLength() >= 2 &&
                 aServices[1].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationView")))
@@ -413,13 +413,13 @@ void SAL_CALL
                 sName = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_N) );
             }
         }
-        else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.NotesView")))
+        else if ( sFirstService == "com.sun.star.presentation.NotesView" )
         {
             SolarMutexGuard aGuard;
 
             sName = String( SdResId(SID_SD_A11Y_I_NOTESVIEW_N) );
         }
-        else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.HandoutView")))
+        else if ( sFirstService == "com.sun.star.presentation.HandoutView" )
         {
             SolarMutexGuard aGuard;
 
@@ -454,7 +454,7 @@ void SAL_CALL
     {
         uno::Sequence< ::rtl::OUString > aServices( xInfo->getSupportedServiceNames() );
         OUString sFirstService = aServices[0];
-        if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
+        if ( sFirstService == "com.sun.star.drawing.DrawingDocumentDrawView" )
         {
             if( aServices.getLength() >= 2 &&
                 aServices[1].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationView")))
@@ -470,13 +470,13 @@ void SAL_CALL
                 sDescription = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_D) );
             }
         }
-        else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.NotesView")))
+        else if ( sFirstService == "com.sun.star.presentation.NotesView" )
         {
             SolarMutexGuard aGuard;
 
             sDescription = String( SdResId(SID_SD_A11Y_I_NOTESVIEW_D) );
         }
-        else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.HandoutView")))
+        else if ( sFirstService == "com.sun.star.presentation.HandoutView" )
         {
             SolarMutexGuard aGuard;
 
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 942f0a2cb3fb..d26f1a485ad1 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -225,14 +225,14 @@ void SAL_CALL
     AccessibleDocumentViewBase::propertyChange (rEventObject);
 
     OSL_TRACE ("AccessibleOutlineView::propertyChange");
-    if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CurrentPage")))
+    if ( rEventObject.PropertyName == "CurrentPage" )
     {
         OSL_TRACE ("    current page changed");
 
         // The current page changed. Update the children accordingly.
         UpdateChildren();
     }
-    else if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("VisibleArea")))
+    else if ( rEventObject.PropertyName == "VisibleArea" )
     {
         OSL_TRACE ("    visible area changed");
 
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 5ce6b395dcdb..56c587b0a6c5 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -590,61 +590,61 @@ void CustomAnimationPane::updateLayout()
 
 static sal_Int32 getPropertyType( const OUString& rProperty )
 {
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Direction") ) )
+    if ( rProperty == "Direction" )
         return nPropertyTypeDirection;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Spokes") ) )
+    if ( rProperty == "Spokes" )
         return nPropertyTypeSpokes;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Zoom") ) )
+    if ( rProperty == "Zoom" )
         return nPropertyTypeZoom;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Accelerate") ) )
+    if ( rProperty == "Accelerate" )
         return nPropertyTypeAccelerate;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Decelerate") ) )
+    if ( rProperty == "Decelerate" )
         return nPropertyTypeDecelerate;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Color1") ) )
+    if ( rProperty == "Color1" )
         return nPropertyTypeFirstColor;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Color2") ) )
+    if ( rProperty == "Color2" )
         return nPropertyTypeSecondColor;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FillColor") ) )
+    if ( rProperty == "FillColor" )
         return nPropertyTypeFillColor;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ColorStyle") ) )
+    if ( rProperty == "ColorStyle" )
         return nPropertyTypeColorStyle;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("AutoReverse") ) )
+    if ( rProperty == "AutoReverse" )
         return nPropertyTypeAutoReverse;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FontStyle") ) )
+    if ( rProperty == "FontStyle" )
         return nPropertyTypeFont;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CharColor") ) )
+    if ( rProperty == "CharColor" )
         return nPropertyTypeCharColor;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CharHeight") ) )
+    if ( rProperty == "CharHeight" )
         return nPropertyTypeCharHeight;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CharDecoration") ) )
+    if ( rProperty == "CharDecoration" )
         return nPropertyTypeCharDecoration;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("LineColor") ) )
+    if ( rProperty == "LineColor" )
         return nPropertyTypeLineColor;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Rotate") ) )
+    if ( rProperty == "Rotate" )
         return nPropertyTypeRotate;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Transparency") ) )
+    if ( rProperty == "Transparency" )
         return nPropertyTypeTransparency;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Color") ) )
+    if ( rProperty == "Color" )
         return nPropertyTypeColor;
 
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Scale") ) )
+    if ( rProperty == "Scale" )
         return nPropertyTypeScale;
 
     return nPropertyTypeNone;
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 6a31952fd972..814730f56066 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1779,7 +1779,7 @@ String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL
                 for (sal_Int32 i=0; i<nCount; i++)
                 {
                     ::rtl::OUString sPropertyName (aProperties[i].Name);
-                    if (sPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Label")))
+                    if ( sPropertyName == "Label" )
                     {
                         aProperties[i].Value >>= sString;
                         break;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index ed9d76d29369..3e85d2384000 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -3506,22 +3506,22 @@ void PresentationSettingsEx::SetArguments( const Sequence< PropertyValue >& rArg
 
 void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const Any& rValue ) throw (IllegalArgumentException)
 {
-    if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("RehearseTimings") ) )
+    if ( rProperty == "RehearseTimings" )
     {
         if( rValue >>= mbRehearseTimings )
             return;
     }
-    else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Preview") ) )
+    else if ( rProperty == "Preview" )
     {
         if( rValue >>= mbPreview )
             return;
     }
-    else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("AnimationNode") ) )
+    else if ( rProperty == "AnimationNode" )
     {
         if( rValue >>= mxAnimationNode )
             return;
     }
-    else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ParentWindow") ) )
+    else if ( rProperty == "ParentWindow" )
     {
         Reference< XWindow > xWindow;
         if( rValue >>= xWindow )
@@ -3530,17 +3530,17 @@ void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const
             return;
         }
     }
-    else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("AllowAnimations") ) )
+    else if ( rProperty == "AllowAnimations" )
     {
         if( rValue >>= mbAnimationAllowed )
             return;
     }
-    else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("AllowAnimations") ) )
+    else if ( rProperty == "AllowAnimations" )
     {
         if( rValue >>= mbAnimationAllowed )
             return;
     }
-    else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FirstPage") ) )
+    else if ( rProperty == "FirstPage" )
     {
         OUString aPresPage;
         if( rValue >>= aPresPage )
@@ -3556,32 +3556,32 @@ void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const
                 return;
         }
     }
-    else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("IsAlwaysOnTop") ) )
+    else if ( rProperty == "IsAlwaysOnTop" )
     {
         if( rValue >>= mbAlwaysOnTop )
             return;
     }
-    else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("IsAutomatic") ) )
+    else if ( rProperty == "IsAutomatic" )
     {
         if( rValue >>= mbManual )
             return;
     }
-    else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("IsEndless") ) )
+    else if ( rProperty == "IsEndless" )
     {
         if( rValue >>= mbEndless )
             return;
     }
-    else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("IsFullScreen") ) )
+    else if ( rProperty == "IsFullScreen" )
     {
         if( rValue >>= mbFullScreen )
             return;
     }
-    else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("IsMouseVisible") ) )
+    else if ( rProperty == "IsMouseVisible" )
     {
         if( rValue >>= mbMouseVisible )
             return;
     }
-    else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Pause") ) )
+    else if ( rProperty == "Pause" )
     {
         sal_Int32 nPause = -1;
         if( (rValue >>= nPause) && (nPause >= 0) )
@@ -3590,12 +3590,12 @@ void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const
             return;
         }
     }
-    else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("StartWithNavigator") ) )
+    else if ( rProperty == "StartWithNavigator" )
     {
         if( rValue >>= mbStartWithNavigator )
             return;
     }
-    else if( rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("UsePen") ) )
+    else if ( rProperty == "UsePen" )
     {
         if( rValue >>= mbMouseAsPen )
             return;
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index 2de089665ba5..10e48d9c903d 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -555,11 +555,11 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange (
 {
     ThrowIfDisposed();
 
-    if (rEvent.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCurrentPagePropertyName)))
+    if ( rEvent.PropertyName == aCurrentPagePropertyName )
     {
         CallListeners(EventMultiplexerEvent::EID_CURRENT_PAGE);
     }
-    else if (rEvent.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aEditModePropertyName)))
+    else if ( rEvent.PropertyName == aEditModePropertyName )
     {
         bool bIsMasterPageMode (false);
         rEvent.NewValue >>= bIsMasterPageMode;
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 5dde7a4b4a65..4e8d46861e97 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -125,7 +125,7 @@ SdFilterDetect::~SdFilterDetect()
     for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
     {
         // extract properties
-        if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
+        if ( lDescriptor[nProperty].Name == "URL" )
         {
             lDescriptor[nProperty].Value >>= sTemp;
             aURL = sTemp;
@@ -135,32 +135,32 @@ SdFilterDetect::~SdFilterDetect()
             lDescriptor[nProperty].Value >>= sTemp;
             aURL = sTemp;
         }
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TypeName")) )
+        else if ( lDescriptor[nProperty].Name == "TypeName" )
         {
             lDescriptor[nProperty].Value >>= sTemp;
             aTypeName = sTemp;
         }
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterName")) )
+        else if ( lDescriptor[nProperty].Name == "FilterName" )
         {
             lDescriptor[nProperty].Value >>= sTemp;
             aPreselectedFilterName = sTemp;
         }
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")) )
+        else if ( lDescriptor[nProperty].Name == "InputStream" )
             nIndexOfInputStream = nProperty;
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ReadOnly")) )
+        else if ( lDescriptor[nProperty].Name == "ReadOnly" )
             nIndexOfReadOnlyFlag = nProperty;
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UCBContent")) )
+        else if ( lDescriptor[nProperty].Name == "UCBContent" )
             nIndexOfContent = nProperty;
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AsTemplate")) )
+        else if ( lDescriptor[nProperty].Name == "AsTemplate" )
         {
             lDescriptor[nProperty].Value >>= bOpenAsTemplate;
             nIndexOfTemplateFlag = nProperty;
         }
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")) )
+        else if ( lDescriptor[nProperty].Name == "InteractionHandler" )
             lDescriptor[nProperty].Value >>= xInteraction;
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RepairPackage")) )
+        else if ( lDescriptor[nProperty].Name == "RepairPackage" )
             lDescriptor[nProperty].Value >>= bRepairPackage;
-        else if( lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocumentTitle")) )
+        else if ( lDescriptor[nProperty].Name == "DocumentTitle" )
             nIndexOfDocumentTitle = nProperty;
     }
 
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 4940f2cbcffe..986455440e02 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -91,23 +91,23 @@ const SvxItemPropertySet* ImplGetSdLayerPropertySet()
 
 String SdLayer::convertToInternalName( const OUString& rName )
 {
-    if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_LayerName_background) ) )
+    if ( rName == sUNO_LayerName_background )
     {
         return String( SdResId( STR_LAYER_BCKGRND ) );
     }
-    else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_LayerName_background_objects) ) )
+    else if ( rName == sUNO_LayerName_background_objects )
     {
         return  String( SdResId( STR_LAYER_BCKGRNDOBJ ) );
     }
-    else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_LayerName_layout) ) )
+    else if ( rName == sUNO_LayerName_layout )
     {
         return  String( SdResId( STR_LAYER_LAYOUT ) );
     }
-    else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_LayerName_controls) ) )
+    else if ( rName == sUNO_LayerName_controls )
     {
         return  String( SdResId( STR_LAYER_CONTROLS ) );
     }
-    else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_LayerName_measurelines) ) )
+    else if ( rName == sUNO_LayerName_measurelines )
     {
         return  String( SdResId( STR_LAYER_MEASURELINES ) );
     }
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index c1a061d054f1..3bf776a1102f 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -882,17 +882,17 @@ uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance( c
 
     }
 
-    if( aServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_Service_ImageMapRectangleObject) ) )
+    if ( aServiceSpecifier == sUNO_Service_ImageMapRectangleObject )
     {
         return SvUnoImageMapRectangleObject_createInstance( ImplGetSupportedMacroItems() );
     }
 
-    if( aServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_Service_ImageMapCircleObject) ) )
+    if ( aServiceSpecifier == sUNO_Service_ImageMapCircleObject )
     {
         return SvUnoImageMapCircleObject_createInstance( ImplGetSupportedMacroItems() );
     }
 
-    if( aServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(sUNO_Service_ImageMapPolygonObject) ) )
+    if ( aServiceSpecifier == sUNO_Service_ImageMapPolygonObject )
     {
         return SvUnoImageMapPolygonObject_createInstance( ImplGetSupportedMacroItems() );
     }
@@ -1055,7 +1055,7 @@ uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance( c
 
         xRet = (uno::XWeak*)pShape;
     }
-    else if( aServiceSpecifier.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TableShape") ) )
+    else if ( aServiceSpecifier == "com.sun.star.drawing.TableShape" )
     {
         SvxShape* pShape = CreateSvxShapeByTypeAndInventor( OBJ_TABLE, SdrInventor );
         if( pShape && !mbClipBoard )
@@ -1802,9 +1802,9 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
 
         for( sal_Int32 nProperty = 0, nPropertyCount = rxOptions.getLength(); nProperty < nPropertyCount; ++nProperty )
         {
-            if( rxOptions[ nProperty ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RenderDevice")) )
+            if ( rxOptions[ nProperty ].Name == "RenderDevice" )
                 rxOptions[ nProperty ].Value >>= xRenderDevice;
-            else if ( rxOptions[ nProperty ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ExportNotesPages")) )
+            else if ( rxOptions[ nProperty ].Name == "ExportNotesPages" )
             {
                 rxOptions[ nProperty].Value >>= bExportNotesPages;
                 if ( bExportNotesPages )
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index 64d000edc8ac..c64105533135 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -108,7 +108,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxMSF ) :
                         {
                             rtl::OUString sDocumentService;
                             rProperty.Value >>= sDocumentService;
-                            if ( sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationDocument")) )
+                            if ( sDocumentService == "com.sun.star.presentation.PresentationDocument" )
                                 bImpressFilter = sal_True;
                             else
                                 j = aFilterProperties.getLength();
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 09db8b223fbc..2b9e071b4cbd 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -398,7 +398,7 @@ sal_Bool InformationDialog::execute()
 void OKActionListener::actionPerformed( const ActionEvent& rEvent )
     throw ( com::sun::star::uno::RuntimeException )
 {
-    if ( rEvent.ActionCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("button")) )
+    if ( rEvent.ActionCommand == "button" )
     {
         mrInformationDialog.endExecute( sal_True );
     }
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index b73da1ddb133..ab4e5fcc811b 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -553,7 +553,7 @@ namespace
         virtual uno::Any SAL_CALL getValueByName(rtl::OUString const& rName)
             throw()
         {
-            if (rName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("/singletons/com.sun.star.deployment.PackageInformationProvider")))
+            if ( rName == "/singletons/com.sun.star.deployment.PackageInformationProvider" )
             {
                 uno::Reference<deployment::XPackageInformationProvider> const xProvider(new PackageInformationProvider());
                 uno::Any aComponent;
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 689bb9d8b4d7..05051a2410cd 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -873,9 +873,9 @@ RendererPaneStyle::RendererPaneStyle (
             mnFontYOffset = mpFont->mnYOffset;
         }
 
-        if (sAnchor.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Left")))
+        if ( sAnchor == "Left" )
             meFontAnchor = AnchorLeft;
-        else if (sAnchor.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Right")))
+        else if ( sAnchor == "Right" )
             meFontAnchor = AnchorRight;
         else
             meFontAnchor = AnchorCenter;
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index ddcf16124c6f..0a0ee297a191 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -150,7 +150,7 @@ Any SAL_CALL PresenterScreenJob::execute(
     const beans::NamedValue* p = Arguments.getConstArray();
     for (i=0; i<c; ++i)
     {
-        if (p[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Environment")))
+        if ( p[i].Name == "Environment" )
         {
             p[i].Value >>= lEnv;
             break;
@@ -162,7 +162,7 @@ Any SAL_CALL PresenterScreenJob::execute(
     p = lEnv.getConstArray();
     for (i=0; i<c; ++i)
     {
-        if (p[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Model")))
+        if ( p[i].Name == "Model" )
         {
             p[i].Value >>= xModel;
             break;
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 3a6aa83635b1..b6181bdc5868 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -697,19 +697,19 @@ void PresenterToolBar::ProcessEntry (
 
     // Create new element.
     ::rtl::Reference<Element> pElement;
-    if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Button")))
+    if ( sType == "Button" )
         pElement = Button::Create(this);
-    else if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CurrentTimeLabel")))
+    else if ( sType == "CurrentTimeLabel" )
         pElement = CurrentTimeLabel::Create(this);
-    else if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PresentationTimeLabel")))
+    else if ( sType == "PresentationTimeLabel" )
         pElement = PresentationTimeLabel::Create(this);
-    else if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("VerticalSeparator")))
+    else if ( sType == "VerticalSeparator" )
         pElement = ::rtl::Reference<Element>(new VerticalSeparator(this));
-    else if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HorizontalSeparator")))
+    else if ( sType == "HorizontalSeparator" )
         pElement = ::rtl::Reference<Element>(new HorizontalSeparator(this));
-    else if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Label")))
+    else if ( sType == "Label" )
         pElement = ::rtl::Reference<Element>(new Label(this));
-    else if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ChangeOrientation")))
+    else if ( sType == "ChangeOrientation" )
     {
         mpCurrentContainerPart.reset(new ElementContainerPart());
         maElementContainer.push_back(mpCurrentContainerPart);
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 03d783c025f1..8dfb849996cf 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -459,14 +459,14 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
             {
                 const ::com::sun::star::beans::PropertyValue& rProp = pPropsVal[n];
                 rtl::OUString aName = rProp.Name;
-                if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sFrame)) )
+                if ( aName == sFrame )
                 {
                     Reference< XFrame > xFrame;
                     OSL_VERIFY( rProp.Value >>= xFrame );
                     rSet.Put( SfxUnoFrameItem( SID_FILLFRAME, xFrame ) );
                 }
                 else
-                if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sHidden)) )
+                if ( aName == sHidden )
                 {
                     sal_Bool bVal = sal_False;
                     if (rProp.Value >>= bVal)
@@ -484,17 +484,17 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
 #endif
                 const ::com::sun::star::beans::PropertyValue& rProp = pPropsVal[n];
                 rtl::OUString aName = rProp.Name;
-                if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sModel)) )
+                if ( aName == sModel )
                     rSet.Put( SfxUnoAnyItem( SID_DOCUMENT, rProp.Value ) );
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sComponentData)) )
+                else if ( aName == sComponentData )
                 {
                     rSet.Put( SfxUnoAnyItem( SID_COMPONENTDATA, rProp.Value ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sComponentContext)) )
+                else if ( aName == sComponentContext )
                 {
                     rSet.Put( SfxUnoAnyItem( SID_COMPONENTCONTEXT, rProp.Value ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sStatusInd)) )
+                else if ( aName == sStatusInd )
                 {
                     Reference< ::com::sun::star::task::XStatusIndicator > xVal;
                     sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
@@ -502,7 +502,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxUnoAnyItem( SID_PROGRESS_STATUSBAR_CONTROL, rProp.Value ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sInteractionHdl)) )
+                else if ( aName == sInteractionHdl )
                 {
                     Reference< ::com::sun::star::task::XInteractionHandler > xVal;
                     sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
@@ -510,11 +510,11 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, rProp.Value ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sViewData)) )
+                else if ( aName == sViewData )
                     rSet.Put( SfxUnoAnyItem( SID_VIEW_DATA, rProp.Value ) );
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sFilterData)) )
+                else if ( aName == sFilterData )
                     rSet.Put( SfxUnoAnyItem( SID_FILTER_DATA, rProp.Value ) );
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sInputStream)) )
+                else if ( aName == sInputStream )
                 {
                     Reference< XInputStream > xVal;
                     sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
@@ -522,7 +522,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxUnoAnyItem( SID_INPUTSTREAM, rProp.Value ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sStream)) )
+                else if ( aName == sStream )
                 {
                     Reference< XInputStream > xVal;
                     sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
@@ -530,7 +530,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxUnoAnyItem( SID_STREAM, rProp.Value ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sUCBContent)) )
+                else if ( aName == sUCBContent )
                 {
                     Reference< XContent > xVal;
                     sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
@@ -538,7 +538,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxUnoAnyItem( SID_CONTENT, rProp.Value ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sOutputStream)) )
+                else if ( aName == sOutputStream )
                 {
                     Reference< XOutputStream > xVal;
                     sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
@@ -546,7 +546,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxUnoAnyItem( SID_OUTPUTSTREAM, rProp.Value ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sPostData)) )
+                else if ( aName == sPostData )
                 {
                     Reference< XInputStream > xVal;
                     sal_Bool bOK = (rProp.Value >>= xVal);
@@ -554,7 +554,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxUnoAnyItem( SID_POSTDATA, rProp.Value ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sFrame)) )
+                else if ( aName == sFrame )
                 {
                     Reference< XFrame > xFrame;
                     sal_Bool bOK = (rProp.Value >>= xFrame);
@@ -562,7 +562,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxUnoFrameItem( SID_FILLFRAME, xFrame ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sAsTemplate)) )
+                else if ( aName == sAsTemplate )
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -570,7 +570,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_TEMPLATE, bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sOpenNewView)) )
+                else if ( aName == sOpenNewView )
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -578,7 +578,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_OPEN_NEW_VIEW, bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sViewId)) )
+                else if ( aName == sViewId )
                 {
                     sal_Int16 nVal = -1;
                     sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
@@ -586,7 +586,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxUInt16Item( SID_VIEW_ID, nVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sPluginMode)) )
+                else if ( aName == sPluginMode )
                 {
                     sal_Int16 nVal = -1;
                     sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
@@ -594,7 +594,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxUInt16Item( SID_PLUGIN_MODE, nVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sReadOnly)) )
+                else if ( aName == sReadOnly )
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -602,7 +602,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_DOC_READONLY, bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sDdeReconnect)) )
+                else if ( aName == sDdeReconnect )
                 {
                     sal_Bool bVal = sal_True;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -610,7 +610,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_DDE_RECONNECT_ONLOAD, bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sStartPresentation)) )
+                else if ( aName == sStartPresentation )
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -618,7 +618,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sSelectionOnly)) )
+                else if ( aName == sSelectionOnly )
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -626,7 +626,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_SELECTION, bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sHidden)) )
+                else if ( aName == sHidden )
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -634,7 +634,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_HIDDEN, bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sMinimized)) )
+                else if ( aName == sMinimized )
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -642,7 +642,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_MINIMIZED, bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sSilent)) )
+                else if ( aName == sSilent )
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -650,7 +650,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_SILENT, bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sPreview)) )
+                else if ( aName == sPreview )
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -658,7 +658,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_PREVIEW, bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sViewOnly)) )
+                else if ( aName == sViewOnly )
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -666,7 +666,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_VIEWONLY, bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sDontEdit)) )
+                else if ( aName == sDontEdit )
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -674,7 +674,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_EDITDOC, !bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sUseSystemDialog)) )
+                else if ( aName == sUseSystemDialog )
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -682,7 +682,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_FILE_DIALOG, bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sStandardDir)) )
+                else if ( aName == sStandardDir )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
@@ -690,7 +690,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_STANDARD_DIR, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sBlackList)) )
+                else if ( aName == sBlackList )
                 {
                     ::com::sun::star::uno::Sequence< ::rtl::OUString > xVal;
                     sal_Bool bOK = (rProp.Value >>= xVal);
@@ -702,7 +702,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                         rSet.Put( stringList );
                     }
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sFileName)) )
+                else if ( aName == sFileName )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
@@ -710,7 +710,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_FILE_NAME, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sSalvagedFile)) )
+                else if ( aName == sSalvagedFile )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = (rProp.Value >>= sVal);
@@ -718,7 +718,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_DOC_SALVAGE, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sFolderName)) )
+                else if ( aName == sFolderName )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = (rProp.Value >>= sVal);
@@ -726,7 +726,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_PATH, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sFrameName)) )
+                else if ( aName == sFrameName )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = (rProp.Value >>= sVal);
@@ -734,7 +734,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK && !sVal.isEmpty())
                         rSet.Put( SfxStringItem( SID_TARGETNAME, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sMediaType)) )
+                else if ( aName == sMediaType )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
@@ -742,7 +742,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_CONTENTTYPE, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sTemplateName)) )
+                else if ( aName == sTemplateName )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
@@ -750,7 +750,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_TEMPLATE_NAME, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sTemplateRegionName)) )
+                else if ( aName == sTemplateRegionName )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
@@ -758,7 +758,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_TEMPLATE_REGIONNAME, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sJumpMark)) )
+                else if ( aName == sJumpMark )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
@@ -766,7 +766,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_JUMPMARK, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sCharacterSet)) )
+                else if ( aName == sCharacterSet )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
@@ -774,7 +774,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_CHARSET, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sFilterFlags)) )
+                else if ( aName == sFilterFlags )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
@@ -782,7 +782,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_FILE_FILTEROPTIONS, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sMacroExecMode)) )
+                else if ( aName == sMacroExecMode )
                 {
                     sal_Int16 nVal =-1;
                     sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
@@ -790,7 +790,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxUInt16Item( SID_MACROEXECMODE, nVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sUpdateDocMode)) )
+                else if ( aName == sUpdateDocMode )
                 {
                     sal_Int16 nVal =-1;
                     sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
@@ -798,7 +798,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxUInt16Item( SID_UPDATEDOCMODE, nVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sRepairPackage)) )
+                else if ( aName == sRepairPackage )
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -806,7 +806,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_REPAIRPACKAGE, bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sDocumentTitle)) )
+                else if ( aName == sDocumentTitle )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
@@ -814,7 +814,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_DOCINFO_TITLE, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sDocumentBaseURL)) )
+                else if ( aName == sDocumentBaseURL )
                 {
                     ::rtl::OUString sVal;
                     // the base url can be set to empty ( for embedded objects for example )
@@ -823,7 +823,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_DOC_BASEURL, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sHierarchicalDocumentName)) )
+                else if ( aName == sHierarchicalDocumentName )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
@@ -831,7 +831,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_DOC_HIERARCHICALNAME, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sCopyStreamIfPossible)) )
+                else if ( aName == sCopyStreamIfPossible )
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -839,7 +839,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_COPY_STREAM_IF_POSSIBLE, bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sNoAutoSave)) )
+                else if ( aName == sNoAutoSave )
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
@@ -847,15 +847,15 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_NOAUTOSAVE, bVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sModifyPasswordInfo)) )
+                else if ( aName == sModifyPasswordInfo )
                 {
                     rSet.Put( SfxUnoAnyItem( SID_MODIFYPASSWORDINFO, rProp.Value ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sEncryptionData)) )
+                else if ( aName == sEncryptionData )
                 {
                     rSet.Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, rProp.Value ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sSuggestedSaveAsDir)) )
+                else if ( aName == sSuggestedSaveAsDir )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
@@ -863,7 +863,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_SUGGESTEDSAVEASDIR, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sSuggestedSaveAsName)) )
+                else if ( aName == sSuggestedSaveAsName )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 9c6567b86407..80a8f881925b 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -474,7 +474,7 @@ String SfxHelp::GetHelpModuleName_Impl()
                 xCont->getByName( aModuleIdentifier ) >>= lProps;
             for ( sal_Int32 i = 0; i < lProps.getLength(); ++i )
             {
-                if ( lProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryShortName")) )
+                if ( lProps[i].Name == "ooSetupFactoryShortName" )
                 {
                     lProps[i].Value >>= aFactoryShortName;
                     break;
@@ -491,9 +491,9 @@ String SfxHelp::GetHelpModuleName_Impl()
     if ( !aFactoryShortName.isEmpty() )
     {
         // Map some module identifiers to their "real" help module string.
-        if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart2")) )
+        if ( aFactoryShortName == "chart2" )
             aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "schart" ) );
-        else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("BasicIDE")) )
+        else if ( aFactoryShortName == "BasicIDE" )
             aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sbasic" ) );
         else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sweb"))
                 || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sglobal"))
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 8aad0f63a4e2..d4062c346486 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -189,9 +189,9 @@ static void add_ugly_db_item( GtkMenuShell *pMenuShell, const char *pAsciiURL,
         Sequence < PropertyValue >& aEntry = aMenu[n];
         for ( sal_Int32 m=0; m<aEntry.getLength(); m++ )
         {
-            if ( aEntry[m].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
+            if ( aEntry[m].Name == "URL" )
                 aEntry[m].Value >>= aURL;
-            if ( aEntry[m].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")) )
+            if ( aEntry[m].Name == "Title" )
                 aEntry[m].Value >>= aDescription;
         }
 
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 599832dba787..818c157950a9 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -947,33 +947,33 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
         sal_Int32 nFilterProperty      = 0                            ;
         for( nFilterProperty=0; nFilterProperty<nFilterPropertyCount; ++nFilterProperty )
         {
-            if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileFormatVersion")) )
+            if ( lFilterProperties[nFilterProperty].Name == "FileFormatVersion" )
             {
                 lFilterProperties[nFilterProperty].Value >>= nFormatVersion;
             }
-            else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TemplateName")) )
+            else if ( lFilterProperties[nFilterProperty].Name == "TemplateName" )
             {
                 lFilterProperties[nFilterProperty].Value >>= sDefaultTemplate;
             }
-            else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Flags")) )
+            else if ( lFilterProperties[nFilterProperty].Name == "Flags" )
             {
                 lFilterProperties[nFilterProperty].Value >>= nFlags;
             }
-            else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UIName")) )
+            else if ( lFilterProperties[nFilterProperty].Name == "UIName" )
             {
                 lFilterProperties[nFilterProperty].Value >>= sUIName;
             }
-            else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserData")) )
+            else if ( lFilterProperties[nFilterProperty].Name == "UserData" )
             {
                 ::com::sun::star::uno::Sequence< ::rtl::OUString > lUserData;
                 lFilterProperties[nFilterProperty].Value >>= lUserData;
                 sUserData = implc_convertStringlistToString( lUserData, ',', ::rtl::OUString() );
             }
-            else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocumentService")) )
+            else if ( lFilterProperties[nFilterProperty].Name == "DocumentService" )
             {
                 lFilterProperties[nFilterProperty].Value >>= sServiceName;
             }
-            else if( lFilterProperties[nFilterProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Type")) )
+            else if ( lFilterProperties[nFilterProperty].Name == "Type" )
             {
                 lFilterProperties[nFilterProperty].Value >>= sType;
                 // Try to get filter .. but look for any exceptions!
@@ -995,25 +995,25 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
                     sal_Int32 nTypeProperty      = 0                          ;
                     for( nTypeProperty=0; nTypeProperty<nTypePropertyCount; ++nTypeProperty )
                     {
-                        if( lTypeProperties[nTypeProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ClipboardFormat")) )
+                        if ( lTypeProperties[nTypeProperty].Name == "ClipboardFormat" )
                         {
                             lTypeProperties[nTypeProperty].Value >>= sHumanName;
                         }
-                        else if( lTypeProperties[nTypeProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocumentIconID")) )
+                        else if ( lTypeProperties[nTypeProperty].Name == "DocumentIconID" )
                         {
                             lTypeProperties[nTypeProperty].Value >>= nDocumentIconId;
                         }
-                        else if( lTypeProperties[nTypeProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MediaType")) )
+                        else if ( lTypeProperties[nTypeProperty].Name == "MediaType" )
                         {
                             lTypeProperties[nTypeProperty].Value >>= sMimeType;
                         }
-                        else if( lTypeProperties[nTypeProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Extensions")) )
+                        else if ( lTypeProperties[nTypeProperty].Name == "Extensions" )
                         {
                             ::com::sun::star::uno::Sequence< ::rtl::OUString > lExtensions;
                             lTypeProperties[nTypeProperty].Value >>= lExtensions;
                             sExtension = implc_convertStringlistToString( lExtensions, ';', DEFINE_CONST_UNICODE("*.") );
                         }
-                        else if( lTypeProperties[nTypeProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URLPattern")) )
+                        else if ( lTypeProperties[nTypeProperty].Name == "URLPattern" )
                         {
                                 ::com::sun::star::uno::Sequence< ::rtl::OUString > lPattern;
                                 lTypeProperties[nTypeProperty].Value >>= lPattern;
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 37a2f29ed1e3..138f8a38ffbf 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -534,7 +534,7 @@ void FileDialogHelper_Impl::updateSelectionBox()
         Sequence< ::rtl::OUString > aCtrlList = xCtrlInfo->getSupportedControls();
         sal_uInt32 nCount = aCtrlList.getLength();
         for ( sal_uInt32 nCtrl = 0; nCtrl < nCount; ++nCtrl )
-            if ( aCtrlList[ nCtrl ].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SelectionBox")) )
+            if ( aCtrlList[ nCtrl ] == "SelectionBox" )
             {
                 bSelectionBoxFound = sal_False;
                 break;
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index 0931a0c7acff..0f706c6da911 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -202,15 +202,15 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL PluginObject::getPropertySetI
 void SAL_CALL PluginObject::setPropertyValue(const ::rtl::OUString& aPropertyName, const uno::Any& aAny)
     throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PluginURL")) )
+    if ( aPropertyName == "PluginURL" )
     {
         aAny >>= maURL;
     }
-    else if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PluginMimeType")) )
+    else if ( aPropertyName == "PluginMimeType" )
     {
         aAny >>= maMimeType;
     }
-    else if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PluginCommands")) )
+    else if ( aPropertyName == "PluginCommands" )
     {
         maCmdList.clear();
         uno::Sequence < beans::PropertyValue > aCommandSequence;
@@ -225,15 +225,15 @@ uno::Any SAL_CALL PluginObject::getPropertyValue(const ::rtl::OUString& aPropert
         throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     uno::Any aAny;
-    if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PluginURL")) )
+    if ( aPropertyName == "PluginURL" )
     {
         aAny <<= maURL;
     }
-    else if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PluginMimeType")) )
+    else if ( aPropertyName == "PluginMimeType" )
     {
         aAny <<= maMimeType;
     }
-    else if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PluginCommands")) )
+    else if ( aPropertyName == "PluginCommands" )
     {
         uno::Sequence< beans::PropertyValue > aCommandSequence;
         maCmdList.FillSequence( aCommandSequence );
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 00b61ab627f5..1e23fada1260 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2058,7 +2058,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
             else
                 throw datatransfer::UnsupportedFlavorException();
         }
-        else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-embed-source;windows_formatname=\"Star EMBS\"")) )
+        else if ( aFlavor.MimeType == "application/x-openoffice-embed-source;windows_formatname=\"Star EMBS\"" )
         {
             if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             {
@@ -2083,7 +2083,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
             else
                 throw datatransfer::UnsupportedFlavorException();
         }
-        else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"")) )
+        else if ( aFlavor.MimeType == "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )
         {
             if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             {
@@ -2104,7 +2104,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
             else
                 throw datatransfer::UnsupportedFlavorException();
         }
-        else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"")) )
+        else if ( aFlavor.MimeType == "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" )
         {
             if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             {
@@ -2124,7 +2124,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
             else
                 throw datatransfer::UnsupportedFlavorException();
         }
-        else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-emf;windows_formatname=\"Image EMF\"")) )
+        else if ( aFlavor.MimeType == "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" )
         {
             if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             {
@@ -2159,7 +2159,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
             else
                 throw datatransfer::UnsupportedFlavorException();
         }
-        else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-wmf;windows_formatname=\"Image WMF\"")) )
+        else if ( aFlavor.MimeType == "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )
         {
             if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             {
@@ -2199,7 +2199,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
             else
                 throw datatransfer::UnsupportedFlavorException();
         }
-        else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"")) )
+        else if ( aFlavor.MimeType == "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )
         {
             if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             {
@@ -2223,7 +2223,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
             else
                 throw datatransfer::UnsupportedFlavorException();
         }
-        else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("image/png")) )
+        else if ( aFlavor.MimeType == "image/png" )
         {
             if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             {
@@ -2333,17 +2333,17 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const DATAFLAVOR& aFlavor
 {
     SfxModelGuard aGuard( *this );
 
-    if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"")) )
+    if ( aFlavor.MimeType == "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )
     {
         if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             return sal_True;
     }
-    else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"")) )
+    else if ( aFlavor.MimeType == "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" )
     {
         if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             return sal_True;
     }
-    else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-emf;windows_formatname=\"Image EMF\"")) )
+    else if ( aFlavor.MimeType == "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" )
     {
         if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             return sal_True;
@@ -2351,7 +2351,7 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const DATAFLAVOR& aFlavor
           && aFlavor.DataType == getCppuType( (const sal_uInt64*) 0 ) )
             return sal_True;
     }
-    else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-wmf;windows_formatname=\"Image WMF\"")) )
+    else if ( aFlavor.MimeType == "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )
     {
         if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             return sal_True;
@@ -2364,17 +2364,17 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const DATAFLAVOR& aFlavor
         if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             return sal_True;
     }
-    else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-embed-source;windows_formatname=\"Star EMBS\"")) )
+    else if ( aFlavor.MimeType == "application/x-openoffice-embed-source;windows_formatname=\"Star EMBS\"" )
     {
         if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             return sal_True;
     }
-    else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"")) )
+    else if ( aFlavor.MimeType == "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )
     {
         if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             return sal_True;
     }
-    else if ( aFlavor.MimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("image/png")) )
+    else if ( aFlavor.MimeType == "image/png" )
     {
         if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             return sal_True;
@@ -2529,7 +2529,7 @@ void addTitle_Impl( Sequence < ::com::sun::star::beans::PropertyValue >& rSeq, c
     for ( nArg = 0; nArg < nCount; nArg++ )
     {
         ::com::sun::star::beans::PropertyValue& rProp = rSeq[nArg];
-        if ( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")) )
+        if ( rProp.Name == "Title" )
         {
             rProp.Value <<= rTitle;
             break;
@@ -3295,7 +3295,7 @@ static void GetCommandFromSequence( rtl::OUString& rCommand, sal_Int32& nIndex,
 
     for ( sal_Int32 i = 0; i < rSeqPropValue.getLength(); i++ )
     {
-        if ( rSeqPropValue[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Command")) )
+        if ( rSeqPropValue[i].Name == "Command" )
         {
             rSeqPropValue[i].Value >>= rCommand;
             nIndex = i;
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 1af00d5b7b96..8c2ac45d3324 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -212,13 +212,13 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg
         sal_Int32 nIndex = 0;
         while ( nIndex < nCount )
         {
-            if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_EVENT_TYPE)))
+            if ( aProperties[ nIndex ].Name == PROP_EVENT_TYPE )
                 aProperties[ nIndex ].Value >>= aType;
-            else if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_SCRIPT)))
+            else if ( aProperties[ nIndex ].Name == PROP_SCRIPT )
                 aProperties[ nIndex ].Value >>= aScript;
-            else if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_LIBRARY)))
+            else if ( aProperties[ nIndex ].Name == PROP_LIBRARY )
                 aProperties[ nIndex ].Value >>= aLibrary;
-            else if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_MACRO_NAME)))
+            else if ( aProperties[ nIndex ].Name == PROP_MACRO_NAME )
                 aProperties[ nIndex ].Value >>= aMacroName;
             else {
                 OSL_FAIL("Unknown property value!");
@@ -390,13 +390,13 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* p
 
         while ( nIndex < nCount )
         {
-            if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_EVENT_TYPE)))
+            if ( aProperties[ nIndex ].Name == PROP_EVENT_TYPE )
                 aProperties[ nIndex ].Value >>= aType;
-            else if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_SCRIPT)))
+            else if ( aProperties[ nIndex ].Name == PROP_SCRIPT )
                 aProperties[ nIndex ].Value >>= aScriptURL;
-            else if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_LIBRARY)))
+            else if ( aProperties[ nIndex ].Name == PROP_LIBRARY )
                 aProperties[ nIndex ].Value >>= aLibrary;
-            else if (aProperties[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_MACRO_NAME)))
+            else if ( aProperties[ nIndex ].Name == PROP_MACRO_NAME )
                 aProperties[ nIndex ].Value >>= aMacroName;
             else {
                 OSL_FAIL("Unknown propery value!");
@@ -406,11 +406,11 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* p
 
         // Get the type
         ScriptType  eType( STARBASIC );
-        if (aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STAR_BASIC)))
+        if ( aType == STAR_BASIC )
             eType = STARBASIC;
         else if (aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Script")) && !aScriptURL.isEmpty())
             eType = EXTENDED_STYPE;
-        else if (aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SVX_MACRO_LANGUAGE_JAVASCRIPT)))
+        else if ( aType == SVX_MACRO_LANGUAGE_JAVASCRIPT )
             eType = JAVASCRIPT;
         else {
             SAL_WARN( "sfx2.notify", "ConvertToMacro: Unknown macro type" );
@@ -418,7 +418,7 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* p
 
         if ( !aMacroName.isEmpty() )
         {
-            if (aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application")))
+            if ( aLibrary == "application" )
                 aLibrary = SFX_APP()->GetName();
             else
                 aLibrary = ::rtl::OUString();
@@ -458,7 +458,7 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i
     if ( !aScript.isEmpty() )
         o_normalizedDescriptor.put( PROP_SCRIPT, aScript );
 
-    if (aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STAR_BASIC)))
+    if ( aType == STAR_BASIC )
     {
         if ( !aScript.isEmpty() )
         {
@@ -469,7 +469,7 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i
                 if ( ( nHashPos != STRING_NOTFOUND ) && ( nHashPos < nArgsPos ) )
                 {
                     rtl::OUString aBasMgrName( INetURLObject::decode( aScript.copy( 8, nHashPos-8 ), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET ) );
-                    if (aBasMgrName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".")))
+                    if ( aBasMgrName == "." )
                         aLibrary = pDoc->GetTitle();
                     else
                         aLibrary = SFX_APP()->GetName();
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index a32dcb7d6c1b..9013a674f08a 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -766,7 +766,7 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch(   const   UNOU
         SfxViewFrame*           pAct    = m_pData->m_pViewShell->GetViewFrame() ;
         if ( !m_pData->m_bDisposing )
         {
-            if ( sTargetFrameName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("_beamer")) )
+            if ( sTargetFrameName == "_beamer" )
             {
                 SfxViewFrame *pFrame = m_pData->m_pViewShell->GetViewFrame();
                 if ( eSearchFlags & ( ::com::sun::star::frame::FrameSearchFlag::CREATE ))
@@ -783,7 +783,7 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch(   const   UNOU
                     return xProv->queryDispatch( aURL, sTargetFrameName, ::com::sun::star::frame::FrameSearchFlag::SELF );
             }
 
-            if ( aURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:")) )
+            if ( aURL.Protocol == ".uno:" )
             {
                 rtl::OUString aMasterCommand = SfxOfficeDispatch::GetMasterUnoCommand( aURL );
                 sal_Bool      bMasterCommand( !aMasterCommand.isEmpty() );
@@ -839,7 +839,7 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch(   const   UNOU
                     }
                 }
             }
-            else if ( aURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("slot:")) )
+            else if ( aURL.Protocol == "slot:" )
             {
                 sal_uInt16 nId = (sal_uInt16) aURL.Path.toInt32();
 
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index d6497d3dac79..405390b6b455 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -610,7 +610,7 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro
     const beans::PropertyValue* pVal = rProps.getConstArray();
     for( sal_Int32 i = 0; i < rProps.getLength(); i++ )
     {
-        if( pVal[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PrinterName")) )
+        if ( pVal[i].Name == "PrinterName" )
         {
             rtl::OUString aPrinterName;
             pVal[i].Value >>= aPrinterName;
@@ -717,18 +717,18 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                 TransformItems( nId, *rReq.GetArgs(), aProps, GetInterface()->GetSlot(nId) );
                 for ( sal_Int32 nProp=0; nProp<aProps.getLength(); nProp++ )
                 {
-                    if ( aProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Copies")) )
+                    if ( aProps[nProp].Name == "Copies" )
                         aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CopyCount"));
-                    else if ( aProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RangeText")) )
+                    else if ( aProps[nProp].Name == "RangeText" )
                         aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pages"));
-                    if ( aProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Asynchron")) )
+                    if ( aProps[nProp].Name == "Asynchron" )
                     {
                         aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wait"));
                         sal_Bool bAsynchron = sal_False;
                         aProps[nProp].Value >>= bAsynchron;
                         aProps[nProp].Value <<= (sal_Bool) (!bAsynchron);
                     }
-                    if ( aProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Silent")) )
+                    if ( aProps[nProp].Name == "Silent" )
                     {
                         aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MonitorVisible"));
                         sal_Bool bPrintSilent = sal_False;
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 2ff3e8cf556c..cd04953062da 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1809,7 +1809,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
         return (rProperty.Value >>= mbNoSlideTransitions);
     }
 
-    if (rProperty.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsSoundEnabled")))
+    if ( rProperty.Name == "IsSoundEnabled" )
     {
         uno::Sequence<uno::Any> aValues;
         uno::Reference<presentation::XSlideShowView> xView;
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 4899aa01a441..5de9a68a0b93 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -1923,7 +1923,7 @@ void UCBStorage_Impl::ReadContent()
                 if ( m_bIsLinked )
                 {
                     // unpacked storages have to deal with the meta-inf folder by themselves
-                    if( aTitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("META-INF")) )
+                    if ( aTitle == "META-INF" )
                         continue;
                 }
                 else
@@ -2046,7 +2046,7 @@ sal_Int32 UCBStorage_Impl::GetObjectCount()
         for ( sal_Int32 nProps=0; nProps<rMyProps.getLength(); nProps++ )
         {
             const PropertyValue& rAny = rMyProps[nProps];
-            if ( rAny.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FullPath")) )
+            if ( rAny.Name == "FullPath" )
             {
                 rtl::OUString aTmp;
                 if ( ( rAny.Value >>= aTmp ) && aTmp == rPath )
@@ -2054,7 +2054,7 @@ sal_Int32 UCBStorage_Impl::GetObjectCount()
                 if ( !aType.isEmpty() )
                     break;
             }
-            else if ( rAny.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MediaType")) )
+            else if ( rAny.Name == "MediaType" )
             {
                 if ( ( rAny.Value >>= aType ) && !aType.isEmpty() && bFound )
                     break;
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 1b57eb7de563..48fa447bdef7 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -2365,7 +2365,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect(
                         }
                         else if( rxMethod_i->getDeclaringClass()->equals( mxAggregationClass ) )
                         {
-                            if( aMethName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("setDelegator")) )
+                            if ( aMethName == "setDelegator" )
                             {
                                 rMethodConcept_i |= MethodConcept::DANGEROUS;
                                 continue;
@@ -2398,7 +2398,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect(
 
                         // Ist es eine get-Methode?
                         aStartStr = aMethName.copy( 0, 3 );
-                        if( aStartStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("get")) )
+                        if ( aStartStr == "get" )
                         {
                             // Namen der potentiellen Property
                             aPropName = aMethName.copy( 3 );
@@ -2519,7 +2519,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect(
                         }
 
                         // Ist es eine addListener-Methode?
-                        else if( aStartStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("add")) )
+                        else if ( aStartStr == "add" )
                         {
                             OUString aListenerStr( RTL_CONSTASCII_USTRINGPARAM("Listener" ) );
 
@@ -2608,7 +2608,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect(
 
                         // Ist es eine set-Methode ohne zugehoerige get-Methode?
                         aStartStr = aMethName.copy( 0, 3 );
-                        if( aStartStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("set")) )
+                        if ( aStartStr == "set" )
                         {
                             // Namen der potentiellen Property
                             aPropName = aMethName.copy( 3 );
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 25d0000fea0d..c73d2fae4cd4 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -1128,7 +1128,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced(
     rtl::OUString aPropertyName2;
     rtl::OUString aPropertyValue;
     bool bSecurityChanged = false;
-    if (aAccessor.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooInetProxyType")))
+    if ( aAccessor == "ooInetProxyType" )
     {
         // Proxy none, manually
         sal_Int32 value = 0;
@@ -1194,7 +1194,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced(
         rEvent.Element >>= aPropertyValue;
         aPropertyValue = aPropertyValue.replace(';', '|');
     }
-    else if (aAccessor.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("NetAccess")))
+    else if ( aAccessor == "NetAccess" )
     {
         aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                           "appletviewer.security.mode"));
@@ -1219,7 +1219,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced(
             return;
         bSecurityChanged = true;
     }
-    else if (aAccessor.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Security")))
+    else if ( aAccessor == "Security" )
     {
         aPropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                           "stardiv.security.disableSecurity"));
@@ -1347,7 +1347,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced(
                     const jchar* jcharName= pJNIEnv->GetStringChars( jsClass, NULL);
                     rtl::OUString sName( jcharName);
                     jboolean bIsSandbox;
-                    if (sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.lib.sandbox.SandboxSecurity")))
+                    if ( sName == "com.sun.star.lib.sandbox.SandboxSecurity" )
                         bIsSandbox= JNI_TRUE;
                     else
                         bIsSandbox= JNI_FALSE;
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index f2b029bcdaa4..00dc8edde9af 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -485,19 +485,19 @@ AccessController::AccessController( Reference< XComponentContext > const & xComp
     OUString mode;
     if (m_xComponentContext->getValueByName( OUSTR("/services/" SERVICE_NAME "/mode") ) >>= mode)
     {
-        if (mode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("off") ))
+        if ( mode == "off" )
         {
             m_mode = OFF;
         }
-        else if (mode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("on") ))
+        else if ( mode == "on" )
         {
             m_mode = ON;
         }
-        else if (mode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dynamic-only") ))
+        else if ( mode == "dynamic-only" )
         {
             m_mode = DYNAMIC_ONLY;
         }
-        else if (mode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("single-user") ))
+        else if ( mode == "single-user" )
         {
             m_xComponentContext->getValueByName(
                 OUSTR("/services/" SERVICE_NAME "/single-user-id") ) >>= m_singleUserId;
@@ -510,7 +510,7 @@ AccessController::AccessController( Reference< XComponentContext > const & xComp
             }
             m_mode = SINGLE_USER;
         }
-        else if (mode.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("single-default-user") ))
+        else if ( mode == "single-default-user" )
         {
             m_mode = SINGLE_DEFAULT_USER;
         }
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index d8327344d4ef..236294664b8b 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -336,14 +336,14 @@ FilePermission::FilePermission(
 {
     if (! m_allFiles)
     {
-        if (m_url.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("*") ))
+        if ( m_url == "*" )
         {
             OUStringBuffer buf( 64 );
             buf.append( getWorkingDir() );
             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("/*") );
             m_url = buf.makeStringAndClear();
         }
-        else if (m_url.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("-") ))
+        else if ( m_url == "-" )
         {
             OUStringBuffer buf( 64 );
             buf.append( getWorkingDir() );
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 1671321cac23..8cc4fbac3d61 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -729,7 +729,7 @@ void SAL_CALL OServiceManagerWrapper::setPropertyValue(
     throw (beans::UnknownPropertyException, beans::PropertyVetoException,
            lang::IllegalArgumentException, lang::WrappedTargetException, RuntimeException)
 {
-    if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DefaultContext") ))
+    if ( PropertyName == "DefaultContext" )
     {
         Reference< XComponentContext > xContext;
         if (aValue >>= xContext)
@@ -754,7 +754,7 @@ Any SAL_CALL OServiceManagerWrapper::getPropertyValue(
     const OUString& PropertyName )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, RuntimeException)
 {
-    if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DefaultContext") ))
+    if ( PropertyName == "DefaultContext" )
     {
         MutexGuard aGuard( m_mutex );
         if( m_xContext.is() )
@@ -1041,7 +1041,7 @@ void OServiceManager::setPropertyValue(
     throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
     check_undisposed();
-    if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DefaultContext") ))
+    if ( PropertyName == "DefaultContext" )
     {
         Reference< XComponentContext > xContext;
         if (aValue >>= xContext)
@@ -1068,7 +1068,7 @@ Any OServiceManager::getPropertyValue(const OUString& PropertyName)
     throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
     check_undisposed();
-    if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DefaultContext") ))
+    if ( PropertyName == "DefaultContext" )
     {
         MutexGuard aGuard( m_mutex );
         if( m_xContext.is() )
@@ -1939,7 +1939,7 @@ Any ORegistryServiceManager::getPropertyValue(const OUString& PropertyName)
     throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
     check_undisposed();
-    if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Registry") ))
+    if ( PropertyName == "Registry" )
     {
         MutexGuard aGuard( m_mutex );
         if( m_xRegistry.is() )
diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx
index e8a8256395c3..58a1784e5f09 100644
--- a/stoc/source/tdmanager/tdmgr.cxx
+++ b/stoc/source/tdmanager/tdmgr.cxx
@@ -788,35 +788,35 @@ inline Any ManagerImpl::getSimpleType( const OUString & rName )
 {
     Any aRet;
 
-    if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("string") ))
+    if ( rName == "string" )
         aRet <<= Reference< XTypeDescription >( new SimpleTypeDescriptionImpl( TypeClass_STRING, rName ) );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("long") ))
+    else if ( rName == "long" )
         aRet <<= Reference< XTypeDescription >( new SimpleTypeDescriptionImpl( TypeClass_LONG, rName ) );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("unsigned long") ))
+    else if ( rName == "unsigned long" )
         aRet <<= Reference< XTypeDescription >( new SimpleTypeDescriptionImpl( TypeClass_UNSIGNED_LONG, rName ) );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("boolean") ))
+    else if ( rName == "boolean" )
         aRet <<= Reference< XTypeDescription >( new SimpleTypeDescriptionImpl( TypeClass_BOOLEAN, rName ) );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("char") ))
+    else if ( rName == "char" )
         aRet <<= Reference< XTypeDescription >( new SimpleTypeDescriptionImpl( TypeClass_CHAR, rName ) );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("byte") ))
+    else if ( rName == "byte" )
         aRet <<= Reference< XTypeDescription >( new SimpleTypeDescriptionImpl( TypeClass_BYTE, rName ) );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("short") ))
+    else if ( rName == "short" )
         aRet <<= Reference< XTypeDescription >( new SimpleTypeDescriptionImpl( TypeClass_SHORT, rName ) );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("unsigned short") ))
+    else if ( rName == "unsigned short" )
         aRet <<= Reference< XTypeDescription >( new SimpleTypeDescriptionImpl( TypeClass_UNSIGNED_SHORT, rName ) );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("hyper") ))
+    else if ( rName == "hyper" )
         aRet <<= Reference< XTypeDescription >( new SimpleTypeDescriptionImpl( TypeClass_HYPER, rName ) );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("unsigned hyper") ))
+    else if ( rName == "unsigned hyper" )
         aRet <<= Reference< XTypeDescription >( new SimpleTypeDescriptionImpl( TypeClass_UNSIGNED_HYPER, rName ) );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("float") ))
+    else if ( rName == "float" )
         aRet <<= Reference< XTypeDescription >( new SimpleTypeDescriptionImpl( TypeClass_FLOAT, rName ) );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("double") ))
+    else if ( rName == "double" )
         aRet <<= Reference< XTypeDescription >( new SimpleTypeDescriptionImpl( TypeClass_DOUBLE, rName ) );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("any") ))
+    else if ( rName == "any" )
         aRet <<= Reference< XTypeDescription >( new SimpleTypeDescriptionImpl( TypeClass_ANY, rName ) );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("void") ))
+    else if ( rName == "void" )
         aRet <<= Reference< XTypeDescription >( new SimpleTypeDescriptionImpl( TypeClass_VOID, rName ) );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("type") ))
+    else if ( rName == "type" )
         aRet <<= Reference< XTypeDescription >( new SimpleTypeDescriptionImpl( TypeClass_TYPE, rName ) );
 
     return aRet;
diff --git a/stoc/test/security/test_security.cxx b/stoc/test/security/test_security.cxx
index b8809dea0885..b920a6ccbe68 100644
--- a/stoc/test/security/test_security.cxx
+++ b/stoc/test/security/test_security.cxx
@@ -132,7 +132,7 @@ void user_CurrentContext::release()
 Any user_CurrentContext::getValueByName( OUString const & name )
     throw (RuntimeException)
 {
-    if (name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(USER_CREDS ".id") ))
+    if ( name == USER_CREDS ".id" )
     {
         return m_userId;
     }
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index eb0fa8696091..3b63f77a0a1e 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -347,7 +347,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
         Sequence< TestElement > aSeq;
         TestData aData;
 
-        if (rFunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("setValues") ))
+        if ( rFunctionName == "setValues" )
         {
             OSL_ASSERT( rParams.getLength() == 17 );
             aBool = *(sal_Bool *)rParams[0].getValue();
@@ -375,7 +375,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
             rOutParamIndex.realloc( 0 );
             rOutParam.realloc( 0 );
         }
-        else if (rFunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("setValues2") ))
+        else if ( rFunctionName == "setValues2" )
         {
             aBool = *(sal_Bool *)rParams[0].getValue();
             aChar = *(sal_Unicode *)rParams[1].getValue();
@@ -437,7 +437,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
             rOutParam[15] <<= aSeq;
             rOutParam[16] <<= aData;
         }
-        else if (rFunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("getValues") ))
+        else if ( rFunctionName == "getValues" )
         {
             aRet <<= _xLBT->getValues( aBool, aChar, nByte, nShort, nUShort, nLong, nULong,
                                        nHyper, nUHyper, fFloat, fDouble, eEnum, aString, xInterface,
@@ -481,7 +481,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
             rOutParam[15] <<= aSeq;
             rOutParam[16] <<= aData;
         }
-        else if (rFunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("raiseException") ))
+        else if ( rFunctionName == "raiseException" )
         {
             aRet <<= _xLBT->raiseException( aBool, aChar, nByte, nShort, nUShort, nLong, nULong,
                                             nHyper, nUHyper, fFloat, fDouble, eEnum, aString, xInterface,
@@ -556,41 +556,41 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
 void XLB_Invocation::setValue( const OUString & rName, const Any & rValue )
     throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException)
 {
-    if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Bool") ))
+    if ( rName == "Bool" )
         _xLBT->setBool( *(const sal_Bool *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Byte") ))
+    else if ( rName == "Byte" )
         _xLBT->setByte( *(const sal_Int8 *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Char") ))
+    else if ( rName == "Char" )
         _xLBT->setChar( *(const sal_Unicode *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Short") ))
+    else if ( rName == "Short" )
         _xLBT->setShort( *(const sal_Int16 *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("UShort") ))
+    else if ( rName == "UShort" )
         _xLBT->setUShort( *(const sal_uInt16 *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Long") ))
+    else if ( rName == "Long" )
         _xLBT->setLong( *(const sal_Int32 *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ULong") ))
+    else if ( rName == "ULong" )
         _xLBT->setULong( *(const sal_uInt32 *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Hyper") ))
+    else if ( rName == "Hyper" )
         _xLBT->setHyper( *(const sal_Int64 *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("UHyper") ))
+    else if ( rName == "UHyper" )
         _xLBT->setUHyper( *(const sal_uInt64 *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Float") ))
+    else if ( rName == "Float" )
         _xLBT->setFloat( *(const float *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Double") ))
+    else if ( rName == "Double" )
         _xLBT->setDouble( *(const double *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Enum") ))
+    else if ( rName == "Enum" )
         _xLBT->setEnum( *(const TestEnum *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("String") ))
+    else if ( rName == "String" )
         _xLBT->setString( *(const OUString *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Interface") ))
+    else if ( rName == "Interface" )
         _xLBT->setInterface( *(const Reference< XInterface > *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Any") ))
+    else if ( rName == "Any" )
         _xLBT->setAny( rValue );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Sequence") ))
+    else if ( rName == "Sequence" )
         _xLBT->setSequence( *(const Sequence< TestElement > *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Struct") ))
+    else if ( rName == "Struct" )
         _xLBT->setStruct( *(const TestData *)rValue.getValue() );
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("RuntimeException") ))
+    else if ( rName == "RuntimeException" )
         _xLBT->setRuntimeException( *(const sal_Int32 *)rValue.getValue() );
 }
 //__________________________________________________________________________________________________
@@ -598,47 +598,47 @@ Any XLB_Invocation::getValue( const OUString & rName )
     throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
 {
     Any aRet;
-    if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Bool") ))
+    if ( rName == "Bool" )
     {
         sal_Bool aBool = _xLBT->getBool();
         aRet.setValue( &aBool, ::getCppuBooleanType() );
     }
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Byte") ))
+    else if ( rName == "Byte" )
         aRet <<= _xLBT->getByte();
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Char") ))
+    else if ( rName == "Char" )
     {
         sal_Unicode aChar = _xLBT->getChar();
         aRet.setValue( &aChar, ::getCppuCharType() );
     }
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Short") ))
+    else if ( rName == "Short" )
         aRet <<= _xLBT->getShort();
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("UShort") ))
+    else if ( rName == "UShort" )
         aRet <<= _xLBT->getUShort();
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Long") ))
+    else if ( rName == "Long" )
         aRet <<= _xLBT->getLong();
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ULong") ))
+    else if ( rName == "ULong" )
         aRet <<= _xLBT->getULong();
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Hyper") ))
+    else if ( rName == "Hyper" )
         aRet <<= _xLBT->getHyper();
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("UHyper") ))
+    else if ( rName == "UHyper" )
         aRet <<= _xLBT->getUHyper();
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Float") ))
+    else if ( rName == "Float" )
         aRet <<= _xLBT->getFloat();
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Double") ))
+    else if ( rName == "Double" )
         aRet <<= _xLBT->getDouble();
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Enum") ))
+    else if ( rName == "Enum" )
         aRet <<= _xLBT->getEnum();
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("String") ))
+    else if ( rName == "String" )
         aRet <<= _xLBT->getString();
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Interface") ))
+    else if ( rName == "Interface" )
         aRet <<= _xLBT->getInterface();
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Any") ))
+    else if ( rName == "Any" )
         aRet <<= _xLBT->getAny();
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Sequence") ))
+    else if ( rName == "Sequence" )
         aRet <<= _xLBT->getSequence();
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Struct") ))
+    else if ( rName == "Struct" )
         aRet <<= _xLBT->getStruct();
-    else if (rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("RuntimeException") ))
+    else if ( rName == "RuntimeException" )
         aRet <<= _xLBT->getRuntimeException();
     return aRet;
 }
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index cf4fb57bf8d3..36093fa011e9 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -1350,9 +1350,9 @@ uno::Any SAL_CALL FSStorage::getPropertyValue( const ::rtl::OUString& aPropertyN
     if ( !m_pImpl )
         throw lang::DisposedException();
 
-    if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
+    if ( aPropertyName == "URL" )
         return uno::makeAny( m_pImpl->m_aURL );
-    else if ( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OpenMode")) )
+    else if ( aPropertyName == "OpenMode" )
         return uno::makeAny( m_pImpl->m_nMode );
 
     throw beans::UnknownPropertyException(); // TODO
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 32bbad885730..73807233ee41 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -54,9 +54,9 @@ SvxMacro::SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString &rLan
     : aMacName( rMacName ), aLibName( rLanguage),
       pFunctionObject(NULL), eType( EXTENDED_STYPE)
 {
-    if (rLanguage.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SVX_MACRO_LANGUAGE_STARBASIC)))
+    if ( rLanguage == SVX_MACRO_LANGUAGE_STARBASIC )
         eType=STARBASIC;
-    else if (rLanguage.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SVX_MACRO_LANGUAGE_JAVASCRIPT)))
+    else if ( rLanguage == SVX_MACRO_LANGUAGE_JAVASCRIPT )
         eType=JAVASCRIPT;
 }
 
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index a2e7d8b1d4af..b762c2fcd030 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -142,7 +142,7 @@ uno::Sequence< beans::PropertyValue > SvFilterOptionsDialog::getPropertyValues()
     sal_Int32 i, nCount;
     for ( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ )
     {
-        if ( maMediaDescriptor[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterData")) )
+        if ( maMediaDescriptor[ i ].Name == "FilterData" )
             break;
     }
     if ( i == nCount )
@@ -164,11 +164,11 @@ void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::Prope
     sal_Int32 i, nCount;
     for ( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ )
     {
-        if ( maMediaDescriptor[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterData")) )
+        if ( maMediaDescriptor[ i ].Name == "FilterData" )
         {
             maMediaDescriptor[ i ].Value >>= maFilterDataSequence;
         }
-        else if ( maMediaDescriptor[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SelectionOnly")) )
+        else if ( maMediaDescriptor[ i ].Name == "SelectionOnly" )
         {
             maMediaDescriptor[ i ].Value >>= mbExportSelection;
         }
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index ed197e9018c8..9fc8ecd0eb71 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -87,39 +87,39 @@ using namespace ::com::sun::star;
 static sal_Int16 GetFilterFormat(const rtl::OUString& rExt)
 {
     sal_Int16 nFormat = FORMAT_UNKNOWN;
-    if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("JPG")))
+    if ( rExt == "JPG" )
         nFormat = FORMAT_JPG;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PNG")))
+    else if ( rExt == "PNG" )
         nFormat = FORMAT_PNG;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("BMP")))
+    else if ( rExt == "BMP" )
         nFormat = FORMAT_BMP;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GIF")))
+    else if ( rExt == "GIF" )
         nFormat = FORMAT_GIF;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PBM")))
+    else if ( rExt == "PBM" )
         nFormat = FORMAT_PBM;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PGM")))
+    else if ( rExt == "PGM" )
         nFormat = FORMAT_PGM;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PPM")))
+    else if ( rExt == "PPM" )
         nFormat = FORMAT_PPM;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PCT")))
+    else if ( rExt == "PCT" )
         nFormat = FORMAT_PCT;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RAS")))
+    else if ( rExt == "RAS" )
         nFormat = FORMAT_RAS;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TIF")))
+    else if ( rExt == "TIF" )
         nFormat = FORMAT_TIF;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("XPM")))
+    else if ( rExt == "XPM" )
         nFormat = FORMAT_XPM;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("WMF")))
+    else if ( rExt == "WMF" )
         nFormat = FORMAT_WMF;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EMF")))
+    else if ( rExt == "EMF" )
         nFormat = FORMAT_EMF;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EPS")))
+    else if ( rExt == "EPS" )
         nFormat = FORMAT_EPS;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MET")))
+    else if ( rExt == "MET" )
         nFormat = FORMAT_MET;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SVG")))
+    else if ( rExt == "SVG" )
         nFormat = FORMAT_SVG;
-    else if (rExt.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SVM")))
+    else if ( rExt == "SVM" )
         nFormat = FORMAT_SVM;
     return nFormat;
 }
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index d5bcf46d990b..bbc2bc7abee0 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -226,19 +226,19 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( co
     if( ( 0 == rResourceURL.getToken( 0, '/', nIndex ).compareToAscii( "private:standardimage" ) ) )
     {
         rtl::OUString sImageName( rResourceURL.copy( nIndex ) );
-        if ( sImageName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("info")) )
+        if ( sImageName == "info" )
         {
             xRet = InfoBox::GetStandardImage().GetXGraphic();
         }
-        else if ( sImageName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("warning")) )
+        else if ( sImageName == "warning" )
         {
             xRet = WarningBox::GetStandardImage().GetXGraphic();
         }
-        else if ( sImageName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("error")) )
+        else if ( sImageName == "error" )
         {
             xRet = ErrorBox::GetStandardImage().GetXGraphic();
         }
-        else if ( sImageName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("query")) )
+        else if ( sImageName == "query" )
         {
             xRet = QueryBox::GetStandardImage().GetXGraphic();
         }
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index 48554a3420bd..22d361a17a1e 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.cxx
@@ -557,7 +557,7 @@ ContextMenuHelper::getLabelFromCommandURL(
                 {
                     for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
                     {
-                        if ( aPropSeq[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Label")) )
+                        if ( aPropSeq[i].Name == "Label" )
                         {
                             aPropSeq[i].Value >>= aStr;
                             break;
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx
index d10de663f31d..69e942e65360 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.cxx
@@ -369,9 +369,9 @@ void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArgum
         {
             if ( aArguments[i] >>= aPropValue )
             {
-                if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Frame")) )
+                if ( aPropValue.Name == "Frame" )
                     aPropValue.Value >>= xFrame;
-                else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CommandURL")) )
+                else if ( aPropValue.Name == "CommandURL" )
                     aPropValue.Value >>= aCommandURL;
             }
         }
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index ee6e6455d666..2cb1d9c55a78 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -160,15 +160,15 @@ throw ( Exception, RuntimeException )
         {
             if ( aArguments[i] >>= aPropValue )
             {
-                if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Frame")) )
+                if ( aPropValue.Name == "Frame" )
                     aPropValue.Value >>= m_xFrame;
-                else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CommandURL")) )
+                else if ( aPropValue.Name == "CommandURL" )
                     aPropValue.Value >>= m_aCommandURL;
-                else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ServiceManager")) )
+                else if ( aPropValue.Name == "ServiceManager" )
                     aPropValue.Value >>= m_xServiceManager;
-                else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ParentWindow")) )
+                else if ( aPropValue.Name == "ParentWindow" )
                     aPropValue.Value >>= m_xParentWindow;
-                else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Identifier")) )
+                else if ( aPropValue.Name == "Identifier" )
                     aPropValue.Value >>= m_nID;
             }
         }
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index b46f5eb0509e..ea31875b346d 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -225,13 +225,13 @@ throw ( Exception, RuntimeException )
         {
             if ( aArguments[i] >>= aPropValue )
             {
-                if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Frame") ))
+                if ( aPropValue.Name == "Frame" )
                     m_xFrame.set(aPropValue.Value,UNO_QUERY);
-                else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CommandURL") ))
+                else if ( aPropValue.Name == "CommandURL" )
                     aPropValue.Value >>= m_aCommandURL;
-                else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ServiceManager") ))
+                else if ( aPropValue.Name == "ServiceManager" )
                     m_xServiceManager.set(aPropValue.Value,UNO_QUERY);
-                else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ParentWindow") ))
+                else if ( aPropValue.Name == "ParentWindow" )
                     m_pImpl->m_xParentWindow.set(aPropValue.Value,UNO_QUERY);
                 else if ( aPropValue.Name == "ModuleName" )
                     aPropValue.Value >>= m_pImpl->m_sModuleName;
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index 47f0fe198fac..711615053f6f 100644
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -147,7 +147,7 @@ namespace svt { namespace table
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL ColumnChangeMultiplexer::columnChanged( const GridColumnEvent& i_event ) throw (RuntimeException)
     {
-        if ( i_event.AttributeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataColumnIndex")) )
+        if ( i_event.AttributeName == "DataColumnIndex" )
         {
             SolarMutexGuard aGuard;
             if ( m_pColumnImplementation != NULL )
@@ -157,7 +157,7 @@ namespace svt { namespace table
 
         ColumnAttributeGroup nChangedAttributes( COL_ATTRS_NONE );
 
-        if ( i_event.AttributeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HorizontalAlign")) )
+        if ( i_event.AttributeName == "HorizontalAlign" )
             nChangedAttributes |= COL_ATTRS_APPEARANCE;
 
         if  (   i_event.AttributeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ColumnWidth"))
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index abdce55c131e..75e9138f6867 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -399,9 +399,9 @@ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight)
         const PropertyValue* pProps = aProps.getConstArray();
         for(sal_Int32 nProp = 0; nProp < aProps.getLength(); nProp++)
         {
-            if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyBaseText)))
+            if ( pProps[nProp].Name == cRubyBaseText )
                 pProps[nProp].Value >>= sLeft;
-            else if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyText)))
+            else if ( pProps[nProp].Name == cRubyText )
                 pProps[nProp].Value >>= sRight;
         }
     }
@@ -431,9 +431,9 @@ void SvxRubyDialog::GetText()
             PropertyValue* pProps = rProps.getArray();
             for(sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++)
             {
-                if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyBaseText)))
+                if ( pProps[nProp].Name == cRubyBaseText )
                     pProps[nProp].Value <<= OUString(aEditArr[i]->GetText());
-                else if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyText)))
+                else if ( pProps[nProp].Name == cRubyText )
                     pProps[nProp].Value <<= OUString(aEditArr[i + 1]->GetText());
             }
         }
@@ -610,7 +610,7 @@ IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox*, pBox)
         PropertyValue* pProps = rProps.getArray();
         for(sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++)
         {
-            if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyAdjust)))
+            if ( pProps[nProp].Name == cRubyAdjust )
                 pProps[nProp].Value <<= nAdjust;
         }
         SetModified(sal_True);
@@ -631,7 +631,7 @@ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox)
         PropertyValue* pProps = rProps.getArray();
         for(sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++)
         {
-            if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyIsAbove)))
+            if ( pProps[nProp].Name == cRubyIsAbove )
                 pProps[nProp].Value.setValue(&bAbove, rType);
         }
         SetModified(sal_True);
@@ -653,7 +653,7 @@ IMPL_LINK_NOARG(SvxRubyDialog, CharStyleHdl_Impl)
         PropertyValue* pProps = rProps.getArray();
         for(sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++)
         {
-            if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyCharStyleName)))
+            if ( pProps[nProp].Name == cRubyCharStyleName )
             {
                 pProps[nProp].Value <<= sStyleName;
             }
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index f1b810c69692..e885e17f758e 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -310,17 +310,17 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
                     aNumberingTypes[i] = 0;
                     for(sal_Int32 nProperty = 0; nProperty < aLevel.getLength() - 1; nProperty++)
                     {
-                        if(pValues[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cNumberingType)))
+                        if ( pValues[nProperty].Name == cNumberingType )
                             pValues[nProperty].Value >>= aNumberingTypes[i];
-                        else if(pValues[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cBulletFontName)))
+                        else if ( pValues[nProperty].Name == cBulletFontName )
                             pValues[nProperty].Value >>= sFontNames[i];
-                        else if(pValues[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cBulletChar)))
+                        else if ( pValues[nProperty].Name == cBulletChar )
                             pValues[nProperty].Value >>= sBulletChars[i];
-                        else if(pValues[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cPrefix)))
+                        else if ( pValues[nProperty].Name == cPrefix )
                             pValues[nProperty].Value >>= sPrefixes[i];
-                        else if(pValues[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cSuffix)))
+                        else if ( pValues[nProperty].Name == cSuffix )
                             pValues[nProperty].Value >>= sSuffixes[i];
-                        else if(pValues[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cParentNumbering)))
+                        else if ( pValues[nProperty].Name == cParentNumbering )
                             pValues[nProperty].Value >>= aParentNumberings[i];
                     }
                     Sequence< PropertyValue > aProperties(2);
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index df609e587c9a..d1c6efcc8d1c 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -2460,7 +2460,7 @@ void FmXGridPeer::setMode(const ::rtl::OUString& Mode) throw( NoSupportException
     m_aMode = Mode;
 
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
-    if ( Mode.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterMode")) )
+    if ( Mode == "FilterMode" )
         pGrid->SetFilterMode(sal_True);
     else
     {
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 86ee670152e1..13882b6268bb 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -44,7 +44,7 @@ using namespace ::svxform;
     {
         xRet = ::comphelper::getProcessServiceFactory()->createInstance(ServiceSpecifier);
     }
-    else if ( ServiceSpecifier.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ControlShape")) )
+    else if ( ServiceSpecifier == "com.sun.star.drawing.ControlShape" )
     {
         SdrObject* pObj = new FmFormObj();
         xRet = static_cast<cppu::OWeakObject*>(static_cast<SvxShape_UnoImplHelper*>(new SvxShapeControl(pObj)));
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index 273286c18972..47cf331a294a 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -755,7 +755,7 @@ void TableDesignFamily::setPropertyValue( const OUString& , const Any&  ) throw
 
 Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
-    if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DisplayName") ))
+    if ( PropertyName == "DisplayName" )
     {
         OUString sDisplayName( SVX_RESSTR( RID_SVXSTR_STYLEFAMILY_TABLEDESIGN ) );
         return Any( sDisplayName );
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index d96fa497e240..184c6db400f0 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -383,9 +383,9 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< :
         for ( sal_uInt16 i=0; i<nItemCount; ++i )
         {
             ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
-            if ( sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMMAND_DOWNSEARCH)))
+            if ( sItemCommand == COMMAND_DOWNSEARCH )
                 m_nDownSearchId = i;
-            else if (sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMMAND_UPSEARCH)))
+            else if ( sItemCommand == COMMAND_UPSEARCH )
                 m_nUpSearchId = i;
         }
     }
@@ -426,7 +426,7 @@ void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::Featur
         return;
 
     ::rtl::OUString aFeatureURL = rEvent.FeatureURL.Complete;
-    if (aFeatureURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AppendSearchHistory")))
+    if ( aFeatureURL == "AppendSearchHistory" )
     {
         m_pFindTextFieldControl->Remember_Impl(m_pFindTextFieldControl->GetText());
     }
@@ -554,7 +554,7 @@ void SAL_CALL DownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
         for ( sal_uInt16 i=0; i<nItemCount; ++i )
         {
             ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
-            if ( sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(COMMAND_FINDTEXT)) )
+            if ( sItemCommand == COMMAND_FINDTEXT )
             {
                 Window* pItemWin = pToolBox->GetItemWindow(i);
                 if (pItemWin)
@@ -798,7 +798,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL FindbarDispatcher::queryDi
 {
     css::uno::Reference< css::frame::XDispatch > xDispatch;
 
-    if ( aURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.findbar:")) )
+    if ( aURL.Protocol == "vnd.sun.star.findbar:" )
         xDispatch = this;
 
     return xDispatch;
@@ -819,7 +819,7 @@ css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fin
 void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css::uno::Sequence < css::beans::PropertyValue >& /*lArgs*/ ) throw( css::uno::RuntimeException )
 {
     //vnd.sun.star.findbar:FocusToFindbar  - set cursor to the FindTextFieldControl of the findbar
-    if ( aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FocusToFindbar")) )
+    if ( aURL.Path == "FocusToFindbar" )
     {
         css::uno::Reference< css::beans::XPropertySet > xPropSet(m_xFrame, css::uno::UNO_QUERY);
         if(!xPropSet.is())
@@ -852,7 +852,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css
             for ( sal_uInt16 i=0; i<nItemCount; ++i )
             {
                 ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
-                if ( sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:FindText")) )
+                if ( sItemCommand == ".uno:FindText" )
                 {
                     Window* pItemWin = pToolBox->GetItemWindow( i );
                     if ( pItemWin )
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index d23c1ca6da04..9707d5117481 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -134,7 +134,7 @@ void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName )
 
     // a little quickfix for 2.0 to let applications clear api
     // created items that are not used
-    if( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("~clear~") ) )
+    if ( aApiName == "~clear~" )
     {
         dispose();
         return;
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 517c7fb32a67..df4ec36a50c4 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -394,17 +394,17 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( c
         return uno::Reference< uno::XInterface >( SvxCreateNumRule( mpDoc ), uno::UNO_QUERY );
     }
 
-    if( aServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.image.ImageMapRectangleObject") ) )
+    if ( aServiceSpecifier == "com.sun.star.image.ImageMapRectangleObject" )
     {
         return SvUnoImageMapRectangleObject_createInstance( ImplGetSupportedMacroItems() );
     }
 
-    if( aServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.image.ImageMapCircleObject") ) )
+    if ( aServiceSpecifier == "com.sun.star.image.ImageMapCircleObject" )
     {
         return SvUnoImageMapCircleObject_createInstance( ImplGetSupportedMacroItems() );
     }
 
-    if( aServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.image.ImageMapPolygonObject") ) )
+    if ( aServiceSpecifier == "com.sun.star.image.ImageMapPolygonObject" )
     {
         return SvUnoImageMapPolygonObject_createInstance( ImplGetSupportedMacroItems() );
     }
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index bcbca448e56e..e90f635a1df8 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -203,7 +203,7 @@ void SAL_CALL SvxUnoMarkerTable::removeByName( const OUString& aApiName )
 
     // a little quickfix for 2.0 to let applications clear api
     // created items that are not used
-    if( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("~clear~") ) )
+    if ( aApiName == "~clear~" )
     {
         dispose();
         return;
diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx
index 12e64160fad5..703345582d4b 100644
--- a/svx/workben/msview/xmlconfig.cxx
+++ b/svx/workben/msview/xmlconfig.cxx
@@ -98,23 +98,23 @@ void ConfigHandler::errorThrow( const OUString& rErrorMessage ) throw (SAXExcept
 
 ElementConfigType ConfigHandler::parseType( const OUString& sType ) throw (SAXException )
 {
-    if( sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("uint") ) )
+    if ( sType == "uint" )
     {
         return ECT_UINT;
     }
-    else if( sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("byte") ) )
+    else if ( sType == "byte" )
     {
         return ECT_BYTE;
     }
-    else if( sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("unistring") ) )
+    else if ( sType == "unistring" )
     {
         return ECT_UNISTRING;
     }
-    else if( sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("float") ) )
+    else if ( sType == "float" )
     {
         return ETC_FLOAT;
     }
-    else if( sType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("hexdump") ) )
+    else if ( sType == "hexdump" )
     {
     }
     else
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index 926796799f82..a8908d5ad001 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -177,7 +177,7 @@ void RtfModelTest::testFdo45553()
         {
             uno::Reference<text::XTextRange> xRange(xRangeEnum->nextElement(), uno::UNO_QUERY);
             OUString aStr = xRange->getString();
-            if (aStr.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("space-before")))
+            if ( aStr == "space-before" )
             {
                 sal_Int32 nMargin = 0;
                 uno::Reference<beans::XPropertySet> xPropertySet(xRange, uno::UNO_QUERY);
@@ -185,7 +185,7 @@ void RtfModelTest::testFdo45553()
                 aValue >>= nMargin;
                 CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(120)), nMargin);
             }
-            else if (aStr.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("space-after")))
+            else if ( aStr == "space-after" )
             {
                 sal_Int32 nMargin = 0;
                 uno::Reference<beans::XPropertySet> xPropertySet(xRange, uno::UNO_QUERY);
@@ -325,13 +325,13 @@ void RtfModelTest::testFdo46662()
     {
         const beans::PropertyValue& rProp = aProps[i];
 
-        if (rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ParentNumbering")))
+        if ( rProp.Name == "ParentNumbering" )
         {
             sal_Int16 nValue;
             rProp.Value >>= nValue;
             CPPUNIT_ASSERT_EQUAL(sal_Int16(2), nValue);
         }
-        else if (rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Suffix")))
+        else if ( rProp.Name == "Suffix" )
         {
             rtl::OUString sValue;
             rProp.Value >>= sValue;
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index b502d1220a01..96ca62708dc4 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -1752,7 +1752,7 @@ void SwSpellIter::CreatePortion(uno::Reference< XSpellAlternatives > xAlt,
                 const beans::PropertyValue* pProperties = pGrammarResult->aProperties.getConstArray();
                 for( sal_Int32 nProp = 0; nProp < pGrammarResult->aProperties.getLength(); ++nProp )
                 {
-                    if( pProperties->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DialogTitle") ) )
+                    if ( pProperties->Name == "DialogTitle" )
                     {
                         pProperties->Value >>= aPortion.sDialogTitle;
                         break;
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 76001036c10e..0b3796169d15 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -600,7 +600,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
     const beans::PropertyValue *pArg = rArguments.getConstArray();
     for (sal_Int32 i = 0;  i < nArgs;  ++i)
     {
-        if (pArg[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataRowSource")))
+        if ( pArg[i].Name == "DataRowSource" )
         {
             chart::ChartDataRowSource eSource;
             if (!(pArg[i].Value >>= eSource))
@@ -612,22 +612,22 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
             }
             bDtaSrcIsColumns = eSource == chart::ChartDataRowSource_COLUMNS;
         }
-        else if (pArg[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FirstCellAsLabel")))
+        else if ( pArg[i].Name == "FirstCellAsLabel" )
         {
             if (!(pArg[i].Value >>= bFirstIsLabel))
                 throw lang::IllegalArgumentException();
         }
-        else if (pArg[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
+        else if ( pArg[i].Name == "CellRangeRepresentation" )
         {
             if (!(pArg[i].Value >>= aRangeRepresentation))
                 throw lang::IllegalArgumentException();
         }
-        else if (pArg[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SequenceMapping")))
+        else if ( pArg[i].Name == "SequenceMapping" )
         {
             if (!(pArg[i].Value >>= aSequenceMapping))
                 throw lang::IllegalArgumentException();
         }
-        else if (pArg[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ChartOleObjectName")))
+        else if ( pArg[i].Name == "ChartOleObjectName" )
         {
             if (!(pArg[i].Value >>= aChartOleObjectName))
                 throw lang::IllegalArgumentException();
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index e387015b62e0..2bf8ead309f6 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -2626,7 +2626,7 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
         const OUString& rPropName = pProperties[n].Name;
 
         // old and new sortdescriptor
-        if (rPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsSortInTable")))
+        if ( rPropName == "IsSortInTable" )
         {
             if (aValue.getValueType() == ::getBooleanCppuType())
             {
@@ -2637,7 +2637,7 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
                 bRet = sal_False;
             }
         }
-        else if (rPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Delimiter")))
+        else if ( rPropName == "Delimiter" )
         {
             sal_Unicode uChar = sal_Unicode();
             if (aValue >>= uChar)
@@ -2650,7 +2650,7 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
             }
         }
         // old sortdescriptor
-        else if (rPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SortColumns")))
+        else if ( rPropName == "SortColumns" )
         {
             bOldSortdescriptor = sal_True;
             sal_Bool bTemp(sal_False);
@@ -2663,7 +2663,7 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
                 bRet = sal_False;
             }
         }
-        else if ( rPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsCaseSensitive")))
+        else if ( rPropName == "IsCaseSensitive" )
         {
             bOldSortdescriptor = sal_True;
             sal_Bool bTemp(sal_False);
@@ -2676,7 +2676,7 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
                 bRet = sal_False;
             }
         }
-        else if (rPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CollatorLocale")))
+        else if ( rPropName == "CollatorLocale" )
         {
             bOldSortdescriptor = sal_True;
             lang::Locale aLocale;
@@ -2764,7 +2764,7 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
             }
         }
         // new sortdescriptor
-        else if (rPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsSortColumns")))
+        else if ( rPropName == "IsSortColumns" )
         {
             bNewSortdescriptor = sal_True;
             if (aValue.getValueType() == ::getBooleanCppuType())
@@ -2777,7 +2777,7 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
                 bRet = sal_False;
             }
         }
-        else if (rPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SortFields")))
+        else if ( rPropName == "SortFields" )
         {
             bNewSortdescriptor = sal_True;
             uno::Sequence < table::TableSortField > aFields;
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 00b069c66971..088f5d24cf40 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -1441,7 +1441,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
     if (!pMeta)
         throw lang::DisposedException();
 
-    if (rPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("NumberFormat")))
+    if ( rPropertyName == "NumberFormat" )
     {
         sal_Int32 nNumberFormat(0);
         if (rValue >>= nNumberFormat)
@@ -1449,7 +1449,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
             pMeta->SetNumberFormat(static_cast<sal_uInt32>(nNumberFormat));
         }
     }
-    else if (rPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsFixedLanguage")))
+    else if ( rPropertyName == "IsFixedLanguage" )
     {
         bool b(false);
         if (rValue >>= b)
@@ -1476,12 +1476,12 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 
     uno::Any any;
 
-    if (rPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("NumberFormat")))
+    if ( rPropertyName == "NumberFormat" )
     {
         const ::rtl::OUString text( getPresentation(sal_False) );
         any <<= static_cast<sal_Int32>(pMeta->GetNumberFormat(text));
     }
-    else if (rPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsFixedLanguage")))
+    else if ( rPropertyName == "IsFixedLanguage" )
     {
         any <<= pMeta->IsFixedLanguage();
     }
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index f2f13313282e..93ad7961a24e 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -977,7 +977,7 @@ uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const ::rtl::OUString& sProp
 {
     uno::Any aRet;
 
-    if ( sPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DisplayName") ) )
+    if ( sPropertyName == "DisplayName" )
     {
         SolarMutexGuard aGuard;
         sal_uInt32 nResId = 0;
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index c83d243c447b..cd7d061cfebe 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2049,7 +2049,7 @@ lcl_ApplyCellProperties(
     {
         const OUString & rName  = rCellProperties[nProperty].Name;
         const uno::Any & rValue = rCellProperties[nProperty].Value;
-        if (rName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("VerticalMerge")))
+        if ( rName == "VerticalMerge" )
         {
             // determine left border position
             // add the cell to a queue of merged cells
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 6fa217848770..d20f738b127b 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1233,45 +1233,45 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
                 }
 
                 // did we find any of the non-default cases?
-                if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PrinterIndependentLayout")) )
+                if ( pValues->Name == "PrinterIndependentLayout" )
                     bPrinterIndependentLayout = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AddExternalLeading")) )
+                else if ( pValues->Name == "AddExternalLeading" )
                     bAddExternalLeading = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AddParaSpacingToTableCells")) )
+                else if ( pValues->Name == "AddParaSpacingToTableCells" )
                     bAddParaSpacingToTableCells = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UseFormerLineSpacing")) )
+                else if ( pValues->Name == "UseFormerLineSpacing" )
                     bUseFormerLineSpacing = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UseFormerObjectPositioning")) )
+                else if ( pValues->Name == "UseFormerObjectPositioning" )
                     bUseFormerObjectPositioning = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UseFormerTextWrapping")) )
+                else if ( pValues->Name == "UseFormerTextWrapping" )
                     bUseFormerTextWrapping = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UseOldNumbering")) )
+                else if ( pValues->Name == "UseOldNumbering" )
                     bUseOldNumbering = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutlineLevelYieldsNumbering")) )
+                else if ( pValues->Name == "OutlineLevelYieldsNumbering" )
                     bOutlineLevelYieldsOutlineRule = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ConsiderTextWrapOnObjPos")) )
+                else if ( pValues->Name == "ConsiderTextWrapOnObjPos" )
                     bConsiderWrapOnObjPos = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IgnoreFirstLineIndentInNumbering")) )
+                else if ( pValues->Name == "IgnoreFirstLineIndentInNumbering" )
                     bIgnoreFirstLineIndentInNumbering = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DoNotJustifyLinesWithManualBreak")) )
+                else if ( pValues->Name == "DoNotJustifyLinesWithManualBreak" )
                     bDoNotJustifyLinesWithManualBreak = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DoNotResetParaAttrsForNumFont")) )
+                else if ( pValues->Name == "DoNotResetParaAttrsForNumFont" )
                     bDoNotResetParaAttrsForNumFont = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LoadReadonly")) )
+                else if ( pValues->Name == "LoadReadonly" )
                     bLoadReadonly = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DoNotCaptureDrawObjsOnPage")) )
+                else if ( pValues->Name == "DoNotCaptureDrawObjsOnPage" )
                     bDoNotCaptureDrawObjsOnPage = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ClipAsCharacterAnchoredWriterFlyFrames")) )
+                else if ( pValues->Name == "ClipAsCharacterAnchoredWriterFlyFrames" )
                     bClipAsCharacterAnchoredWriterFlyFrames = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UnxForceZeroExtLeading")) )
+                else if ( pValues->Name == "UnxForceZeroExtLeading" )
                     bUnixForceZeroExtLeading = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UseOldPrinterMetrics")) )
+                else if ( pValues->Name == "UseOldPrinterMetrics" )
                     bUseOldPrinterMetrics = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SmallCapsPercentage66")) )
+                else if ( pValues->Name == "SmallCapsPercentage66" )
                     bSmallCapsPercentage66 = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TabOverflow")) )
+                else if ( pValues->Name == "TabOverflow" )
                     bTabOverflow = true;
-                else if( pValues->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UnbreakableNumberings")) )
+                else if ( pValues->Name == "UnbreakableNumberings" )
                     bUnbreakableNumberings = true;
             }
             catch( Exception& )
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 46cd7092d77f..54d39f910c85 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -1324,11 +1324,11 @@ void SwDocShell::Execute(SfxRequest& rReq)
 
                             sal_Int32 nColonPos = sTmpl.indexOf( sal_Unicode(':') );
                             OUString sPrefix = sTmpl.copy( 0L, nColonPos );
-                            if( sPrefix.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Style")))
+                            if ( sPrefix == "Style" )
                             {
                                 aTemplateName = sTmpl.copy( 7L );   //get string behind "Style: "
                             }
-                            else if( sPrefix.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Outline")))
+                            else if ( sPrefix == "Outline" )
                             {
                                 nTemplateOutlineLevel = ( sTmpl.copy( 15L )).toInt32(); //get string behind "Outline: Leve  ";
                                 bCreateByOutlineLevel = true;
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 1e019e37d018..bc8b93b34af2 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -2561,17 +2561,17 @@ void SwNewDBMgr::InsertText(SwWrtShell& rSh,
     uno::Reference< XConnection> xConnection;
     for(sal_Int32 nPos = 0; nPos < rProperties.getLength(); nPos++)
     {
-        if(pValues[nPos].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cDataSourceName)))
+        if ( pValues[nPos].Name == cDataSourceName )
             pValues[nPos].Value >>= sDataSource;
-        else if(pValues[nPos].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cCommand)))
+        else if ( pValues[nPos].Name == cCommand )
             pValues[nPos].Value >>= sDataTableOrQuery;
-        else if(pValues[nPos].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cCursor)))
+        else if ( pValues[nPos].Name == cCursor )
             pValues[nPos].Value >>= xResSet;
-        else if(pValues[nPos].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cSelection)))
+        else if ( pValues[nPos].Name == cSelection )
             pValues[nPos].Value >>= aSelection;
-        else if(pValues[nPos].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cCommandType)))
+        else if ( pValues[nPos].Name == cCommandType )
             pValues[nPos].Value >>= nCmdType;
-        else if(pValues[nPos].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cActiveConnection)))
+        else if ( pValues[nPos].Name == cActiveConnection )
             pValues[nPos].Value >>= xConnection;
     }
     if(sDataSource.isEmpty() || sDataTableOrQuery.isEmpty() || !xResSet.is())
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
index 7cac4bff27af..fd976c85229a 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
@@ -68,7 +68,7 @@ SwDBTablePreviewDialog::SwDBTablePreviewDialog(Window* pParent, uno::Sequence< b
     const beans::PropertyValue* pValues = rValues.getConstArray();
     for(sal_Int32 nValue = 0; nValue < rValues.getLength(); ++nValue        )
     {
-        if(pValues[nValue].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Command")))
+        if ( pValues[nValue].Name == "Command" )
         {
             String sDescription = m_aDescriptionFI.GetText();
             OUString sTemp;
diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx
index 9920f699cab9..b2058ad9edb8 100644
--- a/sw/source/ui/dbui/mailmergehelper.cxx
+++ b/sw/source/ui/dbui/mailmergehelper.cxx
@@ -770,7 +770,7 @@ uno::Any SwMailTransferable::getPropertyValue( const ::rtl::OUString& rPropertyN
     throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     uno::Any aRet;
-    if( rPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
+    if ( rPropertyName == "URL" )
         aRet <<= m_aURL;
     return aRet;
 }
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 5e54f1055d61..6abb921c2a9d 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -586,7 +586,7 @@ aInfo16( SW_RES(IMG_INFO_16) )
         sal_Int32 i = 0;
         while ( sExplanationLink.isEmpty() && i < aProperties.getLength() )
         {
-            if ( aProperties[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FullCommentURL")) )
+            if ( aProperties[i].Name == "FullCommentURL" )
             {
                 uno::Any aValue = aProperties[i].Value;
                 aValue >>= sExplanationLink;
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index ff9af042063e..7552c080f49f 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -121,7 +121,7 @@ SwFilterDetect::~SwFilterDetect()
     for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
     {
         // extract properties
-        if( lDescriptor[nProperty].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("URL")) )
+        if ( lDescriptor[nProperty].Name == "URL" )
         {
             lDescriptor[nProperty].Value >>= sTemp;
             aURL = sTemp;
@@ -131,35 +131,35 @@ SwFilterDetect::~SwFilterDetect()
             lDescriptor[nProperty].Value >>= sTemp;
             aURL = sTemp;
         }
-        else if( lDescriptor[nProperty].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("TypeName")) )
+        else if ( lDescriptor[nProperty].Name == "TypeName" )
         {
             lDescriptor[nProperty].Value >>= sTemp;
             aTypeName = sTemp;
         }
-        else if( lDescriptor[nProperty].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FilterName")) )
+        else if ( lDescriptor[nProperty].Name == "FilterName" )
         {
             lDescriptor[nProperty].Value >>= sTemp;
             aPreselectedFilterName = sTemp;
         }
-        else if( lDescriptor[nProperty].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("InputStream")) )
+        else if ( lDescriptor[nProperty].Name == "InputStream" )
             nIndexOfInputStream = nProperty;
-        else if( lDescriptor[nProperty].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ReadOnly")) )
+        else if ( lDescriptor[nProperty].Name == "ReadOnly" )
             nIndexOfReadOnlyFlag = nProperty;
-        else if( lDescriptor[nProperty].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("UCBContent")) )
+        else if ( lDescriptor[nProperty].Name == "UCBContent" )
             nIndexOfContent = nProperty;
-        else if( lDescriptor[nProperty].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("AsTemplate")) )
+        else if ( lDescriptor[nProperty].Name == "AsTemplate" )
         {
             lDescriptor[nProperty].Value >>= bOpenAsTemplate;
             nIndexOfTemplateFlag = nProperty;
         }
-        else if( lDescriptor[nProperty].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("InteractionHandler")) )
+        else if ( lDescriptor[nProperty].Name == "InteractionHandler" )
         {
             lDescriptor[nProperty].Value >>= xInteraction;
             nIndexOfInteractionHandler = nProperty;
         }
-        else if( lDescriptor[nProperty].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("RepairPackage")) )
+        else if ( lDescriptor[nProperty].Name == "RepairPackage" )
             lDescriptor[nProperty].Value >>= bRepairPackage;
-        else if( lDescriptor[nProperty].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DocumentTitle")) )
+        else if ( lDescriptor[nProperty].Name == "DocumentTitle" )
             nIndexOfDocumentTitle = nProperty;
     }
 
diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.cxx b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
index 2f7ee3f20959..8ea8db176ef6 100644
--- a/sw/source/ui/vba/vbaheaderfooterhelper.cxx
+++ b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
@@ -52,7 +52,7 @@ sal_Bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< text::XText >
 {
     uno::Reference< lang::XServiceInfo > xServiceInfo( xText, uno::UNO_QUERY_THROW );
     rtl::OUString aImplName = xServiceInfo->getImplementationName();
-    if( aImplName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SwXHeadFootText")) )
+    if ( aImplName == "SwXHeadFootText" )
         return sal_True;
     return sal_False;
 }
diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx
index 184ece7327b2..e7c17e5d4dd4 100644
--- a/sw/source/ui/vba/vbapagesetup.cxx
+++ b/sw/source/ui/vba/vbapagesetup.cxx
@@ -237,9 +237,9 @@ rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException
     sal_Int32 wdSectionStart = word::WdSectionStart::wdSectionNewPage;
     uno::Reference< container::XNamed > xNamed( mxPageProps, uno::UNO_QUERY_THROW );
     rtl::OUString sStyleName = xNamed->getName();
-    if( sStyleName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Left Page")) )
+    if ( sStyleName == "Left Page" )
         wdSectionStart = word::WdSectionStart::wdSectionEvenPage;
-    else if( sStyleName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Right Page")) )
+    else if ( sStyleName == "Right Page" )
         wdSectionStart = word::WdSectionStart::wdSectionOddPage;
     else
         wdSectionStart = word::WdSectionStart::wdSectionNewPage;
diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx
index 917d7d0e6adc..862dd9df6338 100644
--- a/sw/source/ui/vba/vbatables.cxx
+++ b/sw/source/ui/vba/vbatables.cxx
@@ -36,7 +36,7 @@ sal_Bool lcl_isInHeaderFooter( const uno::Reference< text::XTextTable >& xTable
     uno::Reference< text::XText > xText = xTextContent->getAnchor()->getText();
     uno::Reference< lang::XServiceInfo > xServiceInfo( xText, uno::UNO_QUERY_THROW );
     rtl::OUString aImplName = xServiceInfo->getImplementationName();
-    if( aImplName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SwXHeadFootText")) )
+    if ( aImplName == "SwXHeadFootText" )
         return sal_True;
     return sal_False;
 }
diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index 2b8d3d1124c7..95b21c29a177 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -87,11 +87,11 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException)
     }
     uno::Reference< lang::XServiceInfo > xServiceInfo( xCurrentText, uno::UNO_QUERY_THROW );
     rtl::OUString aImplName = xServiceInfo->getImplementationName();
-    if( aImplName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SwXBodyText")) )
+    if ( aImplName == "SwXBodyText" )
     {
         return word::WdSeekView::wdSeekMainDocument;
     }
-    else if( aImplName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SwXHeadFootText")) )
+    else if ( aImplName == "SwXHeadFootText" )
     {
         if( HeaderFooterHelper::isHeader( mxModel ) )
         {
@@ -112,7 +112,7 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException)
                 return word::WdSeekView::wdSeekPrimaryFooter;
         }
     }
-    else if( aImplName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SwXFootnote")) )
+    else if ( aImplName == "SwXFootnote" )
     {
         if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Endnote") ) ) )
             return word::WdSeekView::wdSeekEndnotes;
@@ -313,7 +313,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
             uno::Reference< beans::XPropertySet > xCursorProps( mxViewCursor, uno::UNO_QUERY_THROW );
             rtl::OUString aPageStyleName;
             xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyleName"))) >>= aPageStyleName;
-            if( aPageStyleName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("First Page")) )
+            if ( aPageStyleName == "First Page" )
             {
                 // go to the beginning of where the next style is used
                 sal_Bool hasNextPage = sal_False;
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index ffbdaa88893c..49477eb68a91 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -3278,9 +3278,9 @@ bool INetURLObject::parsePath(INetProtocol eScheme,
             }
             bool bInbox;
             rtl::OUString sCompare(aTheSynPath.toString());
-            if (sCompare.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("/inbox")))
+            if ( sCompare == "/inbox" )
                 bInbox = true;
-            else if (sCompare.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("/newsgroups")))
+            else if ( sCompare == "/newsgroups" )
                 bInbox = false;
             else
                 return false;
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index c73fe311e54b..f8ef7a066b2e 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -347,7 +347,7 @@ UcbContentProviderProxy::getContentProvider()
             m_xProvider
                 = Reference< XContentProvider >(
                       m_xSMgr->createInstance( m_aService ), UNO_QUERY );
-            if(m_aArguments.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("NoConfig")))
+            if ( m_aArguments == "NoConfig" )
             {
                 Reference<XInitialization> xInit(m_xProvider,UNO_QUERY);
                 if(xInit.is()) {
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 4c1c9f04415e..8c6e2e7a47f5 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -274,7 +274,7 @@ sal_Bool SAL_CALL
 BaseContent::supportsService( const rtl::OUString& ServiceName )
     throw( RuntimeException)
 {
-    if (ServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.ucb.FileContent")))
+    if ( ServiceName == "com.sun.star.ucb.FileContent" )
         return true;
     else
         return false;
@@ -355,7 +355,7 @@ BaseContent::execute( const Command& aCommand,
     {
         aAny <<= getCommandInfo();
     }
-    else if (aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("setPropertyValues")))
+    else if ( aCommand.Name == "setPropertyValues" )
     {
         Sequence< beans::PropertyValue > sPropertyValues;
 
@@ -365,7 +365,7 @@ BaseContent::execute( const Command& aCommand,
         else
             aAny <<= setPropertyValues( CommandId,sPropertyValues );  // calls endTask by itself
     }
-    else if (aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getPropertyValues")))
+    else if ( aCommand.Name == "getPropertyValues" )
     {
         Sequence< beans::Property > ListOfRequestedProperties;
 
@@ -376,7 +376,7 @@ BaseContent::execute( const Command& aCommand,
             aAny <<= getPropertyValues( CommandId,
                                         ListOfRequestedProperties );
     }
-    else if (aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("open")))
+    else if ( aCommand.Name == "open" )
     {
         OpenCommandArgument2 aOpenArgument;
         if( ! ( aCommand.Argument >>= aOpenArgument ) )
@@ -389,7 +389,7 @@ BaseContent::execute( const Command& aCommand,
                 aAny <<= result;
         }
     }
-    else if (aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("delete")))
+    else if ( aCommand.Name == "delete" )
     {
         if( ! aCommand.Argument.has< sal_Bool >() )
             m_pMyShell->installError( CommandId,
@@ -397,7 +397,7 @@ BaseContent::execute( const Command& aCommand,
         else
             deleteContent( CommandId );
     }
-    else if (aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("transfer")))
+    else if ( aCommand.Name == "transfer" )
     {
         TransferInfo aTransferInfo;
         if( ! ( aCommand.Argument >>= aTransferInfo ) )
@@ -406,7 +406,7 @@ BaseContent::execute( const Command& aCommand,
         else
             transfer( CommandId, aTransferInfo );
     }
-    else if (aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("insert")))
+    else if ( aCommand.Name == "insert" )
     {
         InsertCommandArgument aInsertArgument;
         if( ! ( aCommand.Argument >>= aInsertArgument ) )
@@ -415,7 +415,7 @@ BaseContent::execute( const Command& aCommand,
         else
             insert( CommandId,aInsertArgument );
     }
-    else if (aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getCasePreservingURL")))
+    else if ( aCommand.Name == "getCasePreservingURL" )
     {
         Sequence< beans::Property > seq(1);
         seq[0] = beans::Property(
@@ -428,7 +428,7 @@ BaseContent::execute( const Command& aCommand,
         if(!xRow->wasNull())
             aAny <<= CasePreservingURL;
     }
-    else if (aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("createNewContent")))
+    else if ( aCommand.Name == "createNewContent" )
     {
         ucb::ContentInfo aArg;
         if ( !( aCommand.Argument >>= aArg ) )
@@ -830,16 +830,16 @@ BaseContent::getPropertyValues(
             const beans::Property& rProp = pProps[ n ];
             Any& rValue = pValues[ n ];
 
-            if (rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ContentType")))
+            if ( rProp.Name == "ContentType" )
             {
                 rValue <<= m_bFolder ? m_pMyShell->FolderContentType
                     : m_pMyShell->FileContentType;
             }
-            else if (rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsFolder")))
+            else if ( rProp.Name == "IsFolder" )
             {
                 rValue <<= m_bFolder;
             }
-            else if (rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsDocument")))
+            else if ( rProp.Name == "IsDocument" )
             {
                 rValue <<= sal_Bool( !m_bFolder );
             }
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index d436fa096745..a6176ccbae46 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -219,7 +219,7 @@ namespace fileaccess {
         if( aParent[ aParent.getLength()-1] == sal_Unicode(':') && aParent.getLength() == 6 )
             aParent += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
-        if( aParent.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("file://")) )
+        if ( aParent == "file://" )
             aParent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///"));
 
         return aParent;
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 324d820ba42c..60f42e80d90b 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -341,7 +341,7 @@ rtl::OUString FTPURL::parent(bool internal) const
 
     if(last.isEmpty())
         bff.appendAscii("..");
-    else if(last.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("..")))
+    else if ( last == ".." )
         bff.append(last).appendAscii("/..");
 
     bff.append(m_aType);
diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx
index 687aacf41baa..8ac01f85e818 100644
--- a/ucb/source/ucp/odma/odma_content.cxx
+++ b/ucb/source/ucp/odma/odma_content.cxx
@@ -832,15 +832,15 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
         {
             changePropertyValue(rValue,n,m_aProps->m_sTitle,nChanged,aRet,aChanges);
         }
-        else if ( rValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "Author") ) )
+        else if ( rValue.Name == "Author" )
         {
             changePropertyValue(rValue,n,m_aProps->m_sAuthor,nChanged,aRet,aChanges);
         }
-        else if ( rValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "Keywords") ) )
+        else if ( rValue.Name == "Keywords" )
         {
             changePropertyValue(rValue,n,m_aProps->m_sKeywords,nChanged,aRet,aChanges);
         }
-        else if ( rValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "Subject") ) )
+        else if ( rValue.Name == "Subject" )
         {
             changePropertyValue(rValue,n,m_aProps->m_sSubject,nChanged,aRet,aChanges);
         }
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index aa2f076e8572..6bba8bd79db2 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -1259,25 +1259,25 @@ namespace
 -----------------------------------------------*/
 SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByShortName(const ::rtl::OUString& sName)
 {
-    if (sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swriter")))
+    if ( sName == "swriter" )
         return E_WRITER;
     if (sName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("swriter/Web"))) // sometimes they are registerd for swriter/web :-(
         return E_WRITERWEB;
     if (sName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("swriter/GlobalDocument"))) // sometimes they are registerd for swriter/globaldocument :-(
         return E_WRITERGLOBAL;
-    if (sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("scalc")))
+    if ( sName == "scalc" )
         return E_CALC;
-    if (sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdraw")))
+    if ( sName == "sdraw" )
         return E_DRAW;
-    if (sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("simpress")))
+    if ( sName == "simpress" )
         return E_IMPRESS;
-    if (sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("schart")))
+    if ( sName == "schart" )
         return E_CHART;
-    if (sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("smath")))
+    if ( sName == "smath" )
         return E_MATH;
-    if (sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sbasic")))
+    if ( sName == "sbasic" )
         return E_BASIC;
-    if (sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdatabase")))
+    if ( sName == "sdatabase" )
         return E_DATABASE;
 
     return E_UNKNOWN_FACTORY;
diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx
index f91851b6040e..d182be2dc51d 100644
--- a/unoxml/source/dom/saxbuilder.cxx
+++ b/unoxml/source/dom/saxbuilder.cxx
@@ -231,7 +231,7 @@ namespace DOM
                 newprefix = attr_qname.copy(attr_qname.indexOf(':')+1);
                 aNSMap.insert(NSMap::value_type(newprefix, attr_value));
             }
-            else if (attr_qname.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("xmlns")))
+            else if ( attr_qname == "xmlns" )
             {
                 // new default prefix
                 aNSMap.insert(NSMap::value_type(OUString(), attr_value));
diff --git a/vbahelper/source/vbahelper/vbadialogbase.cxx b/vbahelper/source/vbahelper/vbadialogbase.cxx
index fd380bcab98b..f6f530d92c01 100644
--- a/vbahelper/source/vbahelper/vbadialogbase.cxx
+++ b/vbahelper/source/vbahelper/vbadialogbase.cxx
@@ -44,7 +44,7 @@ sal_Bool SAL_CALL VbaDialogBase::Show() throw ( uno::RuntimeException )
                 uno::Reference< XInterface > () );
 
         uno::Sequence< beans::PropertyValue > dispatchProps(0);
-        if ( aURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:PrinterSetup")) )
+        if ( aURL == ".uno:PrinterSetup" )
         {
             dispatchProps.realloc(1);
             dispatchProps[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBADialogResultRequest" ) );
diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx
index d81cfc155440..efb28486f4a6 100644
--- a/vbahelper/source/vbahelper/vbaglobalbase.cxx
+++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx
@@ -104,7 +104,7 @@ uno::Reference< uno::XInterface > SAL_CALL
 VbaGlobalsBase::createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (uno::Exception, uno::RuntimeException)
 {
     uno::Reference< uno::XInterface > xReturn;
-    if ( aServiceSpecifier.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sAppService)) )
+    if ( aServiceSpecifier == sAppService )
     {
         // try to extract the Application from the context
         uno::Reference< container::XNameContainer > xNameContainer( mxContext, uno::UNO_QUERY );
@@ -120,7 +120,7 @@ VbaGlobalsBase::createInstanceWithArguments( const ::rtl::OUString& aServiceSpec
 {
 
     uno::Reference< uno::XInterface > xReturn;
-    if ( aServiceSpecifier.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sAppService)) )
+    if ( aServiceSpecifier == sAppService )
     {
         // try to extract the Application from the context
         uno::Reference< container::XNameContainer > xNameContainer( mxContext, uno::UNO_QUERY );
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index d44b19e41418..06bfb7b1dad5 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -1431,7 +1431,7 @@ namespace
     bool isBadTNR(const OUString &rName, ::std::set< OUString >& rSet)
     {
         bool bRet = false;
-        if (rName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Berling Antiqua")))
+        if ( rName == "Berling Antiqua" )
         {
             ::std::set< OUString >::iterator aEnd = rSet.end();
             ::std::set< OUString >::iterator aI = rSet.find(OUString(RTL_CONSTASCII_USTRINGPARAM("Times New Roman")));
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 2624e6c32b44..3147b9a85910 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -249,7 +249,7 @@ uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const rtl::OUString
 {
     uno::Any retVal;
 
-    if (Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("system.desktop-environment")))
+    if ( Name == "system.desktop-environment" )
     {
         retVal = uno::makeAny( Application::GetDesktopEnvironment() );
     }
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index aaa72bbe88ea..128d7db6b878 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -3080,7 +3080,7 @@ void Edit::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragE
     {
         sal_Int32 nIndex = 0;
         rtl::OUString aMimetype = rFlavors[i].MimeType.getToken( 0, ';', nIndex );
-        if( aMimetype.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text/plain")) )
+        if ( aMimetype == "text/plain" )
         {
             mpDDInfo->bIsStringSupported = sal_True;
             break;
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 8194f527f509..1a4b9405c390 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -1396,7 +1396,7 @@ void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_
             {
                 rEntry.Value >>= aDep.mnDependsOnEntry;
             }
-            else if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ChoicesDisabled")) )
+            else if ( rEntry.Name == "ChoicesDisabled" )
             {
                 rEntry.Value >>= aChoicesDisabled;
             }
diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx
index 5ff1ac48a738..e24706fb459d 100644
--- a/vcl/source/window/arrange.cxx
+++ b/vcl/source/window/arrange.cxx
@@ -237,7 +237,7 @@ void WindowArranger::setProperties( const uno::Sequence< beans::PropertyValue >&
     bool bResize = false;
     for( sal_Int32 i = 0; i < i_rProps.getLength(); i++ )
     {
-        if( pProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OuterBorder")) )
+        if ( pProps[i].Name == "OuterBorder" )
         {
             sal_Int32 nVal = 0;
             if( pProps[i].Value >>= nVal )
@@ -249,7 +249,7 @@ void WindowArranger::setProperties( const uno::Sequence< beans::PropertyValue >&
                 }
             }
         }
-        else if( pProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ManagedArea")) )
+        else if ( pProps[i].Name == "ManagedArea" )
         {
             awt::Rectangle aArea( 0, 0, 0, 0 );
             if( pProps[i].Value >>= aArea )
@@ -261,7 +261,7 @@ void WindowArranger::setProperties( const uno::Sequence< beans::PropertyValue >&
                 bResize = true;
             }
         }
-        else if( pProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Visible")) )
+        else if ( pProps[i].Name == "Visible" )
         {
             sal_Bool bVal = sal_False;
             if( pProps[i].Value >>= bVal )
diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx
index 238c032cd4be..f0d8f47b2515 100644
--- a/vcl/source/window/window4.cxx
+++ b/vcl/source/window/window4.cxx
@@ -161,19 +161,19 @@ void Window::setProperties( const uno::Sequence< beans::PropertyValue >& i_rProp
     const beans::PropertyValue* pVals = i_rProps.getConstArray();
     for( sal_Int32 i = 0; i < i_rProps.getLength(); i++ )
     {
-        if( pVals[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Enabled")) )
+        if ( pVals[i].Name == "Enabled" )
         {
             sal_Bool bVal = sal_True;
             if( pVals[i].Value >>= bVal )
                 Enable( bVal );
         }
-        else if( pVals[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Visible")) )
+        else if ( pVals[i].Name == "Visible" )
         {
             sal_Bool bVal = sal_True;
             if( pVals[i].Value >>= bVal )
                 Show( bVal );
         }
-        else if( pVals[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Text")) )
+        else if ( pVals[i].Name == "Text" )
         {
             rtl::OUString aText;
             if( pVals[i].Value >>= aText )
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index d1424762b946..c0fcf8768d4d 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -428,7 +428,7 @@ void SalXLib::Init()
     for (sal_uInt16 i=0; i<nParams; i++)
     {
         osl_getCommandArg(i, &aParam.pData);
-        if (aParam.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("-display")))
+        if ( aParam == "-display" )
         {
             osl_getCommandArg(i+1, &aParam.pData);
             aDisplay = rtl::OUStringToOString(
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 4ea5f7b10a82..2f4c9f639c9e 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -502,35 +502,35 @@ GtkPrintDialog::impl_initCustomTab()
         for (int n = 0; n != aOptProp.getLength(); n++)
         {
             const beans::PropertyValue& rEntry(aOptProp[ n ]);
-            if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Text")))
+            if ( rEntry.Name == "Text" )
             {
                 rtl::OUString aValue;
                 rEntry.Value >>= aValue;
                 aText = aValue.replace('~', '_');
             }
-            else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ControlType")))
+            else if ( rEntry.Name == "ControlType" )
                 rEntry.Value >>= aCtrlType;
-            else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Choices")))
+            else if ( rEntry.Name == "Choices" )
                 rEntry.Value >>= aChoices;
-            else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ChoicesDisabled")))
+            else if ( rEntry.Name == "ChoicesDisabled" )
                 rEntry.Value >>= aChoicesDisabled;
-            else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Property")))
+            else if ( rEntry.Name == "Property" )
             {
                 beans::PropertyValue aVal;
                 rEntry.Value >>= aVal;
                 aPropertyName = aVal.Name;
             }
-            else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DependsOnName")))
+            else if ( rEntry.Name == "DependsOnName" )
                 rEntry.Value >>= aDependsOnName;
-            else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DependsOnEntry")))
+            else if ( rEntry.Name == "DependsOnEntry" )
                 rEntry.Value >>= nDependsOnValue;
-            else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AttachToDependency")))
+            else if ( rEntry.Name == "AttachToDependency" )
                 rEntry.Value >>= bUseDependencyRow;
-            else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MinValue")))
+            else if ( rEntry.Name == "MinValue" )
                 rEntry.Value >>= nMinValue;
-            else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MaxValue")))
+            else if ( rEntry.Name == "MaxValue" )
                 rEntry.Value >>= nMaxValue;
-            else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HelpId")))
+            else if ( rEntry.Name == "HelpId" )
             {
                 uno::Sequence<rtl::OUString> aHelpIds;
                 lcl_extractHelpTextsOrIds(rEntry, aHelpIds);
@@ -545,16 +545,16 @@ GtkPrintDialog::impl_initCustomTab()
                 else // fallback
                     aHelpTexts = aHelpIds;
             }
-            else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HelpText")))
+            else if ( rEntry.Name == "HelpText" )
                 lcl_extractHelpTextsOrIds(rEntry, aHelpTexts);
-            else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InternalUIOnly")))
+            else if ( rEntry.Name == "InternalUIOnly" )
                 rEntry.Value >>= bIgnore;
-            else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Enabled")))
+            else if ( rEntry.Name == "Enabled" )
             {
                 // Ignore this. We use UIControlOptions::isUIOptionEnabled
                 // to check whether a control should be enabled.
             }
-            else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GroupingHint")))
+            else if ( rEntry.Name == "GroupingHint" )
             {
                 // Ignore this. We cannot add/modify controls to/on existing
                 // tabs of the Gtk print dialog.
@@ -565,7 +565,7 @@ GtkPrintDialog::impl_initCustomTab()
             }
         }
 
-        if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PrintContent")))
+        if ( aPropertyName == "PrintContent" )
             bGtkInternal = true;
 
         if (aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Group")) || !pCurParent)
@@ -591,7 +591,7 @@ GtkPrintDialog::impl_initCustomTab()
         // special case: we need to map these to controls of the gtk print dialog
         else if (bGtkInternal)
         {
-            if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PrintContent")))
+            if ( aPropertyName == "PrintContent" )
             {
                 // What to print? And, more importantly, is there a selection?
                 impl_initPrintContent(aChoicesDisabled);
@@ -672,7 +672,7 @@ GtkPrintDialog::impl_initCustomTab()
                 GtkWidget* const pHbox = gtk_hbox_new(FALSE, 12);
                 gtk_container_set_border_width(GTK_CONTAINER(pHbox), 0);
 
-                if (aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("List")))
+                if ( aCtrlType == "List" )
                 {
                    pWidget = lcl_combo_box_text_new();
 
diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/writerfilter/source/dmapper/ModelEventListener.cxx
index f4fd04adbe39..e0500fcf3e98 100644
--- a/writerfilter/source/dmapper/ModelEventListener.cxx
+++ b/writerfilter/source/dmapper/ModelEventListener.cxx
@@ -57,7 +57,7 @@ ModelEventListener::~ModelEventListener()
 
 void ModelEventListener::notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException)
 {
-    if( rEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnFocus")))
+    if ( rEvent.EventName == "OnFocus" )
     {
         try
         {
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index aa4996a5c4a8..b9359162323e 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx
@@ -81,7 +81,7 @@ void lcl_DumpPropertyValues(const TagLogger::Pointer_t pLogger, beans::PropertyV
         {
         }
 
-        if (pValues[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TableColumnSeparators")))
+        if ( pValues[n].Name == "TableColumnSeparators" )
         {
             lcl_DumpTableColumnSeparators(pLogger, pValues[n].Value);
         }
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx
index 6f30944453f3..31b7b8a5e15b 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -71,7 +71,7 @@ OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& r
     uno::Reference < io::XInputStream > xInputStream;
     for( sal_Int32 nProperty = 0; nProperty < nPropertyCount; ++nProperty )
     {
-        if( pValues[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TypeName")) )
+        if ( pValues[nProperty].Name == "TypeName" )
             rDescriptor[nProperty].Value >>= sTypeName;
         else if ( pValues[nProperty].Name == "URL" )
             pValues[nProperty].Value >>= sURL;
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 1df7bb3f4942..ca2c3cb86db8 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -97,7 +97,7 @@ void RTFSdrImport::resolve(RTFShape& rShape)
     for (std::vector< std::pair<rtl::OUString, rtl::OUString> >::iterator i = rShape.aProperties.begin();
             i != rShape.aProperties.end(); ++i)
     {
-        if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("shapeType")))
+        if ( i->first == "shapeType" )
         {
             nType = i->second.toInt32();
             switch (nType)
@@ -115,17 +115,17 @@ void RTFSdrImport::resolve(RTFShape& rShape)
             if (xPropertySet.is())
                 xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")), aAny);
         }
-        else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("wzName")))
+        else if ( i->first == "wzName" )
         {
             RTFValue::Pointer_t pValue(new RTFValue(i->second));
             m_rImport.getState().aCharacterAttributes->push_back(make_pair(NS_ooxml::LN_CT_NonVisualDrawingProps_name, pValue));
         }
-        else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("wzDescription")))
+        else if ( i->first == "wzDescription" )
         {
             RTFValue::Pointer_t pValue(new RTFValue(i->second));
             m_rImport.getState().aCharacterAttributes->push_back(make_pair(NS_ooxml::LN_CT_NonVisualDrawingProps_descr, pValue));
         }
-        else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("pib")))
+        else if ( i->first == "pib" )
         {
             m_rImport.setDestinationText(i->second);
             bPib = true;
@@ -135,14 +135,14 @@ void RTFSdrImport::resolve(RTFShape& rShape)
             aAny <<= lcl_BGRToRGB(i->second.toInt32());
             xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")), aAny);
         }
-        else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("fillBackColor")))
+        else if ( i->first == "fillBackColor" )
             ; // Ignore: complementer of fillColor
         else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("lineColor")) && xPropertySet.is())
         {
             aAny <<= lcl_BGRToRGB(i->second.toInt32());
             xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")), aAny);
         }
-        else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("lineBackColor")))
+        else if ( i->first == "lineBackColor" )
             ; // Ignore: complementer of lineColor
         else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("txflTextFlow")) && xPropertySet.is())
         {
@@ -160,7 +160,7 @@ void RTFSdrImport::resolve(RTFShape& rShape)
                 xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LineStyle")), aAny);
             }
         }
-        else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("pVerticies")))
+        else if ( i->first == "pVerticies" )
         {
             uno::Sequence<drawing::EnhancedCustomShapeParameterPair> aCoordinates;
             sal_Int32 nSize = 0; // Size of a token (it's value is hardwired in the exporter)
@@ -203,7 +203,7 @@ void RTFSdrImport::resolve(RTFShape& rShape)
             aPropertyValue.Value <<= aCoordinates;
             aPathPropVec.push_back(aPropertyValue);
         }
-        else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("pSegmentInfo")))
+        else if ( i->first == "pSegmentInfo" )
         {
             uno::Sequence<drawing::EnhancedCustomShapeSegment> aSegments;
             sal_Int32 nSize = 0;
@@ -261,13 +261,13 @@ void RTFSdrImport::resolve(RTFShape& rShape)
             aPropertyValue.Value <<= aSegments;
             aPathPropVec.push_back(aPropertyValue);
         }
-        else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("geoLeft")))
+        else if ( i->first == "geoLeft" )
             aViewBox.X = i->second.toInt32();
-        else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("geoTop")))
+        else if ( i->first == "geoTop" )
             aViewBox.Y = i->second.toInt32();
-        else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("geoRight")))
+        else if ( i->first == "geoRight" )
             aViewBox.Width = i->second.toInt32();
-        else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("geoBottom")))
+        else if ( i->first == "geoBottom" )
             aViewBox.Height = i->second.toInt32();
         else
             SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle shape property '" <<
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 96616813f40d..cc0522740ce6 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -311,7 +311,7 @@ uno::Any SAL_CALL Content::execute(
 {
     uno::Any aRet;
 
-    if ( aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getPropertyValues")) )
+    if ( aCommand.Name == "getPropertyValues" )
     {
         uno::Sequence< beans::Property > Properties;
         if ( !( aCommand.Argument >>= Properties ) )
@@ -322,7 +322,7 @@ uno::Any SAL_CALL Content::execute(
 
         aRet <<= getPropertyValues( Properties );
     }
-    else if ( aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("setPropertyValues")) )
+    else if ( aCommand.Name == "setPropertyValues" )
     {
         uno::Sequence<beans::PropertyValue> propertyValues;
 
@@ -345,17 +345,17 @@ uno::Any SAL_CALL Content::execute(
 
         aRet <<= ret;
     }
-    else if ( aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getPropertySetInfo")) )
+    else if ( aCommand.Name == "getPropertySetInfo" )
     {
         // Note: Implemented by base class.
         aRet <<= getPropertySetInfo( Environment );
     }
-    else if ( aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getCommandInfo")) )
+    else if ( aCommand.Name == "getCommandInfo" )
     {
         // Note: Implemented by base class.
         aRet <<= getCommandInfo( Environment );
     }
-    else if ( aCommand.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("open")) )
+    else if ( aCommand.Name == "open" )
     {
         ucb::OpenCommandArgument2 aOpenCommand;
         if ( !( aCommand.Argument >>= aOpenCommand ) )
@@ -457,26 +457,26 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
     {
         const beans::Property& rProp = rProperties[n];
 
-        if ( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ContentType")) )
+        if ( rProp.Name == "ContentType" )
             xRow->appendString(
                 rProp,
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                     "application/vnd.sun.star.help" )) );
-        else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")) )
+        else if ( rProp.Name == "Title" )
             xRow->appendString ( rProp,m_aURLParameter.get_title() );
-        else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsReadOnly")) )
+        else if ( rProp.Name == "IsReadOnly" )
             xRow->appendBoolean( rProp,true );
-        else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsDocument")) )
+        else if ( rProp.Name == "IsDocument" )
             xRow->appendBoolean(
                 rProp,
                 m_aURLParameter.isFile() || m_aURLParameter.isRoot() );
-        else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsFolder")) )
+        else if ( rProp.Name == "IsFolder" )
             xRow->appendBoolean(
                 rProp,
                 ! m_aURLParameter.isFile() || m_aURLParameter.isRoot() );
-        else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsErrorDocument")) )
+        else if ( rProp.Name == "IsErrorDocument" )
             xRow->appendBoolean( rProp, m_aURLParameter.isErrorDocument() );
-        else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MediaType")) )
+        else if ( rProp.Name == "MediaType" )
             if( m_aURLParameter.isPicture() )
                 xRow->appendString(
                     rProp,
@@ -495,7 +495,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             else
                 xRow->appendVoid( rProp );
         else if( m_aURLParameter.isModule() )
-            if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KeywordList")) )
+            if ( rProp.Name == "KeywordList" )
             {
                 KeywordInfo *inf =
                     m_pDatabases->getKeyword( m_aURLParameter.get_module(),
@@ -506,7 +506,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                     aAny <<= inf->getKeywordList();
                 xRow->appendObject( rProp,aAny );
             }
-            else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KeywordRef")) )
+            else if ( rProp.Name == "KeywordRef" )
             {
                 KeywordInfo *inf =
                     m_pDatabases->getKeyword( m_aURLParameter.get_module(),
@@ -517,7 +517,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                     aAny <<= inf->getIdList();
                 xRow->appendObject( rProp,aAny );
             }
-            else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KeywordAnchorForRef")) )
+            else if ( rProp.Name == "KeywordAnchorForRef" )
             {
                 KeywordInfo *inf =
                     m_pDatabases->getKeyword( m_aURLParameter.get_module(),
@@ -528,7 +528,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                     aAny <<= inf->getAnchorList();
                 xRow->appendObject( rProp,aAny );
             }
-            else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KeywordTitleForRef")) )
+            else if ( rProp.Name == "KeywordTitleForRef" )
             {
                 KeywordInfo *inf =
                     m_pDatabases->getKeyword( m_aURLParameter.get_module(),
@@ -539,7 +539,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                     aAny <<= inf->getTitleList();
                 xRow->appendObject( rProp,aAny );
             }
-            else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SearchScopes")) )
+            else if ( rProp.Name == "SearchScopes" )
             {
                 uno::Sequence< rtl::OUString > seq( 2 );
                 seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Heading" ));
@@ -548,7 +548,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                 aAny <<= seq;
                 xRow->appendObject( rProp,aAny );
             }
-            else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Order")) )
+            else if ( rProp.Name == "Order" )
             {
                 StaticModuleInformation *inf =
                     m_pDatabases->getStaticInformationForModule(
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index f412ab05c7a9..60cb7d867bec 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2722,7 +2722,7 @@ void SchXMLExportHelper_Impl::exportSeries(
             OUString aLabelRole = aCTSeq[nCTIdx]->getRoleOfSequenceForSeriesLabel();
 
             // special export for stock charts
-            if( aChartType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart2.CandleStickChartType")))
+            if ( aChartType == "com.sun.star.chart2.CandleStickChartType" )
             {
                 sal_Bool bJapaneseCandleSticks = sal_False;
                 Reference< beans::XPropertySet > xCTProp( aCTSeq[nCTIdx], uno::UNO_QUERY );
@@ -3756,24 +3756,24 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference<
                 bool bBrokenRangeAvailable = false;
                 for( sal_Int32 i=0; i<aArgs.getLength(); ++i )
                 {
-                    if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
+                    if ( aArgs[i].Name == "CellRangeRepresentation" )
                         aArgs[i].Value >>= sCellRange;
-                    else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("BrokenCellRangeForExport")))
+                    else if ( aArgs[i].Name == "BrokenCellRangeForExport" )
                     {
                         if( aArgs[i].Value >>= sBrokenRange )
                             bBrokenRangeAvailable = true;
                     }
-                    else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DataRowSource")))
+                    else if ( aArgs[i].Name == "DataRowSource" )
                     {
                         chart::ChartDataRowSource eRowSource;
                         aArgs[i].Value >>= eRowSource;
                         mbRowSourceColumns = ( eRowSource == chart::ChartDataRowSource_COLUMNS );
                     }
-                    else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FirstCellAsLabel")))
+                    else if ( aArgs[i].Name == "FirstCellAsLabel" )
                         aArgs[i].Value >>= mbHasSeriesLabels;
-                    else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("SequenceMapping")))
+                    else if ( aArgs[i].Name == "SequenceMapping" )
                         aArgs[i].Value >>= maSequenceMapping;
-                    else if( aArgs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("TableNumberList")))
+                    else if ( aArgs[i].Name == "TableNumberList" )
                         aArgs[i].Value >>= msTableNumberList;
                 }
 
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 8aad9438c715..42f9032e3c56 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -409,7 +409,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
                 xSeriesProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Color")),
                                                uno::makeAny( sal_Int32( 0x000000 ))); // black
         }
-        else if( maSeriesChartTypeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart2.PieChartType")))
+        else if ( maSeriesChartTypeName == "com.sun.star.chart2.PieChartType" )
         {
             //@todo: this property should be saved
             Reference< beans::XPropertySet > xSeriesProp( m_xSeries, uno::UNO_QUERY );
@@ -427,7 +427,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
         if( xSeqProp.is())
         {
             OUString aMainRole(RTL_CONSTASCII_USTRINGPARAM("values-y"));
-            if( maSeriesChartTypeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart2.BubbleChartType") ) )
+            if ( maSeriesChartTypeName == "com.sun.star.chart2.BubbleChartType" )
                 aMainRole = OUString(RTL_CONSTASCII_USTRINGPARAM( "values-size" ));
             xSeqProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" )), uno::makeAny( aMainRole ));
         }
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 106afea65947..c25fba0a4fe8 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -341,25 +341,25 @@ XMLTokenEnum getTokenByChartType(
         {
             OUString aServiceName( rChartTypeService.copy( nSkip, nTypeLength ));
 
-            if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Line")))
+            if ( aServiceName == "Line" )
                 eResult = XML_LINE;
-            else if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Area")))
+            else if ( aServiceName == "Area" )
                 eResult = XML_AREA;
             else if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bar")) ||
                      (!bUseOldNames && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Column"))))
                 eResult = XML_BAR;
-            else if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Pie")))
+            else if ( aServiceName == "Pie" )
                 eResult = XML_CIRCLE;
-            else if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Donut")))
+            else if ( aServiceName == "Donut" )
                 eResult = XML_RING;
             else if( (bUseOldNames && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("XY"))) ||
                      (!bUseOldNames && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Scatter"))))
                 eResult = XML_SCATTER;
-            else if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bubble")))
+            else if ( aServiceName == "Bubble" )
                 eResult = XML_BUBBLE;
-            else if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Net")))
+            else if ( aServiceName == "Net" )
                 eResult = XML_RADAR;
-            else if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilledNet")))
+            else if ( aServiceName == "FilledNet" )
                 eResult = XML_FILLED_RADAR;
             else if( (bUseOldNames && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Stock"))) ||
                      (!bUseOldNames && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CandleStick"))))
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index 691baaf9d11c..3628e1ec2c54 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -703,7 +703,7 @@ void XMLConfigItemContext::ManipulateConfigItem()
         {
             nTmp = document::PrinterIndependentLayout::LOW_RESOLUTION;
         }
-        else if( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("disabled")) )
+        else if ( sValue == "disabled" )
         {
             nTmp = document::PrinterIndependentLayout::DISABLED;
         }
diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx
index be466c8c9573..5fe5c9ec13d0 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -192,7 +192,7 @@ RDFaReader::ReadCURIE(::rtl::OUString const & i_rCURIE) const
         ::rtl::OUString Namespace;
         sal_uInt16 nKey( GetImport().GetNamespaceMap()._GetKeyByAttrName(
             i_rCURIE, &Prefix, &LocalName, &Namespace) );
-        if (Prefix.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("_")))
+        if ( Prefix == "_" )
         {
             // eeek, it's a bnode!
             // "_" is not a valid URI scheme => we can identify bnodes
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index d30585f7a4bf..f40ebea041cc 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2481,7 +2481,7 @@ SvXMLExport::AddAttributeXmlId(uno::Reference<uno::XInterface> const & i_xIfc)
                 // a) just omit styles.xml ids -- they are unlikely anyway...
                 // b) somehow find out whether we are currently exporting styles
                 //    or content, and prefix "s" or "c" => unique
-                if ( mdref.First.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("content.xml")) )
+                if ( mdref.First == "content.xml" )
                 {
                     AddAttribute( XML_NAMESPACE_XML, XML_ID, mdref.Second );
                 }
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index ce41663dbe4a..c014771bd285 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -579,7 +579,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName,
     for( sal_Int16 i=0; i < nAttrCount; i++ )
     {
         const OUString& rAttrName = xAttrList->getNameByIndex( i );
-        if ( rAttrName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:version")) )
+        if ( rAttrName == "office:version" )
         {
             mpImpl->aODFVersion = xAttrList->getValueByIndex( i );
 
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index c39d3eef80a1..63d113a2d294 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -874,19 +874,19 @@ void SdXMLImport::SetViewSettings(const com::sun::star::uno::Sequence<com::sun::
         const OUString& rName = pValues->Name;
         const uno::Any rValue = pValues->Value;
 
-        if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("VisibleAreaTop") ) )
+        if ( rName == "VisibleAreaTop" )
         {
             rValue >>= aVisArea.Y;
         }
-        else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("VisibleAreaLeft") ) )
+        else if ( rName == "VisibleAreaLeft" )
         {
             rValue >>= aVisArea.X;
         }
-        else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("VisibleAreaWidth") ) )
+        else if ( rName == "VisibleAreaWidth" )
         {
             rValue >>= aVisArea.Width;
         }
-        else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("VisibleAreaHeight") ) )
+        else if ( rName == "VisibleAreaHeight" )
         {
             rValue >>= aVisArea.Height;
         }
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index efcd5140c5d4..d99469d70338 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -614,19 +614,19 @@ sal_uInt16 SvXMLStylesContext::GetFamily(
         nFamily = XML_STYLE_FAMILY_TABLE_ROW;
     else if( IsXMLToken( rValue, XML_TABLE_CELL ) )
         nFamily = XML_STYLE_FAMILY_TABLE_CELL;
-    else if( rValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)))
+    else if ( rValue == XML_STYLE_FAMILY_SD_GRAPHICS_NAME )
     {
         nFamily = XML_STYLE_FAMILY_SD_GRAPHICS_ID;
     }
-    else if( rValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(XML_STYLE_FAMILY_SD_PRESENTATION_NAME)))
+    else if ( rValue == XML_STYLE_FAMILY_SD_PRESENTATION_NAME )
     {
         nFamily = XML_STYLE_FAMILY_SD_PRESENTATION_ID;
     }
-    else if( rValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(XML_STYLE_FAMILY_SD_POOL_NAME)))
+    else if ( rValue == XML_STYLE_FAMILY_SD_POOL_NAME )
     {
         nFamily = XML_STYLE_FAMILY_SD_POOL_ID;
     }
-    else if( rValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(XML_STYLE_FAMILY_SD_DRAWINGPAGE_NAME)))
+    else if ( rValue == XML_STYLE_FAMILY_SD_DRAWINGPAGE_NAME )
     {
         nFamily = XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID;
     }
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index cd655bfbdf5f..44257c7160e7 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -2797,19 +2797,19 @@ void XMLMacroFieldImportContext::PrepareField(
         sal_Int32 nLength = aValues.getLength();
         for( sal_Int32 i = 0; i < nLength; i++ )
         {
-            if ( aValues[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ScriptType")) )
+            if ( aValues[i].Name == "ScriptType" )
             {
                 // ignore ScriptType
             }
-            else if ( aValues[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Library")) )
+            else if ( aValues[i].Name == "Library" )
             {
                 aValues[i].Value >>= sLibraryName;
             }
-            else if ( aValues[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MacroName")) )
+            else if ( aValues[i].Name == "MacroName" )
             {
                 aValues[i].Value >>= sMacroName;
             }
-            if ( aValues[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Script")) )
+            if ( aValues[i].Name == "Script" )
             {
                 aValues[i].Value >>= sScriptURL;
             }
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index e0ce8ceec546..7016f6255ebe 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -246,11 +246,11 @@ void exportXFormsInstance( SvXMLExport& rExport,
     {
         OUString sName = pInstance[i].Name;
         const Any& rAny = pInstance[i].Value;
-        if( sName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ID") ) )
+        if ( sName == "ID" )
             rAny >>= sId;
-        else if( sName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("URL") ) )
+        else if ( sName == "URL" )
             rAny >>= sURL;
-        else if( sName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Instance") ))
+        else if ( sName == "Instance" )
             rAny >>= xDoc;
     }
 
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index dfcfaf5120a1..6b75e9ae82dc 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -61,14 +61,14 @@ Reference< xml::input::XElement > Frame::startChildElement(
        return new EventElement(
             nUid, rLocalName, xAttributes, this, _pImport );
     }
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") ))
+    else if ( rLocalName == "bulletinboard" )
     {
         // Create new DialogImport for this container
         DialogImport* pFrameImport = new DialogImport( *_pImport );
         pFrameImport->_xDialogModel = m_xContainer;
         return new BulletinBoardElement( rLocalName, xAttributes, this,  pFrameImport );
     }
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("title") ))
+    else if ( rLocalName == "title" )
     {
         getStringAttr( &_label,
             OUString( RTL_CONSTASCII_USTRINGPARAM("value") ),
@@ -134,7 +134,7 @@ rtl::OUString _label(RTL_CONSTASCII_USTRINGPARAM("foo"));
         return new EventElement(
             nUid, rLocalName, xAttributes, this, _pImport );
     }
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") ))
+    else if ( rLocalName == "bulletinboard" )
     {
         // Create new DialogImport for this container
 
@@ -196,7 +196,7 @@ Reference< xml::input::XElement > Page::startChildElement(
         return new EventElement(
             nUid, rLocalName, xAttributes, this, _pImport );
     }
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") ))
+    else if ( rLocalName == "bulletinboard" )
     {
 
         DialogImport* pPageImport = new DialogImport( *_pImport );
@@ -1536,7 +1536,7 @@ Reference< xml::input::XElement > TitledBoxElement::startChildElement(
             Reference< XInterface >(), Any() );
     }
     // title
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("title") ))
+    else if ( rLocalName == "title" )
     {
         getStringAttr( &_label,
                        OUString( RTL_CONSTASCII_USTRINGPARAM("value") ),
@@ -1548,7 +1548,7 @@ Reference< xml::input::XElement > TitledBoxElement::startChildElement(
             rLocalName, xAttributes, this, _pImport );
     }
     // radio
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("radio") ))
+    else if ( rLocalName == "radio" )
     {
         // dont create radios here, => titledbox must be inserted first due to radio grouping,
         // possible predecessors!
@@ -1710,7 +1710,7 @@ Reference< xml::input::XElement > RadioGroupElement::startChildElement(
             Reference< XInterface >(), Any() );
     }
     // radio
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("radio") ))
+    else if ( rLocalName == "radio" )
     {
         // dont create radios here, => titledbox must be inserted first due to radio grouping,
         // possible predecessors!
@@ -1818,7 +1818,7 @@ Reference< xml::input::XElement > MenuPopupElement::startChildElement(
             Reference< XInterface >(), Any() );
     }
     // menuitem
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("menuitem") ))
+    else if ( rLocalName == "menuitem" )
     {
         OUString aValue(
             xAttributes->getValueByUidName(
@@ -1894,7 +1894,7 @@ Reference< xml::input::XElement > MenuListElement::startChildElement(
             Reference< XInterface >(), Any() );
     }
     // menupopup
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("menupopup") ))
+    else if ( rLocalName == "menupopup" )
     {
         _popup = new MenuPopupElement( rLocalName, xAttributes, this, _pImport );
         return _popup;
@@ -1984,7 +1984,7 @@ Reference< xml::input::XElement > ComboBoxElement::startChildElement(
             Reference< XInterface >(), Any() );
     }
     // menupopup
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("menupopup") ))
+    else if ( rLocalName == "menupopup" )
     {
         _popup = new MenuPopupElement( rLocalName, xAttributes, this, _pImport );
         return _popup;
@@ -2270,128 +2270,128 @@ Reference< xml::input::XElement > BulletinBoardElement::startChildElement(
             Reference< XInterface >(), Any() );
     }
     // button
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("button") ))
+    else if ( rLocalName == "button" )
     {
         return new ButtonElement( rLocalName, xAttributes, this, _pImport );
     }
     // checkbox
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("checkbox") ))
+    else if ( rLocalName == "checkbox" )
     {
         return new CheckBoxElement( rLocalName, xAttributes, this, _pImport );
     }
     // combobox
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("combobox") ))
+    else if ( rLocalName == "combobox" )
     {
         return new ComboBoxElement( rLocalName, xAttributes, this, _pImport );
     }
     // listbox
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("menulist") ))
+    else if ( rLocalName == "menulist" )
     {
         return new MenuListElement( rLocalName, xAttributes, this, _pImport );
     }
     // radiogroup
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("radiogroup") ))
+    else if ( rLocalName == "radiogroup" )
     {
         return new RadioGroupElement( rLocalName, xAttributes, this, _pImport );
     }
     // titledbox
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("titledbox") ))
+    else if ( rLocalName == "titledbox" )
     {
         return new TitledBoxElement( rLocalName, xAttributes, this, _pImport );
     }
     // text
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("text") ))
+    else if ( rLocalName == "text" )
     {
         return new TextElement( rLocalName, xAttributes, this, _pImport );
     }
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("linklabel") ))
+    else if ( rLocalName == "linklabel" )
     {
         return new FixedHyperLinkElement( rLocalName, xAttributes, this, _pImport );
     }
     // textfield
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("textfield") ))
+    else if ( rLocalName == "textfield" )
     {
         return new TextFieldElement( rLocalName, xAttributes, this, _pImport );
     }
     // img
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("img") ))
+    else if ( rLocalName == "img" )
     {
         return new ImageControlElement( rLocalName, xAttributes, this, _pImport );
     }
     // filecontrol
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("filecontrol") ))
+    else if ( rLocalName == "filecontrol" )
     {
         return new FileControlElement( rLocalName, xAttributes, this, _pImport );
     }
     // treecontrol
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("treecontrol") ))
+    else if ( rLocalName == "treecontrol" )
     {
         return new TreeControlElement( rLocalName, xAttributes, this, _pImport );
     }
     // currencyfield
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("currencyfield") ))
+    else if ( rLocalName == "currencyfield" )
     {
         return new CurrencyFieldElement( rLocalName, xAttributes, this, _pImport );
     }
     // datefield
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("datefield") ))
+    else if ( rLocalName == "datefield" )
     {
         return new DateFieldElement( rLocalName, xAttributes, this, _pImport );
     }
     // datefield
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("numericfield") ))
+    else if ( rLocalName == "numericfield" )
     {
         return new NumericFieldElement( rLocalName, xAttributes, this, _pImport );
     }
     // timefield
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("timefield") ))
+    else if ( rLocalName == "timefield" )
     {
         return new TimeFieldElement( rLocalName, xAttributes, this, _pImport );
     }
     // patternfield
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("patternfield") ))
+    else if ( rLocalName == "patternfield" )
     {
         return new PatternFieldElement( rLocalName, xAttributes, this, _pImport );
     }
     // formattedfield
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("formattedfield") ))
+    else if ( rLocalName == "formattedfield" )
     {
         return new FormattedFieldElement( rLocalName, xAttributes, this, _pImport );
     }
     // fixedline
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("fixedline") ))
+    else if ( rLocalName == "fixedline" )
     {
         return new FixedLineElement( rLocalName, xAttributes, this, _pImport );
     }
     // scrollbar
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("scrollbar") ))
+    else if ( rLocalName == "scrollbar" )
     {
         return new ScrollBarElement( rLocalName, xAttributes, this, _pImport );
     }
     // spinbutton
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("spinbutton") ) )
+    else if ( rLocalName == "spinbutton" )
     {
         return new SpinButtonElement( rLocalName, xAttributes, this, _pImport );
     }
     // progressmeter
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("progressmeter") ))
+    else if ( rLocalName == "progressmeter" )
     {
         return new ProgressBarElement( rLocalName, xAttributes, this, _pImport );
     }
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("multipage") ))
+    else if ( rLocalName == "multipage" )
     {
         return new MultiPage( rLocalName, xAttributes, this, _pImport );
     }
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("frame") ))
+    else if ( rLocalName == "frame" )
     {
         return new Frame( rLocalName, xAttributes, this, _pImport );
     }
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("page") ))
+    else if ( rLocalName == "page" )
     {
         return new Page( rLocalName, xAttributes, this, _pImport );
     }
     // bulletinboard
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") ))
+    else if ( rLocalName == "bulletinboard" )
     {
         return new BulletinBoardElement( rLocalName, xAttributes, this, _pImport );
     }
@@ -2477,7 +2477,7 @@ Reference< xml::input::XElement > StylesElement::startChildElement(
             Reference< XInterface >(), Any() );
     }
     // style
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("style") ))
+    else if ( rLocalName == "style" )
     {
         return new StyleElement( rLocalName, xAttributes, this, _pImport );
     }
@@ -2510,12 +2510,12 @@ Reference< xml::input::XElement > WindowElement::startChildElement(
             Reference< XInterface >(), Any() );
     }
     // styles
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("styles") ))
+    else if ( rLocalName == "styles" )
     {
         return new StylesElement( rLocalName, xAttributes, this, _pImport );
     }
     // bulletinboard
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") ))
+    else if ( rLocalName == "bulletinboard" )
     {
         return new BulletinBoardElement( rLocalName, xAttributes, this, _pImport );
     }
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index 6a87acc53ef2..17678702b92a 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -293,11 +293,11 @@ bool StyleElement::importBorderStyle(
     if (getStringAttr(
             &aValue, OUSTR("border"),
             _xAttributes, _pImport->XMLNS_DIALOGS_UID )) {
-        if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("none") ))
+        if ( aValue == "none" )
             _border = BORDER_NONE;
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("3d") ))
+        else if ( aValue == "3d" )
             _border = BORDER_3D;
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("simple") ))
+        else if ( aValue == "simple" )
             _border = BORDER_SIMPLE;
         else {
             _border = BORDER_SIMPLE_COLOR;
@@ -330,15 +330,15 @@ bool StyleElement::importVisualEffectStyle(
     if (getStringAttr( &aValue, OUString( RTL_CONSTASCII_USTRINGPARAM("look") ),
                        _xAttributes, _pImport->XMLNS_DIALOGS_UID ))
     {
-        if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("none") ))
+        if ( aValue == "none" )
         {
             _visualEffect = awt::VisualEffect::NONE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("3d") ))
+        else if ( aValue == "3d" )
         {
             _visualEffect = awt::VisualEffect::LOOK3D;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("simple") ))
+        else if ( aValue == "simple" )
         {
             _visualEffect = awt::VisualEffect::FLAT;
         }
@@ -413,27 +413,27 @@ bool StyleElement::importFontStyle(
             &aValue, OUString( RTL_CONSTASCII_USTRINGPARAM("font-family") ),
             _xAttributes, _pImport->XMLNS_DIALOGS_UID ))
     {
-        if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("decorative") ))
+        if ( aValue == "decorative" )
         {
             _descr.Family = awt::FontFamily::DECORATIVE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("modern") ))
+        else if ( aValue == "modern" )
         {
             _descr.Family = awt::FontFamily::MODERN;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("roman") ))
+        else if ( aValue == "roman" )
         {
             _descr.Family = awt::FontFamily::ROMAN;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("script") ))
+        else if ( aValue == "script" )
         {
             _descr.Family = awt::FontFamily::SCRIPT;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("swiss") ))
+        else if ( aValue == "swiss" )
         {
             _descr.Family = awt::FontFamily::SWISS;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("system") ))
+        else if ( aValue == "system" )
         {
             _descr.Family = awt::FontFamily::SYSTEM;
         }
@@ -451,43 +451,43 @@ bool StyleElement::importFontStyle(
             &aValue, OUString( RTL_CONSTASCII_USTRINGPARAM("font-charset") ),
             _xAttributes, _pImport->XMLNS_DIALOGS_UID ))
     {
-        if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ansi") ))
+        if ( aValue == "ansi" )
         {
             _descr.CharSet = awt::CharSet::ANSI;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("mac") ))
+        else if ( aValue == "mac" )
         {
             _descr.CharSet = awt::CharSet::MAC;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ibmpc_437") ))
+        else if ( aValue == "ibmpc_437" )
         {
             _descr.CharSet = awt::CharSet::IBMPC_437;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ibmpc_850") ))
+        else if ( aValue == "ibmpc_850" )
         {
             _descr.CharSet = awt::CharSet::IBMPC_850;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ibmpc_860") ))
+        else if ( aValue == "ibmpc_860" )
         {
             _descr.CharSet = awt::CharSet::IBMPC_860;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ibmpc_861") ))
+        else if ( aValue == "ibmpc_861" )
         {
             _descr.CharSet = awt::CharSet::IBMPC_861;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ibmpc_863") ))
+        else if ( aValue == "ibmpc_863" )
         {
             _descr.CharSet = awt::CharSet::IBMPC_863;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ibmpc_865") ))
+        else if ( aValue == "ibmpc_865" )
         {
             _descr.CharSet = awt::CharSet::IBMPC_865;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("system") ))
+        else if ( aValue == "system" )
         {
             _descr.CharSet = awt::CharSet::SYSTEM;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("symbol") ))
+        else if ( aValue == "symbol" )
         {
             _descr.CharSet = awt::CharSet::SYMBOL;
         }
@@ -505,11 +505,11 @@ bool StyleElement::importFontStyle(
             &aValue, OUString( RTL_CONSTASCII_USTRINGPARAM("font-pitch") ),
             _xAttributes, _pImport->XMLNS_DIALOGS_UID ))
     {
-        if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("fixed") ))
+        if ( aValue == "fixed" )
         {
             _descr.Pitch = awt::FontPitch::FIXED;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("variable") ))
+        else if ( aValue == "variable" )
         {
             _descr.Pitch = awt::FontPitch::VARIABLE;
         }
@@ -544,19 +544,19 @@ bool StyleElement::importFontStyle(
             &aValue, OUString( RTL_CONSTASCII_USTRINGPARAM("font-slant") ),
             _xAttributes, _pImport->XMLNS_DIALOGS_UID ))
     {
-        if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("oblique") ))
+        if ( aValue == "oblique" )
         {
             _descr.Slant = awt::FontSlant_OBLIQUE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("italic") ))
+        else if ( aValue == "italic" )
         {
             _descr.Slant = awt::FontSlant_ITALIC;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("reverse_oblique") ))
+        else if ( aValue == "reverse_oblique" )
         {
             _descr.Slant = awt::FontSlant_REVERSE_OBLIQUE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("reverse_italic") ))
+        else if ( aValue == "reverse_italic" )
         {
             _descr.Slant = awt::FontSlant_REVERSE_ITALIC;
         }
@@ -574,71 +574,71 @@ bool StyleElement::importFontStyle(
             &aValue, OUString( RTL_CONSTASCII_USTRINGPARAM("font-underline") ),
             _xAttributes, _pImport->XMLNS_DIALOGS_UID ))
     {
-        if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("single") ))
+        if ( aValue == "single" )
         {
             _descr.Underline = awt::FontUnderline::SINGLE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("double") ))
+        else if ( aValue == "double" )
         {
             _descr.Underline = awt::FontUnderline::DOUBLE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dotted") ))
+        else if ( aValue == "dotted" )
         {
             _descr.Underline = awt::FontUnderline::DOTTED;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dash") ))
+        else if ( aValue == "dash" )
         {
             _descr.Underline = awt::FontUnderline::DASH;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("longdash") ))
+        else if ( aValue == "longdash" )
         {
             _descr.Underline = awt::FontUnderline::LONGDASH;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dashdot") ))
+        else if ( aValue == "dashdot" )
         {
             _descr.Underline = awt::FontUnderline::DASHDOT;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dashdotdot") ))
+        else if ( aValue == "dashdotdot" )
         {
             _descr.Underline = awt::FontUnderline::DASHDOTDOT;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("smallwave") ))
+        else if ( aValue == "smallwave" )
         {
             _descr.Underline = awt::FontUnderline::SMALLWAVE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("wave") ))
+        else if ( aValue == "wave" )
         {
             _descr.Underline = awt::FontUnderline::WAVE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("doublewave") ))
+        else if ( aValue == "doublewave" )
         {
             _descr.Underline = awt::FontUnderline::DOUBLEWAVE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bold") ))
+        else if ( aValue == "bold" )
         {
             _descr.Underline = awt::FontUnderline::BOLD;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bolddotted") ))
+        else if ( aValue == "bolddotted" )
         {
             _descr.Underline = awt::FontUnderline::BOLDDOTTED;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bolddash") ))
+        else if ( aValue == "bolddash" )
         {
             _descr.Underline = awt::FontUnderline::BOLDDASH;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("boldlongdash") ))
+        else if ( aValue == "boldlongdash" )
         {
             _descr.Underline = awt::FontUnderline::BOLDLONGDASH;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bolddashdot") ))
+        else if ( aValue == "bolddashdot" )
         {
             _descr.Underline = awt::FontUnderline::BOLDDASHDOT;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bolddashdotdot") ))
+        else if ( aValue == "bolddashdotdot" )
         {
             _descr.Underline = awt::FontUnderline::BOLDDASHDOTDOT;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("boldwave") ))
+        else if ( aValue == "boldwave" )
         {
             _descr.Underline = awt::FontUnderline::BOLDWAVE;
         }
@@ -656,23 +656,23 @@ bool StyleElement::importFontStyle(
             &aValue, OUString( RTL_CONSTASCII_USTRINGPARAM("font-strikeout") ),
             _xAttributes, _pImport->XMLNS_DIALOGS_UID ))
     {
-        if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("single") ))
+        if ( aValue == "single" )
         {
             _descr.Strikeout = awt::FontStrikeout::SINGLE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("double") ))
+        else if ( aValue == "double" )
         {
             _descr.Strikeout = awt::FontStrikeout::DOUBLE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bold") ))
+        else if ( aValue == "bold" )
         {
             _descr.Strikeout = awt::FontStrikeout::BOLD;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("slash") ))
+        else if ( aValue == "slash" )
         {
             _descr.Strikeout = awt::FontStrikeout::SLASH;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("x") ))
+        else if ( aValue == "x" )
         {
             _descr.Strikeout = awt::FontStrikeout::X;
         }
@@ -710,15 +710,15 @@ bool StyleElement::importFontStyle(
             &aValue, OUString( RTL_CONSTASCII_USTRINGPARAM("font-type") ),
             _xAttributes, _pImport->XMLNS_DIALOGS_UID ))
     {
-        if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("raster") ))
+        if ( aValue == "raster" )
         {
             _descr.Type = awt::FontType::RASTER;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("device") ))
+        else if ( aValue == "device" )
         {
             _descr.Type = awt::FontType::DEVICE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("scalable") ))
+        else if ( aValue == "scalable" )
         {
             _descr.Type = awt::FontType::SCALABLE;
         }
@@ -737,15 +737,15 @@ bool StyleElement::importFontStyle(
             &aValue, OUString( RTL_CONSTASCII_USTRINGPARAM("font-relief") ),
             _xAttributes, _pImport->XMLNS_DIALOGS_UID ))
     {
-        if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("none") ))
+        if ( aValue == "none" )
         {
             _fontRelief = awt::FontRelief::NONE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("embossed") ))
+        else if ( aValue == "embossed" )
         {
             _fontRelief = awt::FontRelief::EMBOSSED;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("engraved") ))
+        else if ( aValue == "engraved" )
         {
             _fontRelief = awt::FontRelief::ENGRAVED;
         }
@@ -763,31 +763,31 @@ bool StyleElement::importFontStyle(
             OUString( RTL_CONSTASCII_USTRINGPARAM("font-emphasismark") ),
             _xAttributes, _pImport->XMLNS_DIALOGS_UID ))
     {
-        if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("none") ))
+        if ( aValue == "none" )
         {
             _fontEmphasisMark = awt::FontEmphasisMark::NONE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dot") ))
+        else if ( aValue == "dot" )
         {
             _fontEmphasisMark = awt::FontEmphasisMark::DOT;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("circle") ))
+        else if ( aValue == "circle" )
         {
             _fontEmphasisMark = awt::FontEmphasisMark::CIRCLE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("disc") ))
+        else if ( aValue == "disc" )
         {
             _fontEmphasisMark = awt::FontEmphasisMark::DISC;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("accent") ))
+        else if ( aValue == "accent" )
         {
             _fontEmphasisMark = awt::FontEmphasisMark::ACCENT;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("above") ))
+        else if ( aValue == "above" )
         {
             _fontEmphasisMark = awt::FontEmphasisMark::ABOVE;
         }
-        else if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("below") ))
+        else if ( aValue == "below" )
         {
             _fontEmphasisMark = awt::FontEmphasisMark::BELOW;
         }
@@ -929,19 +929,19 @@ bool ImportContext::importAlignProperty(
     if (!aAlign.isEmpty())
     {
         sal_Int16 nAlign;
-        if (aAlign.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("left") ))
+        if ( aAlign == "left" )
         {
             nAlign = 0;
         }
-        else if (aAlign.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("center") ))
+        else if ( aAlign == "center" )
         {
             nAlign = 1;
         }
-        else if (aAlign.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("right") ))
+        else if ( aAlign == "right" )
         {
             nAlign = 2;
         }
-        else if (aAlign.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("none") ))
+        else if ( aAlign == "none" )
         {
             nAlign = 0; // default
         }
@@ -969,15 +969,15 @@ bool ImportContext::importVerticalAlignProperty(
     {
         style::VerticalAlignment eAlign;
 
-        if (aAlign.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("top") ))
+        if ( aAlign == "top" )
         {
             eAlign = style::VerticalAlignment_TOP;
         }
-        else if (aAlign.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("center") ))
+        else if ( aAlign == "center" )
         {
             eAlign = style::VerticalAlignment_MIDDLE;
         }
-        else if (aAlign.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bottom") ))
+        else if ( aAlign == "bottom" )
         {
             eAlign = style::VerticalAlignment_BOTTOM;
         }
@@ -1112,19 +1112,19 @@ bool ImportContext::importImageAlignProperty(
     if (!aAlign.isEmpty())
     {
         sal_Int16 nAlign;
-        if (aAlign.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("left") ))
+        if ( aAlign == "left" )
         {
             nAlign = 0;
         }
-        else if (aAlign.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("top") ))
+        else if ( aAlign == "top" )
         {
             nAlign = 1;
         }
-        else if (aAlign.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("right") ))
+        else if ( aAlign == "right" )
         {
             nAlign = 2;
         }
-        else if (aAlign.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bottom") ))
+        else if ( aAlign == "bottom" )
         {
             nAlign = 3;
         }
@@ -1151,55 +1151,55 @@ bool ImportContext::importImagePositionProperty(
     if (!aPosition.isEmpty())
     {
         sal_Int16 nPosition;
-        if (aPosition.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("left-top") ))
+        if ( aPosition == "left-top" )
         {
             nPosition = awt::ImagePosition::LeftTop;
         }
-        else if (aPosition.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("left-center") ))
+        else if ( aPosition == "left-center" )
         {
             nPosition = awt::ImagePosition::LeftCenter;
         }
-        else if (aPosition.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("left-bottom") ))
+        else if ( aPosition == "left-bottom" )
         {
             nPosition = awt::ImagePosition::LeftBottom;
         }
-        else if (aPosition.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("right-top") ))
+        else if ( aPosition == "right-top" )
         {
             nPosition = awt::ImagePosition::RightTop;
         }
-        else if (aPosition.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("right-center") ))
+        else if ( aPosition == "right-center" )
         {
             nPosition = awt::ImagePosition::RightCenter;
         }
-        else if (aPosition.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("right-bottom") ))
+        else if ( aPosition == "right-bottom" )
         {
             nPosition = awt::ImagePosition::RightBottom;
         }
-        else if (aPosition.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("top-left") ))
+        else if ( aPosition == "top-left" )
         {
             nPosition = awt::ImagePosition::AboveLeft;
         }
-        else if (aPosition.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("top-center") ))
+        else if ( aPosition == "top-center" )
         {
             nPosition = awt::ImagePosition::AboveCenter;
         }
-        else if (aPosition.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("top-right") ))
+        else if ( aPosition == "top-right" )
         {
             nPosition = awt::ImagePosition::AboveRight;
         }
-        else if (aPosition.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bottom-left") ))
+        else if ( aPosition == "bottom-left" )
         {
             nPosition = awt::ImagePosition::BelowLeft;
         }
-        else if (aPosition.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bottom-center") ))
+        else if ( aPosition == "bottom-center" )
         {
             nPosition = awt::ImagePosition::BelowCenter;
         }
-        else if (aPosition.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bottom-right") ))
+        else if ( aPosition == "bottom-right" )
         {
             nPosition = awt::ImagePosition::BelowRight;
         }
-        else if (aPosition.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("center") ))
+        else if ( aPosition == "center" )
         {
             nPosition = awt::ImagePosition::Centered;
         }
@@ -1226,19 +1226,19 @@ bool ImportContext::importButtonTypeProperty(
     if (!buttonType.isEmpty())
     {
         sal_Int16 nButtonType;
-        if (buttonType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("standard") ))
+        if ( buttonType == "standard" )
         {
             nButtonType = awt::PushButtonType_STANDARD;
         }
-        else if (buttonType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ok") ))
+        else if ( buttonType == "ok" )
         {
             nButtonType = awt::PushButtonType_OK;
         }
-        else if (buttonType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("cancel") ))
+        else if ( buttonType == "cancel" )
         {
             nButtonType = awt::PushButtonType_CANCEL;
         }
-        else if (buttonType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("help") ))
+        else if ( buttonType == "help" )
         {
             nButtonType = awt::PushButtonType_HELP;
         }
@@ -1265,51 +1265,51 @@ bool ImportContext::importDateFormatProperty(
     if (!aFormat.isEmpty())
     {
         sal_Int16 nFormat;
-        if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("system_short") ))
+        if ( aFormat == "system_short" )
         {
             nFormat = 0;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("system_short_YY") ))
+        else if ( aFormat == "system_short_YY" )
         {
             nFormat = 1;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("system_short_YYYY") ))
+        else if ( aFormat == "system_short_YYYY" )
         {
             nFormat = 2;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("system_long") ))
+        else if ( aFormat == "system_long" )
         {
             nFormat = 3;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("short_DDMMYY") ))
+        else if ( aFormat == "short_DDMMYY" )
         {
             nFormat = 4;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("short_MMDDYY") ))
+        else if ( aFormat == "short_MMDDYY" )
         {
             nFormat = 5;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("short_YYMMDD") ))
+        else if ( aFormat == "short_YYMMDD" )
         {
             nFormat = 6;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("short_DDMMYYYY") ))
+        else if ( aFormat == "short_DDMMYYYY" )
         {
             nFormat = 7;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("short_MMDDYYYY") ))
+        else if ( aFormat == "short_MMDDYYYY" )
         {
             nFormat = 8;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("short_YYYYMMDD") ))
+        else if ( aFormat == "short_YYYYMMDD" )
         {
             nFormat = 9;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("short_YYMMDD_DIN5008") ))
+        else if ( aFormat == "short_YYMMDD_DIN5008" )
         {
             nFormat = 10;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("short_YYYYMMDD_DIN5008") ))
+        else if ( aFormat == "short_YYYYMMDD_DIN5008" )
         {
             nFormat = 11;
         }
@@ -1336,27 +1336,27 @@ bool ImportContext::importTimeFormatProperty(
     if (!aFormat.isEmpty())
     {
         sal_Int16 nFormat;
-        if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("24h_short") ))
+        if ( aFormat == "24h_short" )
         {
             nFormat = 0;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("24h_long") ))
+        else if ( aFormat == "24h_long" )
         {
             nFormat = 1;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("12h_short") ))
+        else if ( aFormat == "12h_short" )
         {
             nFormat = 2;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("12h_long") ))
+        else if ( aFormat == "12h_long" )
         {
             nFormat = 3;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Duration_short") ))
+        else if ( aFormat == "Duration_short" )
         {
             nFormat = 4;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Duration_long") ))
+        else if ( aFormat == "Duration_long" )
         {
             nFormat = 5;
         }
@@ -1383,11 +1383,11 @@ bool ImportContext::importOrientationProperty(
     if (!aOrient.isEmpty())
     {
         sal_Int32 nOrient;
-        if (aOrient.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("horizontal") ))
+        if ( aOrient == "horizontal" )
         {
             nOrient = 0;
         }
-        else if (aOrient.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("vertical") ))
+        else if ( aOrient == "vertical" )
         {
             nOrient = 1;
         }
@@ -1414,15 +1414,15 @@ bool ImportContext::importLineEndFormatProperty(
     if (!aFormat.isEmpty())
     {
         sal_Int16 nFormat;
-        if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("carriage-return") ))
+        if ( aFormat == "carriage-return" )
         {
             nFormat = awt::LineEndFormat::CARRIAGE_RETURN;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("line-feed") ))
+        else if ( aFormat == "line-feed" )
         {
             nFormat = awt::LineEndFormat::LINE_FEED;
         }
-        else if (aFormat.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("carriage-return-line-feed") ))
+        else if ( aFormat == "carriage-return-line-feed" )
         {
             nFormat = awt::LineEndFormat::CARRIAGE_RETURN_LINE_FEED;
         }
@@ -1450,19 +1450,19 @@ bool ImportContext::importSelectionTypeProperty(
     {
         view::SelectionType eSelectionType;
 
-        if (aSelectionType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("none") ))
+        if ( aSelectionType == "none" )
         {
             eSelectionType = view::SelectionType_NONE;
         }
-        else if (aSelectionType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("single") ))
+        else if ( aSelectionType == "single" )
         {
             eSelectionType = view::SelectionType_SINGLE;
         }
-        else if (aSelectionType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("multi") ))
+        else if ( aSelectionType == "multi" )
         {
             eSelectionType = view::SelectionType_MULTI;
         }
-        else  if (aSelectionType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("range") ))
+        else  if ( aSelectionType == "range" )
         {
             eSelectionType = view::SelectionType_RANGE;
         }
@@ -1601,7 +1601,7 @@ void ImportContext::importEvents(
                     }
 
                     // script:event element
-                    if (aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("event") ))
+                    if ( aLocalName == "event" )
                     {
                         OUString aEventName;
                         if (! getStringAttr(
@@ -1960,7 +1960,7 @@ Reference< xml::input::XElement > DialogImport::startRootElement(
             Reference< XInterface >(), Any() );
     }
     // window
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("window") ))
+    else if ( rLocalName == "window" )
     {
         return new WindowElement( rLocalName, xAttributes, 0, this );
     }
diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
index 21cc0f366933..8566529e5295 100644
--- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
@@ -238,7 +238,7 @@ Reference< xml::input::XElement > LibrariesElement::startChildElement(
             Reference< XInterface >(), Any() );
     }
     // library
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("library") ))
+    else if ( rLocalName == "library" )
     {
         LibDescriptor aDesc;
         aDesc.bLink = aDesc.bReadOnly = aDesc.bPasswordProtected = aDesc.bPreload = sal_False;
@@ -300,7 +300,7 @@ Reference< xml::input::XElement > LibraryElement::startChildElement(
             Reference< XInterface >(), Any() );
     }
     // library
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("element") ))
+    else if ( rLocalName == "element" )
     {
         OUString aValue( xAttributes->getValueByUidName(
             _pImport->XMLNS_LIBRARY_UID,
diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
index ac358681e6cd..00017b5ed555 100644
--- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
@@ -184,7 +184,7 @@ Reference< xml::input::XElement > ModuleImport::startRootElement(
             Reference< XInterface >(), Any() );
     }
     // window
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("module") ))
+    else if ( rLocalName == "module" )
     {
         mrModuleDesc.aName = xAttributes->getValueByUidName(
             XMLNS_SCRIPT_UID,
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index f008f670cb7c..0e23871a9fca 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -389,7 +389,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
 
             ::rtl::OUString objId = ::rtl::OUString::createFromAscii( pExtn->pszObjId );
 
-            if ( objId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2.5.29.17")) )
+            if ( objId == "2.5.29.17" )
                 xExtn = (CertificateExtension_XmlSecImpl*) new SanExtensionImpl() ;
             else
                 xExtn = new CertificateExtension_XmlSecImpl() ;
author	Szabolcs Dezsi <dezsiszabi@hotmail.com>	2012-04-06 15:05:52 +0200
committer	Jan Holesovsky <kendy@suse.cz>	2012-04-06 15:07:41 +0200
commit	743f22045c4ec08c46c259fc0ba240194a391457 (patch)
tree	faed42bb31c4ee767619eb5c3ebd4dec0a41fa03
parent	0c6ebe5d225d6a655f078977455cec6d0a3afa6e (diff)