Merge remote-tracking branch 'origin/master'

18 files changed, 285 insertions, 331 deletions

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 5d5cef47331e..b553ca18cc10 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -428,7 +428,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
     sd/source/ui/unoidl/randomnode \
     sd/source/ui/unoidl/unocpres \
     sd/source/ui/unoidl/unodoc \
-    sd/source/ui/unoidl/unokywds \
     sd/source/ui/unoidl/unolayer \
     sd/source/ui/unoidl/unomodel \
     sd/source/ui/unoidl/unomodule \
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/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index 89c77b204ba6..8210979f6ba9 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -29,187 +29,179 @@
 #ifndef _SD_UNOKYWDS_HXX_
 #define _SD_UNOKYWDS_HXX_
 
-#include <tools/solar.h>
-
-#ifndef SD_DEFINE_KEYWORDS
-#define SD_CONSTASCII_ACTION( n, s ) extern sal_Char n[sizeof(s)]
-#else
-#define SD_CONSTASCII_ACTION( n, s ) sal_Char n[sizeof(s)] = s
-#endif
-
 #define UNO_PREFIX "com.sun.star."
 
 // SdXImpressDocument
-SD_CONSTASCII_ACTION( sUNO_Service_DrawingDocument, UNO_PREFIX "drawing.DrawingDocument" );
-SD_CONSTASCII_ACTION( sUNO_Service_PresentationDocument, UNO_PREFIX "drawing.PresentationDocument" );
+const char sUNO_Service_DrawingDocument[] = UNO_PREFIX "drawing.DrawingDocument";
+const char sUNO_Service_PresentationDocument[] = UNO_PREFIX "drawing.PresentationDocument";
 
 // SdUnoStyleFamilies
-SD_CONSTASCII_ACTION( sUNO_SdUnoStyleFamilies, "SdUnoStyleFamilies" );
-SD_CONSTASCII_ACTION( sUNO_Graphic_Style_Family_Name, "graphics" );
+const char sUNO_SdUnoStyleFamilies[] = "SdUnoStyleFamilies";
+const char sUNO_Graphic_Style_Family_Name[] = "graphics";
 
 // SdUnoPseudoStyleFamily
-SD_CONSTASCII_ACTION( sUNO_SdUnoPseudoStyleFamily, "SdUnoPseudoStyleFamily" );
-SD_CONSTASCII_ACTION( sUNO_PseudoSheet_Title, "title" );
-SD_CONSTASCII_ACTION( sUNO_PseudoSheet_SubTitle, "subtitle" );
-SD_CONSTASCII_ACTION( sUNO_PseudoSheet_Background, "background" );
-SD_CONSTASCII_ACTION( sUNO_PseudoSheet_Background_Objects, "backgroundobjects" );
-SD_CONSTASCII_ACTION( sUNO_PseudoSheet_Notes, "notes" );
-SD_CONSTASCII_ACTION( sUNO_PseudoSheet_Outline1, "outline1" );
-SD_CONSTASCII_ACTION( sUNO_PseudoSheet_Outline2, "outline2" );
-SD_CONSTASCII_ACTION( sUNO_PseudoSheet_Outline3, "outline3" );
-SD_CONSTASCII_ACTION( sUNO_PseudoSheet_Outline4, "outline4" );
-SD_CONSTASCII_ACTION( sUNO_PseudoSheet_Outline5, "outline5" );
-SD_CONSTASCII_ACTION( sUNO_PseudoSheet_Outline6, "outline6" );
-SD_CONSTASCII_ACTION( sUNO_PseudoSheet_Outline7, "outline7" );
-SD_CONSTASCII_ACTION( sUNO_PseudoSheet_Outline8, "outline8" );
-SD_CONSTASCII_ACTION( sUNO_PseudoSheet_Outline9, "outline9" );
+const char sUNO_SdUnoPseudoStyleFamily[] = "SdUnoPseudoStyleFamily";
+const char sUNO_PseudoSheet_Title[] = "title";
+const char sUNO_PseudoSheet_SubTitle[] = "subtitle";
+const char sUNO_PseudoSheet_Background[] = "background";
+const char sUNO_PseudoSheet_Background_Objects[] = "backgroundobjects";
+const char sUNO_PseudoSheet_Notes[] = "notes";
+const char sUNO_PseudoSheet_Outline1[] = "outline1";
+const char sUNO_PseudoSheet_Outline2[] = "outline2";
+const char sUNO_PseudoSheet_Outline3[] = "outline3";
+const char sUNO_PseudoSheet_Outline4[] = "outline4";
+const char sUNO_PseudoSheet_Outline5[] = "outline5";
+const char sUNO_PseudoSheet_Outline6[] = "outline6";
+const char sUNO_PseudoSheet_Outline7[] = "outline7";
+const char sUNO_PseudoSheet_Outline8[] = "outline8";
+const char sUNO_PseudoSheet_Outline9[] = "outline9";
 
 // SdUnoPseudoStyle
-SD_CONSTASCII_ACTION( sUNO_SdUnoPseudoStyle, "SdUnoPseudoStyle" );
+const char sUNO_SdUnoPseudoStyle[] = "SdUnoPseudoStyle";
 
 // SdUnoGraphicStyleFamily
-SD_CONSTASCII_ACTION( sUNO_SdUnoGraphicStyleFamily, "SdUnoGraphicStyleFamily" );
-SD_CONSTASCII_ACTION( sUNO_StyleName_standard, "standard" );
-SD_CONSTASCII_ACTION( sUNO_StyleName_objwitharrow, "objectwitharrow" );
-SD_CONSTASCII_ACTION( sUNO_StyleName_objwithshadow, "objectwithshadow" );
-SD_CONSTASCII_ACTION( sUNO_StyleName_objwithoutfill, "objectwithoutfill" );
-SD_CONSTASCII_ACTION( sUNO_StyleName_text, "text" );
-SD_CONSTASCII_ACTION( sUNO_StyleName_textbody, "textbody" );
-SD_CONSTASCII_ACTION( sUNO_StyleName_textbodyjust, "textbodyjustfied" );
-SD_CONSTASCII_ACTION( sUNO_StyleName_textbodyindent, "textbodyindent" );
-SD_CONSTASCII_ACTION( sUNO_StyleName_title, "title" );
-SD_CONSTASCII_ACTION( sUNO_StyleName_title1, "title1" );
-SD_CONSTASCII_ACTION( sUNO_StyleName_title2, "title2" );
-SD_CONSTASCII_ACTION( sUNO_StyleName_headline, "headline" );
-SD_CONSTASCII_ACTION( sUNO_StyleName_headline1, "headline1" );
-SD_CONSTASCII_ACTION( sUNO_StyleName_headline2, "headline2" );
-SD_CONSTASCII_ACTION( sUNO_StyleName_measure, "measure" );
+const char sUNO_SdUnoGraphicStyleFamily[] = "SdUnoGraphicStyleFamily";
+const char sUNO_StyleName_standard[] = "standard";
+const char sUNO_StyleName_objwitharrow[] = "objectwitharrow";
+const char sUNO_StyleName_objwithshadow[] = "objectwithshadow";
+const char sUNO_StyleName_objwithoutfill[] = "objectwithoutfill";
+const char sUNO_StyleName_text[] = "text";
+const char sUNO_StyleName_textbody[] = "textbody";
+const char sUNO_StyleName_textbodyjust[] = "textbodyjustfied";
+const char sUNO_StyleName_textbodyindent[] = "textbodyindent";
+const char sUNO_StyleName_title[] = "title";
+const char sUNO_StyleName_title1[] = "title1";
+const char sUNO_StyleName_title2[] = "title2";
+const char sUNO_StyleName_headline[] = "headline";
+const char sUNO_StyleName_headline1[] = "headline1";
+const char sUNO_StyleName_headline2[] = "headline2";
+const char sUNO_StyleName_measure[] = "measure";
 
 // SdUnoGraphicStyle
-SD_CONSTASCII_ACTION( sUNO_SdUnoGraphicStyle, "SdUnoGraphicStyle" );
+const char sUNO_SdUnoGraphicStyle[] = "SdUnoGraphicStyle";
 
 // SdUnoPageBackground
-SD_CONSTASCII_ACTION( sUNO_SdUnoPageBackground, "SdUnoPageBackground" );
+const char sUNO_SdUnoPageBackground[] = "SdUnoPageBackground";
 
 // SdLayerManager
-SD_CONSTASCII_ACTION( sUNO_SdLayerManager, "SdUnoLayerManager" );
+const char sUNO_SdLayerManager[] = "SdUnoLayerManager";
 
 // SdLayer
-SD_CONSTASCII_ACTION( sUNO_SdLayer, "SdUnoLayer" );
-SD_CONSTASCII_ACTION( sUNO_LayerName_background,         "background" );
-SD_CONSTASCII_ACTION( sUNO_LayerName_background_objects, "backgroundobjects" );
-SD_CONSTASCII_ACTION( sUNO_LayerName_layout,             "layout" );
-SD_CONSTASCII_ACTION( sUNO_LayerName_controls,           "controls" );
-SD_CONSTASCII_ACTION( sUNO_LayerName_measurelines,       "measurelines" );
+const char sUNO_SdLayer[] = "SdUnoLayer";
+const char sUNO_LayerName_background[] = "background";
+const char sUNO_LayerName_background_objects[] = "backgroundobjects";
+const char sUNO_LayerName_layout[] = "layout";
+const char sUNO_LayerName_controls[] = "controls";
+const char sUNO_LayerName_measurelines[] = "measurelines";
 
 // SdXShape
-SD_CONSTASCII_ACTION( sUNO_shape_style, "Style" );
-SD_CONSTASCII_ACTION( sUNO_shape_layername, "LayerName" );
-SD_CONSTASCII_ACTION( sUNO_shape_zorder, "ZOrder" );
+const char sUNO_shape_style[] = "Style";
+const char sUNO_shape_layername[] = "LayerName";
+const char sUNO_shape_zorder[] = "ZOrder";
 
 // services
-SD_CONSTASCII_ACTION( sUNO_Service_StyleFamily, UNO_PREFIX "style.StyleFamily" );
-SD_CONSTASCII_ACTION( sUNO_Service_StyleFamilies, UNO_PREFIX "style.StyleFamilies" );
-SD_CONSTASCII_ACTION( sUNO_Service_Style, UNO_PREFIX "style.Style" );
-SD_CONSTASCII_ACTION( sUNO_Service_FillProperties, UNO_PREFIX "drawing.FillProperties" );
-SD_CONSTASCII_ACTION( sUNO_Service_LineProperties, UNO_PREFIX "drawing.LineProperties" );
-SD_CONSTASCII_ACTION( sUNO_Service_ParagraphProperties, UNO_PREFIX "style.ParagraphProperties" );
-SD_CONSTASCII_ACTION( sUNO_Service_CharacterProperties, UNO_PREFIX "style.CharacterProperties" );
-SD_CONSTASCII_ACTION( sUNO_Service_Text, UNO_PREFIX "drawing.Text" );
-SD_CONSTASCII_ACTION( sUNO_Service_TextProperties, UNO_PREFIX "drawing.TextProperties" );
-SD_CONSTASCII_ACTION( sUNO_Service_ShadowProperties, UNO_PREFIX "drawing.ShadowProperties" );
-SD_CONSTASCII_ACTION( sUNO_Service_ConnectorProperties, UNO_PREFIX "drawing.ConnectorProperties" );
-SD_CONSTASCII_ACTION( sUNO_Service_MeasureProperties, UNO_PREFIX "drawing.MeasureProperties" );
-SD_CONSTASCII_ACTION( sUNO_Service_PageBackground, UNO_PREFIX "drawing.PageBackground" );
-SD_CONSTASCII_ACTION( sUNO_Service_DrawingLayer, UNO_PREFIX "drawing.Layer" );
-SD_CONSTASCII_ACTION( sUNO_Service_DrawingLayerManager, UNO_PREFIX "drawing.LayerManager" );
-SD_CONSTASCII_ACTION( sUNO_Service_GraphicObjectShape, UNO_PREFIX "drawing.GraphicObjectShape" );
-SD_CONSTASCII_ACTION( sUNO_Service_ImageMapRectangleObject, UNO_PREFIX "image.ImageMapRectangleObject" );
-SD_CONSTASCII_ACTION( sUNO_Service_ImageMapCircleObject, UNO_PREFIX "image.ImageMapCircleObject" );
-SD_CONSTASCII_ACTION( sUNO_Service_ImageMapPolygonObject, UNO_PREFIX "image.ImageMapPolygonObject" );
+const char sUNO_Service_StyleFamily[] = UNO_PREFIX "style.StyleFamily";
+const char sUNO_Service_StyleFamilies[] = UNO_PREFIX "style.StyleFamilies";
+const char sUNO_Service_Style[] = UNO_PREFIX "style.Style";
+const char sUNO_Service_FillProperties[] = UNO_PREFIX "drawing.FillProperties";
+const char sUNO_Service_LineProperties[] = UNO_PREFIX "drawing.LineProperties";
+const char sUNO_Service_ParagraphProperties[] = UNO_PREFIX "style.ParagraphProperties";
+const char sUNO_Service_CharacterProperties[] = UNO_PREFIX "style.CharacterProperties";
+const char sUNO_Service_Text[] = UNO_PREFIX "drawing.Text";
+const char sUNO_Service_TextProperties[] = UNO_PREFIX "drawing.TextProperties";
+const char sUNO_Service_ShadowProperties[] = UNO_PREFIX "drawing.ShadowProperties";
+const char sUNO_Service_ConnectorProperties[] = UNO_PREFIX "drawing.ConnectorProperties";
+const char sUNO_Service_MeasureProperties[] = UNO_PREFIX "drawing.MeasureProperties";
+const char sUNO_Service_PageBackground[] = UNO_PREFIX "drawing.PageBackground";
+const char sUNO_Service_DrawingLayer[] = UNO_PREFIX "drawing.Layer";
+const char sUNO_Service_DrawingLayerManager[] = UNO_PREFIX "drawing.LayerManager";
+const char sUNO_Service_GraphicObjectShape[] = UNO_PREFIX "drawing.GraphicObjectShape";
+const char sUNO_Service_ImageMapRectangleObject[] = UNO_PREFIX "image.ImageMapRectangleObject";
+const char sUNO_Service_ImageMapCircleObject[] = UNO_PREFIX "image.ImageMapCircleObject";
+const char sUNO_Service_ImageMapPolygonObject[] = UNO_PREFIX "image.ImageMapPolygonObject";
 
 // properties
-SD_CONSTASCII_ACTION( sUNO_Prop_Background,             "Background" );
-SD_CONSTASCII_ACTION( sUNO_Prop_ForbiddenCharacters,    "ForbiddenCharacters" );
-SD_CONSTASCII_ACTION( sUNO_Prop_MapUnit,                "MapUnit" );
-SD_CONSTASCII_ACTION( sUNO_Prop_VisibleArea,            "VisibleArea" );
-SD_CONSTASCII_ACTION( sUNO_Prop_Aspect,                 "Aspect" );
-SD_CONSTASCII_ACTION( sUNO_Prop_TabStop,                "TabStop" );
-SD_CONSTASCII_ACTION( sUNO_Prop_CharLocale,             "CharLocale" );
-SD_CONSTASCII_ACTION( sUNO_Prop_AutomContFocus,         "AutomaticControlFocus" );
-SD_CONSTASCII_ACTION( sUNO_Prop_ApplyFrmDsgnMode,       "ApplyFormDesignMode" );
-SD_CONSTASCII_ACTION( sUNO_Prop_IsBackgroundVisible,    "IsBackgroundVisible" );
-SD_CONSTASCII_ACTION( sUNO_Prop_IsBackgroundObjectsVisible, "IsBackgroundObjectsVisible" );
-SD_CONSTASCII_ACTION( sUNO_Prop_UserDefinedAttributes, "UserDefinedAttributes" );
-SD_CONSTASCII_ACTION( sUNO_Prop_BookmarkURL,            "BookmarkURL" );
-SD_CONSTASCII_ACTION( sUNO_Prop_RuntimeUID,             "RuntimeUID" );
-SD_CONSTASCII_ACTION( sUNO_Prop_HasValidSignatures,     "HasValidSignatures" );
+const char sUNO_Prop_Background[] = "Background";
+const char sUNO_Prop_ForbiddenCharacters[] = "ForbiddenCharacters";
+const char sUNO_Prop_MapUnit[] = "MapUnit";
+const char sUNO_Prop_VisibleArea[] = "VisibleArea";
+const char sUNO_Prop_Aspect[] = "Aspect";
+const char sUNO_Prop_TabStop[] = "TabStop";
+const char sUNO_Prop_CharLocale[] = "CharLocale";
+const char sUNO_Prop_AutomContFocus[] = "AutomaticControlFocus";
+const char sUNO_Prop_ApplyFrmDsgnMode[] = "ApplyFormDesignMode";
+const char sUNO_Prop_IsBackgroundVisible[] = "IsBackgroundVisible";
+const char sUNO_Prop_IsBackgroundObjectsVisible[] = "IsBackgroundObjectsVisible";
+const char sUNO_Prop_UserDefinedAttributes[] = "UserDefinedAttributes";
+const char sUNO_Prop_BookmarkURL[] = "BookmarkURL";
+const char sUNO_Prop_RuntimeUID[] = "RuntimeUID";
+const char sUNO_Prop_HasValidSignatures[] = "HasValidSignatures";
 
 // view settings
-SD_CONSTASCII_ACTION( sUNO_View_ViewId,                         "ViewId" );
-SD_CONSTASCII_ACTION( sUNO_View_SnapLinesDrawing,               "SnapLinesDrawing" );
-SD_CONSTASCII_ACTION( sUNO_View_SnapLinesNotes,                 "SnapLinesNotes" );
-SD_CONSTASCII_ACTION( sUNO_View_SnapLinesHandout,               "SnapLinesHandout" );
-SD_CONSTASCII_ACTION( sUNO_View_RulerIsVisible,                 "RulerIsVisible" );
-SD_CONSTASCII_ACTION( sUNO_View_PageKind,                       "PageKind" );
-SD_CONSTASCII_ACTION( sUNO_View_SelectedPage,                   "SelectedPage" );
-SD_CONSTASCII_ACTION( sUNO_View_IsLayerMode,                    "IsLayerMode" );
-SD_CONSTASCII_ACTION( sUNO_View_IsQuickEdit,                    "IsQuickEdit" );
-SD_CONSTASCII_ACTION( sUNO_View_IsDoubleClickTextEdit,          "IsDoubleClickTextEdit" );
-SD_CONSTASCII_ACTION( sUNO_View_IsClickChangeRotation,          "IsClickChangeRotation" );
-SD_CONSTASCII_ACTION( sUNO_View_IsDragWithCopy,                 "IsDragWithCopy" );
-SD_CONSTASCII_ACTION( sUNO_View_SlidesPerRow,                   "SlidesPerRow" );
-SD_CONSTASCII_ACTION( sUNO_View_DrawMode,                       "DrawMode" );
-SD_CONSTASCII_ACTION( sUNO_View_PreviewDrawMode,                "PreviewDrawMode" );
-SD_CONSTASCII_ACTION( sUNO_View_IsShowPreviewInPageMode,        "IsShowPreviewInPageMode" );
-SD_CONSTASCII_ACTION( sUNO_View_IsShowPreviewInMasterPageMode,  "IsShowPreviewInMasterPageMode" );
-SD_CONSTASCII_ACTION( sUNO_View_SetShowPreviewInOutlineMode,    "SetShowPreviewInOutlineMode" );
-SD_CONSTASCII_ACTION( sUNO_View_EditModeStandard,               "EditModeStandard" );
-SD_CONSTASCII_ACTION( sUNO_View_EditModeNotes,                  "EditModeNotes" );
-SD_CONSTASCII_ACTION( sUNO_View_EditModeHandout,                "EditModeHandout" );
-SD_CONSTASCII_ACTION( sUNO_View_VisArea,                        "VisArea" );
-
-SD_CONSTASCII_ACTION( sUNO_View_GridIsVisible,                  "GridIsVisible" );
-SD_CONSTASCII_ACTION( sUNO_View_GridIsFront,                    "GridIsFront" );
-SD_CONSTASCII_ACTION( sUNO_View_IsSnapToGrid,                   "IsSnapToGrid" );
-SD_CONSTASCII_ACTION( sUNO_View_IsSnapToPageMargins,            "IsSnapToPageMargins" );
-SD_CONSTASCII_ACTION( sUNO_View_IsSnapToSnapLines,              "IsSnapToSnapLines" );
-SD_CONSTASCII_ACTION( sUNO_View_IsSnapToObjectFrame,            "IsSnapToObjectFrame" );
-SD_CONSTASCII_ACTION( sUNO_View_IsSnapToObjectPoints,           "IsSnapToObjectPoints" );
-SD_CONSTASCII_ACTION( sUNO_View_IsSnapLinesVisible,             "IsSnapLinesVisible" );
-SD_CONSTASCII_ACTION( sUNO_View_IsDragStripes,                  "IsDragStripes" );
-SD_CONSTASCII_ACTION( sUNO_View_IsPlusHandlesAlwaysVisible,     "IsPlusHandlesAlwaysVisible" );
-SD_CONSTASCII_ACTION( sUNO_View_IsFrameDragSingles,             "IsFrameDragSingles" );
-SD_CONSTASCII_ACTION( sUNO_View_IsMarkedHitMovesAlways,         "IsMarkedHitMovesAlways" );
-SD_CONSTASCII_ACTION( sUNO_View_EliminatePolyPointLimitAngle,   "EliminatePolyPointLimitAngle" );
-SD_CONSTASCII_ACTION( sUNO_View_IsEliminatePolyPoints,          "IsEliminatePolyPoints" );
-SD_CONSTASCII_ACTION( sUNO_View_IsLineDraft,                    "IsLineDraft" );
-SD_CONSTASCII_ACTION( sUNO_View_IsFillDraft,                    "IsFillDraft" );
-SD_CONSTASCII_ACTION( sUNO_View_IsTextDraft,                    "IsTextDraft" );
-SD_CONSTASCII_ACTION( sUNO_View_IsGrafDraft,                    "IsGrafDraft" );
-SD_CONSTASCII_ACTION( sUNO_View_ActiveLayer,                    "ActiveLayer" );
-SD_CONSTASCII_ACTION( sUNO_View_NoAttribs,                      "NoAttribs" );
-SD_CONSTASCII_ACTION( sUNO_View_NoColors,                       "NoColors" );
-SD_CONSTASCII_ACTION( sUNO_View_GridCoarseWidth,                "GridCoarseWidth" );
-SD_CONSTASCII_ACTION( sUNO_View_GridCoarseHeight,               "GridCoarseHeight" );
-SD_CONSTASCII_ACTION( sUNO_View_GridFineWidth,                  "GridFineWidth" );
-SD_CONSTASCII_ACTION( sUNO_View_GridFineHeight,                 "GridFineHeight" );
-SD_CONSTASCII_ACTION( sUNO_View_IsAngleSnapEnabled,             "IsAngleSnapEnabled" );
-SD_CONSTASCII_ACTION( sUNO_View_SnapAngle,                      "SnapAngle" );
-SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthXNumerator,        "GridSnapWidthXNumerator" );
-SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthXDenominator,      "GridSnapWidthXDenominator" );
-SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthYNumerator,        "GridSnapWidthYNumerator" );
-SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthYDenominator,      "GridSnapWidthYDenominator" );
-SD_CONSTASCII_ACTION( sUNO_View_VisibleLayers,                  "VisibleLayers" );
-SD_CONSTASCII_ACTION( sUNO_View_PrintableLayers,                "PrintableLayers" );
-SD_CONSTASCII_ACTION( sUNO_View_LockedLayers,                   "LockedLayers" );
-
-SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaTop,                 "VisibleAreaTop" );
-SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaLeft,                "VisibleAreaLeft" );
-SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaWidth,               "VisibleAreaWidth" );
-SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaHeight,              "VisibleAreaHeight" );
-
-SD_CONSTASCII_ACTION( sUNO_View_ZoomOnPage,                     "ZoomOnPage" );
+const char sUNO_View_ViewId[] = "ViewId";
+const char sUNO_View_SnapLinesDrawing[] = "SnapLinesDrawing";
+const char sUNO_View_SnapLinesNotes[] = "SnapLinesNotes";
+const char sUNO_View_SnapLinesHandout[] = "SnapLinesHandout";
+const char sUNO_View_RulerIsVisible[] = "RulerIsVisible";
+const char sUNO_View_PageKind[] = "PageKind";
+const char sUNO_View_SelectedPage[] = "SelectedPage";
+const char sUNO_View_IsLayerMode[] = "IsLayerMode";
+const char sUNO_View_IsQuickEdit[] = "IsQuickEdit";
+const char sUNO_View_IsDoubleClickTextEdit[] = "IsDoubleClickTextEdit";
+const char sUNO_View_IsClickChangeRotation[] = "IsClickChangeRotation";
+const char sUNO_View_IsDragWithCopy[] = "IsDragWithCopy";
+const char sUNO_View_SlidesPerRow[] = "SlidesPerRow";
+const char sUNO_View_DrawMode[] = "DrawMode";
+const char sUNO_View_PreviewDrawMode[] = "PreviewDrawMode";
+const char sUNO_View_IsShowPreviewInPageMode[] = "IsShowPreviewInPageMode";
+const char sUNO_View_IsShowPreviewInMasterPageMode[] = "IsShowPreviewInMasterPageMode";
+const char sUNO_View_SetShowPreviewInOutlineMode[] = "SetShowPreviewInOutlineMode";
+const char sUNO_View_EditModeStandard[] = "EditModeStandard";
+const char sUNO_View_EditModeNotes[] = "EditModeNotes";
+const char sUNO_View_EditModeHandout[] = "EditModeHandout";
+const char sUNO_View_VisArea[] = "VisArea";
+
+const char sUNO_View_GridIsVisible[] = "GridIsVisible";
+const char sUNO_View_GridIsFront[] = "GridIsFront";
+const char sUNO_View_IsSnapToGrid[] = "IsSnapToGrid";
+const char sUNO_View_IsSnapToPageMargins[] = "IsSnapToPageMargins";
+const char sUNO_View_IsSnapToSnapLines[] = "IsSnapToSnapLines";
+const char sUNO_View_IsSnapToObjectFrame[] = "IsSnapToObjectFrame";
+const char sUNO_View_IsSnapToObjectPoints[] = "IsSnapToObjectPoints";
+const char sUNO_View_IsSnapLinesVisible[] = "IsSnapLinesVisible";
+const char sUNO_View_IsDragStripes[] = "IsDragStripes";
+const char sUNO_View_IsPlusHandlesAlwaysVisible[] = "IsPlusHandlesAlwaysVisible";
+const char sUNO_View_IsFrameDragSingles[] = "IsFrameDragSingles";
+const char sUNO_View_IsMarkedHitMovesAlways[] = "IsMarkedHitMovesAlways";
+const char sUNO_View_EliminatePolyPointLimitAngle[] = "EliminatePolyPointLimitAngle";
+const char sUNO_View_IsEliminatePolyPoints[] = "IsEliminatePolyPoints";
+const char sUNO_View_IsLineDraft[] = "IsLineDraft";
+const char sUNO_View_IsFillDraft[] = "IsFillDraft";
+const char sUNO_View_IsTextDraft[] = "IsTextDraft";
+const char sUNO_View_IsGrafDraft[] = "IsGrafDraft";
+const char sUNO_View_ActiveLayer[] = "ActiveLayer";
+const char sUNO_View_NoAttribs[] = "NoAttribs";
+const char sUNO_View_NoColors[] = "NoColors";
+const char sUNO_View_GridCoarseWidth[] = "GridCoarseWidth";
+const char sUNO_View_GridCoarseHeight[] = "GridCoarseHeight";
+const char sUNO_View_GridFineWidth[] = "GridFineWidth";
+const char sUNO_View_GridFineHeight[] = "GridFineHeight";
+const char sUNO_View_IsAngleSnapEnabled[] = "IsAngleSnapEnabled";
+const char sUNO_View_SnapAngle[] = "SnapAngle";
+const char sUNO_View_GridSnapWidthXNumerator[] = "GridSnapWidthXNumerator";
+const char sUNO_View_GridSnapWidthXDenominator[] = "GridSnapWidthXDenominator";
+const char sUNO_View_GridSnapWidthYNumerator[] = "GridSnapWidthYNumerator";
+const char sUNO_View_GridSnapWidthYDenominator[] = "GridSnapWidthYDenominator";
+const char sUNO_View_VisibleLayers[] = "VisibleLayers";
+const char sUNO_View_PrintableLayers[] = "PrintableLayers";
+const char sUNO_View_LockedLayers[] = "LockedLayers";
+
+const char sUNO_View_VisibleAreaTop[] = "VisibleAreaTop";
+const char sUNO_View_VisibleAreaLeft[] = "VisibleAreaLeft";
+const char sUNO_View_VisibleAreaWidth[] = "VisibleAreaWidth";
+const char sUNO_View_VisibleAreaHeight[] = "VisibleAreaHeight";
+
+const char sUNO_View_ZoomOnPage[] = "ZoomOnPage";
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/unoidl/unokywds.cxx b/sd/source/ui/unoidl/unokywds.cxx
deleted file mode 100644
index 30a7d98d0bca..000000000000
--- a/sd/source/ui/unoidl/unokywds.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifndef _SD_UNOKYWDS_HXX_
-#define SD_DEFINE_KEYWORDS
-#include <unokywds.hxx>
-#undef SD_DEFINE_KEYWORDS
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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;
             }
         }