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 )/' \{\} \;

15 files changed, 139 insertions, 139 deletions

diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 9f99d1e7ab7b..bb1862c0be3e 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -176,27 +176,27 @@ void CustomAnimationEffect::setNode( const ::com::sun::star::uno::Reference< ::c
 
     while( nLength-- )
     {
-        if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
+        if ( p->Name == "node-type" )
         {
             p->Value >>= mnNodeType;
         }
-        else if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-id" ) ) )
+        else if ( p->Name == "preset-id" )
         {
             p->Value >>= maPresetId;
         }
-        else if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-sub-type" ) ) )
+        else if ( p->Name == "preset-sub-type" )
         {
             p->Value >>= maPresetSubType;
         }
-        else if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-class" ) ) )
+        else if ( p->Name == "preset-class" )
         {
             p->Value >>= mnPresetClass;
         }
-        else if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-property" ) ) )
+        else if ( p->Name == "preset-property" )
         {
             p->Value >>= maProperty;
         }
-        else if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "group-id" ) ) )
+        else if ( p->Name == "group-id" )
         {
             p->Value >>= mnGroupId;
         }
@@ -416,7 +416,7 @@ sal_Int32 CustomAnimationEffect::get_node_type( const Reference< XAnimationNode
             const NamedValue* p = aUserData.getConstArray();
             while( nLength-- )
             {
-                if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
+                if ( p->Name == "node-type" )
                 {
                     p->Value >>= nNodeType;
                     break;
@@ -448,7 +448,7 @@ void CustomAnimationEffect::setPresetClass( sal_Int16 nPresetClass )
                 NamedValue* p = aUserData.getArray();
                 while( nLength-- )
                 {
-                    if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-class" ) ) )
+                    if ( p->Name == "preset-class" )
                     {
                         p->Value <<= mnPresetClass;
                         bFound = true;
@@ -489,7 +489,7 @@ void CustomAnimationEffect::setNodeType( sal_Int16 nNodeType )
                 NamedValue* p = aUserData.getArray();
                 while( nLength-- )
                 {
-                    if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
+                    if ( p->Name == "node-type" )
                     {
                         p->Value <<= mnNodeType;
                         bFound = true;
@@ -530,7 +530,7 @@ void CustomAnimationEffect::setGroupId( sal_Int32 nGroupId )
             NamedValue* p = aUserData.getArray();
             while( nLength-- )
             {
-                if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "group-id" ) ) )
+                if ( p->Name == "group-id" )
                 {
                     p->Value <<= mnGroupId;
                     bFound = true;
@@ -3132,7 +3132,7 @@ void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode >
 
         while( nLength-- )
         {
-            if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "master-element" ) ) )
+            if ( p->Name == "master-element" )
             {
                 p->Value >>= xMaster;
                 break;
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index 78b7f878bd0c..122405890799 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -156,7 +156,7 @@ CustomAnimationPreset::CustomAnimationPreset( CustomAnimationEffectPtr pEffect )
 
     while( nLength-- )
     {
-        if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "text-only" ) ) )
+        if ( p->Name == "text-only" )
         {
             mbIsTextOnly = true;
             break;
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 89b101bbe497..5d4820070a24 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -80,7 +80,7 @@ TransitionPreset::TransitionPreset( const ::com::sun::star::uno::Reference< ::co
     const NamedValue* p = aUserData.getConstArray();
     while( nLength-- )
     {
-        if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-id" ) ) )
+        if ( p->Name == "preset-id" )
         {
             p->Value >>= maPresetId;
             break;
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 1e65805ed606..f9b6694ed709 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -170,12 +170,12 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl
             {
                 case 5 :
                 {
-                    if ( rPresetSubType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "downward" ) ) )
+                    if ( rPresetSubType == "downward" )
                     {
                         nPresetSubType = 5;
                         bTranslated = sal_True;
                     }
-                    else if ( rPresetSubType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "across" ) ) )
+                    else if ( rPresetSubType == "across" )
                     {
                         nPresetSubType = 10;
                         bTranslated = sal_True;
@@ -184,7 +184,7 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl
                 break;
                 case 17 :
                 {
-                    if ( rPresetSubType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "across" ) ) )
+                    if ( rPresetSubType == "across" )
                     {
                         nPresetSubType = 10;
                         bTranslated = sal_True;
@@ -193,22 +193,22 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl
                 break;
                 case 18 :
                 {
-                    if ( rPresetSubType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "right-to-top" ) ) )
+                    if ( rPresetSubType == "right-to-top" )
                     {
                         nPresetSubType = 3;
                         bTranslated = sal_True;
                     }
-                    else if ( rPresetSubType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "right-to-bottom" ) ) )
+                    else if ( rPresetSubType == "right-to-bottom" )
                     {
                         nPresetSubType = 6;
                         bTranslated = sal_True;
                     }
-                    else if ( rPresetSubType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "left-to-top" ) ) )
+                    else if ( rPresetSubType == "left-to-top" )
                     {
                         nPresetSubType = 9;
                         bTranslated = sal_True;
                     }
-                    else if ( rPresetSubType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "left-to-bottom" ) ) )
+                    else if ( rPresetSubType == "left-to-bottom" )
                     {
                         nPresetSubType = 12;
                         bTranslated = sal_True;
@@ -394,7 +394,7 @@ void AnimationExporter::processAfterEffectNodes( const Reference< XAnimationNode
 
                                     while( nLength-- )
                                     {
-                                        if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "master-element" ) ) )
+                                        if ( p->Name == "master-element" )
                                         {
                                             p->Value >>= xMaster;
                                             break;
@@ -783,7 +783,7 @@ sal_Bool AnimationExporter::GetNodeType( const Reference< XAnimationNode >& xNod
     sal_Int32 nLength = aUserData.getLength();
     while( nLength-- )
     {
-        if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
+        if ( p->Name == "node-type" )
         {
         if ( p->Value >>= nType )
             return sal_True;
@@ -896,23 +896,23 @@ void AnimationExporter::GetUserData( const Sequence< NamedValue >& rUserData, co
     sal_Int32 nLength = rUserData.getLength();
     while( nLength-- )
     {
-        if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
+        if ( p->Name == "node-type" )
         {
         pAny[ DFF_ANIM_NODE_TYPE ] = &(p->Value);
         }
-        else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-class" ) ) )
+        else if ( p->Name == "preset-class" )
         {
         pAny[ DFF_ANIM_PRESET_CLASS ] = &(p->Value);
         }
-        else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-id" ) ) )
+        else if ( p->Name == "preset-id" )
         {
         pAny[ DFF_ANIM_PRESET_ID ] = &(p->Value);
         }
-        else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-sub-type" ) ) )
+        else if ( p->Name == "preset-sub-type" )
         {
         pAny[ DFF_ANIM_PRESET_SUB_TYPE ] = &(p->Value);
         }
-        else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "master-element" ) ) )
+        else if ( p->Name == "master-element" )
         {
         pAny[ DFF_ANIM_AFTEREFFECT ] = &(p->Value);;
         }
@@ -1467,7 +1467,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
             aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
         }
     }
-    else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FillStyle" ) ) )
+    else if ( rAttributeName == "FillStyle" )
     {
         ::com::sun::star::drawing::FillStyle eFillStyle;
         if ( rSourceValue >>= eFillStyle )
@@ -1478,7 +1478,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
                 aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "solid" ) );
         }
     }
-    else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LineStyle" ) ) )
+    else if ( rAttributeName == "LineStyle" )
     {
         ::com::sun::star::drawing::LineStyle eLineStyle;
         if ( rSourceValue >>= eLineStyle )
@@ -1489,7 +1489,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
                 aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) );
         }
     }
-    else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharWeight" ) ) )
+    else if ( rAttributeName == "CharWeight" )
     {
         float fFontWeight = 0.0;
         if ( rSourceValue >>= fFontWeight )
@@ -1500,7 +1500,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
                 aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "normal" ) );
         }
     }
-    else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharUnderline" ) ) )
+    else if ( rAttributeName == "CharUnderline" )
     {
         sal_Int16 nFontUnderline = 0;
         if ( rSourceValue >>= nFontUnderline )
@@ -1511,7 +1511,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
                 aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) );
         }
     }
-    else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharPosture" ) ) )
+    else if ( rAttributeName == "CharPosture" )
     {
         ::com::sun::star::awt::FontSlant eFontSlant;
         if ( rSourceValue >>= eFontSlant )
@@ -1522,7 +1522,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::
                 aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "normal" ) );  // ?
         }
     }
-    else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Visibility" ) ) )
+    else if ( rAttributeName == "Visibility" )
     {
         sal_Bool bVisible = sal_True;
         if ( rSourceValue >>= bVisible )
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 11679669c7fe..8118a70ff662 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -247,43 +247,43 @@ ShapeExport& PowerPointShapeExport::WriteTextShape( Reference< XShape > xShape )
 
     DBG(printf( "shape(text): %s\n", USS(sShapeType) ));
 
-    if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.TextShape" ) ) )
+    if ( sShapeType == "com.sun.star.drawing.TextShape" )
     {
     ShapeExport::WriteTextShape( xShape );
     }
-    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.DateTimeShape" ) ) )
+    else if ( sShapeType == "com.sun.star.presentation.DateTimeShape" )
     {
         if( !WritePlaceholder( xShape, DateAndTime, mbMaster ) )
             ShapeExport::WriteTextShape( xShape );
     }
-    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.FooterShape" ) ) )
+    else if ( sShapeType == "com.sun.star.presentation.FooterShape" )
     {
         if( !WritePlaceholder( xShape, Footer, mbMaster ) )
             ShapeExport::WriteTextShape( xShape );
     }
-    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.HeaderShape" ) ) )
+    else if ( sShapeType == "com.sun.star.presentation.HeaderShape" )
     {
         if( !WritePlaceholder( xShape, Header, mbMaster ) )
             ShapeExport::WriteTextShape( xShape );
     }
-    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.NotesShape" ) ) )
+    else if ( sShapeType == "com.sun.star.presentation.NotesShape" )
     {
         if( mePageType == NOTICE && mrExport.GetPresObj() )
             WritePlaceholderShape( xShape, Notes );
         else
             ShapeExport::WriteTextShape( xShape );
     }
-    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.OutlinerShape" ) ) )
+    else if ( sShapeType == "com.sun.star.presentation.OutlinerShape" )
     {
         if( !WritePlaceholder( xShape, Outliner, mbMaster ) )
             ShapeExport::WriteTextShape( xShape );
     }
-    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.SlideNumberShape" ) ) )
+    else if ( sShapeType == "com.sun.star.presentation.SlideNumberShape" )
     {
         if( !WritePlaceholder( xShape, SlideNumber, mbMaster ) )
             ShapeExport::WriteTextShape( xShape );
     }
-    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.TitleTextShape" ) ) )
+    else if ( sShapeType == "com.sun.star.presentation.TitleTextShape" )
     {
         if( !WritePlaceholder( xShape, Title, mbMaster ) )
             ShapeExport::WriteTextShape( xShape );
@@ -298,18 +298,18 @@ ShapeExport& PowerPointShapeExport::WriteUnknownShape( Reference< XShape > xShap
 
     DBG(printf( "shape(unknown): %s\n", USS(sShapeType) ));
 
-    if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.GroupShape" ) ) )
+    if ( sShapeType == "com.sun.star.drawing.GroupShape" )
     {
         Reference< XIndexAccess > rXIndexAccess( xShape, UNO_QUERY );
 
         mrExport.EnterGroup( rXIndexAccess );
         DBG(printf( "enter group\n" ));
     }
-    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.PageShape" ) ) )
+    else if ( sShapeType == "com.sun.star.drawing.PageShape" )
     {
         WritePageShape( xShape, mePageType, mrExport.GetPresObj() );
     }
-    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.SubtitleShape" ) ) )
+    else if ( sShapeType == "com.sun.star.presentation.SubtitleShape" )
     {
         if( !WritePlaceholder( xShape, Subtitle, mbMaster ) )
             ShapeExport::WriteTextShape( xShape );
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index e53b0c2230a9..ad0d11a8b881 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -825,17 +825,17 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
                     if ( pValue )
                     {
                         ::rtl::OUString aPropName( pPropValue[ i ].Name );
-                        if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "NumberingType" ) ) )
+                        if ( aPropName == "NumberingType" )
                             nNumberingType = *( (sal_Int16*)pValue );
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Adjust" ) ) )
+                        else if ( aPropName == "Adjust" )
                             nHorzAdjust = *( (sal_Int16*)pValue );
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletChar" ) ) )
+                        else if ( aPropName == "BulletChar" )
                         {
                             String aString( *( (String*)pValue ) );
                             if ( aString.Len() )
                                 cBulletId = aString.GetChar( 0 );
                         }
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletFont" ) ) )
+                        else if ( aPropName == "BulletFont" )
                         {
                             aFontDesc = *( (::com::sun::star::awt::FontDescriptor*)pValue );
 
@@ -843,13 +843,13 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
                             // instead of a Unicode encoding the encoding RTL_TEXTENCODING_SYMBOL was used.
                             // Because there might exist a lot of damaged documemts I added this two lines
                             // which fixes the bullet problem for the export.
-                            if ( aFontDesc.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StarSymbol" ) ) )
+                            if ( aFontDesc.Name == "StarSymbol" )
                                 aFontDesc.CharSet = RTL_TEXTENCODING_MS_1252;
 
                         }
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GraphicURL" ) ) )
+                        else if ( aPropName == "GraphicURL" )
                             aGraphicURL = ( *(::rtl::OUString*)pValue );
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GraphicSize" ) ) )
+                        else if ( aPropName == "GraphicSize" )
                         {
                             if ( pPropValue[ i ].Value.getValueType() == ::getCppuType( (::com::sun::star::awt::Size*)0) )
                             {
@@ -860,28 +860,28 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
                                 aBuGraSize.nB = aSize.Height;
                             }
                         }
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StartWith" ) ) )
+                        else if ( aPropName == "StartWith" )
                             nStartWith = *( (sal_Int16*)pValue );
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LeftMargin" ) ) )
+                        else if ( aPropName == "LeftMargin" )
                             nTextOfs = nTextOfs + static_cast< sal_Int16 >( *( (sal_Int32*)pValue ) / ( 2540.0 / 576 ) );
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FirstLineOffset" ) ) )
+                        else if ( aPropName == "FirstLineOffset" )
                             nBulletOfs += (sal_Int16)( *( (sal_Int32*)pValue ) / ( 2540.0 / 576 ) );
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletColor" ) ) )
+                        else if ( aPropName == "BulletColor" )
                         {
                             sal_uInt32 nSOColor = *( (sal_uInt32*)pValue );
                             nBulletColor = nSOColor & 0xff00ff00;                       // green and hibyte
                             nBulletColor |= (sal_uInt8)( nSOColor ) << 16;              // red
                             nBulletColor |= (sal_uInt8)( nSOColor >> 16 ) | 0xfe000000; // blue
                         }
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletRelSize" ) ) )
+                        else if ( aPropName == "BulletRelSize" )
                         {
                             nBulletRealSize = *( (sal_Int16*)pValue );
                             nParaFlags |= 0x40;
                             nBulletFlags |= 8;
                         }
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Prefix" ) ) )
+                        else if ( aPropName == "Prefix" )
                             sPrefix = ( *(::rtl::OUString*)pValue );
-                        else if  ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Suffix" ) ) )
+                        else if ( aPropName == "Suffix" )
                             sSuffix = ( *(::rtl::OUString*)pValue );
 #ifdef DBG_UTIL
                         else if ( ! (
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 2d55e3e061a1..52f6c126b86c 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -196,7 +196,7 @@ Sequence< PropertyValue > SdHtmlOptionsDialog::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 )
@@ -218,7 +218,7 @@ void SdHtmlOptionsDialog::setPropertyValues( const Sequence< PropertyValue > & a
     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;
             break;
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index f2d46ba9f9d3..4d6d3720e29f 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -462,24 +462,24 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams
     OUString aStr;
     while( nArgs-- )
     {
-        if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PublishMode" ) ) )
+        if ( pParams->Name == "PublishMode" )
         {
             sal_Int32 temp = 0;
             pParams->Value >>= temp;
             meMode = (HtmlPublishMode)temp;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IndexURL" ) ) )
+        else if ( pParams->Name == "IndexURL" )
         {
             pParams->Value >>= aStr;
             maIndexUrl = aStr;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Format" ) ) )
+        else if ( pParams->Name == "Format" )
         {
             sal_Int32 temp = 0;
             pParams->Value >>= temp;
             meFormat = (PublishingFormat)temp;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Compression" ) ) )
+        else if ( pParams->Name == "Compression" )
         {
             pParams->Value >>= aStr;
             String aTmp( aStr );
@@ -491,19 +491,19 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams
                 mnCompression = (sal_Int16)aTmp.ToInt32();
             }
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Width" ) ) )
+        else if ( pParams->Name == "Width" )
         {
             sal_Int32 temp = 0;
             pParams->Value >>= temp;
             mnWidthPixel = (sal_uInt16)temp;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseButtonSet" ) ) )
+        else if ( pParams->Name == "UseButtonSet" )
         {
             sal_Int32 temp = 0;
             pParams->Value >>= temp;
             mnButtonThema = (sal_Int16)temp;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsExportNotes" ) ) )
+        else if ( pParams->Name == "IsExportNotes" )
         {
             if( mbImpress )
             {
@@ -512,118 +512,118 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams
                 mbNotes = temp;
             }
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsExportContentsPage" ) ) )
+        else if ( pParams->Name == "IsExportContentsPage" )
         {
             sal_Bool temp = sal_False;
             pParams->Value >>= temp;
             mbContentsPage = temp;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Author" ) ) )
+        else if ( pParams->Name == "Author" )
         {
             pParams->Value >>= aStr;
             maAuthor = aStr;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EMail" ) ) )
+        else if ( pParams->Name == "EMail" )
         {
             pParams->Value >>= aStr;
             maEMail = aStr;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HomepageURL" ) ) )
+        else if ( pParams->Name == "HomepageURL" )
         {
             pParams->Value >>= aStr;
             maHomePage = aStr;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserText" ) ) )
+        else if ( pParams->Name == "UserText" )
         {
             pParams->Value >>= aStr;
             maInfo = aStr;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EnableDownload" ) ) )
+        else if ( pParams->Name == "EnableDownload" )
         {
             sal_Bool temp = sal_False;
             pParams->Value >>= temp;
             mbDownload = temp;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SlideSound" ) ) )
+        else if ( pParams->Name == "SlideSound" )
         {
             sal_Bool temp = sal_True;
             pParams->Value >>= temp;
             mbSlideSound = temp;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HiddenSlides" ) ) )
+        else if ( pParams->Name == "HiddenSlides" )
         {
             sal_Bool temp = sal_True;
             pParams->Value >>= temp;
             mbHiddenSlides = temp;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BackColor" ) ) )
+        else if ( pParams->Name == "BackColor" )
         {
             sal_Int32 temp = 0;
             pParams->Value >>= temp;
             maBackColor = temp;
             mbUserAttr = true;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TextColor" ) ) )
+        else if ( pParams->Name == "TextColor" )
         {
             sal_Int32 temp = 0;
             pParams->Value >>= temp;
             maTextColor = temp;
             mbUserAttr = true;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LinkColor" ) ) )
+        else if ( pParams->Name == "LinkColor" )
         {
             sal_Int32 temp = 0;
             pParams->Value >>= temp;
             maLinkColor = temp;
             mbUserAttr = true;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VLinkColor" ) ) )
+        else if ( pParams->Name == "VLinkColor" )
         {
             sal_Int32 temp = 0;
             pParams->Value >>= temp;
             maVLinkColor = temp;
             mbUserAttr = true;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ALinkColor" ) ) )
+        else if ( pParams->Name == "ALinkColor" )
         {
             sal_Int32 temp = 0;
             pParams->Value >>= temp;
             maALinkColor = temp;
             mbUserAttr = true;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsUseDocumentColors" ) ) )
+        else if ( pParams->Name == "IsUseDocumentColors" )
         {
             sal_Bool temp = sal_False;
             pParams->Value >>= temp;
             mbDocColors = temp;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "KioskSlideDuration" ) ) )
+        else if ( pParams->Name == "KioskSlideDuration" )
         {
             sal_Int32 temp = sal_False;
             pParams->Value >>= temp;
             mnSlideDuration = temp;
             mbAutoSlide = true;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "KioskEndless" ) ) )
+        else if ( pParams->Name == "KioskEndless" )
         {
             sal_Bool temp = sal_False;
             pParams->Value >>= temp;
             mbEndless = temp;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "WebCastCGIURL" ) ) )
+        else if ( pParams->Name == "WebCastCGIURL" )
         {
             pParams->Value >>= aStr;
             maCGIPath = aStr;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "WebCastTargetURL" ) ) )
+        else if ( pParams->Name == "WebCastTargetURL" )
         {
             pParams->Value >>= aStr;
             maURLPath = aStr;
         }
-        else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "WebCastScriptLanguage" ) ) )
+        else if ( pParams->Name == "WebCastScriptLanguage" )
         {
             pParams->Value >>= aStr;
-            if( aStr.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "asp" ) ) )
+            if ( aStr == "asp" )
             {
                 meScript = SCRIPT_ASP;
             }
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 3af544eb88ff..e5e1f1d57ead 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -616,7 +616,7 @@ void AnimationImporter::fixMainSequenceTiming( const ::com::sun::star::uno::Refe
                         sal_Int32 nLength = aUserData.getLength();
                         while( nLength-- )
                         {
-                            if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
+                            if ( p->Name == "node-type" )
                             {
                                 sal_Int16 nNodeType = 0;
                                 p->Value >>= nNodeType;
@@ -2222,7 +2222,7 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen
             {
             case 0: // event
             case 1: // call
-                if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "onstopaudio" ) ) )
+                if ( aParam == "onstopaudio" )
                 {
                     nCommand = EffectCommands::STOPAUDIO;
                 }
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 5b691d334522..c1a061d054f1 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1438,7 +1438,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SdXImpressDocument::getRenderer(
     sal_Bool bExportNotesPages = sal_False;
     for( sal_Int32 nProperty = 0, nPropertyCount = rxOptions.getLength(); nProperty < nPropertyCount; ++nProperty )
     {
-        if( rxOptions[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportNotesPages" ) ) )
+        if ( rxOptions[ nProperty ].Name == "ExportNotesPages" )
             rxOptions[ nProperty].Value >>= bExportNotesPages;
     }
     uno::Sequence< beans::PropertyValue > aRenderer;
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 82380b6cc652..c4f2566c8c84 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -447,7 +447,7 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName )
     {
         uno::Any aRet( mpShape->_getPropertyDefault(aPropertyName) );
 
-        if( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_shape_layername ) ) )
+        if ( aPropertyName == sUNO_shape_layername )
         {
             OUString aName;
             if( aRet >>= aName )
@@ -688,7 +688,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
     {
         uno::Any aAny( aValue );
 
-        if( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_shape_layername ) ) )
+        if ( aPropertyName == sUNO_shape_layername )
         {
             OUString aName;
             if( aAny >>= aName )
@@ -848,7 +848,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
     {
         aRet = mpShape->_getPropertyValue(PropertyName);
 
-        if( PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_shape_layername ) ) )
+        if ( PropertyName == sUNO_shape_layername )
         {
             OUString aName;
             if( aRet >>= aName )
@@ -1451,7 +1451,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno
                 sBuffer.append( aLibName );
                 sBuffer.append( sal_Unicode('.') );
 
-                if( aStrLibrary.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StarOffice" ) ) )
+                if ( aStrLibrary == "StarOffice" )
                 {
                     sBuffer.append( OUString( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ) );
                 }
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 4a8107a2ee46..5ad0394408cd 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1158,7 +1158,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB
                 {
                     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;
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 0af7f39b9054..673cfe83d453 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -565,7 +565,7 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence
     const com::sun::star::beans::PropertyValue *pValue = rSequence.getConstArray();
     for (sal_Int16 i = 0 ; i < nLength; i++, pValue++ )
     {
-        if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_ZoomOnPage ) ) )
+        if ( pValue->Name == sUNO_View_ZoomOnPage )
         {
             sal_Bool bZoomPage = sal_False;
             if( pValue->Value >>= bZoomPage )
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 9cf26a6c0187..8724d525bbcc 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -638,10 +638,10 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
         const com::sun::star::beans::PropertyValue *pValue = rSequence.getConstArray();
         for (sal_Int16 i = 0 ; i < nLength; i++, pValue++ )
         {
-            if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_ViewId ) ) )
+            if ( pValue->Name == sUNO_View_ViewId )
             {
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SnapLinesDrawing ) ) )
+            else if ( pValue->Name == sUNO_View_SnapLinesDrawing )
             {
                 if( pValue->Value >>= aString )
                 {
@@ -650,7 +650,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                     SetStandardHelpLines( aHelpLines );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SnapLinesNotes ) ) )
+            else if ( pValue->Name == sUNO_View_SnapLinesNotes )
             {
                 if( pValue->Value >>= aString )
                 {
@@ -659,7 +659,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                     SetNotesHelpLines( aHelpLines );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SnapLinesHandout ) ) )
+            else if ( pValue->Name == sUNO_View_SnapLinesHandout )
             {
                 if( pValue->Value >>= aString )
                 {
@@ -668,14 +668,14 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                     SetHandoutHelpLines( aHelpLines );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_RulerIsVisible ) ) )
+            else if ( pValue->Name == sUNO_View_RulerIsVisible )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetRuler( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_PageKind ) ) )
+            else if ( pValue->Name == sUNO_View_PageKind )
             {
                 if( pValue->Value >>= nInt16 )
                 {
@@ -686,7 +686,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                     SetPageKindOnLoad( (PageKind)nInt16 );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SelectedPage ) ) )
+            else if ( pValue->Name == sUNO_View_SelectedPage )
             {
                 if( pValue->Value >>= nInt16 )
                 {
@@ -697,35 +697,35 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                     SetSelectedPageOnLoad( (sal_uInt16)nInt16 );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsLayerMode ) ) )
+            else if ( pValue->Name == sUNO_View_IsLayerMode )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetLayerMode( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsDoubleClickTextEdit ) ) )
+            else if ( pValue->Name == sUNO_View_IsDoubleClickTextEdit )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetDoubleClickTextEdit( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsClickChangeRotation ) ) )
+            else if ( pValue->Name == sUNO_View_IsClickChangeRotation )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetClickChangeRotation( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SlidesPerRow ) ) )
+            else if ( pValue->Name == sUNO_View_SlidesPerRow )
             {
                 if( pValue->Value >>= nInt16 )
                 {
                     SetSlidesPerRow( (sal_uInt16)nInt16 );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EditModeStandard ) ) )
+            else if ( pValue->Name == sUNO_View_EditModeStandard )
             {
                 if( pValue->Value >>= nInt32 )
                 {
@@ -734,7 +734,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                         SetViewShEditMode( (EditMode)nInt32, PK_STANDARD );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EditModeNotes ) ) )
+            else if ( pValue->Name == sUNO_View_EditModeNotes )
             {
                 if( pValue->Value >>= nInt32 )
                 {
@@ -743,7 +743,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                         SetViewShEditMode( (EditMode)nInt32, PK_NOTES );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EditModeHandout ) ) )
+            else if ( pValue->Name == sUNO_View_EditModeHandout )
             {
                 if( pValue->Value >>= nInt32 )
                 {
@@ -752,7 +752,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                         SetViewShEditMode( (EditMode)nInt32, PK_HANDOUT );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleAreaTop ) ) )
+            else if ( pValue->Name == sUNO_View_VisibleAreaTop )
             {
                 sal_Int32 nTop = 0;
                 if( pValue->Value >>= nTop )
@@ -763,7 +763,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                     SetVisArea( aVisArea );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleAreaLeft ) ) )
+            else if ( pValue->Name == sUNO_View_VisibleAreaLeft )
             {
                 sal_Int32 nLeft = 0;
                 if( pValue->Value >>= nLeft )
@@ -774,7 +774,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                     SetVisArea( aVisArea );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleAreaWidth ) ) )
+            else if ( pValue->Name == sUNO_View_VisibleAreaWidth )
             {
                 sal_Int32 nWidth = 0;
                 if( pValue->Value >>= nWidth )
@@ -784,7 +784,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                     SetVisArea( aVisArea );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleAreaHeight ) ) )
+            else if ( pValue->Name == sUNO_View_VisibleAreaHeight )
             {
                 sal_Int32 nHeight = 0;
                 if( pValue->Value >>= nHeight )
@@ -795,7 +795,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                 }
             }
 
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridIsVisible ) ) )
+            else if ( pValue->Name == sUNO_View_GridIsVisible )
             {
                 if( pValue->Value >>= bBool )
                 {
@@ -803,98 +803,98 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                 }
             }
 
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapToGrid ) ) )
+            else if ( pValue->Name == sUNO_View_IsSnapToGrid )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetGridSnap( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridIsFront ) ) )
+            else if ( pValue->Name == sUNO_View_GridIsFront )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetGridFront( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapToPageMargins ) ) )
+            else if ( pValue->Name == sUNO_View_IsSnapToPageMargins )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetBordSnap( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapToSnapLines ) ) )
+            else if ( pValue->Name == sUNO_View_IsSnapToSnapLines )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetHlplSnap( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapToObjectFrame ) ) )
+            else if ( pValue->Name == sUNO_View_IsSnapToObjectFrame )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetOFrmSnap( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapToObjectPoints ) ) )
+            else if ( pValue->Name == sUNO_View_IsSnapToObjectPoints )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetOPntSnap( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsPlusHandlesAlwaysVisible ) ) )
+            else if ( pValue->Name == sUNO_View_IsPlusHandlesAlwaysVisible )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetPlusHandlesAlwaysVisible( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsFrameDragSingles ) ) )
+            else if ( pValue->Name == sUNO_View_IsFrameDragSingles )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetFrameDragSingles( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EliminatePolyPointLimitAngle ) ) )
+            else if ( pValue->Name == sUNO_View_EliminatePolyPointLimitAngle )
             {
                 if( pValue->Value >>= nInt32 )
                 {
                     SetEliminatePolyPointLimitAngle( nInt32 );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsEliminatePolyPoints ) ) )
+            else if ( pValue->Name == sUNO_View_IsEliminatePolyPoints )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetEliminatePolyPoints( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_ActiveLayer ) ) )
+            else if ( pValue->Name == sUNO_View_ActiveLayer )
             {
                 if( pValue->Value >>= aString )
                 {
                     SetActiveLayer( aString );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_NoAttribs ) ) )
+            else if ( pValue->Name == sUNO_View_NoAttribs )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetNoAttribs( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_NoColors ) ) )
+            else if ( pValue->Name == sUNO_View_NoColors )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetNoColors( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridCoarseWidth ) ) )
+            else if ( pValue->Name == sUNO_View_GridCoarseWidth )
             {
                 if( pValue->Value >>= nInt32 )
                 {
@@ -902,7 +902,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                     SetGridCoarse( aCoarse );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridCoarseHeight ) ) )
+            else if ( pValue->Name == sUNO_View_GridCoarseHeight )
             {
                 if( pValue->Value >>= nInt32 )
                 {
@@ -910,7 +910,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                     SetGridCoarse( aCoarse );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridFineWidth ) ) )
+            else if ( pValue->Name == sUNO_View_GridFineWidth )
             {
                 if( pValue->Value >>= nInt32 )
                 {
@@ -918,7 +918,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                     SetGridFine( aCoarse );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridFineHeight ) ) )
+            else if ( pValue->Name == sUNO_View_GridFineHeight )
             {
                 if( pValue->Value >>= nInt32 )
                 {
@@ -926,33 +926,33 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                     SetGridFine( aCoarse );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsAngleSnapEnabled ) ) )
+            else if ( pValue->Name == sUNO_View_IsAngleSnapEnabled )
             {
                 if( pValue->Value >>= bBool )
                 {
                     SetAngleSnapEnabled( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SnapAngle ) ) )
+            else if ( pValue->Name == sUNO_View_SnapAngle )
             {
                 if( pValue->Value >>= nInt32 )
                 {
                     SetSnapAngle( nInt32 );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridSnapWidthXNumerator ) ) )
+            else if ( pValue->Name == sUNO_View_GridSnapWidthXNumerator )
             {
                 pValue->Value >>= aSnapGridWidthXNum;
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridSnapWidthXDenominator ) ) )
+            else if ( pValue->Name == sUNO_View_GridSnapWidthXDenominator )
             {
                 pValue->Value >>= aSnapGridWidthXDom;
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridSnapWidthYNumerator ) ) )
+            else if ( pValue->Name == sUNO_View_GridSnapWidthYNumerator )
             {
                 pValue->Value >>= aSnapGridWidthYNum;
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_GridSnapWidthYDenominator ) ) )
+            else if ( pValue->Name == sUNO_View_GridSnapWidthYDenominator )
             {
                 pValue->Value >>= aSnapGridWidthYDom;
             }
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 062cf34dc94c..1640b73bb471 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1938,7 +1938,7 @@ void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfos )
             if( pStyleSheet )
             {
                 const OUString aName( pStyleSheet->GetApiName() );
-                if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("title" ) ) )
+                if ( aName == "title" )
                     bPage = true;
             }
         }