[Libreoffice-commits] .: sd/source slideshow/test

Thomas Arnhold tarnhold at kemper.freedesktop.org
Thu Jan 20 02:32:45 PST 2011


 sd/source/core/CustomAnimationEffect.cxx    |   22 +++++++++++-----------
 sd/source/core/TransitionPreset.cxx         |    2 +-
 sd/source/filter/eppt/epptso.cxx            |    2 +-
 sd/source/filter/eppt/pptexanimations.cxx   |    2 +-
 sd/source/filter/eppt/pptx-epptooxml.cxx    |   28 ++++++++++++++--------------
 sd/source/filter/html/HtmlOptionsDialog.cxx |    4 ++--
 sd/source/filter/ppt/pptinanimations.cxx    |   14 +++++++-------
 sd/source/ui/dlg/dlgass.cxx                 |    2 +-
 sd/source/ui/unoidl/unomodel.cxx            |    8 ++++----
 sd/source/ui/view/DocumentRenderer.cxx      |    4 ++--
 sd/source/ui/view/ViewShellBase.cxx         |    2 +-
 slideshow/test/demoshow.cxx                 |    4 ++--
 12 files changed, 47 insertions(+), 47 deletions(-)

New commits:
commit efba0936c1dec3e9524e39f35d8e4052a4683574
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Thu Jan 20 10:34:08 2011 +0100

    Replace suitable equalsAscii calls with equalsAsciiL.
    
    Done with sed -i 's%\(\.equalsAscii\)(\(\s\?"[^"]\+"\)\(\s\?\))%\1L(\3RTL_CONSTASCII_STRINGPARAM(\2\3)\3)%g'.

diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index dfd03be..9555384 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.equalsAscii( "node-type" ) )
+        if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
         {
             p->Value >>= mnNodeType;
         }
-        else if( p->Name.equalsAscii( "preset-id" ) )
+        else if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-id" ) ) )
         {
             p->Value >>= maPresetId;
         }
-        else if( p->Name.equalsAscii( "preset-sub-type" ) )
+        else if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-sub-type" ) ) )
         {
             p->Value >>= maPresetSubType;
         }
-        else if( p->Name.equalsAscii( "preset-class" ) )
+        else if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-class" ) ) )
         {
             p->Value >>= mnPresetClass;
         }
-        else if( p->Name.equalsAscii( "preset-property" ) )
+        else if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-property" ) ) )
         {
             p->Value >>= maProperty;
         }
-        else if( p->Name.equalsAscii( "group-id" ) )
+        else if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "group-id" ) ) )
         {
             p->Value >>= mnGroupId;
         }
@@ -417,7 +417,7 @@ sal_Int32 CustomAnimationEffect::get_node_type( const Reference< XAnimationNode
             const NamedValue* p = aUserData.getConstArray();
             while( nLength-- )
             {
-                if( p->Name.equalsAscii( "node-type" ) )
+                if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
                 {
                     p->Value >>= nNodeType;
                     break;
@@ -449,7 +449,7 @@ void CustomAnimationEffect::setPresetClass( sal_Int16 nPresetClass )
                 NamedValue* p = aUserData.getArray();
                 while( nLength-- )
                 {
-                    if( p->Name.equalsAscii( "preset-class" ) )
+                    if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-class" ) ) )
                     {
                         p->Value <<= mnPresetClass;
                         bFound = true;
@@ -490,7 +490,7 @@ void CustomAnimationEffect::setNodeType( sal_Int16 nNodeType )
                 NamedValue* p = aUserData.getArray();
                 while( nLength-- )
                 {
-                    if( p->Name.equalsAscii( "node-type" ) )
+                    if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
                     {
                         p->Value <<= mnNodeType;
                         bFound = true;
@@ -531,7 +531,7 @@ void CustomAnimationEffect::setGroupId( sal_Int32 nGroupId )
             NamedValue* p = aUserData.getArray();
             while( nLength-- )
             {
-                if( p->Name.equalsAscii( "group-id" ) )
+                if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "group-id" ) ) )
                 {
                     p->Value <<= mnGroupId;
                     bFound = true;
@@ -3140,7 +3140,7 @@ void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode >
 
         while( nLength-- )
         {
-            if( p->Name.equalsAscii( "master-element" ) )
+            if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "master-element" ) ) )
             {
                 p->Value >>= xMaster;
                 break;
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index b567d43..c4b2cf8 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -82,7 +82,7 @@ TransitionPreset::TransitionPreset( const ::com::sun::star::uno::Reference< ::co
     const NamedValue* p = aUserData.getConstArray();
     while( nLength-- )
     {
-        if( p->Name.equalsAscii( "preset-id" ) )
+        if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-id" ) ) )
         {
             p->Value >>= maPresetId;
             break;
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 0297952..4733296 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2350,7 +2350,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                 sal_uInt32 nMirrorFlags;
                 rtl::OUString sCustomShapeType;
                 MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( mXShape, nMirrorFlags, sCustomShapeType );
-                if ( sCustomShapeType.equalsAscii( "col-502ad400" ) || sCustomShapeType.equalsAscii( "col-60da8460" ) )
+                if ( sCustomShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "col-502ad400" ) ) || sCustomShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "col-60da8460" ) ) )
                 {   // sj: creating metafile for customshapes that can't be saved to ms format properly
                     ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer );
                     if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False ) )
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index ae83076..342f719 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -396,7 +396,7 @@ void AnimationExporter::processAfterEffectNodes( const Reference< XAnimationNode
 
                                     while( nLength-- )
                                     {
-                                        if( p->Name.equalsAscii( "master-element" ) )
+                                        if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "master-element" ) ) )
                                         {
                                             p->Value >>= xMaster;
                                             break;
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index ce801ee..ce72c44 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -236,43 +236,43 @@ ShapeExport& PowerPointShapeExport::WriteTextShape( Reference< XShape > xShape )
 
     DBG(printf( "shape(text): %s\n", USS(sShapeType) ));
 
-    if( sShapeType.equalsAscii( "com.sun.star.drawing.TextShape" ) )
+    if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.TextShape" ) ) )
     {
     ShapeExport::WriteTextShape( xShape );
     }
-    else if( sShapeType.equalsAscii( "com.sun.star.presentation.DateTimeShape" ) )
+    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.DateTimeShape" ) ) )
     {
         if( !WritePlaceholder( xShape, DateAndTime, mbMaster ) )
             ShapeExport::WriteTextShape( xShape );
     }
-    else if( sShapeType.equalsAscii( "com.sun.star.presentation.FooterShape" ) )
+    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.FooterShape" ) ) )
     {
         if( !WritePlaceholder( xShape, Footer, mbMaster ) )
             ShapeExport::WriteTextShape( xShape );
     }
-    else if( sShapeType.equalsAscii( "com.sun.star.presentation.HeaderShape" ) )
+    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.HeaderShape" ) ) )
     {
         if( !WritePlaceholder( xShape, Header, mbMaster ) )
             ShapeExport::WriteTextShape( xShape );
     }
-    else if( sShapeType.equalsAscii( "com.sun.star.presentation.NotesShape" ) )
+    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.NotesShape" ) ) )
     {
         if( mePageType == NOTICE && mrExport.GetPresObj() )
             WritePlaceholderShape( xShape, Notes );
         else
             ShapeExport::WriteTextShape( xShape );
     }
-    else if( sShapeType.equalsAscii( "com.sun.star.presentation.OutlinerShape" ) )
+    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.OutlinerShape" ) ) )
     {
         if( !WritePlaceholder( xShape, Outliner, mbMaster ) )
             ShapeExport::WriteTextShape( xShape );
     }
-    else if( sShapeType.equalsAscii( "com.sun.star.presentation.SlideNumberShape" ) )
+    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.SlideNumberShape" ) ) )
     {
         if( !WritePlaceholder( xShape, SlideNumber, mbMaster ) )
             ShapeExport::WriteTextShape( xShape );
     }
-    else if( sShapeType.equalsAscii( "com.sun.star.presentation.TitleTextShape" ) )
+    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.TitleTextShape" ) ) )
     {
         if( !WritePlaceholder( xShape, Title, mbMaster ) )
             ShapeExport::WriteTextShape( xShape );
@@ -287,18 +287,18 @@ ShapeExport& PowerPointShapeExport::WriteUnknownShape( Reference< XShape > xShap
 
     DBG(printf( "shape(unknown): %s\n", USS(sShapeType) ));
 
-    if( sShapeType.equalsAscii( "com.sun.star.drawing.GroupShape" ) )
+    if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.GroupShape" ) ) )
     {
         Reference< XIndexAccess > rXIndexAccess( xShape, UNO_QUERY );
 
         mrExport.EnterGroup( rXIndexAccess );
         DBG(printf( "enter group\n" ));
     }
-    else if( sShapeType.equalsAscii( "com.sun.star.drawing.PageShape" ) )
+    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.PageShape" ) ) )
     {
         WritePageShape( xShape, mePageType, mrExport.GetPresObj() );
     }
-    else if( sShapeType.equalsAscii( "com.sun.star.presentation.SubtitleShape" ) )
+    else if( sShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.SubtitleShape" ) ) )
     {
         if( !WritePlaceholder( xShape, Subtitle, mbMaster ) )
             ShapeExport::WriteTextShape( xShape );
@@ -713,11 +713,11 @@ void PowerPointExport::WriteAnimationAttributeName( FSHelperPtr pFS, const OUStr
     DBG(printf("write attribute name: %s\n", USS( rAttributeName )));
 
     const char* sAttributeName = NULL;
-    if( rAttributeName.equalsAscii( "Visibility" ) ) {
+    if( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Visibility" ) ) ) {
     sAttributeName = "style.visibility";
-    } else if( rAttributeName.equalsAscii( "X" ) ) {
+    } else if( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "X" ) ) ) {
     sAttributeName = "ppt_x";
-    } else if( rAttributeName.equalsAscii( "Y" ) ) {
+    } else if( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Y" ) ) ) {
     sAttributeName = "ppt_y";
     }
 
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index c754c8d..1b2b3d1 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -200,7 +200,7 @@ Sequence< PropertyValue > SdHtmlOptionsDialog::getPropertyValues()
     sal_Int32 i, nCount;
     for ( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ )
     {
-        if ( maMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) )
+        if ( maMediaDescriptor[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterData" ) ) )
             break;
     }
     if ( i == nCount )
@@ -222,7 +222,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.equalsAscii( "FilterData" ) )
+        if ( maMediaDescriptor[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterData" ) ) )
         {
             maMediaDescriptor[ i ].Value >>= maFilterDataSequence;
             break;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 50c91f2..0111171 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -688,7 +688,7 @@ bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >&
 
     OUString aAttributeName( xAnimate->getAttributeName() );
 
-    if( (nNodeType == AnimationNodeType::SET) && aAttributeName.equalsAscii( "fill.on" ) )
+    if( (nNodeType == AnimationNodeType::SET) && aAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "fill.on" ) ) )
         return false;
 
     const ImplAttributeNameConversion* p = gImplConversionList;
@@ -971,7 +971,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any
         OUString aString;
         if( rValue >>= aString )
         {
-            rValue <<= aString.equalsAscii( "solid" ) ? FillStyle_SOLID : FillStyle_NONE;
+            rValue <<= aString.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "solid" ) ) ? FillStyle_SOLID : FillStyle_NONE;
             bRet = true;
         }
     }
@@ -982,7 +982,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any
         OUString aString;
         if( rValue >>= aString )
         {
-            rValue <<= aString.equalsAscii( "true" ) ? ::com::sun::star::drawing::LineStyle_SOLID : ::com::sun::star::drawing::LineStyle_NONE;
+            rValue <<= aString.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "true" ) ) ? ::com::sun::star::drawing::LineStyle_SOLID : ::com::sun::star::drawing::LineStyle_NONE;
             bRet = true;
         }
     }
@@ -993,7 +993,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any
         OUString aString;
         if( rValue >>= aString )
         {
-            rValue <<= aString.equalsAscii( "bold" ) ? com::sun::star::awt::FontWeight::BOLD : com::sun::star::awt::FontWeight::NORMAL;
+            rValue <<= aString.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "bold" ) ) ? com::sun::star::awt::FontWeight::BOLD : com::sun::star::awt::FontWeight::NORMAL;
             bRet = true;
         }
     }
@@ -1004,7 +1004,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any
         OUString aString;
         if( rValue >>= aString )
         {
-            rValue <<= aString.equalsAscii( "italic" ) ? com::sun::star::awt::FontSlant_ITALIC : com::sun::star::awt::FontSlant_NONE;
+            rValue <<= aString.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "italic" ) ) ? com::sun::star::awt::FontSlant_ITALIC : com::sun::star::awt::FontSlant_NONE;
             bRet = true;
         }
     }
@@ -1015,7 +1015,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any
         OUString aString;
         if( rValue >>= aString )
         {
-            rValue <<= aString.equalsAscii( "true" ) ? com::sun::star::awt::FontUnderline::SINGLE : com::sun::star::awt::FontUnderline::NONE;
+            rValue <<= aString.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "true" ) ) ? com::sun::star::awt::FontUnderline::SINGLE : com::sun::star::awt::FontUnderline::NONE;
             bRet = true;
         }
     }
@@ -1038,7 +1038,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any
         OUString aString;
         if( rValue >>= aString )
         {
-            rValue <<= aString.equalsAscii( "visible" ) ? sal_True : sal_False;
+            rValue <<= aString.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "visible" ) ) ? sal_True : sal_False;
             bRet = true;
         }
     }
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 88b0d55..2b34d79 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1777,7 +1777,7 @@ String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL
                 for (sal_Int32 i=0; i<nCount; i++)
                 {
                     ::rtl::OUString sPropertyName (aProperties[i].Name);
-                    if (sPropertyName.equalsAscii("Label"))
+                    if (sPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Label")))
                     {
                         aProperties[i].Value >>= sString;
                         break;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 2aa661d..3a46cf7 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1193,15 +1193,15 @@ sal_Bool SAL_CALL SdXImpressDocument::supportsService( const OUString& ServiceNa
 
     if (
         (ServiceName.equalsAscii("com.sun.star.document.OfficeDocument"       )) ||
-        (ServiceName.equalsAscii("com.sun.star.drawing.GenericDrawingDocument")) ||
-        (ServiceName.equalsAscii("com.sun.star.drawing.DrawingDocumentFactory"))
+        (ServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.GenericDrawingDocument"))) ||
+        (ServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocumentFactory")))
        )
     {
         return sal_True;
     }
 
     return (
-            ( mbImpressDoc && ServiceName.equalsAscii("com.sun.star.presentation.PresentationDocument")) ||
+            ( mbImpressDoc && ServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationDocument"))) ||
             (!mbImpressDoc && ServiceName.equalsAscii("com.sun.star.drawing.DrawingDocument"          ))
            );
 }
@@ -1471,7 +1471,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.equalsAscii( "ExportNotesPages" ) )
+        if( rxOptions[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportNotesPages" ) ) )
             rxOptions[ nProperty].Value >>= bExportNotesPages;
     }
     uno::Sequence< beans::PropertyValue > aRenderer;
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 15461c0..95bd53b 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -269,8 +269,8 @@ namespace {
     {
     public:
         Selection (const OUString& rsSelection, const SdPage* pCurrentPage)
-            : mbAreAllPagesSelected(rsSelection.equalsAscii("all")),
-              mbIsShapeSelection(rsSelection.equalsAscii("selection")),
+            : mbAreAllPagesSelected(rsSelection.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("all"))),
+              mbIsShapeSelection(rsSelection.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("selection"))),
               mnCurrentPageIndex(pCurrentPage!=NULL ? (pCurrentPage->GetPageNum()-1)/2 : -1),
               mpSelectedPages()
         {
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 5aa9dde..16b0eb2 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1231,7 +1231,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB
                 {
                     for( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
                     {
-                        if( aPropSeq[i].Name.equalsAscii( "Name" ))
+                        if( aPropSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Name" ) ))
                         {
                             aPropSeq[i].Value >>= aLabel;
                             break;
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index e6830ff..0496941 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -523,8 +523,8 @@ void DemoApp::Main()
     {
         ::rtl::OUString aParam = GetCommandLineParam( i );
 
-        if( aParam.equalsAscii( "--help" ) ||
-            aParam.equalsAscii( "-h" ) )
+        if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--help" ) ) ||
+            aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ) ) )
                 bHelp = true;
     }
 


More information about the Libreoffice-commits mailing list