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

12 files changed, 75 insertions, 75 deletions

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 )